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

Merge branch 'master' of github.com:martinrotter/rssguard

Browse Source
This commit is contained in:
Martin Rotter 2023-08-07 08:42:23 +02:00
commit 500748b68f
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/sql/db_init_sqlite.sql
View File

@ -106,7 +106,7 @@ CREATE TABLE Probes (
id $$, id $$,
name TEXT NOT NULL CHECK (name != ''), name TEXT NOT NULL CHECK (name != ''),
color VARCHAR(7) NOT NULL CHECK (color != ''), color VARCHAR(7) NOT NULL CHECK (color != ''),
fltr TEXT NOT NULL CHECK (filter != ''), /* Regular expression. */ fltr TEXT NOT NULL CHECK (fltr != ''), /* Regular expression. */
account_id INTEGER NOT NULL, account_id INTEGER NOT NULL,
FOREIGN KEY (account_id) REFERENCES Accounts (id) ON DELETE CASCADE FOREIGN KEY (account_id) REFERENCES Accounts (id) ON DELETE CASCADE

2
resources/sql/db_update_sqlite_6_7.sql
View File

@ -2,7 +2,7 @@ CREATE TABLE Probes (
id $$, id $$,
name TEXT NOT NULL CHECK (name != ''), name TEXT NOT NULL CHECK (name != ''),
color VARCHAR(7) NOT NULL CHECK (color != ''), color VARCHAR(7) NOT NULL CHECK (color != ''),
fltr TEXT NOT NULL CHECK (filter != ''), /* Regular expression. */ fltr TEXT NOT NULL CHECK (fltr != ''), /* Regular expression. */
account_id INTEGER NOT NULL, account_id INTEGER NOT NULL,
FOREIGN KEY (account_id) REFERENCES Accounts (id) ON DELETE CASCADE FOREIGN KEY (account_id) REFERENCES Accounts (id) ON DELETE CASCADE

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

@ -853,16 +853,30 @@ bool ServiceRoot::onAfterSetMessagesRead(RootItem* selected_item,
// 4. Labels assigned. // 4. Labels assigned.
if (labelsNode() != nullptr) { if (labelsNode() != nullptr) {
auto db = qApp->database()->driver()->connection(metaObject()->className()); auto db = qApp->database()->driver()->connection(metaObject()->className());
auto lbls = DatabaseQueries::getCountOfAssignedLabelsToMessages(db, messages, accountId()); QStringList lbls; // = DatabaseQueries::getCountOfAssignedLabelsToMessages(db, messages, accountId());
for (const QString& lbl_custom_id : lbls.keys()) { for (const Message& msg : messages) {
auto* lbl = labelsNode()->labelById(lbl_custom_id); for (const QString& lbl : msg.m_assignedLabelsIds) {
if (!lbls.contains(lbl)) {
if (lbl != nullptr) { lbls.append(lbl);
lbl->setCountOfUnreadMessages(lbls.value(lbl_custom_id).m_unread); }
to_update << lbl;
} }
} }
for (const QString& lbl : lbls) {
Label* l = labelsNode()->labelById(lbl);
l->updateCounts(false);
to_update << l;
}
/*
for (const QString& lbl_custom_id : lbls.keys()) {
auto* lbl = labelsNode()->labelById(lbl_custom_id);
if (lbl != nullptr) {
lbl->setCountOfUnreadMessages(lbls.value(lbl_custom_id).m_unread);
to_update << lbl;
}
}*/
} }
} }