mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 21:14:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove deprecated property manga from folder and comic_info

Browse Source
This commit is contained in:
Luis Ángel San Martín
2023-06-10 11:09:55 +02:00
parent 13993f0381
commit 51a4dbf049
9 changed files with 9 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
YACReaderLibrary/db/data_base_management.cpp
View File

@ -64,7 +64,7 @@ static QString fields = "title,"
//"coverSizeRatio," cover may have changed since the info was exported...
//"originalCoverSize," // h/w
// new 9.8 fields
"manga,"
// "manga," //removed in 9.13
// new 9.13 fields
"added,"
"type,"
@ -315,7 +315,7 @@ bool DataBaseManagement::createV8Tables(QSqlDatabase &database)
"name TEXT NOT NULL, "
"finished BOOLEAN DEFAULT 0, "
"completed BOOLEAN DEFAULT 1, "
"manga BOOLEAN DEFAULT 0, "
"manga BOOLEAN DEFAULT 0, " // TODO never used, replace with `type`
"FOREIGN KEY(parentId) REFERENCES reading_list(id) ON DELETE CASCADE)");
QSqlQuery queryIndexReadingList(database);
@ -485,7 +485,7 @@ bool DataBaseManagement::importComicsInfo(QString source, QString dest)
//--
// new 9.8 fields
"manga = :manga,"
// "manga = :manga," //removed in 9.13
// new 9.13 fields
"added = :added,"
@ -539,7 +539,6 @@ bool DataBaseManagement::importComicsInfo(QString source, QString dest)
"comicVineID,"
"lastTimeOpened,"
"coverSizeRatio,"
"manga,"
"added,"
"type,"
"editor,"
@ -582,7 +581,6 @@ bool DataBaseManagement::importComicsInfo(QString source, QString dest)
":format,"
":color,"
":ageRating,"
":manga,"
":synopsis,"
":characters,"
@ -597,7 +595,6 @@ bool DataBaseManagement::importComicsInfo(QString source, QString dest)
":coverSizeRatio,"
":originalCoverSize,"
":manga,"
":added,"
":type,"
":editor,"
@ -704,7 +701,6 @@ void DataBaseManagement::bindValuesFromRecord(const QSqlRecord &record, QSqlQuer
bindValue("format", record, query);
bindValue("color", record, query);
bindValue("ageRating", record, query);
bindValue("manga", record, query);
bindValue("synopsis", record, query);
bindValue("characters", record, query);

9
YACReaderLibrary/db/folder_model.cpp
View File

@ -94,7 +94,6 @@ QHash<int, QByteArray> FolderModel::roleNames() const
roles[FinishedRole] = "is_finished";
roles[CompletedRole] = "is_completed";
roles[IdRole] = "id";
roles[MangaRole] = "is_manga";
roles[CoverPathRole] = "cover_path";
roles[FolderNameRole] = "name";
roles[NumChildrenRole] = "num_children";
@ -164,9 +163,6 @@ QVariant FolderModel::data(const QModelIndex &index, int role) const
if (role == FolderModel::FinishedRole)
return item->data(FolderModel::Finished);
if (role == FolderModel::MangaRole)
return item->data(FolderModel::Manga);
if (role == FolderModel::IdRole)
return item->id;
@ -343,7 +339,6 @@ void FolderModel::setupModelData(QSqlQuery &sqlquery, FolderItem *parent)
int path = record.indexOf("path");
int finished = record.indexOf("finished");
int completed = record.indexOf("completed");
int manga = record.indexOf("manga");
int id = record.indexOf("id");
int parentId = record.indexOf("parentId");
int numChildren = record.indexOf("numChildren");
@ -360,7 +355,6 @@ void FolderModel::setupModelData(QSqlQuery &sqlquery, FolderItem *parent)
data << sqlquery.value(path);
data << sqlquery.value(finished);
data << sqlquery.value(completed);
data << sqlquery.value(manga);
data << sqlquery.value(numChildren);
data << sqlquery.value(firstChildHash);
data << sqlquery.value(customImage);
@ -549,7 +543,6 @@ Folder FolderModel::getFolder(const QModelIndex &mi)
folderItem->parent()->data(Columns::Path).toString() + "/" + name,
folderItem->data(Columns::Completed).toBool(),
folderItem->data(Columns::Finished).toBool(),
folderItem->data(Columns::Manga).toBool(),
folderItem->data(Columns::NumChildren).toInt(),
folderItem->data(Columns::FirstChildHash).toString(),
folderItem->data(Columns::CustomImage).toString(),
@ -605,7 +598,6 @@ QModelIndex FolderModel::addFolderAtParent(const QString &folderName, const QMod
newFolder.name = folderName;
newFolder.parentId = parentItem->id;
newFolder.path = parentItem->data(Columns::Path).toString() + "/" + folderName;
newFolder.manga = parentItem->data(Columns::Manga).toBool();
newFolder.type = parentItem->data(Columns::Type).value<YACReader::FileType>();
QString connectionName = "";
@ -624,7 +616,6 @@ QModelIndex FolderModel::addFolderAtParent(const QString &folderName, const QMod
data << newFolder.path;
data << false; // finished
data << true; // completed
data << newFolder.manga;
data << 0; // numChildren
data << QVariant(); // first child hash, new folder is empty
data << QVariant(); // custom cover

2
YACReaderLibrary/db/folder_model.h
View File

@ -89,7 +89,6 @@ public:
Path,
Finished,
Completed,
Manga, // deprecated
NumChildren,
FirstChildHash,
CustomImage,
@ -102,7 +101,6 @@ public:
FinishedRole = Qt::UserRole + 1,
CompletedRole,
IdRole,
MangaRole, // deprecated
CoverPathRole,
FolderNameRole,
NumChildrenRole,