pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix build

Browse source
This commit is contained in:
Martin Rotter 2025-05-12 09:32:44 +02:00
parent f098a560f1
commit 25f35227e4
4 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/scripts/github-actions/build-linux-mac.sh
View file

@ -40,7 +40,7 @@ if [ $is_linux = true ]; then
sudo apt-get -qy install appstream cmake ninja-build openssl libssl-dev sudo apt-get -qy install appstream cmake ninja-build openssl libssl-dev
sudo apt-get -qy install qt6-5compat-dev qt6-base-dev-tools qt6-image-formats-plugins qt6-multimedia-dev qt6-positioning-dev qt6-webengine-dev linguist-qt6 qt6-tools-dev sudo apt-get -qy install qt6-5compat-dev qt6-base-dev-tools qt6-image-formats-plugins qt6-multimedia-dev qt6-positioning-dev qt6-webengine-dev linguist-qt6 qt6-tools-dev
sudo apt-get -qy install libmpv-dev libssl-dev libsqlite3-dev alsa-base alsa-oss alsa-tools alsa-utils gstreamer1.0-alsa gstreamer1.0-plugins-bad gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-pulseaudio gstreamer1.0-qt6 gstreamer1.0-vaapi gstreamer1.0-x sudo apt-get -qy install libmpv-dev libssl-dev libsqlite3-dev alsa-base alsa-oss alsa-tools alsa-utils gstreamer1.0-alsa gstreamer1.0-plugins-bad gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-pulseaudio gstreamer1.0-qt6 gstreamer1.0-vaapi gstreamer1.0-x libasound2-plugins libasound2-plugins-extra libasound2-dev
else else

9
src/librssguard/services/abstract/category.cpp
View file

@ -71,6 +71,11 @@ bool Category::markAsReadUnread(RootItem::ReadStatus status) {
QString Category::additionalTooltip() const { QString Category::additionalTooltip() const {
return tr("Number of feeds: %1\n" return tr("Number of feeds: %1\n"
"Number of categories: %2") "Number of categories: %2\n"
.arg(QString::number(getSubTreeFeeds().size()), QString::number(getSubTreeCategories().size() - 1)); "Number of disabled feeds: %3")
.arg(QString::number(getSubTreeFeeds().size()),
QString::number(getSubTreeCategories().size() - 1),
QString::number(getSubTree([](const RootItem* ri) {
return ri->kind() == RootItem::Kind::Feed && ri->toFeed()->isSwitchedOff();
}).size()));
} }

20
src/librssguard/services/abstract/rootitem.cpp
View file

@ -285,6 +285,26 @@ QList<RootItem*> RootItem::getSubTree() const {
return children; return children;
} }
QList<RootItem*> RootItem::getSubTree(std::function<bool(const RootItem*)> tester) const {
QList<RootItem*> children;
QList<RootItem*> traversable_items;
traversable_items.append(const_cast<RootItem* const>(this));
// Iterate all nested items.
while (!traversable_items.isEmpty()) {
RootItem* active_item = traversable_items.takeFirst();
if (tester(active_item)) {
children.append(active_item);
}
traversable_items.append(active_item->childItems());
}
return children;
}
QList<RootItem*> RootItem::getSubTree(RootItem::Kind kind_of_item) const { QList<RootItem*> RootItem::getSubTree(RootItem::Kind kind_of_item) const {
QList<RootItem*> children; QList<RootItem*> children;
QList<RootItem*> traversable_items; QList<RootItem*> traversable_items;

1
src/librssguard/services/abstract/rootitem.h
View file

@ -144,6 +144,7 @@ class RSSGUARD_DLLSPEC RootItem : public QObject {
// Returns flat list of all items from subtree where this item is a root. // Returns flat list of all items from subtree where this item is a root.
// Returned list includes this item too. // Returned list includes this item too.
QList<RootItem*> getSubTree() const; QList<RootItem*> getSubTree() const;
QList<RootItem*> getSubTree(std::function<bool(const RootItem*)> tester) const;
QList<RootItem*> getSubTree(RootItem::Kind kind_of_item) const; QList<RootItem*> getSubTree(RootItem::Kind kind_of_item) const;
QList<Category*> getSubTreeCategories() const; QList<Category*> getSubTreeCategories() const;