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

fixing couple of found bugs, working on discovery

Browse source
This commit is contained in:
Martin Rotter 2023-10-20 09:29:51 +02:00
parent c92957224b
commit ca9a1db2be
11 changed files with 194 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -25,7 +25,9 @@
# IS_FLATPAK_BUILD - Set to "ON" when building RSS Guard with Flatpak. # IS_FLATPAK_BUILD - Set to "ON" when building RSS Guard with Flatpak.
# FORCE_BUNDLE_ICONS - Forcibly bundles icons into executables. # FORCE_BUNDLE_ICONS - Forcibly bundles icons into executables.
# ENABLE_COMPRESSED_SITEMAP - Set to "ON" if you want to enable support for "sitemap.xml.gz" format. # ENABLE_COMPRESSED_SITEMAP - Set to "ON" if you want to enable support for "sitemap.xml.gz" format.
# This requires "zlib" library. # This requires "zlib" library and if you want to use specific
# zlib location, then use "ZLIB_ROOT" variable, for example
# -DZLIB_ROOT="C:\\zlib"
# USE_WEBENGINE - if specified, then QtWebEngine module for internal web browser is used. # USE_WEBENGINE - if specified, then QtWebEngine module for internal web browser is used.
# Otherwise simple text component is used and some features will be disabled. # Otherwise simple text component is used and some features will be disabled.
# Default value is "false". If QtWebEngine is installed during compilation, then # Default value is "false". If QtWebEngine is installed during compilation, then

14
src/librssguard/services/abstract/gui/formcategorydetails.cpp
View file

@ -64,10 +64,10 @@ void FormCategoryDetails::loadCategoryData() {
if (m_parentToSelect != nullptr) { if (m_parentToSelect != nullptr) {
if (m_parentToSelect->kind() == RootItem::Kind::Category) { if (m_parentToSelect->kind() == RootItem::Kind::Category) {
m_ui->m_cmbParentCategory m_ui->m_cmbParentCategory
->setCurrentIndex(m_ui->m_cmbParentCategory->findData(QVariant::fromValue((void*)m_parentToSelect))); ->setCurrentIndex(m_ui->m_cmbParentCategory->findData(QVariant::fromValue(m_parentToSelect)));
} }
else if (m_parentToSelect->kind() == RootItem::Kind::Feed) { else if (m_parentToSelect->kind() == RootItem::Kind::Feed) {
int target_item = m_ui->m_cmbParentCategory->findData(QVariant::fromValue((void*)m_parentToSelect->parent())); int target_item = m_ui->m_cmbParentCategory->findData(QVariant::fromValue(m_parentToSelect->parent()));
if (target_item >= 0) { if (target_item >= 0) {
m_ui->m_cmbParentCategory->setCurrentIndex(target_item); m_ui->m_cmbParentCategory->setCurrentIndex(target_item);
@ -79,7 +79,7 @@ void FormCategoryDetails::loadCategoryData() {
GuiUtilities::applyDialogProperties(*this, m_category->fullIcon(), tr("Edit \"%1\"").arg(m_category->title())); GuiUtilities::applyDialogProperties(*this, m_category->fullIcon(), tr("Edit \"%1\"").arg(m_category->title()));
m_ui->m_cmbParentCategory m_ui->m_cmbParentCategory
->setCurrentIndex(m_ui->m_cmbParentCategory->findData(QVariant::fromValue((void*)m_category->parent()))); ->setCurrentIndex(m_ui->m_cmbParentCategory->findData(QVariant::fromValue(m_category->parent())));
} }
m_ui->m_txtTitle->lineEdit()->setText(m_category->title()); m_ui->m_txtTitle->lineEdit()->setText(m_category->title());
@ -90,9 +90,7 @@ void FormCategoryDetails::loadCategoryData() {
} }
void FormCategoryDetails::apply() { void FormCategoryDetails::apply() {
RootItem* parent = RootItem* parent = m_ui->m_cmbParentCategory->currentData().value<RootItem*>();
static_cast<RootItem*>(m_ui->m_cmbParentCategory->itemData(m_ui->m_cmbParentCategory->currentIndex())
.value<void*>());
m_category->setTitle(m_ui->m_txtTitle->lineEdit()->text()); m_category->setTitle(m_ui->m_txtTitle->lineEdit()->text());
m_category->setDescription(m_ui->m_txtDescription->lineEdit()->text()); m_category->setDescription(m_ui->m_txtDescription->lineEdit()->text());
@ -207,7 +205,7 @@ void FormCategoryDetails::initialize() {
void FormCategoryDetails::loadCategories(const QList<Category*>& categories, void FormCategoryDetails::loadCategories(const QList<Category*>& categories,
RootItem* root_item, RootItem* root_item,
Category* input_category) { Category* input_category) {
m_ui->m_cmbParentCategory->addItem(root_item->icon(), root_item->title(), QVariant::fromValue((void*)root_item)); m_ui->m_cmbParentCategory->addItem(root_item->icon(), root_item->title(), QVariant::fromValue(root_item));
for (Category* category : categories) { for (Category* category : categories) {
if (input_category != nullptr && (category == input_category || category->isChildOf(input_category))) { if (input_category != nullptr && (category == input_category || category->isChildOf(input_category))) {
@ -219,6 +217,6 @@ void FormCategoryDetails::loadCategories(const QList<Category*>& categories,
m_ui->m_cmbParentCategory->addItem(category->data(FDS_MODEL_TITLE_INDEX, Qt::DecorationRole).value<QIcon>(), m_ui->m_cmbParentCategory->addItem(category->data(FDS_MODEL_TITLE_INDEX, Qt::DecorationRole).value<QIcon>(),
category->title(), category->title(),
QVariant::fromValue((void*)category)); QVariant::fromValue(category));
} }
} }

77
src/librssguard/services/standard/gui/formdiscoverfeeds.cpp
View file

@ -10,6 +10,7 @@
#include "services/abstract/category.h" #include "services/abstract/category.h"
#include "services/abstract/serviceroot.h" #include "services/abstract/serviceroot.h"
#include "services/standard/definitions.h" #include "services/standard/definitions.h"
#include "services/standard/gui/formstandardfeeddetails.h"
#include "services/standard/standardfeed.h" #include "services/standard/standardfeed.h"
#include "services/standard/parsers/atomparser.h" #include "services/standard/parsers/atomparser.h"
@ -32,26 +33,29 @@ FormDiscoverFeeds::FormDiscoverFeeds(ServiceRoot* service_root,
m_parsers = {new AtomParser({}), new RssParser({}), new RdfParser({}), new JsonParser({}), new SitemapParser({})}; m_parsers = {new AtomParser({}), new RssParser({}), new RdfParser({}), new JsonParser({}), new SitemapParser({})};
m_btnGoAdvanced = m_ui.m_buttonBox->addButton(tr("Close && &advanced mode"), QDialogButtonBox::ButtonRole::NoRole); m_btnGoAdvanced = m_ui.m_buttonBox->addButton(tr("Close && &advanced mode"), QDialogButtonBox::ButtonRole::NoRole);
m_btnImportSelectedFeeds =
m_ui.m_buttonBox->addButton(tr("Import selected feeds"), QDialogButtonBox::ButtonRole::ActionRole);
m_btnGoAdvanced m_btnGoAdvanced
->setToolTip(tr("Close this dialog and display dialog for adding individual feeds with advanced options.")); ->setToolTip(tr("Close this dialog and display dialog for adding individual feeds with advanced options."));
m_ui.m_btnSelecAll->setIcon(qApp->icons()->fromTheme(QSL("dialog-yes"), QSL("edit-select-all")));
m_ui.m_btnSelectNone->setIcon(qApp->icons()->fromTheme(QSL("dialog-no"), QSL("edit-select-none")));
m_ui.m_btnAddIndividually->setIcon(qApp->icons()->fromTheme(QSL("list-add")));
m_btnGoAdvanced->setIcon(qApp->icons()->fromTheme(QSL("system-upgrade"))); m_btnGoAdvanced->setIcon(qApp->icons()->fromTheme(QSL("system-upgrade")));
m_btnImportSelectedFeeds->setIcon(qApp->icons()->fromTheme(QSL("document-import"))); m_ui.m_btnImportSelected->setIcon(qApp->icons()->fromTheme(QSL("document-import")));
m_ui.m_buttonBox->button(QDialogButtonBox::StandardButton::Close)
->setIcon(qApp->icons()->fromTheme(QSL("window-close")));
m_ui.m_btnDiscover->setIcon(qApp->icons()->fromTheme(QSL("system-search"))); m_ui.m_btnDiscover->setIcon(qApp->icons()->fromTheme(QSL("system-search")));
connect(m_ui.m_txtUrl->lineEdit(), &QLineEdit::textChanged, this, &FormDiscoverFeeds::onUrlChanged); connect(m_ui.m_txtUrl->lineEdit(), &QLineEdit::textChanged, this, &FormDiscoverFeeds::onUrlChanged);
connect(m_btnImportSelectedFeeds, &QPushButton::clicked, this, &FormDiscoverFeeds::importSelectedFeeds); connect(m_ui.m_btnImportSelected, &QPushButton::clicked, this, &FormDiscoverFeeds::importSelectedFeeds);
connect(m_ui.m_btnSelecAll, &QPushButton::clicked, m_discoveredModel, &DiscoveredFeedsModel::checkAllItems);
connect(m_ui.m_btnSelectNone, &QPushButton::clicked, m_discoveredModel, &DiscoveredFeedsModel::uncheckAllItems);
connect(m_ui.m_btnAddIndividually, &QPushButton::clicked, this, &FormDiscoverFeeds::addSingleFeed);
connect(m_btnGoAdvanced, &QPushButton::clicked, this, &FormDiscoverFeeds::userWantsAdvanced); connect(m_btnGoAdvanced, &QPushButton::clicked, this, &FormDiscoverFeeds::userWantsAdvanced);
connect(m_ui.m_btnDiscover, &QPushButton::clicked, this, &FormDiscoverFeeds::discoverFeeds); connect(m_ui.m_btnDiscover, &QPushButton::clicked, this, &FormDiscoverFeeds::discoverFeeds);
connect(&m_watcherLookup, connect(&m_watcherLookup,
&QFutureWatcher<QList<StandardFeed*>>::progressValueChanged, &QFutureWatcher<QList<StandardFeed*>>::progressValueChanged,
this, this,
&FormDiscoverFeeds::onDiscoveryProgress); &FormDiscoverFeeds::onDiscoveryProgress);
connect(&m_watcherLookup, connect(&m_watcherLookup,
&QFutureWatcher<QList<StandardFeed*>>::finished, &QFutureWatcher<QList<StandardFeed*>>::finished,
this, this,
@ -64,6 +68,11 @@ FormDiscoverFeeds::FormDiscoverFeeds(ServiceRoot* service_root,
m_ui.m_tvFeeds->header()->setSectionResizeMode(0, QHeaderView::ResizeMode::Stretch); m_ui.m_tvFeeds->header()->setSectionResizeMode(0, QHeaderView::ResizeMode::Stretch);
m_ui.m_tvFeeds->header()->setSectionResizeMode(1, QHeaderView::ResizeMode::ResizeToContents); m_ui.m_tvFeeds->header()->setSectionResizeMode(1, QHeaderView::ResizeMode::ResizeToContents);
connect(m_ui.m_tvFeeds->selectionModel(),
&QItemSelectionModel::selectionChanged,
this,
&FormDiscoverFeeds::onFeedSelectionChanged);
m_ui.m_pbDiscovery->setVisible(false); m_ui.m_pbDiscovery->setVisible(false);
m_ui.m_txtUrl->lineEdit()->setText(url); m_ui.m_txtUrl->lineEdit()->setText(url);
@ -77,10 +86,10 @@ FormDiscoverFeeds::FormDiscoverFeeds(ServiceRoot* service_root,
if (parent_to_select != nullptr) { if (parent_to_select != nullptr) {
if (parent_to_select->kind() == RootItem::Kind::Category) { if (parent_to_select->kind() == RootItem::Kind::Category) {
m_ui.m_cmbParentCategory m_ui.m_cmbParentCategory
->setCurrentIndex(m_ui.m_cmbParentCategory->findData(QVariant::fromValue((void*)parent_to_select))); ->setCurrentIndex(m_ui.m_cmbParentCategory->findData(QVariant::fromValue(parent_to_select)));
} }
else if (parent_to_select->kind() == RootItem::Kind::Feed) { else if (parent_to_select->kind() == RootItem::Kind::Feed) {
int target_item = m_ui.m_cmbParentCategory->findData(QVariant::fromValue((void*)parent_to_select->parent())); int target_item = m_ui.m_cmbParentCategory->findData(QVariant::fromValue(parent_to_select->parent()));
if (target_item >= 0) { if (target_item >= 0) {
m_ui.m_cmbParentCategory->setCurrentIndex(target_item); m_ui.m_cmbParentCategory->setCurrentIndex(target_item);
@ -109,6 +118,16 @@ void FormDiscoverFeeds::onDiscoveryFinished() {
setEnabled(true); setEnabled(true);
} }
StandardFeed* FormDiscoverFeeds::selectedFeed() const {
RootItem* it = m_discoveredModel->itemForIndex(m_ui.m_tvFeeds->currentIndex());
return qobject_cast<StandardFeed*>(it);
}
RootItem* FormDiscoverFeeds::targetParent() const {
return m_ui.m_cmbParentCategory->currentData().value<RootItem*>();
}
FormDiscoverFeeds::~FormDiscoverFeeds() { FormDiscoverFeeds::~FormDiscoverFeeds() {
qDeleteAll(m_parsers); qDeleteAll(m_parsers);
@ -168,26 +187,34 @@ void FormDiscoverFeeds::onUrlChanged(const QString& new_url) {
} }
void FormDiscoverFeeds::loadCategories(const QList<Category*>& categories, RootItem* root_item) { void FormDiscoverFeeds::loadCategories(const QList<Category*>& categories, RootItem* root_item) {
m_ui.m_cmbParentCategory->addItem(root_item->fullIcon(), root_item->title(), QVariant::fromValue((void*)root_item)); m_ui.m_cmbParentCategory->addItem(root_item->fullIcon(), root_item->title(), QVariant::fromValue(root_item));
for (Category* category : categories) { for (Category* category : categories) {
m_ui.m_cmbParentCategory->addItem(category->fullIcon(), category->title(), QVariant::fromValue((void*)category)); m_ui.m_cmbParentCategory->addItem(category->fullIcon(), category->title(), QVariant::fromValue(category));
} }
} }
void FormDiscoverFeeds::addSingleFeed(StandardFeed* feed) { void FormDiscoverFeeds::addSingleFeed() {
/* auto* fd = selectedFeed();
QScopedPointer<FormStandardFeedDetails> form_pointer(new FormStandardFeedDetails(this,
selected_item, if (fd == nullptr) {
feed->source(), return;
}
QScopedPointer<FormStandardFeedDetails> form_pointer(new FormStandardFeedDetails(m_serviceRoot,
targetParent(),
fd->source(),
qApp->mainFormWidget())); qApp->mainFormWidget()));
form_pointer->addEditFeed<StandardFeed>(); form_pointer->addEditFeed<StandardFeed>();
*/
} }
void FormDiscoverFeeds::importSelectedFeeds() {} void FormDiscoverFeeds::importSelectedFeeds() {}
void FormDiscoverFeeds::onFeedSelectionChanged() {
m_ui.m_btnAddIndividually->setEnabled(selectedFeed() != nullptr);
}
void FormDiscoverFeeds::userWantsAdvanced() { void FormDiscoverFeeds::userWantsAdvanced() {
setResult(ADVANCED_FEED_ADD_DIALOG_CODE); setResult(ADVANCED_FEED_ADD_DIALOG_CODE);
close(); close();
@ -237,3 +264,19 @@ QVariant DiscoveredFeedsModel::headerData(int section, Qt::Orientation orientati
return {}; return {};
} }
void FormDiscoverFeeds::closeEvent(QCloseEvent* event) {
try {
// Wait for discovery to finish.
if (m_watcherLookup.isRunning()) {
m_watcherLookup.result();
}
}
catch (...) {
}
// Clear all remaining items.
m_discoveredModel->setRootItem(nullptr);
QDialog::closeEvent(event);
}

10
src/librssguard/services/standard/gui/formdiscoverfeeds.h
View file

@ -37,16 +37,23 @@ class FormDiscoverFeeds : public QDialog {
QWidget* parent = {}); QWidget* parent = {});
virtual ~FormDiscoverFeeds(); virtual ~FormDiscoverFeeds();
protected:
virtual void closeEvent(QCloseEvent* event);
private slots: private slots:
void discoverFeeds(); void discoverFeeds();
void onUrlChanged(const QString& new_url); void onUrlChanged(const QString& new_url);
void addSingleFeed(StandardFeed* feed); void addSingleFeed();
void importSelectedFeeds(); void importSelectedFeeds();
void onFeedSelectionChanged();
void onDiscoveryProgress(int progress); void onDiscoveryProgress(int progress);
void onDiscoveryFinished(); void onDiscoveryFinished();
private: private:
StandardFeed* selectedFeed() const;
RootItem* targetParent() const;
QList<StandardFeed*> discoverFeedsWithParser(const FeedParser* parser, const QString& url); QList<StandardFeed*> discoverFeedsWithParser(const FeedParser* parser, const QString& url);
void userWantsAdvanced(); void userWantsAdvanced();
@ -55,7 +62,6 @@ class FormDiscoverFeeds : public QDialog {
private: private:
Ui::FormDiscoverFeeds m_ui; Ui::FormDiscoverFeeds m_ui;
QPushButton* m_btnImportSelectedFeeds;
QPushButton* m_btnGoAdvanced; QPushButton* m_btnGoAdvanced;
ServiceRoot* m_serviceRoot; ServiceRoot* m_serviceRoot;
QList<FeedParser*> m_parsers; QList<FeedParser*> m_parsers;

138
src/librssguard/services/standard/gui/formdiscoverfeeds.ui
View file

@ -45,6 +45,19 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0" colspan="2">
<widget class="QProgressBar" name="m_pbDiscovery">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>8</height>
</size>
</property>
<property name="textVisible">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="m_gbFeeds"> <widget class="QGroupBox" name="m_gbFeeds">
<property name="sizePolicy"> <property name="sizePolicy">
@ -57,6 +70,82 @@
<string>Discovered feeds</string> <string>Discovered feeds</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_2"> <layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0" colspan="2">
<widget class="QTreeView" name="m_tvFeeds">
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="indentation">
<number>0</number>
</property>
<property name="uniformRowHeights">
<bool>true</bool>
</property>
<property name="itemsExpandable">
<bool>false</bool>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<attribute name="headerStretchLastSection">
<bool>false</bool>
</attribute>
</widget>
</item>
<item row="1" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QPushButton" name="m_btnSelecAll">
<property name="text">
<string>Select &amp;all</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="m_btnSelectNone">
<property name="text">
<string>&amp;Unselect all</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="m_btnAddIndividually">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Add single feed with advanced details</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="m_btnImportSelected">
<property name="text">
<string>&amp;Import checked feeds</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="m_lblParentCategory"> <widget class="QLabel" name="m_lblParentCategory">
<property name="text"> <property name="text">
@ -100,34 +189,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0" colspan="2">
<widget class="QTreeView" name="m_tvFeeds">
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="indentation">
<number>0</number>
</property>
<property name="uniformRowHeights">
<bool>true</bool>
</property>
<property name="itemsExpandable">
<bool>false</bool>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<attribute name="headerStretchLastSection">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -141,19 +202,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2">
<widget class="QProgressBar" name="m_pbDiscovery">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>8</height>
</size>
</property>
<property name="textVisible">
<bool>false</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
@ -164,6 +212,14 @@
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops>
<tabstop>m_btnDiscover</tabstop>
<tabstop>m_tvFeeds</tabstop>
<tabstop>m_btnSelecAll</tabstop>
<tabstop>m_btnSelectNone</tabstop>
<tabstop>m_btnAddIndividually</tabstop>
<tabstop>m_cmbParentCategory</tabstop>
</tabstops>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>

5
src/librssguard/services/standard/gui/formstandardfeeddetails.cpp
View file

@ -67,10 +67,7 @@ void FormStandardFeedDetails::apply() {
FormFeedDetails::apply(); FormFeedDetails::apply();
auto* std_feed = feed<StandardFeed>(); auto* std_feed = feed<StandardFeed>();
RootItem* parent = RootItem* parent = m_standardFeedDetails->m_ui.m_cmbParentCategory->currentData().value<RootItem*>();
static_cast<RootItem*>(m_standardFeedDetails->m_ui.m_cmbParentCategory
->itemData(m_standardFeedDetails->m_ui.m_cmbParentCategory->currentIndex())
.value<void*>());
StandardFeed::Type type = StandardFeed::Type type =
static_cast<StandardFeed::Type>(m_standardFeedDetails->m_ui.m_cmbType static_cast<StandardFeed::Type>(m_standardFeedDetails->m_ui.m_cmbType

7
src/librssguard/services/standard/gui/formstandardimportexport.cpp
View file

@ -347,8 +347,7 @@ void FormStandardImportExport::exportFeeds() {
void FormStandardImportExport::importFeeds() { void FormStandardImportExport::importFeeds() {
QString output_message; QString output_message;
RootItem* parent = RootItem* parent = m_ui->m_cmbRootNode->currentData().value<RootItem*>();
static_cast<RootItem*>(m_ui->m_cmbRootNode->itemData(m_ui->m_cmbRootNode->currentIndex()).value<void*>());
if (m_serviceRoot->mergeImportExportModel(m_model, parent, output_message)) { if (m_serviceRoot->mergeImportExportModel(m_model, parent, output_message)) {
m_serviceRoot->requestItemExpand(parent->getSubTree(), true); m_serviceRoot->requestItemExpand(parent->getSubTree(), true);
@ -360,9 +359,9 @@ void FormStandardImportExport::importFeeds() {
} }
void FormStandardImportExport::loadCategories(const QList<Category*>& categories, RootItem* root_item) { void FormStandardImportExport::loadCategories(const QList<Category*>& categories, RootItem* root_item) {
m_ui->m_cmbRootNode->addItem(root_item->icon(), root_item->title(), QVariant::fromValue((void*)root_item)); m_ui->m_cmbRootNode->addItem(root_item->icon(), root_item->title(), QVariant::fromValue(root_item));
for (Category* category : categories) { for (Category* category : categories) {
m_ui->m_cmbRootNode->addItem(category->icon(), category->title(), QVariant::fromValue((void*)category)); m_ui->m_cmbRootNode->addItem(category->icon(), category->title(), QVariant::fromValue(category));
} }
} }

11
src/librssguard/services/standard/gui/standardfeeddetails.cpp
View file

@ -357,10 +357,10 @@ void StandardFeedDetails::prepareForNewFeed(RootItem* parent_to_select, const QS
if (parent_to_select != nullptr) { if (parent_to_select != nullptr) {
if (parent_to_select->kind() == RootItem::Kind::Category) { if (parent_to_select->kind() == RootItem::Kind::Category) {
m_ui.m_cmbParentCategory m_ui.m_cmbParentCategory
->setCurrentIndex(m_ui.m_cmbParentCategory->findData(QVariant::fromValue((void*)parent_to_select))); ->setCurrentIndex(m_ui.m_cmbParentCategory->findData(QVariant::fromValue(parent_to_select)));
} }
else if (parent_to_select->kind() == RootItem::Kind::Feed) { else if (parent_to_select->kind() == RootItem::Kind::Feed) {
int target_item = m_ui.m_cmbParentCategory->findData(QVariant::fromValue((void*)parent_to_select->parent())); int target_item = m_ui.m_cmbParentCategory->findData(QVariant::fromValue(parent_to_select->parent()));
if (target_item >= 0) { if (target_item >= 0) {
m_ui.m_cmbParentCategory->setCurrentIndex(target_item); m_ui.m_cmbParentCategory->setCurrentIndex(target_item);
@ -384,8 +384,7 @@ void StandardFeedDetails::prepareForNewFeed(RootItem* parent_to_select, const QS
void StandardFeedDetails::setExistingFeed(StandardFeed* feed) { void StandardFeedDetails::setExistingFeed(StandardFeed* feed) {
m_ui.m_cmbSourceType->setCurrentIndex(m_ui.m_cmbSourceType->findData(QVariant::fromValue(feed->sourceType()))); m_ui.m_cmbSourceType->setCurrentIndex(m_ui.m_cmbSourceType->findData(QVariant::fromValue(feed->sourceType())));
m_ui.m_cmbParentCategory m_ui.m_cmbParentCategory->setCurrentIndex(m_ui.m_cmbParentCategory->findData(QVariant::fromValue(feed->parent())));
->setCurrentIndex(m_ui.m_cmbParentCategory->findData(QVariant::fromValue((void*)feed->parent())));
m_ui.m_txtTitle->lineEdit()->setText(feed->title()); m_ui.m_txtTitle->lineEdit()->setText(feed->title());
m_ui.m_txtDescription->lineEdit()->setText(feed->description()); m_ui.m_txtDescription->lineEdit()->setText(feed->description());
m_ui.m_btnIcon->setIcon(feed->icon()); m_ui.m_btnIcon->setIcon(feed->icon());
@ -398,9 +397,9 @@ void StandardFeedDetails::setExistingFeed(StandardFeed* feed) {
} }
void StandardFeedDetails::loadCategories(const QList<Category*>& categories, RootItem* root_item) { void StandardFeedDetails::loadCategories(const QList<Category*>& categories, RootItem* root_item) {
m_ui.m_cmbParentCategory->addItem(root_item->fullIcon(), root_item->title(), QVariant::fromValue((void*)root_item)); m_ui.m_cmbParentCategory->addItem(root_item->fullIcon(), root_item->title(), QVariant::fromValue(root_item));
for (Category* category : categories) { for (Category* category : categories) {
m_ui.m_cmbParentCategory->addItem(category->fullIcon(), category->title(), QVariant::fromValue((void*)category)); m_ui.m_cmbParentCategory->addItem(category->fullIcon(), category->title(), QVariant::fromValue(category));
} }
} }

8
src/librssguard/services/standard/parsers/atomparser.cpp
View file

@ -167,11 +167,15 @@ QList<StandardFeed*> AtomParser::discoverFeeds(ServiceRoot* root, const QUrl& ur
// 5. // 5.
my_url = url.toString(QUrl::UrlFormattingOption::StripTrailingSlash); my_url = url.toString(QUrl::UrlFormattingOption::StripTrailingSlash);
if (QRegularExpression(QSL(GITHUB_URL_REGEX)).match(my_url).isValid()) { auto mtch = QRegularExpression(QSL(GITHUB_URL_REGEX)).match(my_url);
if (mtch.isValid()) {
QStringList github_feeds = {QSL("releases.atom"), QSL("commits.atom"), QSL("tags.atom")}; QStringList github_feeds = {QSL("releases.atom"), QSL("commits.atom"), QSL("tags.atom")};
QString gh_username = mtch.captured(1);
QString gh_repo = mtch.captured(2);
for (const QString& github_feed : github_feeds) { for (const QString& github_feed : github_feeds) {
my_url = url.toString(QUrl::UrlFormattingOption::StripTrailingSlash) + QL1C('/') + github_feed; my_url = QSL("https://github.com/%1/%2/%3").arg(gh_username, gh_repo, github_feed);
res = NetworkFactory::performNetworkOperation(my_url, res = NetworkFactory::performNetworkOperation(my_url,
timeout, timeout,
{}, {},

4
src/librssguard/services/tt-rss/gui/formttrssfeeddetails.cpp
View file

@ -27,9 +27,7 @@ void FormTtRssFeedDetails::apply() {
FormFeedDetails::apply(); FormFeedDetails::apply();
} }
else { else {
RootItem* parent = static_cast<RootItem*>(m_feedDetails->ui.m_cmbParentCategory RootItem* parent = m_feedDetails->ui.m_cmbParentCategory->currentData().value<RootItem*>();
->itemData(m_feedDetails->ui.m_cmbParentCategory->currentIndex())
.value<void*>());
auto* root = qobject_cast<TtRssServiceRoot*>(parent->getParentServiceRoot()); auto* root = qobject_cast<TtRssServiceRoot*>(parent->getParentServiceRoot());
const int category_id = parent->kind() == RootItem::Kind::ServiceRoot ? 0 : parent->customId().toInt(); const int category_id = parent->kind() == RootItem::Kind::ServiceRoot ? 0 : parent->customId().toInt();
const TtRssSubscribeToFeedResponse response = const TtRssSubscribeToFeedResponse response =

9
src/librssguard/services/tt-rss/gui/ttrssfeeddetails.cpp
View file

@ -35,19 +35,18 @@ void TtRssFeedDetails::onUrlChanged(const QString& new_url) {
void TtRssFeedDetails::loadCategories(const QList<Category*>& categories, void TtRssFeedDetails::loadCategories(const QList<Category*>& categories,
RootItem* root_item, RootItem* root_item,
RootItem* parent_to_select) { RootItem* parent_to_select) {
ui.m_cmbParentCategory->addItem(root_item->fullIcon(), root_item->title(), QVariant::fromValue((void*)root_item)); ui.m_cmbParentCategory->addItem(root_item->fullIcon(), root_item->title(), QVariant::fromValue(root_item));
for (Category* category : categories) { for (Category* category : categories) {
ui.m_cmbParentCategory->addItem(category->fullIcon(), category->title(), QVariant::fromValue((void*)category)); ui.m_cmbParentCategory->addItem(category->fullIcon(), category->title(), QVariant::fromValue(category));
} }
if (parent_to_select != nullptr) { if (parent_to_select != nullptr) {
if (parent_to_select->kind() == RootItem::Kind::Category) { if (parent_to_select->kind() == RootItem::Kind::Category) {
ui.m_cmbParentCategory ui.m_cmbParentCategory->setCurrentIndex(ui.m_cmbParentCategory->findData(QVariant::fromValue(parent_to_select)));
->setCurrentIndex(ui.m_cmbParentCategory->findData(QVariant::fromValue((void*)parent_to_select)));
} }
else if (parent_to_select->kind() == RootItem::Kind::Feed) { else if (parent_to_select->kind() == RootItem::Kind::Feed) {
int target_item = ui.m_cmbParentCategory->findData(QVariant::fromValue((void*)parent_to_select->parent())); int target_item = ui.m_cmbParentCategory->findData(QVariant::fromValue(parent_to_select->parent()));
if (target_item >= 0) { if (target_item >= 0) {
ui.m_cmbParentCategory->setCurrentIndex(target_item); ui.m_cmbParentCategory->setCurrentIndex(target_item);