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

save work

Browse Source
This commit is contained in:
Martin Rotter 2023-12-19 07:22:54 +01:00
parent 43d164dc40
commit 11ec85f694
5 changed files with 148 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,6 +419,47 @@ bool DatabaseQueries::markMessagesReadUnread(const QSqlDatabase& db,
.arg(ids.join(QSL(", ")), read == RootItem::ReadStatus::Read ? QSL("1") : QSL("0")));
}
void DatabaseQueries::markMessagesReadUnreadImportant(const QSqlDatabase& db,
int account_id,
const QStringList& custom_ids,
RootItem::ReadStatus read,
RootItem::Importance important) {
auto stringed_ids = boolinq::from(custom_ids)
.select([](const QString& id) {
return QSL("'%1'").arg(id);
})
.toStdList();
QStringList textual_ids = FROM_STD_LIST(QStringList, stringed_ids);
QSqlQuery q(db);
QStringList setters;
if (read != RootItem::ReadStatus::Unknown) {
setters.append(QSL("is_read = :read"));
}
if (important != RootItem::Importance::Unknown) {
setters.append(QSL("is_important = :important"));
}
q.setForwardOnly(true);
if (!q.prepare(QSL("UPDATE Messages SET %2 "
" WHERE account_id = :account_id AND "
" custom_id in (%1);")
.arg(textual_ids.join(", "), setters.join(" AND ")))) {
throw ApplicationException(q.lastError().text());
}
q.bindValue(QSL(":read"), int(read));
q.bindValue(QSL(":important"), int(important));
q.bindValue(QSL(":account_id"), account_id);
if (!q.exec()) {
throw ApplicationException(q.lastError().text());
}
}
bool DatabaseQueries::markMessageImportant(const QSqlDatabase& db, int id, RootItem::Importance importance) {
QSqlQuery q(db);

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

@ -54,6 +54,11 @@ class DatabaseQueries {
static bool markImportantMessagesReadUnread(const QSqlDatabase& db, int account_id, RootItem::ReadStatus read);
static bool markUnreadMessagesRead(const QSqlDatabase& db, int account_id);
static bool markMessagesReadUnread(const QSqlDatabase& db, const QStringList& ids, RootItem::ReadStatus read);
static void markMessagesReadUnreadImportant(const QSqlDatabase& db,
int account_id,
const QStringList& custom_ids,
RootItem::ReadStatus read,
RootItem::Importance important);
static bool markMessageImportant(const QSqlDatabase& db, int id, RootItem::Importance importance);
static bool markFeedsReadUnread(const QSqlDatabase& db,
const QStringList& ids,

104
src/librssguard/network-web/apiserver.cpp
View File

@ -3,9 +3,14 @@
#include "network-web/apiserver.h"
#include "3rd-party/boolinq/boolinq.h"
#include "core/feedsmodel.h"
#include "database/databasefactory.h"
#include "database/databasequeries.h"
#include "definitions/definitions.h"
#include "gui/dialogs/formmain.h"
#include "gui/feedmessageviewer.h"
#include "gui/messagesview.h"
#include "miscellaneous/application.h"
#include <QJsonArray>
@ -145,10 +150,102 @@ ApiResponse ApiServer::processMarkArticles(const QJsonValue& req) const {
for (const QJsonValue& article_val : data.value(QSL("articles")).toArray()) {
QJsonObject article_obj = article_val.toObject();
articles_per_accounts[article_obj.value(QSL("accountId")).toInt()]
articles_per_accounts[article_obj.value(QSL("account")).toInt()]
.append(article_obj.value(QSL("article_custom_id")).toString());
}
QMapIterator<int, QStringList> articles_per_accounts_iter(articles_per_accounts);
QSqlDatabase database = qApp->database()->driver()->connection(metaObject()->className());
RootItem::ReadStatus target_read = mark_read ? RootItem::ReadStatus::Read : RootItem::ReadStatus::Unread;
if (!mark_read && !mark_unread) {
target_read = RootItem::ReadStatus::Unknown;
}
RootItem::Importance target_important =
mark_starred ? RootItem::Importance::Important : RootItem::Importance::NotImportant;
if (!mark_starred && !mark_unstarred) {
target_important = RootItem::Importance::Unknown;
}
QList<ServiceRoot*> accts = qApp->feedReader()->feedsModel()->serviceRoots();
auto linq_accts = boolinq::from(accts);
while (articles_per_accounts_iter.hasNext()) {
auto nxt = articles_per_accounts_iter.next();
int account_id = nxt.key();
QStringList custom_ids = nxt.value();
ServiceRoot* acc = linq_accts.firstOrDefault([=](ServiceRoot* acc) {
return acc->id() == account_id;
});
if (acc == nullptr) {
return ApiResponse(ApiResponse::Result::Error,
ApiRequest::Method::MarkArticles,
tr("account with ID %1 not found").arg(account_id));
}
/*
QList<Message> read_msgs;
QList<ImportanceChange> imp_msgs;
if (target_read != RootItem::ReadStatus::Unknown) {
read_msgs.reserve(custom_ids.size());
auto std_msgs = boolinq::from(custom_ids)
.select([](const QString& custom_id) {
Message msg;
msg.m_customId = custom_id;
return msg;
})
.toStdList();
read_msgs = FROM_STD_LIST(QList<Message>, std_msgs);
acc->onBeforeSetMessagesRead(acc, read_msgs, target_read);
}
if (target_important != RootItem::Importance::Unknown) {
imp_msgs.reserve(custom_ids.size());
auto std_msgs = boolinq::from(custom_ids)
.select([=](const QString& custom_id) {
ImportanceChange ch;
Message msg;
msg.m_customId = custom_id;
ch.first = msg;
ch.second = target_important;
return ch;
})
.toStdList();
imp_msgs = FROM_STD_LIST(QList<ImportanceChange>, std_msgs);
acc->onBeforeSwitchMessageImportance(acc, imp_msgs);
}
*/
DatabaseQueries::markMessagesReadUnreadImportant(database, account_id, custom_ids, target_read, target_important);
/*
if (target_read != RootItem::ReadStatus::Unknown) {
acc->onAfterSetMessagesRead(acc, read_msgs, target_read);
}
if (target_important != RootItem::Importance::Unknown) {
acc->onAfterSwitchMessageImportance(acc, imp_msgs);
}
*/
}
// All updates are done, recalculate.
qApp->feedReader()->feedsModel()->reloadCountsOfWholeModel();
qApp->mainForm()->tabWidget()->feedMessageViewer()->messagesView()->reloadSelections();
ApiResponse resp(ApiResponse::Result::Success, ApiRequest::Method::MarkArticles);
return resp;
@ -158,10 +255,7 @@ ApiResponse ApiServer::processArticlesFromFeed(const QJsonValue& req) const {
QJsonObject data = req.toObject();
QString feed_id = data.value(QSL("feed")).toString();
qint64 start_after_article_date = qint64(data
.value(QSL("start_after_"
"article_date"))
.toDouble());
qint64 start_after_article_date = qint64(data.value(QSL("start_after_article_date")).toDouble());
int account_id = data.value(QSL("account")).toInt();
bool newest_first = data.value(QSL("newest_first")).toBool();
bool unread_only = data.value(QSL("unread_only")).toBool();

2
src/librssguard/services/abstract/serviceroot.cpp
View File

@ -1015,7 +1015,7 @@ bool ServiceRoot::onAfterSetMessagesRead(RootItem* selected_item,
// 4. Labels assigned.
if (labelsNode() != nullptr) {
auto db = qApp->database()->driver()->connection(metaObject()->className());
// auto db = qApp->database()->driver()->connection(metaObject()->className());
QStringList lbls; // = DatabaseQueries::getCountOfAssignedLabelsToMessages(db, messages, accountId());
for (const Message& msg : messages) {

4
src/librssguard/services/standard/gui/formstandardfeeddetails.cpp
View File

@ -183,9 +183,9 @@ void FormStandardFeedDetails::loadFeedData() {
m_authDetails->m_txtPassword->lineEdit()->setText(std_feed->password());
if (m_creatingNew) {
auto processed_url = qApp->web()->processFeedUriScheme(m_urlToProcess);
// auto processed_url = qApp->web()->processFeedUriScheme(m_urlToProcess);
m_standardFeedDetails->prepareForNewFeed(m_parentToSelect, processed_url);
m_standardFeedDetails->prepareForNewFeed(m_parentToSelect, m_urlToProcess);
}
else {
m_standardFeedDetails->setExistingFeed(std_feed);