When retrying an URL fetch from History, remove the History entry and don't show a re-queue message anymore.

sabnzbd/interface.py

@@ -414,21 +414,17 @@ class MainPage(object):
         """ Duplicate of retry of History, needed for some skins """
         msg = check_session(kwargs)
         if msg: return msg
-
-        url = kwargs.get('url', '')
+        job = kwargs.get('job', '')
+        url = kwargs.get('url', '').strip()
         pp = kwargs.get('pp')
         cat = kwargs.get('cat')
         script = kwargs.get('script')
-
-        url = url.strip()
         if url and (url.isdigit() or len(url)==5):
             sabnzbd.add_msgid(url, pp, script, cat)
         elif url:
-            sabnzbd.add_url(url, pp, script, cat)
-        if url:
-            return ShowOK(url)
-        else:
-            raise dcRaiser(self.__root, kwargs)
+            sabnzbd.add_url(url, pp, script, cat, nzbname=kwargs.get('nzbname'))
+        del_hist_job(job, del_files=True)
+        raise dcRaiser(self.__root, kwargs)
 
     @cherrypy.expose
     def retry_pp(self, **kwargs):
@@ -971,6 +967,7 @@ class HistoryPage(object):
     def retry(self, **kwargs):
         msg = check_session(kwargs)
         if msg: return msg
+        job = kwargs.get('job', '')
         url = kwargs.get('url', '').strip()
         pp = kwargs.get('pp')
         cat = kwargs.get('cat')
@@ -979,10 +976,9 @@ class HistoryPage(object):
             sabnzbd.add_msgid(url, pp, script, cat)
         elif url:
             sabnzbd.add_url(url, pp, script, cat, nzbname=kwargs.get('nzbname'))
-        if url:
-            return ShowOK(url)
-        else:
-            raise dcRaiser(self.__root, kwargs)
+        del_hist_job(job, del_files=True)
+        raise dcRaiser(self.__root, kwargs)
+
 
 #------------------------------------------------------------------------------
 class ConfigPage(object):

sabnzbd/misc.py

@@ -907,8 +907,8 @@ def bad_fetch(nzo, url, msg='', retry=False, content=False):
             nzbname = '&nzbname=%s' % urllib.quote(nzbname)
         else:
             nzbname = ''
-        text = T('URL Fetching failed; %s') + ', <a href="./retry?session=%s&url=%s%s%s%s%s">' + T('Try again') + '</a>'
-        parms = (msg, cfg.api_key(), urllib.quote(url), pp, cat, script, nzbname)
+        text = T('URL Fetching failed; %s') + ', <a href="./retry?session=%s&url=%s&job=%s%s%s%s%s">' + T('Try again') + '</a>'
+        parms = (msg, cfg.api_key(), urllib.quote(url), nzo.nzo_id, pp, cat, script, nzbname)
         nzo.fail_msg = text % parms
     else:
         nzo.fail_msg = msg