FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

experimental implementation of #302

Browse Source
This commit is contained in:
Martin Rotter 2022-03-16 08:14:50 +01:00
parent 6ec12602a2
commit c6cfb2e5df
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View File

@ -26,7 +26,7 @@
<url type="donation">https://github.com/sponsors/martinrotter</url> <url type="donation">https://github.com/sponsors/martinrotter</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="4.1.2" date="2022-03-15"/> <release version="4.1.2" date="2022-03-16"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

18
src/librssguard/database/databasequeries.cpp
View File

@ -1936,18 +1936,15 @@ QStringList DatabaseQueries::customIdsOfMessagesFromFeed(const QSqlDatabase& db,
return ids; return ids;
} }
void DatabaseQueries::createOverwriteCategory(const QSqlDatabase& db, Category* category, int account_id, int parent_id) { void DatabaseQueries::createOverwriteCategory(const QSqlDatabase& db, Category* category, int account_id, int new_parent_id) {
QSqlQuery q(db); QSqlQuery q(db);
int next_sort_order; int next_sort_order;
// TODO: check, then go to createoverwriteaccount if (category->id() <= 0 ||
(category->parent() != nullptr && category->parent()->id() != new_parent_id)) {
if ((category->id() <= 0 && category->sortOrder() < 0) ||
(category->parent() != nullptr && category->parent()->id() != parent_id)) {
// We need to insert category first.
q.prepare(QSL("SELECT MAX(ordr) FROM Categories WHERE account_id = :account_id AND parent_id = :parent_id;")); q.prepare(QSL("SELECT MAX(ordr) FROM Categories WHERE account_id = :account_id AND parent_id = :parent_id;"));
q.bindValue(QSL(":account_id"), account_id); q.bindValue(QSL(":account_id"), account_id);
q.bindValue(QSL(":parent_id"), parent_id); q.bindValue(QSL(":parent_id"), new_parent_id);
if (!q.exec() || !q.next()) { if (!q.exec() || !q.next()) {
throw ApplicationException(q.lastError().text()); throw ApplicationException(q.lastError().text());
@ -1961,6 +1958,7 @@ void DatabaseQueries::createOverwriteCategory(const QSqlDatabase& db, Category*
} }
if (category->id() <= 0) { if (category->id() <= 0) {
// We need to insert category first.
q.prepare(QSL("INSERT INTO " q.prepare(QSL("INSERT INTO "
"Categories (parent_id, ordr, title, date_created, account_id) " "Categories (parent_id, ordr, title, date_created, account_id) "
"VALUES (0, 0, 'new', 0, %1);").arg(QString::number(account_id))); "VALUES (0, 0, 'new', 0, %1);").arg(QString::number(account_id)));
@ -1972,7 +1970,7 @@ void DatabaseQueries::createOverwriteCategory(const QSqlDatabase& db, Category*
category->setId(q.lastInsertId().toInt()); category->setId(q.lastInsertId().toInt());
} }
} }
else if (category->parent() != nullptr && category->parent()->id() != parent_id) { else if (category->parent() != nullptr && category->parent()->id() != new_parent_id) {
// Category is moving between parents. // Category is moving between parents.
// 1. Move category to bottom of current parent. // 1. Move category to bottom of current parent.
// 2. Assign proper new sort order. // 2. Assign proper new sort order.
@ -1989,7 +1987,7 @@ void DatabaseQueries::createOverwriteCategory(const QSqlDatabase& db, Category*
"SET parent_id = :parent_id, ordr = :ordr, title = :title, description = :description, date_created = :date_created, " "SET parent_id = :parent_id, ordr = :ordr, title = :title, description = :description, date_created = :date_created, "
" icon = :icon, account_id = :account_id, custom_id = :custom_id " " icon = :icon, account_id = :account_id, custom_id = :custom_id "
"WHERE id = :id;"); "WHERE id = :id;");
q.bindValue(QSL(":parent_id"), parent_id); q.bindValue(QSL(":parent_id"), new_parent_id);
q.bindValue(QSL(":title"), category->title()); q.bindValue(QSL(":title"), category->title());
q.bindValue(QSL(":description"), category->description()); q.bindValue(QSL(":description"), category->description());
q.bindValue(QSL(":date_created"), category->creationDate().toMSecsSinceEpoch()); q.bindValue(QSL(":date_created"), category->creationDate().toMSecsSinceEpoch());
@ -2008,7 +2006,7 @@ void DatabaseQueries::createOverwriteFeed(const QSqlDatabase& db, Feed* feed, in
QSqlQuery q(db); QSqlQuery q(db);
int next_sort_order; int next_sort_order;
if ((feed->id() <= 0 && feed->sortOrder() < 0) || if (feed->id() <= 0 ||
(feed->parent() != nullptr && feed->parent()->id() != new_parent_id)) { (feed->parent() != nullptr && feed->parent()->id() != new_parent_id)) {
// We either insert completely new feed or we move feed // We either insert completely new feed or we move feed
// to new parent. Get new viable sort order. // to new parent. Get new viable sort order.

2
src/librssguard/database/databasequeries.h
View File

@ -123,7 +123,7 @@ class DatabaseQueries {
static bool cleanFeeds(const QSqlDatabase& db, const QStringList& ids, bool clean_read_only, int account_id); static bool cleanFeeds(const QSqlDatabase& db, const QStringList& ids, bool clean_read_only, int account_id);
static void storeAccountTree(const QSqlDatabase& db, RootItem* tree_root, int account_id); static void storeAccountTree(const QSqlDatabase& db, RootItem* tree_root, int account_id);
static void createOverwriteFeed(const QSqlDatabase& db, Feed* feed, int account_id, int new_parent_id); static void createOverwriteFeed(const QSqlDatabase& db, Feed* feed, int account_id, int new_parent_id);
static void createOverwriteCategory(const QSqlDatabase& db, Category* category, int account_id, int parent_id); static void createOverwriteCategory(const QSqlDatabase& db, Category* category, int account_id, int new_parent_id);
static bool deleteFeed(const QSqlDatabase& db, Feed* feed, int account_id); static bool deleteFeed(const QSqlDatabase& db, Feed* feed, int account_id);
static bool deleteCategory(const QSqlDatabase& db, Category* category); static bool deleteCategory(const QSqlDatabase& db, Category* category);