diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index e44ed4271..58f69a1b0 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -30,7 +30,7 @@ https://martinrotter.github.io/donate/ - + none diff --git a/resources/scripts/scrapers/translate-rss2.py b/resources/scripts/scrapers/translate-rss2.py new file mode 100755 index 000000000..4a9f398ea --- /dev/null +++ b/resources/scripts/scrapers/translate-rss2.py @@ -0,0 +1,39 @@ +# Translates entries of RSS 2.0 feed into different locale. +# +# Make sure to have all dependencies installed: +# pip3 install googletrans==4.0.0-rc1 +# +# You must provide raw RSS 2.0 UTF-8 feed XML data as input, for example with curl: +# curl 'https://phys.org/rss-feed/' | python ./translate-rss2.py "en" "pt_BR" +# +# You must provide two additional command line arguments: +# translate-rss2.py [FROM-LANGUAGE] [TO-LANGUAGE] + +import sys +import time +import xml.etree.ElementTree as ET +from googletrans import Translator + +lang_from = sys.argv[1] +lang_to = sys.argv[2] +sys.stdin.reconfigure(encoding='utf-8') +rss_data = sys.stdin.read() +rss_document = ET.fromstring(rss_data) +translator = Translator() + +def translate_string(to_translate): + translated_text = translator.translate(to_translate, src = lang_from, dest = lang_to) + time.sleep(0.2) + return translated_text.text + +def process_article(article): + title = article.find("title") + title.text = translate_string(title.text) + + contents = article.find("description") + contents.text = translate_string(" ".join(contents.itertext())) + +for article in rss_document.findall(".//item"): + process_article(article) + +print(ET.tostring(rss_document, encoding = "unicode")) \ No newline at end of file diff --git a/src/librssguard/core/feedsproxymodel.cpp b/src/librssguard/core/feedsproxymodel.cpp index ce30046e7..d2a9caae1 100644 --- a/src/librssguard/core/feedsproxymodel.cpp +++ b/src/librssguard/core/feedsproxymodel.cpp @@ -30,6 +30,7 @@ FeedsProxyModel::FeedsProxyModel(FeedsModel* source_model, QObject* parent) RootItem::Kind::Feed, RootItem::Kind::Labels, RootItem::Kind::Important, + RootItem::Kind::Unread, RootItem::Kind::Bin }; } diff --git a/src/librssguard/database/databasequeries.cpp b/src/librssguard/database/databasequeries.cpp index 310292bca..20e5d8928 100755 --- a/src/librssguard/database/databasequeries.cpp +++ b/src/librssguard/database/databasequeries.cpp @@ -638,6 +638,31 @@ int DatabaseQueries::getImportantMessageCounts(const QSqlDatabase& db, int accou } } +int DatabaseQueries::getUnreadMessageCounts(const QSqlDatabase& db, int account_id, bool* ok) { + QSqlQuery q(db); + + q.setForwardOnly(true); + q.prepare("SELECT count(*) FROM Messages " + "WHERE is_read = 0 AND is_deleted = 0 AND is_pdeleted = 0 AND account_id = :account_id;"); + + q.bindValue(QSL(":account_id"), account_id); + + if (q.exec() && q.next()) { + if (ok != nullptr) { + *ok = true; + } + + return q.value(0).toInt(); + } + else { + if (ok != nullptr) { + *ok = false; + } + + return 0; + } +} + int DatabaseQueries::getMessageCountsForBin(const QSqlDatabase& db, int account_id, bool including_total_counts, bool* ok) { QSqlQuery q(db); @@ -781,6 +806,40 @@ QList DatabaseQueries::getUndeletedImportantMessages(const QSqlDatabase return messages; } +QList DatabaseQueries::getUndeletedUnreadMessages(const QSqlDatabase& db, int account_id, bool* ok) { + QList messages; + QSqlQuery q(db); + + q.setForwardOnly(true); + q.prepare(QSL("SELECT %1 " + "FROM Messages " + "WHERE is_read = 0 AND is_deleted = 0 AND " + " is_pdeleted = 0 AND account_id = :account_id;").arg(messageTableAttributes(true).values().join(QSL(", ")))); + q.bindValue(QSL(":account_id"), account_id); + + if (q.exec()) { + while (q.next()) { + bool decoded; + Message message = Message::fromSqlRecord(q.record(), &decoded); + + if (decoded) { + messages.append(message); + } + } + + if (ok != nullptr) { + *ok = true; + } + } + else { + if (ok != nullptr) { + *ok = false; + } + } + + return messages; +} + QList DatabaseQueries::getUndeletedMessagesForFeed(const QSqlDatabase& db, const QString& feed_custom_id, int account_id, bool* ok) { QList messages; @@ -1603,6 +1662,29 @@ QStringList DatabaseQueries::customIdsOfImportantMessages(const QSqlDatabase& db return ids; } +QStringList DatabaseQueries::customIdsOfUnreadMessages(const QSqlDatabase& db, int account_id, bool* ok) { + QSqlQuery q(db); + QStringList ids; + + q.setForwardOnly(true); + q.prepare(QSL("SELECT custom_id FROM Messages " + "WHERE is_read = 0 AND is_deleted = 0 AND is_pdeleted = 0 AND account_id = :account_id;")); + q.bindValue(QSL(":account_id"), account_id); + + if (ok != nullptr) { + *ok = q.exec(); + } + else { + q.exec(); + } + + while (q.next()) { + ids.append(q.value(0).toString()); + } + + return ids; +} + QStringList DatabaseQueries::customIdsOfMessagesFromBin(const QSqlDatabase& db, int account_id, bool* ok) { QSqlQuery q(db); QStringList ids; diff --git a/src/librssguard/database/databasequeries.h b/src/librssguard/database/databasequeries.h index 919973ff9..b2204ab05 100644 --- a/src/librssguard/database/databasequeries.h +++ b/src/librssguard/database/databasequeries.h @@ -78,12 +78,14 @@ class DatabaseQueries { bool only_total_counts, bool* ok = nullptr); static int getImportantMessageCounts(const QSqlDatabase& db, int account_id, bool only_total_counts, bool* ok = nullptr); + static int getUnreadMessageCounts(const QSqlDatabase& db, int account_id, bool* ok = nullptr); static int getMessageCountsForBin(const QSqlDatabase& db, int account_id, bool including_total_counts, bool* ok = nullptr); // Get messages (for newspaper view for example). static QList getUndeletedMessagesWithLabel(const QSqlDatabase& db, const Label* label, bool* ok = nullptr); static QList getUndeletedLabelledMessages(const QSqlDatabase& db, int account_id, bool* ok = nullptr); static QList getUndeletedImportantMessages(const QSqlDatabase& db, int account_id, bool* ok = nullptr); + static QList getUndeletedUnreadMessages(const QSqlDatabase& db, int account_id, bool* ok = nullptr); static QList getUndeletedMessagesForFeed(const QSqlDatabase& db, const QString& feed_custom_id, int account_id, bool* ok = nullptr); static QList getUndeletedMessagesForBin(const QSqlDatabase& db, int account_id, bool* ok = nullptr); @@ -92,6 +94,7 @@ class DatabaseQueries { // Custom ID accumulators. static QStringList customIdsOfMessagesFromLabel(const QSqlDatabase& db, Label* label, bool* ok = nullptr); static QStringList customIdsOfImportantMessages(const QSqlDatabase& db, int account_id, bool* ok = nullptr); + static QStringList customIdsOfUnreadMessages(const QSqlDatabase& db, int account_id, bool* ok = nullptr); static QStringList customIdsOfMessagesFromAccount(const QSqlDatabase& db, int account_id, bool* ok = nullptr); static QStringList customIdsOfMessagesFromBin(const QSqlDatabase& db, int account_id, bool* ok = nullptr); static QStringList customIdsOfMessagesFromFeed(const QSqlDatabase& db, const QString& feed_custom_id, int account_id, diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h index 39c9692c9..07ebbfc96 100755 --- a/src/librssguard/definitions/definitions.h +++ b/src/librssguard/definitions/definitions.h @@ -43,6 +43,7 @@ #define ID_RECYCLE_BIN -2 #define ID_IMPORTANT -3 #define ID_LABELS -4 +#define ID_UNREAD -5 #define MSG_SCORE_MAX 100.0 #define MSG_SCORE_MIN 0.0 diff --git a/src/librssguard/gui/feedsview.cpp b/src/librssguard/gui/feedsview.cpp index c8df48e16..877230a03 100755 --- a/src/librssguard/gui/feedsview.cpp +++ b/src/librssguard/gui/feedsview.cpp @@ -747,7 +747,8 @@ void FeedsView::contextMenuEvent(QContextMenuEvent* event) { // Display context menu for feeds. initializeContextMenuFeeds(clicked_item)->exec(event->globalPos()); } - else if (clicked_item->kind() == RootItem::Kind::Important) { + else if (clicked_item->kind() == RootItem::Kind::Important || + clicked_item->kind() == RootItem::Kind::Unread) { initializeContextMenuImportant(clicked_item)->exec(event->globalPos()); } else if (clicked_item->kind() == RootItem::Kind::Bin) { diff --git a/src/librssguard/librssguard.pro b/src/librssguard/librssguard.pro index a97e3a2fb..df488f832 100644 --- a/src/librssguard/librssguard.pro +++ b/src/librssguard/librssguard.pro @@ -152,6 +152,7 @@ HEADERS += core/feeddownloader.h \ services/abstract/rootitem.h \ services/abstract/serviceentrypoint.h \ services/abstract/serviceroot.h \ + services/abstract/unreadnode.h \ services/feedly/definitions.h \ services/feedly/feedlyentrypoint.h \ services/feedly/feedlynetwork.h \ @@ -326,6 +327,7 @@ SOURCES += core/feeddownloader.cpp \ services/abstract/recyclebin.cpp \ services/abstract/rootitem.cpp \ services/abstract/serviceroot.cpp \ + services/abstract/unreadnode.cpp \ services/feedly/feedlyentrypoint.cpp \ services/feedly/feedlynetwork.cpp \ services/feedly/feedlyserviceroot.cpp \ diff --git a/src/librssguard/services/abstract/accountcheckmodel.cpp b/src/librssguard/services/abstract/accountcheckmodel.cpp index 3a079d5f1..6264fe1e3 100644 --- a/src/librssguard/services/abstract/accountcheckmodel.cpp +++ b/src/librssguard/services/abstract/accountcheckmodel.cpp @@ -313,6 +313,7 @@ bool AccountCheckSortedModel::lessThan(const QModelIndex& source_left, const QMo RootItem::Kind::Feed, RootItem::Kind::Labels, RootItem::Kind::Important, + RootItem::Kind::Unread, RootItem::Kind::Bin }; diff --git a/src/librssguard/services/abstract/feed.cpp b/src/librssguard/services/abstract/feed.cpp index a7e98a905..4858b01c1 100755 --- a/src/librssguard/services/abstract/feed.cpp +++ b/src/librssguard/services/abstract/feed.cpp @@ -15,6 +15,7 @@ #include "services/abstract/labelsnode.h" #include "services/abstract/recyclebin.h" #include "services/abstract/serviceroot.h" +#include "services/abstract/unreadnode.h" #include @@ -233,6 +234,11 @@ int Feed::updateMessages(const QList& messages, bool error_during_obtai items_to_update.append(getParentServiceRoot()->importantNode()); } + if (getParentServiceRoot()->unreadNode() != nullptr && anything_updated) { + getParentServiceRoot()->unreadNode()->updateCounts(true); + items_to_update.append(getParentServiceRoot()->unreadNode()); + } + if (getParentServiceRoot()->labelsNode() != nullptr) { getParentServiceRoot()->labelsNode()->updateCounts(true); items_to_update.append(getParentServiceRoot()->labelsNode()); diff --git a/src/librssguard/services/abstract/importantnode.h b/src/librssguard/services/abstract/importantnode.h index c8cff710e..01fbe4523 100755 --- a/src/librssguard/services/abstract/importantnode.h +++ b/src/librssguard/services/abstract/importantnode.h @@ -10,7 +10,6 @@ class ImportantNode : public RootItem { public: explicit ImportantNode(RootItem* parent_item = nullptr); - virtual ~ImportantNode() = default; virtual QList undeletedMessages() const; virtual bool cleanMessages(bool clean_read_only); diff --git a/src/librssguard/services/abstract/rootitem.cpp b/src/librssguard/services/abstract/rootitem.cpp index 8c08b9f16..53e57e54d 100644 --- a/src/librssguard/services/abstract/rootitem.cpp +++ b/src/librssguard/services/abstract/rootitem.cpp @@ -207,13 +207,21 @@ bool RootItem::performDragDropChange(RootItem* target_item) { int RootItem::countOfUnreadMessages() const { return boolinq::from(m_childItems).sum([](RootItem* it) { - return (it->kind() == RootItem::Kind::Important || it->kind() == RootItem::Kind::Labels) ? 0 : it->countOfUnreadMessages(); + return (it->kind() == RootItem::Kind::Important || + it->kind() == RootItem::Kind::Unread || + it->kind() == RootItem::Kind::Labels) + ? 0 + : it->countOfUnreadMessages(); }); } int RootItem::countOfAllMessages() const { return boolinq::from(m_childItems).sum([](RootItem* it) { - return (it->kind() == RootItem::Kind::Important || it->kind() == RootItem::Kind::Labels) ? 0 : it->countOfAllMessages(); + return (it->kind() == RootItem::Kind::Important || + it->kind() == RootItem::Kind::Unread || + it->kind() == RootItem::Kind::Labels) + ? 0 + : it->countOfAllMessages(); }); } diff --git a/src/librssguard/services/abstract/rootitem.h b/src/librssguard/services/abstract/rootitem.h index ca2521729..ab9f8ad69 100644 --- a/src/librssguard/services/abstract/rootitem.h +++ b/src/librssguard/services/abstract/rootitem.h @@ -47,7 +47,8 @@ class RSSGUARD_DLLSPEC RootItem : public QObject { ServiceRoot = 16, Labels = 32, Important = 64, - Label = 128 + Label = 128, + Unread = 256 }; // Constructors and destructors. diff --git a/src/librssguard/services/abstract/serviceroot.cpp b/src/librssguard/services/abstract/serviceroot.cpp index a6f062f4a..4b63a3f1e 100644 --- a/src/librssguard/services/abstract/serviceroot.cpp +++ b/src/librssguard/services/abstract/serviceroot.cpp @@ -16,10 +16,12 @@ #include "services/abstract/importantnode.h" #include "services/abstract/labelsnode.h" #include "services/abstract/recyclebin.h" +#include "services/abstract/unreadnode.h" ServiceRoot::ServiceRoot(RootItem* parent) : RootItem(parent), m_recycleBin(new RecycleBin(this)), m_importantNode(new ImportantNode(this)), - m_labelsNode(new LabelsNode(this)), m_accountId(NO_PARENT_CATEGORY), m_networkProxy(QNetworkProxy()) { + m_labelsNode(new LabelsNode(this)), m_unreadNode(new UnreadNode(this)), + m_accountId(NO_PARENT_CATEGORY), m_networkProxy(QNetworkProxy()) { setKind(RootItem::Kind::ServiceRoot); appendCommonNodes(); } @@ -198,6 +200,7 @@ void ServiceRoot::cleanAllItemsFromModel() { for (RootItem* top_level_item : qAsConst(chi)) { if (top_level_item->kind() != RootItem::Kind::Bin && top_level_item->kind() != RootItem::Kind::Important && + top_level_item->kind() != RootItem::Kind::Unread && top_level_item->kind() != RootItem::Kind::Labels) { requestItemRemoval(top_level_item); } @@ -221,6 +224,10 @@ void ServiceRoot::appendCommonNodes() { appendChild(importantNode()); } + if (unreadNode() != nullptr && !childItems().contains(unreadNode())) { + appendChild(unreadNode()); + } + if (labelsNode() != nullptr && !childItems().contains(labelsNode())) { appendChild(labelsNode()); } @@ -391,6 +398,10 @@ LabelsNode* ServiceRoot::labelsNode() const { return m_labelsNode; } +UnreadNode* ServiceRoot::unreadNode() const { + return m_unreadNode; +} + void ServiceRoot::syncIn() { QIcon original_icon = icon(); @@ -516,6 +527,13 @@ QStringList ServiceRoot::customIDSOfMessagesForItem(RootItem* item) { break; } + case RootItem::Kind::Unread: { + QSqlDatabase database = qApp->database()->driver()->connection(metaObject()->className()); + + list = DatabaseQueries::customIdsOfUnreadMessages(database, accountId()); + break; + } + default: break; } @@ -606,6 +624,10 @@ bool ServiceRoot::loadMessagesForItem(RootItem* item, MessagesModel* model) { model->setFilter(QString("Messages.is_important = 1 AND Messages.is_deleted = 0 AND Messages.is_pdeleted = 0 AND Messages.account_id = %1") .arg(QString::number(accountId()))); } + else if (item->kind() == RootItem::Kind::Unread) { + model->setFilter(QString("Messages.is_read = 0 AND Messages.is_deleted = 0 AND Messages.is_pdeleted = 0 AND Messages.account_id = %1") + .arg(QString::number(accountId()))); + } else if (item->kind() == RootItem::Kind::Label) { // Show messages with particular label. model->setFilter(QString("Messages.is_deleted = 0 AND Messages.is_pdeleted = 0 AND Messages.account_id = %1 AND " diff --git a/src/librssguard/services/abstract/serviceroot.h b/src/librssguard/services/abstract/serviceroot.h index 0d4601649..149fd21ba 100644 --- a/src/librssguard/services/abstract/serviceroot.h +++ b/src/librssguard/services/abstract/serviceroot.h @@ -16,6 +16,7 @@ class FeedsModel; class RecycleBin; class ImportantNode; +class UnreadNode; class LabelsNode; class Label; class QAction; @@ -43,6 +44,7 @@ class ServiceRoot : public RootItem { RecycleBin* recycleBin() const; ImportantNode* importantNode() const; LabelsNode* labelsNode() const; + UnreadNode* unreadNode() const; virtual void updateCounts(bool including_total_count); virtual bool canBeDeleted() const; @@ -256,6 +258,7 @@ class ServiceRoot : public RootItem { RecycleBin* m_recycleBin; ImportantNode* m_importantNode; LabelsNode* m_labelsNode; + UnreadNode* m_unreadNode; int m_accountId; QList m_serviceMenu; QNetworkProxy m_networkProxy; diff --git a/src/librssguard/services/abstract/unreadnode.cpp b/src/librssguard/services/abstract/unreadnode.cpp new file mode 100755 index 000000000..9845673d8 --- /dev/null +++ b/src/librssguard/services/abstract/unreadnode.cpp @@ -0,0 +1,79 @@ +// For license of this file, see /LICENSE.md. + +#include "services/abstract/unreadnode.h" + +#include "database/databasequeries.h" +#include "miscellaneous/application.h" +#include "miscellaneous/iconfactory.h" + +#include + +UnreadNode::UnreadNode(RootItem* parent_item) : RootItem(parent_item) { + setKind(RootItem::Kind::Unread); + setId(ID_UNREAD); + setIcon(qApp->icons()->fromTheme(QSL("mail-mark-unread"))); + setTitle(tr("Unread messages")); + setDescription(tr("You can find all unread messages here.")); +} + +QList UnreadNode::undeletedMessages() const { + QSqlDatabase database = qApp->database()->driver()->connection(metaObject()->className()); + + return DatabaseQueries::getUndeletedUnreadMessages(database, getParentServiceRoot()->accountId()); +} + +void UnreadNode::updateCounts(bool including_total_count) { + Q_UNUSED(including_total_count) + + bool is_main_thread = QThread::currentThread() == qApp->thread(); + QSqlDatabase database = is_main_thread ? + qApp->database()->driver()->connection(metaObject()->className()) : + qApp->database()->driver()->connection(QSL("feed_upd")); + int account_id = getParentServiceRoot()->accountId(); + + m_totalCount = m_unreadCount = DatabaseQueries::getUnreadMessageCounts(database, account_id); +} + +bool UnreadNode::cleanMessages(bool clean_read_only) { + ServiceRoot* service = getParentServiceRoot(); + QSqlDatabase database = qApp->database()->driver()->connection(metaObject()->className()); + + if (DatabaseQueries::cleanImportantMessages(database, clean_read_only, service->accountId())) { + service->updateCounts(true); + service->itemChanged(service->getSubTree()); + service->requestReloadMessageList(true); + return true; + } + else { + return false; + } +} + +bool UnreadNode::markAsReadUnread(RootItem::ReadStatus status) { + ServiceRoot* service = getParentServiceRoot(); + auto* cache = dynamic_cast(service); + + if (cache != nullptr) { + cache->addMessageStatesToCache(service->customIDSOfMessagesForItem(this), status); + } + + QSqlDatabase database = qApp->database()->driver()->connection(metaObject()->className()); + + if (DatabaseQueries::markImportantMessagesReadUnread(database, service->accountId(), status)) { + service->updateCounts(false); + service->itemChanged(service->getSubTree()); + service->requestReloadMessageList(status == RootItem::ReadStatus::Read); + return true; + } + else { + return false; + } +} + +int UnreadNode::countOfUnreadMessages() const { + return m_unreadCount; +} + +int UnreadNode::countOfAllMessages() const { + return m_totalCount; +} diff --git a/src/librssguard/services/abstract/unreadnode.h b/src/librssguard/services/abstract/unreadnode.h new file mode 100755 index 000000000..5b5fcfd29 --- /dev/null +++ b/src/librssguard/services/abstract/unreadnode.h @@ -0,0 +1,24 @@ +// For license of this file, see /LICENSE.md. + +#ifndef UNREADNODE_H +#define UNREADNODE_H + +#include "services/abstract/rootitem.h" + +class UnreadNode : public RootItem { + public: + explicit UnreadNode(RootItem* parent_item = nullptr); + + virtual QList undeletedMessages() const; + virtual bool cleanMessages(bool clean_read_only); + virtual void updateCounts(bool including_total_count); + virtual bool markAsReadUnread(ReadStatus status); + virtual int countOfUnreadMessages() const; + virtual int countOfAllMessages() const; + + private: + int m_totalCount{}; + int m_unreadCount{}; +}; + +#endif // UNREADNODE_H