Set version to 2.3.1 and resolve merge conflicts

Merge branch 'develop'
Set Windows tray double click timeout to user double-click timeout
2026-01-20 13:28:45 -05:00 · 2017-10-27 10:12:36 +02:00 · 2017-10-27 10:07:42 +02:00 · 2017-10-26 20:30:49 +02:00 · 2017-10-26 20:15:21 +02:00 · 2017-10-26 14:23:58 +02:00
47 changed files with 8370 additions and 8267 deletions
--- a/4
+++ b/4
@@ -1,7 +1,7 @@
 Metadata-Version: 1.0
 Name: SABnzbd
-Version: 2.3.1RC2
-Summary: SABnzbd-2.3.1RC2
+Version: 2.3.1
+Summary: SABnzbd-2.3.1
 Home-page: https://sabnzbd.org
 Author: The SABnzbd Team
 Author-email: team@sabnzbd.org
--- a/README.mkd
+++ b/README.mkd
@@ -1,34 +1,41 @@
-Release Notes - SABnzbd 2.3.1 RC 2
+Release Notes - SABnzbd 2.3.1
 =========================================================

 ## Changes since 2.3.0
 - Added post-processing script Deobfuscate.py (in "scripts" folder)
  which can automatically process "rename.par2" after unpacking
-  or rename the largest file in the folder to the download name
+  or rename the largest file in the folder to the job's name
 - Maximum Article Cache size increased to 4GB on 64 bit systems
+- New servers will have timeout of 60 seconds instead of 120
+- Last output of a running script is shown in history
 - Paths to par2, unrar, unzip and 7zip are passed to scripts
- Path to gzipped NZB file of job is now passed to scripts
+- Path to gzipped NZB file of job is passed to scripts
 - Windows: Single click on tray icon pauses/unpauses queue

 ## Bugfixes since 2.3.0
- Abort Direct Unpack if no progress for 2 minutes after download
+- Abort Direct Unpack if not progressing 2 minutes after download
+- Direct Unpacker could crash on some downloads
 - Added measures to prevent "Failed to import" errors
- Downloader could crash during first few seconds
+- Downloader could crash during first few seconds after start
 - Saving errors of renames-file prevented
+- More verbose logging of creating and deleting files
 - Remove ".par2" at end of job name, could cause failure of repair
+- Fix racing-condition for files coming in after a job finishes
 - When re-adding a job, the time left was not calculated
 - Priority of category was ignored when adding new job
- Server information in Status window was not updated
- Always show Direct Unpack status
+- Server information in Status window was not always updated
+- Always show Direct Unpack status on smaller screens
 - Correctly adapt date and time display to local time zone
 - Category folders cannot be sub-folders of Temporary Download Folder
 - Email notifications could not be limited to categories
- Testing email notifications did not function
+- Testing email notifications did not work
 - Added "with" to list of lowercase words in titles for Sorting
 - "From SxxEyy" RSS filter did not always work
- Show clearly that RSS "From Show SxxEyy" is an Accept-type filter
+- Show clearly that RSS "From Show SxxEyy" is an "Accept"-type filter
 - Sorting failed when "Ignore folders inside archives" was enabled
- Always send failure_url to post-processing scripts
+- Always send "failure_url" to post-processing scripts
+- Decoding of articles no longer logged by default to reduce logging
+- Windows: Remove incompatible "Extra Par2 Parameters" for MultiPar
 - Windows: Special filenames could cause failures during unpack
 - Windows: Message box is shown in case of fatal startup error
 - Windows: Unpacking to network shares could fail
--- a/SABnzbd.py
+++ b/SABnzbd.py
@@ -87,7 +87,7 @@ import sabnzbd.interface
 from sabnzbd.constants import *
 import sabnzbd.newsunpack
 from sabnzbd.misc import real_path, \
-    check_latest_version, exit_sab, \
+    check_latest_version, exit_sab, get_from_url, \
    split_host, get_ext, create_https_certificates, \
    windows_variant, ip_extract, set_serv_parms, get_serv_parms, globber_full
 from sabnzbd.panic import panic_tmpl, panic_port, panic_host, \
@@ -657,7 +657,7 @@ def is_sabnzbd_running(url):
        url = '%s&mode=version' % (url)
        # Do this without certificate verification, few installations will have that
        prev = sabnzbd.set_https_verification(False)
-        ver = sabnzbd.newsunpack.get_from_url(url)
+        ver = get_from_url(url)
        sabnzbd.set_https_verification(prev)
        return (ver and (re.search(r'\d+\.\d+\.', ver) or ver.strip() == sabnzbd.__version__))
    except:
--- a/interfaces/Config/templates/config_server.tmpl
+++ b/interfaces/Config/templates/config_server.tmpl
@@ -57,7 +57,7 @@
                </div>
                <div class="field-pair advanced-settings">
                    <label class="config" for="timeout">$T('srv-timeout')</label>
-                    <input type="number" name="timeout" id="timeout" min="30" /> <i>$T('seconds')</i>
+                    <input type="number" name="timeout" id="timeout" min="20" max="240" /> <i>$T('seconds')</i>
                </div>
                <div class="field-pair <!--#if int($have_ssl_context) == 0 then "disabled" else ""#--> advanced-settings">
                    <label class="config" for="ssl_verify">$T('opt-ssl_verify')</label>
@@ -219,7 +219,7 @@
                </div>
                <div class="field-pair advanced-settings">
                    <label class="config" for="timeout$cur">$T('srv-timeout')</label>
-                    <input type="number" name="timeout" id="timeout$cur" value="$server['timeout']" min="30" required /> <i>$T('seconds')</i>
+                    <input type="number" name="timeout" id="timeout$cur" value="$server['timeout']" min="20" max="240" required /> <i>$T('seconds')</i>
                </div>

                <div class="field-pair <!--#if int($have_ssl_context) == 0 then "disabled" else ""#--> advanced-settings">
--- a/interfaces/Glitter/templates/include_queue.tmpl
+++ b/interfaces/Glitter/templates/include_queue.tmpl
@@ -133,8 +133,8 @@
                    <label data-bind="visible: parent.isMultiEditing()">
                        <input type="checkbox" name="multiedit" title="$T('Glitter-multiSelect')" data-bind="click: parent.addMultiEdit, attr: { 'id': 'multiedit_' + id } " />
                    </label>
-                    <!-- ko if: !isGrabbing()  -->
-                    <div class="dropdown" data-bind="visible: !isGrabbing() && !parent.isMultiEditing()">
+                    <!-- ko if: !isGrabbing() -->
+                    <div class="dropdown" data-bind="visible: !parent.isMultiEditing()">
                        <a href="#" data-toggle="dropdown" data-bind="click: toggleDropdown">
                            <span class="caret"></span>
                        </a>
@@ -144,7 +144,7 @@
                                <span class="glyphicon glyphicon-tag"></span>
                                <select name="Category" class="form-control" data-bind="options: parent.categoriesList, optionsValue: 'catValue', optionsText: 'catText',  value: category, event: { change: changeCat }"></select>
                            </li>
-                            <!-- ko if: (status() != 'Fetching')  -->
+                            <!-- ko if: !isFetchingBlocks -->
                            <li title="$T('priority')" data-tooltip="true" data-placement="left">
                                <span class="glyphicon glyphicon-sort-by-attributes-alt"></span>
                                <select name="Priority" class="form-control" data-bind="options: parent.priorityOptions, optionsValue: 'value', optionsText: 'name', value: priority, event: { change: changePriority }"></select>
--- a/interfaces/Glitter/templates/static/javascripts/glitter.queue.js
+++ b/interfaces/Glitter/templates/static/javascripts/glitter.queue.js
@@ -479,6 +479,7 @@ function QueueModel(parent, data) {
    self.index = ko.observable(data.index);
    self.status = ko.observable(data.status);
    self.isGrabbing = ko.observable(data.status == 'Grabbing' || data.avg_age == '-')
+    self.isFetchingBlocks = data.status == 'Fetching' || data.priority == 'Repair' // No need to update
    self.totalMB = ko.observable(parseFloat(data.mb));
    self.remainingMB = ko.observable(parseFloat(data.mbleft))
    self.missingMB = ko.observable(parseFloat(data.mbmissing))
@@ -699,7 +700,7 @@ function QueueModel(parent, data) {
    }
    self.changePriority = function(item, event) {
        // Not if we are fetching extra blocks for repair!
-        if(item.status() == 'Fetching') return
+        if(item.isFetchingBlocks) return
        callAPI({
            mode: 'queue',
            name: 'priority',
--- a/interfaces/Glitter/templates/static/stylesheets/glitter.css
+++ b/interfaces/Glitter/templates/static/stylesheets/glitter.css
@@ -634,7 +634,7 @@ td.name .row-wrap-text {
 }

 .queue-table td.name .direct-unpack-text {
-    max-width: calc(100% - 85px);
+    max-width: calc(100% - 75px);
 }

 .queue-table td.name:hover .row-wrap-text {
@@ -1867,7 +1867,6 @@ input[name="nzbURL"] {
    td.name .name-icons {
        margin-left: 0px;
        margin-right: -5px;
-        display: block;
    }

    td.name .row-wrap-text {
--- a/interfaces/smpl/templates/static/MochiKit/MochiKit.js
+++ b/interfaces/smpl/templates/static/MochiKit/MochiKit.js
--- a/interfaces/smpl/templates/static/MochiKit/package.js
+++ b/interfaces/smpl/templates/static/MochiKit/package.js
@@ -1,2 +1,2 @@
-dojo.hostenv.conditionalLoadModule({"common": ["MochiKit.MochiKit"]});
-dojo.hostenv.moduleLoaded("MochiKit.*");
+dojo.hostenv.conditionalLoadModule({"common": ["MochiKit.MochiKit"]});
+dojo.hostenv.moduleLoaded("MochiKit.*");
--- a/licenses/License-pynewsleecher.txt
+++ b/licenses/License-pynewsleecher.txt
@@ -1,11 +1,11 @@
-The original author of SABnzbd based his work on Pynewsleecher by Freddy@madcowdesease.org.
-
-Few parts of Pynewsleecher have survived the generations of SABnzbd in a
-recognizable form.
-Still, we wish to thank Freddy for his inspiration.
-
-The home of the Pynewsleecher project:
-http://www.madcowdisease.org/mcd/pynewsleecher
-
-The software does not carry any license information.
-
+The original author of SABnzbd based his work on Pynewsleecher by Freddy@madcowdesease.org.
+
+Few parts of Pynewsleecher have survived the generations of SABnzbd in a
+recognizable form.
+Still, we wish to thank Freddy for his inspiration.
+
+The home of the Pynewsleecher project:
+http://www.madcowdisease.org/mcd/pynewsleecher
+
+The software does not carry any license information.
+
--- a/licenses/License-systrayicon.txt
+++ b/licenses/License-systrayicon.txt
@@ -1,8 +1,8 @@
-On http://www.brunningonline.net/simon/blog/archives/001835.html,
-the author licensed SysTrayIcon.py under a variant of the WTFPL:
-
-> Any road up, help yourself. Consider SysTrayIcon.py to be under an
-> "Aleister Crowley" style license - "Do what thou wilt shall be the
-> only law".
-> 
-> Err, but don't sue me if it doesn't work. ;-)
+On http://www.brunningonline.net/simon/blog/archives/001835.html,
+the author licensed SysTrayIcon.py under a variant of the WTFPL:
+
+> Any road up, help yourself. Consider SysTrayIcon.py to be under an
+> "Aleister Crowley" style license - "Do what thou wilt shall be the
+> only law".
+> 
+> Err, but don't sue me if it doesn't work. ;-)
--- a/po/main/SABnzbd.pot
+++ b/po/main/SABnzbd.pot
@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 7bit\n"
-"POT-Creation-Date: 2017-10-04 15:20+W. Europe Daylight Time\n"
+"POT-Creation-Date: 2017-10-21 16:01+W. Europe Daylight Time\n"
 "Generated-By: pygettext.py 1.5\n"


@@ -668,6 +668,10 @@ msgstr ""
 msgid "Incorrect parameter"
 msgstr ""

+#: sabnzbd/interface.py
+msgid "Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr ""
--- a/po/main/da.po
+++ b/po/main/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2017-06-22 07:07+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-05 04:49+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:45+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -731,6 +731,11 @@ msgstr "Udefineret server"
 msgid "Incorrect parameter"
 msgstr "Fejl parameter"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Tilbage"
--- a/po/main/de.po
+++ b/po/main/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2017-10-10 19:03+0000\n"
 "Last-Translator: Robin Munkittrick <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-11 06:14+0000\n"
-"X-Generator: Launchpad (build 18474)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:45+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "MultiPar binary... NOT found!"
@@ -755,6 +755,11 @@ msgstr "Undefinierter Server!"
 msgid "Incorrect parameter"
 msgstr "Fehlerhafter Parameter"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Zurück"
--- a/po/main/es.po
+++ b/po/main/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2017-06-22 07:07+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-05 04:50+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:46+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -733,6 +733,11 @@ msgstr "¡Servidor no definido!"
 msgid "Incorrect parameter"
 msgstr "Parámetro incorrecto"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Atrás"
--- a/po/main/fi.po
+++ b/po/main/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2017-06-22 07:07+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-05 04:49+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:45+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -729,6 +729,11 @@ msgstr "Määrittämätön palvelin!"
 msgid "Incorrect parameter"
 msgstr "Virheellinen parametri"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Takaisin"
--- a/po/main/fr.po
+++ b/po/main/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2017-10-05 18:52+0000\n"
 "Last-Translator: Fred <88com88@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-06 05:30+0000\n"
-"X-Generator: Launchpad (build 18474)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:45+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -759,6 +759,11 @@ msgstr "Serveur non défini !"
 msgid "Incorrect parameter"
 msgstr "Paramètre incorrect"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Retour"
--- a/po/main/he.po
+++ b/po/main/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2017-10-07 08:28+0000\n"
 "Last-Translator: ION IL <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-08 05:54+0000\n"
-"X-Generator: Launchpad (build 18474)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:45+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -721,6 +721,11 @@ msgstr "!שרת בלתי מוגדר"
 msgid "Incorrect parameter"
 msgstr "משתנה לא נכון"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "הקודם"
--- a/po/main/nb.po
+++ b/po/main/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2017-09-03 14:07+0000\n"
 "Last-Translator: Steffen Bærø <steffen.baro@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-05 04:49+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:46+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -725,6 +725,11 @@ msgstr "Udefinert server!"
 msgid "Incorrect parameter"
 msgstr "Feil parameter"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Tilbake"
--- a/po/main/nl.po
+++ b/po/main/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
-"PO-Revision-Date: 2017-09-28 11:31+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
+"PO-Revision-Date: 2017-10-20 09:43+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-05 04:49+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:45+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -748,6 +748,11 @@ msgstr "Onbekende server."
 msgid "Incorrect parameter"
 msgstr "Incorrecte parameter"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Terug"
@@ -1546,6 +1551,8 @@ msgid ""
 "Module subprocessww missing. Expect problems with Unicoded file and "
 "directory names in downloads."
 msgstr ""
+"De module subprocessww ontbreekt. Je kunt problemen krijgen met Unicode "
+"namen van bestanden en mappen."

 #: sabnzbd/postproc.py
 msgid "Download might fail, only %s of required %s available"
--- a/po/main/pl.po
+++ b/po/main/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2015-12-28 10:22+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-05 04:49+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:46+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -728,6 +728,11 @@ msgstr "Niezdefiniowany serwer!"
 msgid "Incorrect parameter"
 msgstr "Błędny parametr"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Powrót"
--- a/po/main/pt_BR.po
+++ b/po/main/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2016-01-01 22:58+0000\n"
 "Last-Translator: lrrosa <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-05 04:50+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:46+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -728,6 +728,11 @@ msgstr "Servidor não definido!"
 msgid "Incorrect parameter"
 msgstr "Parâmetro incorreto"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Voltar"
--- a/po/main/ro.po
+++ b/po/main/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2016-07-29 16:20+0000\n"
 "Last-Translator: nicusor <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-05 04:50+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:46+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -731,6 +731,11 @@ msgstr "Server nedefinit!"
 msgid "Incorrect parameter"
 msgstr "Parametru Incorect"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Înapoi"
--- a/po/main/ru.po
+++ b/po/main/ru.po
@@ -2,15 +2,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SABnzbd-0.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Pavel Maryanov <Unknown>\n"
 "Language-Team: Russian <gmu@mx.ru>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-05 04:50+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:46+0000\n"
+"X-Generator: Launchpad (build 18484)\n"
 "Generated-By: pygettext.py 1.5\n"

 #: SABnzbd.py [Error message]
@@ -718,6 +718,11 @@ msgstr ""
 msgid "Incorrect parameter"
 msgstr "Неправильный параметр"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Назад"
--- a/po/main/sr.po
+++ b/po/main/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: ОZZII <ozzii.translate@gmail.com>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2015-12-28 10:25+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-05 04:50+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:46+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -720,6 +720,11 @@ msgstr "Server nije definisan!"
 msgid "Incorrect parameter"
 msgstr "Погрешан параметар"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Назад"
--- a/po/main/sv.po
+++ b/po/main/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2016-02-20 20:34+0000\n"
 "Last-Translator: shypike <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-05 04:50+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:46+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -724,6 +724,11 @@ msgstr "Odefinerad server!"
 msgid "Incorrect parameter"
 msgstr "Fel parameter"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "Bakåt"
--- a/po/main/zh_CN.po
+++ b/po/main/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-10-04 18:54+0000\n"
+"POT-Creation-Date: 2017-10-25 23:30+0000\n"
 "PO-Revision-Date: 2017-06-22 07:06+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-10-05 04:50+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-26 05:47+0000\n"
+"X-Generator: Launchpad (build 18484)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -707,6 +707,11 @@ msgstr "未定义服务器!"
 msgid "Incorrect parameter"
 msgstr "参数不正确"

+#: sabnzbd/interface.py
+msgid ""
+"Category folder cannot be a subfolder of the Temporary Download Folder."
+msgstr ""
+
 #: sabnzbd/interface.py # sabnzbd/interface.py
 msgid "Back"
 msgstr "返回"
--- a/sabnzbd/api.py
+++ b/sabnzbd/api.py
@@ -1358,7 +1358,7 @@ def build_queue(start=0, limit=0, trans=False, output=None, search=None):
            slot['status'] = "%s" % (status)

        if (Downloader.do.paused or Downloader.do.postproc or is_propagating or  \
-           status not in (Status.DOWNLOADING, Status.QUEUED)) and priority != TOP_PRIORITY:
+           status not in (Status.DOWNLOADING, Status.FETCHING, Status.QUEUED)) and priority != TOP_PRIORITY:
            slot['timeleft'] = '0:00:00'
            slot['eta'] = 'unknown'
        else:
--- a/sabnzbd/assembler.py
+++ b/sabnzbd/assembler.py
@@ -97,13 +97,15 @@ class Assembler(Thread):
                    try:
                        filepath = self.assemble(nzf, filepath)
                    except IOError, (errno, strerror):
-                        # If job was deleted, ignore error
-                        if not nzo.is_gone():
+                        # If job was deleted or in active post-processing, ignore error
+                        if not nzo.is_gone() and not nzo.pp_active:
                            # 28 == disk full => pause downloader
                            if errno == 28:
                                logging.error(T('Disk full! Forcing Pause'))
                            else:
                                logging.error(T('Disk error on creating file %s'), clip_path(filepath))
+                            # Log traceback
+                            logging.info('Traceback: ', exc_info=True)
                            # Pause without saving
                            sabnzbd.downloader.Downloader.do.pause(save=False)
                        continue
@@ -318,7 +320,8 @@ def check_encrypted_and_unwanted_files(nzo, filepath):
                zf.close()
                del zf
        except:
-            logging.info('Error during inspection of RAR-file %s', filepath, exc_info=True)
+            logging.info('Error during inspection of RAR-file %s', filepath)
+            logging.debug('Traceback: ', exc_info=True)

    return encrypted, unwanted

--- a/sabnzbd/cfg.py
+++ b/sabnzbd/cfg.py
@@ -261,6 +261,7 @@ fixed_ports = OptionBool('misc', 'fixed_ports', False)
 api_warnings = OptionBool('misc', 'api_warnings', True, protect=True)
 disable_key = OptionBool('misc', 'disable_api_key', False, protect=True)
 no_penalties = OptionBool('misc', 'no_penalties', False)
+debug_log_decoding = OptionBool('misc', 'debug_log_decoding', False)

 # Text values
 rss_odd_titles = OptionList('misc', 'rss_odd_titles', ['nzbindex.nl/', 'nzbindex.com/', 'nzbclub.com/'])
--- a/sabnzbd/config.py
+++ b/sabnzbd/config.py
@@ -385,7 +385,7 @@ class ConfigServer(object):
        self.displayname = OptionStr(name, 'displayname', '', add=False)
        self.host = OptionStr(name, 'host', '', add=False)
        self.port = OptionNumber(name, 'port', 119, 0, 2 ** 16 - 1, add=False)
-        self.timeout = OptionNumber(name, 'timeout', 120, 30, 240, add=False)
+        self.timeout = OptionNumber(name, 'timeout', 60, 20, 240, add=False)
        self.username = OptionStr(name, 'username', '', add=False)
        self.password = OptionPassword(name, 'password', '', add=False)
        self.connections = OptionNumber(name, 'connections', 1, 0, 100, add=False)
--- a/sabnzbd/decoder.py
+++ b/sabnzbd/decoder.py
@@ -31,6 +31,7 @@ from sabnzbd.constants import Status, MAX_DECODE_QUEUE, LIMIT_DECODE_QUEUE, SABY
 import sabnzbd.articlecache
 import sabnzbd.downloader
 import sabnzbd.nzbqueue
+import sabnzbd.cfg as cfg
 from sabnzbd.encoding import yenc_name_fixer
 from sabnzbd.misc import match_str

@@ -79,6 +80,7 @@ class Decoder(Thread):

        self.queue = queue
        self.servers = servers
+        self.__log_decoding = cfg.debug_log_decoding()

    def stop(self):
        # Put multiple to stop all decoders
@@ -115,7 +117,9 @@ class Decoder(Thread):
                    if nzo.precheck:
                        raise BadYenc
                    register = True
-                    logging.debug("Decoding %s", art_id)
+
+                    if self.__log_decoding:
+                        logging.debug("Decoding %s", art_id)

                    data = self.decode(article, lines, raw_data)
                    nzf.article_count += 1
--- a/sabnzbd/decorators.py
+++ b/sabnzbd/decorators.py
@@ -23,19 +23,20 @@ from threading import RLock, Condition

 # All operations that modify the queue need to happen in a lock
 # Also used when importing NZBs to prevent IO-race conditions
+# Names of wrapper-functions should be the same in misc.caller_name
 # The NzbQueueLocker both locks and notifies the Downloader
 NZBQUEUE_LOCK = RLock()
 DOWNLOADER_CV = Condition(NZBQUEUE_LOCK)

 def synchronized(lock):
    def wrap(f):
-        def newFunction(*args, **kw):
+        def call_func(*args, **kw):
            lock.acquire()
            try:
                return f(*args, **kw)
            finally:
                lock.release()
-        return newFunction
+        return call_func
    return wrap


--- a/sabnzbd/directunpacker.py
+++ b/sabnzbd/directunpacker.py
@@ -247,10 +247,15 @@ class DirectUnpacker(threading.Thread):

                # Possible that the instance was deleted while locked
                if not self.killed:
-                    # Give unrar some time to do it's thing
-                    self.active_instance.stdin.write('C\n')
-                    start_time = time.time()
-                    time.sleep(0.1)
+                    # If unrar stopped or is killed somehow, writing will cause a crash
+                    try:
+                        # Give unrar some time to do it's thing
+                        self.active_instance.stdin.write('C\n')
+                        start_time = time.time()
+                        time.sleep(0.1)
+                    except IOError:
+                        self.abort()
+                        break

                    # Did we unpack a new volume? Sometimes UnRar hangs on 1 volume
                    if not last_volume_linebuf or last_volume_linebuf != linebuf:
@@ -308,7 +313,14 @@ class DirectUnpacker(threading.Thread):
        """ Start the unrar instance using the user's options """
        # Generate extraction path and save for post-proc
        if not self.unpack_dir_info:
-            self.unpack_dir_info = prepare_extraction_path(self.nzo)
+            try:
+                self.unpack_dir_info = prepare_extraction_path(self.nzo)
+            except:
+                # Prevent fatal crash if directory creation fails
+                self.abort()
+                return
+
+        # Get the information
        extraction_path, _, _, one_folder, _ = self.unpack_dir_info

        # Set options
--- a/sabnzbd/encoding.py
+++ b/sabnzbd/encoding.py
@@ -70,19 +70,6 @@ def yenc_name_fixer(p):
        return p.decode('cp1252', errors='replace').replace('?', '!')


-def is_utf8(p):
-    """ Return True when p is UTF-8 or plain ASCII """
-    utf8 = True
-    try:
-        p.decode('ascii')
-    except:
-        try:
-            p.decode('utf-8')
-        except:
-            utf8 = False
-    return utf8
-
-
 def special_fixer(p):
    """ Return string appropriate for the platform.
        Also takes care of the situation where a non-Windows/UTF-8 system
--- a/sabnzbd/interface.py
+++ b/sabnzbd/interface.py
@@ -1373,7 +1373,7 @@ class ConfigSwitches(object):
 SPECIAL_BOOL_LIST = \
    ('start_paused', 'no_penalties', 'ignore_wrong_unrar', 'overwrite_files', 'enable_par_cleanup',
              'queue_complete_pers', 'api_warnings', 'ampm', 'enable_unrar', 'enable_unzip', 'enable_7zip',
-              'enable_filejoin', 'enable_tsjoin', 'ignore_unrar_dates',
+              'enable_filejoin', 'enable_tsjoin', 'ignore_unrar_dates', 'debug_log_decoding',
              'multipar', 'osx_menu', 'osx_speed', 'win_menu', 'use_pickle', 'allow_incomplete_nzb',
              'rss_filenames', 'ipv6_hosting', 'keep_awake', 'empty_postproc', 'html_login', 'wait_for_dfolder',
              'max_art_opt', 'warn_empty_nzb', 'enable_bonjour', 'reject_duplicate_files', 'warn_dupl_jobs',
--- a/sabnzbd/misc.py
+++ b/sabnzbd/misc.py
@@ -33,6 +33,7 @@ import datetime
 import fnmatch
 import stat
 import inspect
+import urllib2
 from urlparse import urlparse

 import sabnzbd
@@ -771,42 +772,28 @@ def to_units(val, spaces=0, dec_limit=2, postfix=''):


 def caller_name(skip=2):
-    """Get a name of a caller in the format module.class.method
-
-       `skip` specifies how many levels of stack to skip while getting caller
-       name. skip=1 means "who calls me", skip=2 "who calls my caller" etc.
-
-       An empty string is returned if skipped levels exceed stack height
-
-       Source: https://gist.github.com/techtonik/2151727
+    """Get a name of a caller in the format module.method
+       Originally used: https://gist.github.com/techtonik/2151727
+       Adapted for speed by using sys calls directly
    """
    # Only do the tracing on Debug (function is always called)
    if cfg.log_level() != 2:
        return 'N/A'

-    stack = inspect.stack()
-    start = 0 + skip
-    if len(stack) < start + 1:
-      return ''
-    parentframe = stack[start][0]
+    parentframe = sys._getframe(skip)
+    function_name = parentframe.f_code.co_name

-    name = []
-    module = inspect.getmodule(parentframe)
-    # `modname` can be None when frame is executed directly in console
-    # TODO(techtonik): consider using __main__
-    if module:
-        name.append(module.__name__)
-    # detect classname
-    if 'self' in parentframe.f_locals:
-        # I don't know any way to detect call from the object method
-        # XXX: there seems to be no way to detect static method call - it will
-        #      be just a function call
-        name.append(parentframe.f_locals['self'].__class__.__name__)
-    codename = parentframe.f_code.co_name
-    if codename != '<module>':  # top level usually
-        name.append( codename ) # function or a method
-    del parentframe
-    return ".".join(name)
+    # Modulename not available in the binaries, we can use the filename instead
+    if getattr(sys, 'frozen', None):
+        module_name = inspect.getfile(parentframe)
+    else:
+        module_name = inspect.getmodule(parentframe).__name__
+
+    # For decorated functions we have to go deeper
+    if function_name in ('call_func', 'wrap') and skip == 2:
+        return caller_name(4)
+
+    return ".".join([module_name, function_name])


 def same_file(a, b):
@@ -859,6 +846,14 @@ def split_host(srv):
    return (host, port)


+def get_from_url(url):
+    """ Retrieve URL and return content """
+    try:
+        return urllib2.urlopen(url).read()
+    except:
+        return None
+
+
 def check_mount(path):
    """ Return False if volume isn't mounted on Linux or OSX
        Retry 6 times with an interval of 1 sec.
--- a/sabnzbd/newsunpack.py
+++ b/sabnzbd/newsunpack.py
@@ -188,6 +188,9 @@ def external_processing(extern_proc, nzo, complete_dir, nicename, status):
            line = line.strip()
            lines.append(line)

+            # Show current line in history
+            nzo.set_action_line(T('Running script'), unicoder(line))
+
            # Check if we should still continue
            if not nzo.pp_active:
                p.kill()
@@ -1340,7 +1343,6 @@ def PAR_Verify(parfile, parfile_nzf, nzo, setname, joinables, single=False):
                if added_blocks:
                    msg = T('Fetching %s blocks...') % str(added_blocks)
                    nzo.set_action_line(T('Fetching'), msg)
-                    nzo.status = Status.FETCHING
                    readd = True
                else:
                    # Failed
@@ -1512,6 +1514,11 @@ def MultiPar_Verify(parfile, parfile_nzf, nzo, setname, joinables, single=False)
    # But not really required due to prospective-par2
    command = [str(MULTIPAR_COMMAND), 'r', '-vs2', '-vd%s' % parfolder, parfile]

+    # Check if there are maybe par2cmdline/par2tbb commands supplied
+    if '-t' in cfg.par_option() or '-p' in cfg.par_option():
+        logging.info('Removing old par2cmdline/par2tbb options for MultiPar')
+        cfg.par_option.set('')
+
    # Only add user-options if supplied
    options = cfg.par_option().strip()
    if options:
@@ -1762,7 +1769,6 @@ def MultiPar_Verify(parfile, parfile_nzf, nzo, setname, joinables, single=False)
            if added_blocks:
                msg = T('Fetching %s blocks...') % str(added_blocks)
                nzo.set_action_line(T('Fetching'), msg)
-                nzo.status = Status.FETCHING
                readd = True
            else:
                # Failed
@@ -2303,17 +2309,6 @@ def list2cmdline(lst):
    return ' '.join(nlst)


-def get_from_url(url):
-    """ Retrieve URL and return content
-        `timeout` sets non-standard timeout
-    """
-    import urllib2
-    try:
-        return urllib2.urlopen(url).read()
-    except:
-        return None
-
-
 def is_sevenfile(path):
    """ Return True if path has proper extension and 7Zip is installed """
    return SEVEN_COMMAND and os.path.splitext(path)[1].lower() == '.7z'
--- a/sabnzbd/notifier.py
+++ b/sabnzbd/notifier.py
@@ -27,7 +27,6 @@ import socket
 import urllib2
 import httplib
 import urllib
-import time
 import subprocess
 import json
 from threading import Thread
@@ -166,31 +165,26 @@ def send_notification(title, msg, gtype, job_cat=None):
            return send_local_growl(title, msg, gtype)
        else:
            Thread(target=send_growl, args=(title, msg, gtype)).start()
-            time.sleep(0.5)

    # Prowl
    if sabnzbd.cfg.prowl_enable() and check_cat('prowl', job_cat):
        if sabnzbd.cfg.prowl_apikey():
            Thread(target=send_prowl, args=(title, msg, gtype)).start()
-            time.sleep(0.5)

    # Pushover
    if sabnzbd.cfg.pushover_enable() and check_cat('pushover', job_cat):
        if sabnzbd.cfg.pushover_token():
            Thread(target=send_pushover, args=(title, msg, gtype)).start()
-            time.sleep(0.5)

    # Pushbullet
    if sabnzbd.cfg.pushbullet_enable() and check_cat('pushbullet', job_cat):
        if sabnzbd.cfg.pushbullet_apikey() and check_classes(gtype, 'pushbullet'):
            Thread(target=send_pushbullet, args=(title, msg, gtype)).start()
-            time.sleep(0.5)

    # Notification script.
    if sabnzbd.cfg.nscript_enable() and check_cat('nscript', job_cat):
        if sabnzbd.cfg.nscript_script():
            Thread(target=send_nscript, args=(title, msg, gtype)).start()
-            time.sleep(0.5)

    # NTFOSD
    if have_ntfosd() and sabnzbd.cfg.ntfosd_enable():
--- a/sabnzbd/nzbqueue.py
+++ b/sabnzbd/nzbqueue.py
@@ -887,6 +887,7 @@ class NzbQueue(object):
        empty = []
        for nzo in self.__nzo_list:
            if not nzo.futuretype and not nzo.files and nzo.status not in (Status.PAUSED, Status.GRABBING):
+                logging.info('Found idle job %s', nzo.final_name)
                empty.append(nzo)

            # Stall prevention by checking if all servers are in the trylist
@@ -896,8 +897,11 @@ class NzbQueue(object):
                for nzf in nzo.files:
                    if len(nzf.try_list) == sabnzbd.downloader.Downloader.do.server_nr:
                        # We do not want to reset all article trylists, they are good
+                        logging.info('Resetting bad trylist for file %s in job %s', nzf.filename, nzo.final_name)
                        nzf.reset_try_list()
+
                # Reset main trylist, minimal performance impact
+                logging.info('Resetting bad trylist for job %s', nzo.final_name)
                nzo.reset_try_list()

        for nzo in empty:
--- a/sabnzbd/nzbstuff.py
+++ b/sabnzbd/nzbstuff.py
@@ -512,7 +512,7 @@ class NzbParser(xml.sax.handler.ContentHandler):
                        self.nzf_list.remove(nzo_matches[0])

            if nzf.valid and nzf.nzf_id:
-                logging.info('File %s added to queue', self.filename)
+                logging.info('File %s - %s added to queue', nzf.filename, nzf.nzf_id)
                self.nzo.files.append(nzf)
                self.nzo.files_table[nzf.nzf_id] = nzf
                self.nzo.bytes += nzf.bytes
@@ -1485,8 +1485,8 @@ class NzbObject(TryList):
        # Remove all files for which admin could not be read
        for nzf in nzf_remove_list:
            nzf.deleted = True
-            nzf.completed = True
            self.files.remove(nzf)
+
        # If cleanup emptied the active files list, end this job
        if nzf_remove_list and not self.files:
            sabnzbd.NzbQueue.do.end_job(self)
--- a/sabnzbd/postproc.py
+++ b/sabnzbd/postproc.py
@@ -219,6 +219,9 @@ class PostProcessor(Thread):
                history_db.close()
                nzo.purge_data(keep_basic=False, del_files=True)

+            # Processing done
+            nzo.pp_active = False
+
            self.remove(nzo)
            check_eoq = True

@@ -672,9 +675,9 @@ def parring(nzo, workdir):

    if re_add:
        logging.info('Re-added %s to queue', filename)
-        nzo.status = Status.DOWNLOADING
        if nzo.priority != TOP_PRIORITY:
            nzo.priority = REPAIR_PRIORITY
+        nzo.status = Status.FETCHING
        sabnzbd.nzbqueue.NzbQueue.do.add(nzo)
        sabnzbd.downloader.Downloader.do.resume_from_postproc()

--- a/sabnzbd/sabtray.py
+++ b/sabnzbd/sabtray.py
@@ -111,7 +111,9 @@ class SABTrayThread(SysTrayIconThread):
            self.counter = 0

    # left-click handler
-    def click(self):
+    def click(self, *args):
+        # Make sure to stop the timer
+        self.stop_click_timer()
        # Pause/resume and force update of icon/text
        self.pauseresume(None)
        self.counter = 11
--- a/sabnzbd/utils/systrayiconthread.py
+++ b/sabnzbd/utils/systrayiconthread.py
@@ -11,6 +11,7 @@ import pywintypes
 import win32api
 import win32con
 import win32gui_struct
+import timer
 try:
    import winxpgui as win32gui
 except ImportError:
@@ -46,6 +47,7 @@ class SysTrayIconThread(Thread):
        self.menu_actions_by_id = dict(self.menu_actions_by_id)
        del self._next_action_id

+        self.click_timer = None
        self.default_menu_index = (default_menu_index or 0)
        self.window_class_name = window_class_name or "SysTrayIconPy"

@@ -176,13 +178,18 @@ class SysTrayIconThread(Thread):
        win32gui.PostQuitMessage(0)  # Terminate the app.

    def notify(self, hwnd, msg, wparam, lparam):
+        # Double click is actually 1 single click followed
+        # by a double-click event, no way to differentiate
+        # So we need a timed callback to cancel
        if lparam == win32con.WM_LBUTTONDBLCLK:
            self.execute_menu_option(self.default_menu_index + self.FIRST_ID)
+            self.stop_click_timer()
        elif lparam == win32con.WM_RBUTTONUP:
            self.show_menu()
-        elif lparam == win32con.WM_LBUTTONUP:
-            self.click()
-            pass
+        elif lparam == win32con.WM_LBUTTONDOWN:
+            # Wrapper of win32api, timeout is in ms
+            # We need to wait at least untill what user has defined as double click
+            self.click_timer = timer.set_timer(win32gui.GetDoubleClickTime(), self.click)
        return True

    def show_menu(self):
@@ -206,10 +213,17 @@ class SysTrayIconThread(Thread):
            # Weird PyWin/win32gui bug, just ignore it for now
            pass

-    # Ooverride this for left-click action
-    def click(self):
+    # Override this for left-click action
+    # Need to call the stop-timer in that function!
+    def click(self, *args):
        pass

+    def stop_click_timer(self):
+        # Stop the timer
+        if self.click_timer:
+            timer.kill_timer(self.click_timer)
+            self.click_timer = None
+
    def create_menu(self, menu, menu_options):
        for option_text, option_icon, option_action, option_id in menu_options[::-1]:
            if option_icon:
--- a/sabnzbd/utils/upload.py
+++ b/sabnzbd/utils/upload.py
@@ -24,7 +24,7 @@ import logging
 import os
 from sabnzbd.encoding import unicoder
 import sabnzbd.cfg as cfg
-from sabnzbd.misc import get_ext, get_filename
+from sabnzbd.misc import get_ext, get_filename, get_from_url
 import sabnzbd.newsunpack
 from sabnzbd.constants import VALID_ARCHIVES

@@ -47,7 +47,7 @@ def upload_file(url, fp):
            password = cfg.password()
            if username and password:
                url = '%s&ma_username=%s&ma_password=%s' % (url, username, password)
-        sabnzbd.newsunpack.get_from_url(url)
+        get_from_url(url)
    except:
        logging.error("Failed to upload file: %s", fp)
        logging.info("Traceback: ", exc_info=True)
--- a/sabnzbd/version.py
+++ b/sabnzbd/version.py
@@ -4,5 +4,5 @@

 # You MUST use double quotes (so " and not ')

-__version__ = "2.4.0-develop"
-__baseline__ = "unknown"
+__version__ = "2.3.1"
+__baseline__ = "f1695ec8753fbdb07bd67bdce25eeb3ebe70b972"
--- a/scripts/Sample-PostProc.cmd
+++ b/scripts/Sample-PostProc.cmd
@@ -1,15 +1,15 @@
-@echo off
-rem Example of a post processing script for SABnzbd
-
-echo.
-echo Running in directory "%~d0%~p0"
-echo.
-echo The first parameter (result-dir) = %1
-echo The second parameter (nzb-name)  = %2
-echo The third parameter (nice name)  = %3
-echo The fourth parameter (newzbin #) = %4
-echo The fifth parameter (category)   = %5
-echo The sixth parameter (group)      = %6
-echo The seventh parameter (status)   = %7
-echo The eight parameter (failure_url)= %8
-echo.
+@echo off
+rem Example of a post processing script for SABnzbd
+
+echo.
+echo Running in directory "%~d0%~p0"
+echo.
+echo The first parameter (result-dir) = %1
+echo The second parameter (nzb-name)  = %2
+echo The third parameter (nice name)  = %3
+echo The fourth parameter (newzbin #) = %4
+echo The fifth parameter (category)   = %5
+echo The sixth parameter (group)      = %6
+echo The seventh parameter (status)   = %7
+echo The eight parameter (failure_url)= %8
+echo.