From 60de69635b200f386ebd2d331c2ad9f42febaca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sat, 16 Jan 2021 18:30:25 +0100 Subject: [PATCH] Get/set new manga field from/to the db --- YACReaderLibrary/db_helper.cpp | 12 +++++++++++- common/folder.cpp | 1 + common/folder.h | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/YACReaderLibrary/db_helper.cpp b/YACReaderLibrary/db_helper.cpp index 942dc4f0..c7323367 100644 --- a/YACReaderLibrary/db_helper.cpp +++ b/YACReaderLibrary/db_helper.cpp @@ -649,10 +649,12 @@ void DBHelper::update(const Folder &folder, QSqlDatabase &db) QSqlQuery updateFolderInfo(db); updateFolderInfo.prepare("UPDATE folder SET " "finished = :finished, " - "completed = :completed " + "completed = :completed, " + "manga = :manga " "WHERE id = :id "); updateFolderInfo.bindValue(":finished", folder.isFinished() ? 1 : 0); updateFolderInfo.bindValue(":completed", folder.isCompleted() ? 1 : 0); + updateFolderInfo.bindValue(":manga", folder.isManga() ? 1 : 0); updateFolderInfo.bindValue(":id", folder.id); updateFolderInfo.exec(); } @@ -1535,6 +1537,7 @@ Folder DBHelper::loadFolder(qulonglong id, QSqlDatabase &db) int path = record.indexOf("path"); int finished = record.indexOf("finished"); int completed = record.indexOf("completed"); + int manga = record.indexOf("manga"); int numChildren = record.indexOf("numChildren"); int firstChildHash = record.indexOf("firstChildHash"); int customImage = record.indexOf("customImage"); @@ -1554,6 +1557,9 @@ Folder DBHelper::loadFolder(qulonglong id, QSqlDatabase &db) folder.setNumChildren(query.value(numChildren).toInt()); folder.setFirstChildHash(query.value(firstChildHash).toString()); folder.setCustomImage(query.value(customImage).toString()); + + //new 9.8 + folder.setManga(query.value(manga).toBool()); } return folder; @@ -1576,6 +1582,7 @@ Folder DBHelper::loadFolder(const QString &folderName, qulonglong parentId, QSql int path = record.indexOf("path"); int finished = record.indexOf("finished"); int completed = record.indexOf("completed"); + int manga = record.indexOf("manga"); int numChildren = record.indexOf("numChildren"); int firstChildHash = record.indexOf("firstChildHash"); int customImage = record.indexOf("customImage"); @@ -1596,6 +1603,9 @@ Folder DBHelper::loadFolder(const QString &folderName, qulonglong parentId, QSql folder.setNumChildren(query.value(numChildren).toInt()); folder.setFirstChildHash(query.value(firstChildHash).toString()); folder.setCustomImage(query.value(customImage).toString()); + + //new 9.8 + folder.setManga(query.value(manga).toBool()); } return folder; diff --git a/common/folder.cpp b/common/folder.cpp index 8f66f76d..27c58b2a 100644 --- a/common/folder.cpp +++ b/common/folder.cpp @@ -31,6 +31,7 @@ Folder &Folder::operator=(const Folder &other) this->knownId = other.knownId; this->finished = other.finished; this->completed = other.completed; + this->manga = other.manga; return *this; } diff --git a/common/folder.h b/common/folder.h index 040a181f..25d03d9a 100644 --- a/common/folder.h +++ b/common/folder.h @@ -43,6 +43,11 @@ public: return completed; } + inline bool isManga() const + { + return manga; + } + inline void setFinished(bool b) { finished = b; @@ -53,6 +58,11 @@ public: completed = b; } + inline void setManga(bool b) + { + manga = b; + } + inline qint32 getNumChildren() const { return numChildren; @@ -86,6 +96,7 @@ public: private: bool finished; bool completed; + bool manga; qint32 numChildren; //-1 for unknown number of children QString firstChildHash; //empty for unknown first child