- Fix RSS Feed downloader for RSS with no torrent attachment (but articles link points to the torrent instead)

src/icons.qrc

@@ -144,7 +144,6 @@
   <file>Icons/oxygen/encrypted.png</file>
   <file>Icons/oxygen/edit_clear.png</file>
   <file>Icons/oxygen/download.png</file>
-  <file>Icons/oxygen/application-x-kgetlist-no.png</file>
   <file>Icons/oxygen/gear.png</file>
   <file>Icons/oxygen/remove.png</file>
   <file>Icons/oxygen/dialog-warning.png</file>
@@ -165,7 +164,6 @@
   <file>Icons/oxygen/help-about.png</file>
   <file>Icons/oxygen/list-add.png</file>
   <file>Icons/oxygen/network-server.png</file>
-  <file>Icons/oxygen/application-x-kgetlist.png</file>
   <file>Icons/oxygen/folder.png</file>
   <file>Icons/oxygen/urlseed.png</file>
   <file>Icons/oxygen/edit-cut.png</file>

src/rss.cpp

@@ -376,7 +376,6 @@ void RssManager::saveStreamList(){
 /** RssStream **/
 
 RssStream::RssStream(RssFolder* parent, RssManager *rssmanager, Bittorrent *BTSession, QString _url): parent(parent), rssmanager(rssmanager), BTSession(BTSession), alias(""), iconPath(":/Icons/rss16.png"), refreshed(false), downloadFailure(false), currently_loading(false) {
-  has_attachments = false;
   qDebug("RSSStream constructed");
   QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
   url = QUrl(_url).toString();
@@ -388,8 +387,6 @@ RssStream::RssStream(RssFolder* parent, RssManager *rssmanager, Bittorrent *BTSe
     RssItem *rss_item = RssItem::fromHash(this, item);
     if(rss_item->isValid()) {
       (*this)[rss_item->getTitle()] = rss_item;
-      if(rss_item->has_attachment())
-        has_attachments = true;
     }
   }
 }
@@ -584,29 +581,31 @@ short RssStream::readDoc(const QDomDocument& doc) {
               delete item;
               item = this->value(title);
             }
-            if(item->has_attachment()) {
+            QString torrent_url;
-              has_attachments = true;
+            if(item->has_attachment())
-              // Check if the item should be automatically downloaded
+              torrent_url = item->getTorrentUrl();
-              if(!already_exists || !(*this)[item->getTitle()]->isRead()) {
+            else
-                FeedFilter * matching_filter = FeedFilters::getFeedFilters(url).matches(item->getTitle());
+              torrent_url = item->getLink();
-                if(matching_filter != 0) {
+            // Check if the item should be automatically downloaded
-                  // Download the torrent
+            if(!already_exists || !(*this)[item->getTitle()]->isRead()) {
-                  BTSession->addConsoleMessage(tr("Automatically downloading %1 torrent from %2 RSS feed...").arg(item->getTitle()).arg(getName()));
+              FeedFilter * matching_filter = FeedFilters::getFeedFilters(url).matches(item->getTitle());
-                  if(matching_filter->isValid()) {
+              if(matching_filter != 0) {
-                    QString save_path = matching_filter->getSavePath();
+                // Download the torrent
-                    if(save_path.isEmpty())
+                BTSession->addConsoleMessage(tr("Automatically downloading %1 torrent from %2 RSS feed...").arg(item->getTitle()).arg(getName()));
-                      BTSession->downloadUrlAndSkipDialog(item->getTorrentUrl());
+                if(matching_filter->isValid()) {
-                    else
+                  QString save_path = matching_filter->getSavePath();
-                      BTSession->downloadUrlAndSkipDialog(item->getTorrentUrl(), save_path);
+                  if(save_path.isEmpty())
-                  } else {
+                    BTSession->downloadUrlAndSkipDialog(torrent_url);
-                    // All torrents are downloaded from this feed
+                  else
-                    BTSession->downloadUrlAndSkipDialog(item->getTorrentUrl());
+                    BTSession->downloadUrlAndSkipDialog(torrent_url, save_path);
-                  }
+                } else {
-                  // Item was downloaded, consider it as Read
+                  // All torrents are downloaded from this feed
-                  (*this)[item->getTitle()]->setRead();
+                  BTSession->downloadUrlAndSkipDialog(torrent_url);
-                  // Clean up
-                  delete matching_filter;
                 }
+                // Item was downloaded, consider it as Read
+                (*this)[item->getTitle()]->setRead();
+                // Clean up
+                delete matching_filter;
               }
             }
 

src/rss.h

@@ -394,7 +394,6 @@ private:
   bool refreshed;
   bool downloadFailure;
   bool currently_loading;
-  bool has_attachments;
 
 public slots:
   void processDownloadedFile(QString file_path);
@@ -430,7 +429,6 @@ public:
   QList<RssItem*> getNewsList() const;
   QList<RssItem*> getUnreadNewsList() const;
   QString getIconUrl();
-  bool hasAttachments() const { return has_attachments; }
 
 private:
   short readDoc(const QDomDocument& doc);

src/rss_imp.cpp

@@ -71,10 +71,8 @@ void RSSImp::displayRSSListMenu(const QPoint& pos){
       myRSSListMenu.addSeparator();
       myRSSListMenu.addAction(actionCopy_feed_URL);
       if(selectedItems.size() == 1) {
-        if(((RssStream*)listStreams->getRSSItem(selectedItems.first()))->hasAttachments()) {
+        myRSSListMenu.addSeparator();
-          myRSSListMenu.addSeparator();
+        myRSSListMenu.addAction(actionRSS_feed_downloader);
-          myRSSListMenu.addAction(actionRSS_feed_downloader);
-        }
       }
     }
   }else{
@@ -293,9 +291,7 @@ void RSSImp::downloadTorrent() {
     if(article->has_attachment()) {
       BTSession->downloadFromUrl(article->getTorrentUrl());
     } else {
-      QString link = article->getLink();
+      BTSession->downloadFromUrl(article->getLink());
-      if(!link.isEmpty())
-        QDesktopServices::openUrl(QUrl(link));
     }
   }
 }
@@ -444,10 +440,6 @@ void RSSImp::refreshNewsList(QTreeWidgetItem* item) {
   foreach(RssItem* article, news){
     QTreeWidgetItem* it = new QTreeWidgetItem(listNews);
     it->setText(NEWS_TITLE_COL, article->getTitle());
-    if(article->has_attachment())
-      it->setData(NEWS_TITLE_COL, Qt::DecorationRole, QVariant(QIcon(":/Icons/oxygen/application-x-kgetlist.png")));
-    else
-      it->setData(NEWS_TITLE_COL, Qt::DecorationRole, QVariant(QIcon(":/Icons/oxygen/application-x-kgetlist-no.png")));
     it->setText(NEWS_URL_COL, article->getParent()->getUrl());
     if(article->isRead()){
       it->setData(NEWS_TITLE_COL, Qt::ForegroundRole, QVariant(QColor("grey")));