From a9887a2d46278a0fa40fa64ba7d94d3d2a4d63d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Tue, 24 Apr 2018 14:42:06 +0200 Subject: [PATCH] Add methods for getting json from reading lists and labels(tags) --- .../server/yacreader_server_data_helper.cpp | 32 +++++++++++++++++++ .../server/yacreader_server_data_helper.h | 4 +++ 2 files changed, 36 insertions(+) diff --git a/YACReaderLibrary/server/yacreader_server_data_helper.cpp b/YACReaderLibrary/server/yacreader_server_data_helper.cpp index 2829e28e..2bd5e462 100644 --- a/YACReaderLibrary/server/yacreader_server_data_helper.cpp +++ b/YACReaderLibrary/server/yacreader_server_data_helper.cpp @@ -71,4 +71,36 @@ QJsonObject YACReaderServerDataHelper::fullComicToJSON(const qulonglong libraryI return json; } +QJsonObject YACReaderServerDataHelper::readingListToJSON(const qulonglong libraryId, const ReadingList &readingList) +{ + QJsonObject json; + + json["type"] = "reading_list"; + json["id"] = QString::number(readingList.getId()); + json["library_id"] = QString::number(libraryId); + json["reading_list_name"] = readingList.getName(); + + //TODO + //json["num_children"] = readingList.getNumChildren(); + //json["first_comic_hash"] = readingList.getFirstChildHash(); + + return json; +} + +QJsonObject YACReaderServerDataHelper::labelToJSON(const qulonglong libraryId, const Label &label) +{ + QJsonObject json; + + json["type"] = "label"; + json["id"] = QString::number(label.getId()); + json["library_id"] = QString::number(libraryId); + json["label_list_name"] = label.getName(); + json["color_id"] = label.getColorID(); + + //TODO + //json["num_children"] = label.getNumChildren(); + + return json; +} + YACReaderServerDataHelper::YACReaderServerDataHelper() {} diff --git a/YACReaderLibrary/server/yacreader_server_data_helper.h b/YACReaderLibrary/server/yacreader_server_data_helper.h index 04eadc08..8e71f2dc 100644 --- a/YACReaderLibrary/server/yacreader_server_data_helper.h +++ b/YACReaderLibrary/server/yacreader_server_data_helper.h @@ -4,6 +4,7 @@ #include #include "folder.h" #include "comic_db.h" +#include "reading_list.h" class YACReaderServerDataHelper { @@ -14,6 +15,9 @@ public: static QJsonObject folderToJSON(const qulonglong libraryId, const Folder & folder); static QJsonObject comicToJSON(const qulonglong libraryId, const ComicDB & comic); static QJsonObject fullComicToJSON(const qulonglong libraryId, const ComicDB & comic); + static QJsonObject readingListToJSON(const qulonglong libraryId, const ReadingList & readingList); + static QJsonObject labelToJSON(const qulonglong libraryId, const Label & label); + private: YACReaderServerDataHelper();