From c3013d67b4a1774adf9206babcdb8d85d09e5fb0 Mon Sep 17 00:00:00 2001
From: Safihre <safihre@sabnzbd.org>
Date: Fri, 15 Sep 2017 14:21:45 +0200
Subject: [PATCH] Show NZB name from RSS-feed when fetching

Of course not the name of the RSS-feed itself.
---
 interfaces/Glitter/templates/main.tmpl                           | 1 +
 interfaces/Glitter/templates/static/javascripts/glitter.queue.js | 4 ++++
 sabnzbd/__init__.py                                              | 6 +++---
 sabnzbd/interface.py                                             | 2 +-
 sabnzbd/rss.py                                                   | 2 +-
 sabnzbd/skintext.py                                              | 1 +
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/interfaces/Glitter/templates/main.tmpl b/interfaces/Glitter/templates/main.tmpl
index 246db55..e6ef23b 100644
--- a/interfaces/Glitter/templates/main.tmpl
+++ b/interfaces/Glitter/templates/main.tmpl
@@ -63,6 +63,7 @@
             glitterTranslate.removeDown = "$T('Glitter-confirmClearDownloads')";
             glitterTranslate.removeDow1 = "$T('Glitter-confirmClear1Download')";
             glitterTranslate.retryAll = "$T('link-retryAll')?";
+            glitterTranslate.fetch = "$T('Glitter-fetch')";
             glitterTranslate.encrypted = "$T('Glitter-encrypted')";
             glitterTranslate.duplicate = "$T('Glitter-duplicate')";
             glitterTranslate.tooLarge = "$T('Glitter-tooLarge')";
diff --git a/interfaces/Glitter/templates/static/javascripts/glitter.queue.js b/interfaces/Glitter/templates/static/javascripts/glitter.queue.js
index 3f70f1e..1e3ef63 100644
--- a/interfaces/Glitter/templates/static/javascripts/glitter.queue.js
+++ b/interfaces/Glitter/templates/static/javascripts/glitter.queue.js
@@ -533,6 +533,10 @@ function QueueModel(parent, data) {
         if(self.status() == 'Checking') {
             return glitterTranslate.checking
         }
+        // Grabbing
+        if(self.status() == 'Grabbing') {
+            return glitterTranslate.fetch
+        }
         // Pausing status
         if((self.parent.parent.downloadsPaused() && self.priority() != 2) || self.pausedStatus()) {
             return glitterTranslate.paused;
diff --git a/sabnzbd/__init__.py b/sabnzbd/__init__.py
index 2179083..ce5145e 100644
--- a/sabnzbd/__init__.py
+++ b/sabnzbd/__init__.py
@@ -537,7 +537,7 @@ def guard_https_ver():
     set_https_verification(cfg.enable_https_verification())
 
 
-def add_url(url, pp=None, script=None, cat=None, priority=None, nzbname=None, feed_name=None):
+def add_url(url, pp=None, script=None, cat=None, priority=None, nzbname=None):
     """ Add NZB based on a URL, attributes optional """
     if 'http' not in url:
         return
@@ -551,8 +551,8 @@ def add_url(url, pp=None, script=None, cat=None, priority=None, nzbname=None, fe
 
     # Add feed name if it came from RSS
     msg = T('Trying to fetch NZB from %s') % url
-    if feed_name:
-        msg = '%s - %s' % (feed_name, msg)
+    if nzbname:
+        msg = '%s - %s' % (nzbname, msg)
 
     # Generate the placeholder
     future_nzo = NzbQueue.do.generate_future(msg, pp, script, cat, url=url, priority=priority, nzbname=nzbname)
diff --git a/sabnzbd/interface.py b/sabnzbd/interface.py
index e4784c8..e917aff 100644
--- a/sabnzbd/interface.py
+++ b/sabnzbd/interface.py
@@ -2076,7 +2076,7 @@ class ConfigRss(object):
             prio = att.get('prio')
 
             if url:
-                sabnzbd.add_url(url, pp, script, cat, prio, nzbname, feed_name=feed)
+                sabnzbd.add_url(url, pp, script, cat, prio, nzbname)
             # Need to pass the title instead
             sabnzbd.rss.flag_downloaded(feed, url)
         raise rssRaiser(self.__root, kwargs)
diff --git a/sabnzbd/rss.py b/sabnzbd/rss.py
index fbfbb51..82ef421 100644
--- a/sabnzbd/rss.py
+++ b/sabnzbd/rss.py
@@ -622,7 +622,7 @@ def _HandleLink(jobs, feed, link, title, size, age, season, episode, flag, orgca
         jobs[link]['status'] = 'D'
         jobs[link]['time_downloaded'] = time.localtime()
         logging.info("Adding %s (%s) to queue", link, title)
-        sabnzbd.add_url(link, pp=pp, script=script, cat=cat, priority=priority, nzbname=nzbname, feed_name=feed)
+        sabnzbd.add_url(link, pp=pp, script=script, cat=cat, priority=priority, nzbname=nzbname)
     else:
         if star:
             jobs[link]['status'] = flag + '*'
diff --git a/sabnzbd/skintext.py b/sabnzbd/skintext.py
index f2a1bc7..2a05eda 100644
--- a/sabnzbd/skintext.py
+++ b/sabnzbd/skintext.py
@@ -804,6 +804,7 @@ SKIN_TEXT = {
     'Glitter-filtered' : TT('FILTERED'),
     'Glitter-waitSec' : TT('WAIT %s sec'),
     'Glitter-error' : TT('ERROR:'),
+    'Glitter-fetch' : TT('Fetch'),
     'Glitter-interfaceOptions' : TT('Web Interface'),
     'Glitter-interfaceRefresh' : TT('Refresh rate'),
     'Glitter-useGlobalOptions' : TT('Use global interface settings'),