Add last minor change to changelog

added systemd support to powersup.linux_shutdown, linux_hibernate, linux_standby

ABOUT.txt

@@ -1,5 +1,5 @@
 *******************************************
-*** This is SABnzbd 2.1.0               ***
+*** This is SABnzbd 2.2.0               ***
 *******************************************
 SABnzbd is an open-source cross-platform binary newsreader.
 It simplifies the process of downloading from Usenet dramatically,

INSTALL.txt

@@ -1,4 +1,4 @@
-                                SABnzbd 2.1.0
+                                SABnzbd 2.2.0
 
 -------------------------------------------------------------------------------
 0) LICENSE
@@ -64,15 +64,15 @@ Windows
 
 Essential modules
     cheetah-2.0.1+          use "pip install cheetah"
-    par2cmdline >= 0.4      http://parchive.sourceforge.net/
-                            Note: https://sabnzbd.org/wiki/configuration/2.0/switches#par2cmdline
-                            And: https://sabnzbd.org/wiki/installation/multicore-par2
+    par2cmdline >= 0.4      https://github.com/Parchive/par2cmdline/releases
+                            See also: https://sabnzbd.org/wiki/installation/multicore-par2
     unrar >= 5.00+          http://www.rarlab.com/rar_add.htm
 
 Optional modules
     unzip >= 6.00           http://www.info-zip.org/
     7zip >= 9.20            http://www.7zip.org/
-    sabyenc == 3.0.2        use "pip install sabyenc" - https://sabnzbd.org/sabyenc
+    sabyenc == 3.0.2        use "pip install sabyenc"
+                            More information: https://sabnzbd.org/sabyenc
     openssl >= 1.0.0        http://www.openssl.org/
                             v0.9.8 will work, but limits certificate validation
     cryptography >= 1.0     use "pip install cryptography"

ISSUES.txt

@@ -24,13 +24,13 @@
   For these the server blocking method is not very favourable.
   There is an INI-only option that will limit blocks to 1 minute.
       no_penalties = 1
-  See: https://sabnzbd.org/wiki/configuration/2.0/special
+  See: https://sabnzbd.org/wiki/configuration/2.1/special
 
 - Some third-party utilties try to probe SABnzbd API in such a way that you will
   often see warnings about unauthenticated access.
   If you are sure these probes are harmless, you can suppress the warnings by
   setting the option "api_warnings" to 0.
-  See: https://sabnzbd.org/wiki/configuration/2.0/special
+  See: https://sabnzbd.org/wiki/configuration/2.1/special
 
 - On OSX you may encounter downloaded files with foreign characters.
   The par2 repair may fail when the files were created on a Windows system.
@@ -41,7 +41,7 @@
   You will see this only when downloaded files contain accented characters.
   You need to fix it yourself by running the convmv utility (available for most Linux platforms).
   Possible the file system override setting 'fsys_type' might be solve things:
-  See: https://sabnzbd.org/wiki/configuration/2.0/special
+  See: https://sabnzbd.org/wiki/configuration/2.1/special
 
 - The "Watched Folder" sometimes fails to delete the NZB files it has
   processed. This happens when other software still accesses these files.
@@ -81,4 +81,4 @@
   - Squeeze Linux
   There is a "special" option that will allow you to select an alternative library.
       use_pickle = 1
-  See: https://sabnzbd.org/wiki/configuration/2.0/special
+  See: https://sabnzbd.org/wiki/configuration/2.1/special

PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 1.0
 Name: SABnzbd
-Version: 2.1.0RC1
-Summary: SABnzbd-2.1.0RC1
+Version: 2.2.0Alpha1
+Summary: SABnzbd-2.2.0Alpha1
 Home-page: http://sabnzbd.org
 Author: The SABnzbd Team
 Author-email: team@sabnzbd.org

README.mkd

@@ -1,20 +1,27 @@
-Release Notes  -  SABnzbd 2.1.0 RC 1
+Release Notes  -  SABnzbd 2.2.0 Alpha 1
 =========================================================
 
-## Changes since Beta 1
-- Minimal macOS version set to 10.9 (Mavericks)
-- Human readable history date/time made default in Glitter (x hours ago, etc)
-- Post-processing script execution can now be aborted
-- Windows: "Extra Par2 Parameters" are now also passed to MultiPar
-  For example: Set "/lc32" to enable GPU for repair (can also be slower!)
-- Removed Specials setting never_repair
-- Removed Specials setting to disable QuickCheck
+NOTE: Due to changes in this release, the queue will be converted when 2.2.0
+is started for the first time. Job order, settings and data will be preserved,
+but URL's that did finished fetching before the upgrade will be lost!
 
-## Changes since 2.0.1
-- Windows-only: Will now use MultiPar for verification and repair. MultiPar uses
-  the latest optimizations, multiple cores and can utilize the GPU, resulting in
-  repairs often being twice as fast.
-  Created by Yutaka Sawada (Windows only): http://hp.vector.co.jp/authors/VA021385/
+## Changes in 2.2.0
+- Reduced memory usage, especially with larger queues
+- Slight improvement in download performance by removing internal locks
+- Smoother animations in Firefox (disabled previously due to FF high-CPU usage)
+- If enabled, replace dots in filenames also when there are spaces already
+- Jobs outside server retention are processed faster
+- max_art_opt and replace_illegal moved from Switches to Specials
+
+## Bugfixes in 2.2.0
+- Shutdown/suspend did not work on some Linux systems
+- Deleting a job could result in write errors
+- Display warning if custom par2 parameters are wrong
+- macOS: Catch 'Protocol wrong type for socket' errors
+- Windows: Fix error in MultiPar-code when first par2-file was damaged
+
+## Translations
+- Added Hebrew translation by ION IL, many other languages updated.
 
 ## Upgrading from 0.7.x and older
 - Finish queue

SABnzbd.py

@@ -56,8 +56,6 @@ if [int(n) for n in cherrypy.__version__.split('.')] < [8, 1, 2]:
     print 'Sorry, requires Python module Cherrypy 8.1.2+ (use the included version)'
     sys.exit(1)
 
-from cherrypy import _cpserver
-
 SQLITE_DLL = True
 try:
     from sqlite3 import version as sqlite3_version
@@ -90,7 +88,7 @@ from sabnzbd.misc import real_path, \
     check_latest_version, exit_sab, \
     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, panic_fwall, \
+from sabnzbd.panic import panic_tmpl, panic_port, panic_host, \
     panic_sqlite, panic, launch_a_browser
 import sabnzbd.scheduler as scheduler
 import sabnzbd.config as config
@@ -727,24 +725,6 @@ def evaluate_inipath(path):
             return path
 
 
-def cherrypy_logging(log_path, log_handler):
-    """ Setup CherryPy logging """
-    log = cherrypy.log
-    log.access_file = ''
-    log.error_file = ''
-    # Max size of 512KB
-    maxBytes = getattr(log, "rot_maxBytes", 524288)
-    # cherrypy.log cherrypy.log.1 cherrypy.log.2
-    backupCount = getattr(log, "rot_backupCount", 3)
-
-    # Make a new RotatingFileHandler for the error log.
-    fname = getattr(log, "rot_error_file", log_path)
-    h = log_handler(fname, 'a', maxBytes, backupCount)
-    h.setLevel(logging.DEBUG)
-    h.setFormatter(cherrypy._cplogging.logfmt)
-    log.error_log.addHandler(h)
-
-
 def commandline_handler(frozen=True):
     """ Split win32-service commands are true parameters
         Returns:
@@ -1062,7 +1042,7 @@ def main():
                             sabnzbd.cfg.https_port.set(newport)
                         else:
                             # In case HTTPS == HTTP port
-                            http_port = newport
+                            cherryport = newport
                             sabnzbd.cfg.port.set(newport)
         except:
             # Something else wrong, probably badly specified host
@@ -1353,7 +1333,6 @@ def main():
                             'error_page.404': sabnzbd.panic.error_page_404
                             })
 
-
     # Do we want CherryPy Logging? Cannot be done via the config
     if cherrypylogging:
         sabnzbd.WEBLOGFILE = os.path.join(logdir, DEF_LOG_CHERRY)

cherrypy/wsgiserver/__init__.py

@@ -196,12 +196,13 @@ socket_errors_to_ignore = plat_specific_errors(
 )
 socket_errors_to_ignore.append('timed out')
 socket_errors_to_ignore.append('The read operation timed out')
-if sys.platform == 'darwin':
-    socket_errors_to_ignore.append(plat_specific_errors('EPROTOTYPE'))
-
 socket_errors_nonblocking = plat_specific_errors(
     'EAGAIN', 'EWOULDBLOCK', 'WSAEWOULDBLOCK')
 
+if sys.platform == 'darwin':
+    socket_errors_to_ignore.append(plat_specific_errors('EPROTOTYPE'))
+    socket_errors_nonblocking.append(plat_specific_errors('EPROTOTYPE'))
+
 comma_separated_headers = [
     ntob(h) for h in
     ['Accept', 'Accept-Charset', 'Accept-Encoding',

interfaces/Config/templates/config.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Config"#-->
-<!--#set global $help_uri="configuration/2.0/configure"#-->
+<!--#set global $help_uri="configuration/2.1/configure"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#from locale import getpreferredencoding#-->
@@ -41,12 +41,16 @@
                     </td>
                 </tr>
                 <!--#end if#-->
-                <!--#if not $have_mt_par2#-->
+                <!--#if not $nt and not $darwin#-->
                 <tr>
-                    <th scope="row">Multicore Par2</th>
+                    <th scope="row">$T('opt-multicore-par2')</th>
                     <td>
+                        <!--#if $have_mt_par2#-->
+                        <span class="glyphicon glyphicon-ok"></span>
+                        <!--#else#-->
                         <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2mt')
                         <a href="${helpuri}installation/multicore-par2" target="_blank">${helpuri}installation/multicore-par2</a>
+                        <!--#end if#-->
                     </td>
                 </tr>
                 <!--#end if#-->

interfaces/Config/templates/config_cat.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Categories"#-->
-<!--#set global $help_uri="configuration/2.0/categories"#-->
+<!--#set global $help_uri="configuration/2.1/categories"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <div class="section">

interfaces/Config/templates/config_folders.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Folders"#-->
-<!--#set global $help_uri="configuration/2.0/folders"#-->
+<!--#set global $help_uri="configuration/2.1/folders"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">

interfaces/Config/templates/config_general.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="General"#-->
-<!--#set global $help_uri="configuration/2.0/general"#-->
+<!--#set global $help_uri="configuration/2.1/general"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -240,7 +240,17 @@
             \$('.alert-translate').show()
         }
     }
-    \$('#language').on('change', hideOrShowTranslate)
+    \$('#language').on('change', function() {
+        // Show message
+        hideOrShowTranslate()
+        // Re-load page on submit
+        \$('.fullform').submit(function() {
+            // Skip the fancy stuff, just submit
+            this.submit()
+        })
+        // No JSON reponse
+        \$('#ajax').val('')
+    })
     hideOrShowTranslate()
 
     \$('#apikey, #nzbkey').click(function () { \$(this).select() });
@@ -314,14 +324,20 @@
     if(bandwidthLimit) {
         var bandwithLimitNumber = parseFloat(bandwidthLimit)
         var bandwithLimitText = bandwidthLimit.replace(/[^a-zA-Z]+/g, '');
-        \$('#bandwidth_max_value').val(bandwithLimitNumber)
-        \$('#bandwidth_max_dropdown').val(bandwithLimitText)
+        if(bandwithLimitNumber) {
+            \$('#bandwidth_max_value').val(bandwithLimitNumber)
+            \$('#bandwidth_max_dropdown').val(bandwithLimitText)
+        }
     }
 
 
     // Update the value
     \$('#bandwidth_max_value, #bandwidth_max_dropdown').on('change', function() {
-        \$('#bandwidth_max').val(\$('#bandwidth_max_value').val() + \$('#bandwidth_max_dropdown').val())
+        if(\$('#bandwidth_max_value').val()) {
+            \$('#bandwidth_max').val(\$('#bandwidth_max_value').val() + \$('#bandwidth_max_dropdown').val())
+        } else {
+            \$('#bandwidth_max').val('')
+        }
     })
 
 });

interfaces/Config/templates/config_notify.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Email"#-->
-<!--#set global $help_uri="configuration/2.0/notifications"#-->
+<!--#set global $help_uri="configuration/2.1/notifications"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#def show_notify_checkboxes($section_label)#-->

interfaces/Config/templates/config_rss.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="RSS"#-->
-<!--#set global $help_uri="configuration/2.0/rss"#-->
+<!--#set global $help_uri="configuration/2.1/rss"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <!--#if not $active_feed#-->

interfaces/Config/templates/config_scheduling.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Scheduling"#-->
-<!--#set global $help_uri="configuration/2.0/scheduling"#-->
+<!--#set global $help_uri="configuration/2.1/scheduling"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <%

interfaces/Config/templates/config_server.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Servers"#-->
-<!--#set global $help_uri="configuration/2.0/servers"#-->
+<!--#set global $help_uri="configuration/2.1/servers"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -338,6 +338,7 @@
         }).then(function(data) {
             // Let's replace the link
             msg = data.value.message.replace('https://sabnzbd.org/certificate-errors', '<a href="https://sabnzbd.org/certificate-errors" class="alert-link" target="_blank">https://sabnzbd.org/certificate-errors</a>')
+            msg = msg.replace('-', '<br>')
             // Fill the box and enable the button
             resultBox.removeClass('alert-success alert-danger').show()
             resultBox.html(msg)

interfaces/Config/templates/config_sorting.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Sorting"#-->
-<!--#set global $help_uri="configuration/2.0/sorting"#-->
+<!--#set global $help_uri="configuration/2.1/sorting"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">

interfaces/Config/templates/config_special.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Special"#-->
-<!--#set global $help_uri="configuration/2.0/special"#-->
+<!--#set global $help_uri="configuration/2.1/special"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">

interfaces/Config/templates/config_switches.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Switches"#-->
-<!--#set global $help_uri="configuration/2.0/switches"#-->
+<!--#set global $help_uri="configuration/2.1/switches"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -31,12 +31,6 @@
                         <input type="number" name="max_art_tries" id="max_art_tries" value="$max_art_tries" min="2" max="2000" />
                         <span class="desc">$T('explain-max_art_tries')</span>
                     </div>
-                    <div class="field-pair">
-                        <label class="config" for="max_art_opt">$T('opt-max_art_opt')</label>
-                        <input type="checkbox" name="max_art_opt" id="max_art_opt" value="1" <!--#if int($max_art_opt) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-max_art_opt')</span>
-                    </div>
-
                     <div class="field-pair">
                         <label class="config" for="auto_disconnect">$T('opt-auto_disconnect')</label>
                         <input type="checkbox" name="auto_disconnect" id="auto_disconnect" value="1" <!--#if int($auto_disconnect) > 0 then 'checked="checked"' else ""#--> />
@@ -166,13 +160,6 @@
                         <span class="desc">$T('explain-par2_multipar')</span>
                     </div>
                     <!--#end if#-->
-                    <!--#if $darwin#-->
-                    <div class="field-pair">
-                        <label class="config" for="par2_multicore">$T('opt-par2_multicore')</label>
-                        <input type="checkbox" name="par2_multicore" id="par2_multicore" value="1" <!--#if int($par2_multicore) > 0 then 'checked="checked"' else ""#-->  />
-                        <span class="desc">$T('explain-par2_multicore')</span>
-                    </div>
-                    <!--#end if#-->
                     <div class="field-pair">
                         <label class="config" for="par_option">$T('opt-par_option')</label>
                         <input type="text" name="par_option" id="par_option" value="$par_option" />
@@ -258,11 +245,6 @@
                         <input type="checkbox" name="replace_dots" id="replace_dots" value="1" <!--#if int($replace_dots) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-replace_dots')</span>
                     </div>
-                    <div class="field-pair">
-                        <label class="config" for="replace_illegal">$T('opt-replace_illegal')</label>
-                        <input type="checkbox" name="replace_illegal" id="replace_illegal" value="1" <!--#if int($replace_illegal) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-replace_illegal')</span>
-                    </div>
                     <!--#if not $nt#-->
                     <div class="field-pair">
                         <label class="config" for="sanitize_safe">$T('opt-sanitize_safe')</label>

interfaces/Config/templates/staticcfg/js/script.js

@@ -263,7 +263,7 @@ function do_restart() {
             // Keep counter of failures
             var failureCounter = 0;
 
-            // Now we try untill we can connect
+            // Now we try until we can connect
             var refreshInterval = setInterval(function() {
                 // We skip the first one
                 if(failureCounter == 0) {
@@ -401,7 +401,7 @@ $(document).ready(function () {
     $(checkDisabled).on('change', function() {
         $(this).parent().nextAll().toggleClass('disabled')
     })
-    if(!$(checkDisabled).is(':checked')) {
+    if($(checkDisabled).is(':checked')) {
         $(checkDisabled).parent().nextAll().addClass('disabled')
     }
 
@@ -409,6 +409,9 @@ $(document).ready(function () {
     $('#enable_https').on('change', function() {
         $('.enable_https_options').toggle()
     })
+    if(!$('#enable_https').is(':checked')) {
+        $('.enable_https_options').hide()
+    }
 
     $('.advancedButton').click(function(event){
         $('.advanced-settings').toggle()

interfaces/Glitter/templates/static/stylesheets/glitter.css

@@ -1921,49 +1921,6 @@ input[name="nzbURL"] {
     }
 }
 
-/***
-    SPECIAL FOR FIREFOX
-    It uses very high CPU for anything animated (Sep 2015)
-    Disable animations on progress-bar and make the History-'processing' a block animation
-    Can be removed if it's performance gets better in the future..
-***/
-@supports (-moz-transform: translate(0, 0)) {
-    .progress-bar {
-        transform: none !important;
-        animation: none !important;
-        transition: none !important;
-    }
-
-    @keyframes stretchdelay {
-        0%, 60% {
-            transform: scaleY(0.4);
-        }
-
-        61%, 100% {
-            transform: scaleY(1.0);
-        }
-    }
-
-    .processing-download > div {
-        animation: stretchdelay 2s infinite linear;
-    }
-
-    .processing-download .loader-bar-two {
-        animation-delay: 0.2s;
-    }
-
-    .processing-download .loader-bar-three {
-        animation-delay: 0.4s;
-    }
-
-    .processing-download .loader-bar-four {
-        animation-delay: 0.6s;
-    }
-
-    .queue-table td.name input {
-        margin-left: -2px;
-    }
-}
 
 /***
     Bootstrap overwrites

po/main/en.po

@@ -124,4 +124,12 @@ msgstr "Notification script returned exit code %s and output \"%s\""
 msgid "If empty, the standard port will only listen to HTTPS."
 msgstr "If empty, the SABnzbd Port set above will listen to HTTPS."
 
+#: sabnzbd/skintext.py:466
+msgid "Posts will be paused untill they are at least this age. Setting job priority to Force will skip the delay."
+msgstr "Posts will be paused until they are at least this age. Setting job priority to Force will skip the delay."
+
+#: sabnzbd/skintext.py:841
+msgid "How long or until when do you want to pause? (in English!)"
+msgstr ""
+
 

po/nsis/de.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2017-03-18 21:42+0000\n"
-"PO-Revision-Date: 2013-05-05 14:50+0000\n"
-"Last-Translator: shypike <Unknown>\n"
+"PO-Revision-Date: 2017-05-22 08:00+0000\n"
+"Last-Translator: larshuth <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-03-19 06:37+0000\n"
-"X-Generator: Launchpad (build 18332)\n"
+"X-Launchpad-Export-Date: 2017-05-23 06:10+0000\n"
+"X-Generator: Launchpad (build 18387)\n"
 
 #: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
@@ -23,7 +23,7 @@ msgstr "Versionshinweise anzeigen"
 
 #: NSIS_Installer.nsi:475
 msgid "Start SABnzbd"
-msgstr ""
+msgstr "Starte SABnzbd"
 
 #: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
@@ -38,6 +38,9 @@ msgid ""
 "The installation directory has changed (now in \"Program Files\"). \\nIf you "
 "run SABnzbd as a service, you need to update the service settings."
 msgstr ""
+"Das Installationsverzeichnis hat sich geändert (nun in \"Program Files\"). \\"
+"nWenn du SABnzbd als Service ausführst, musst du die Serviceeinstellungen "
+"anpassen."
 
 #: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"

po/nsis/he.po

@@ -0,0 +1,98 @@
+# Hebrew translation for sabnzbd
+# Copyright (c) 2017 Rosetta Contributors and Canonical Ltd 2017
+# This file is distributed under the same license as the sabnzbd package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sabnzbd\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
+"PO-Revision-Date: 2017-05-06 09:07+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-05-07 05:39+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
+
+#: NSIS_Installer.nsi:473
+msgid "Show Release Notes"
+msgstr "הראה הערות שחרור"
+
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr "התחל את SABnzbd"
+
+#: NSIS_Installer.nsi:477
+msgid "Support the project, Donate!"
+msgstr "תמוך במיזם, תרום!"
+
+#: NSIS_Installer.nsi:479
+msgid "Please close \"SABnzbd.exe\" first"
+msgstr "אנא סגור את \"SABnzbd.exe\" תחילה"
+
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+"ספרית ההתקנה השתנתה (עכשיו ב-\"Program Files\"). \\nאם תריץ את SABnzbd בתור "
+"שירות, אתה צריך לעדכן את הגדרות השירות."
+
+#: NSIS_Installer.nsi:483
+msgid "This will uninstall SABnzbd from your system"
+msgstr "זה יסיר את SABnzbd ממערכתך"
+
+#: NSIS_Installer.nsi:485
+msgid "Run at startup"
+msgstr "הפעל באתחול"
+
+#: NSIS_Installer.nsi:487
+msgid "Desktop Icon"
+msgstr "צלמית שולחן עבודה"
+
+#: NSIS_Installer.nsi:489
+msgid "NZB File association"
+msgstr "שיוך קבצי NZB"
+
+#: NSIS_Installer.nsi:491
+msgid "Delete Program"
+msgstr "מחק תכנית"
+
+#: NSIS_Installer.nsi:493
+msgid "Delete Settings"
+msgstr "מחק הגדרות"
+
+#: NSIS_Installer.nsi:495
+msgid ""
+"This system requires the Microsoft runtime library VC90 to be installed "
+"first. Do you want to do that now?"
+msgstr ""
+"מערכת זו דורשת את ספרית זמן-אמת VC90 של Microsoft שתהיה מותקנת תחילה. האם "
+"ברצונך להתקין אותה כעת?"
+
+#: NSIS_Installer.nsi:497
+msgid "Downloading Microsoft runtime installer..."
+msgstr "מוריד מתקין זמן-אמת של Microsoft..."
+
+#: NSIS_Installer.nsi:499
+msgid "Download error, retry?"
+msgstr "שגיאת הורדה, לנסות שוב?"
+
+#: NSIS_Installer.nsi:501
+msgid "Cannot install without runtime library, retry?"
+msgstr "לא ניתן להתקין ללא ספרית זמן-אמת, לנסות שוב?"
+
+#: NSIS_Installer.nsi:503
+msgid ""
+"You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
+"the previous version or `Cancel` to cancel this upgrade."
+msgstr ""
+"אינך יכול לדרוס התקנה קיימת.\\n\\nלחץ על `אישור` כדי להסיר את הגרסה הקודמת "
+"או על `ביטול` כדי לבטל שדרוג זה."
+
+#: NSIS_Installer.nsi:505
+msgid "Your settings and data will be preserved."
+msgstr "ההגדרות והנתונים שלך יישמרו."

po/nsis/zh_CN.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2017-03-18 21:42+0000\n"
-"PO-Revision-Date: 2013-05-05 14:50+0000\n"
-"Last-Translator: XsLiDian <xslidian@gmail.com>\n"
+"PO-Revision-Date: 2017-05-28 17:17+0000\n"
+"Last-Translator: ninjai <ninjai.us@gmail.com>\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-03-19 06:37+0000\n"
-"X-Generator: Launchpad (build 18332)\n"
+"X-Launchpad-Export-Date: 2017-05-29 06:02+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 
 #: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
@@ -23,7 +23,7 @@ msgstr "显示版本说明"
 
 #: NSIS_Installer.nsi:475
 msgid "Start SABnzbd"
-msgstr ""
+msgstr "启动 SABnzbd"
 
 #: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
@@ -37,7 +37,7 @@ msgstr "请先关闭 \"SABnzbd.exe\""
 msgid ""
 "The installation directory has changed (now in \"Program Files\"). \\nIf you "
 "run SABnzbd as a service, you need to update the service settings."
-msgstr ""
+msgstr "安装目录已更改（现在位于 \"Program Files\" 目录）。\\n如果以服务模式运行，你需要更新相应服务的设置。"
 
 #: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"

sabnzbd/__init__.py

@@ -15,9 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+# Imported to be referenced from other files directly
 from sabnzbd.version import __version__, __baseline__
-__configversion__ = 18
-__queueversion__ = 8
 
 import os
 import logging
@@ -25,8 +24,6 @@ import datetime
 import tempfile
 import cPickle
 import pickle
-import zipfile
-import glob
 import gzip
 import subprocess
 import time
@@ -34,7 +31,7 @@ import socket
 import cherrypy
 import sys
 import re
-from threading import RLock, Lock, Condition, Thread
+from threading import Lock, Thread
 try:
     import sleepless
 except ImportError:
@@ -43,7 +40,7 @@ except ImportError:
 ##############################################################################
 # Determine platform flags
 ##############################################################################
-WIN32 = DARWIN = POSIX = FOUNDATION = WIN64 = False
+WIN32 = DARWIN = FOUNDATION = WIN64 = False
 KERNEL32 = None
 
 if os.name == 'nt':
@@ -57,7 +54,6 @@ if os.name == 'nt':
 elif os.name == 'posix':
     ORG_UMASK = os.umask(18)
     os.umask(ORG_UMASK)
-    POSIX = True
     import platform
     if platform.system().lower() == 'darwin':
         DARWIN = True
@@ -110,9 +106,9 @@ import sabnzbd.cfg as cfg
 import sabnzbd.database
 import sabnzbd.lang as lang
 import sabnzbd.api
-from sabnzbd.decorators import synchronized, synchronized_CV, IO_LOCK
+from sabnzbd.decorators import synchronized, notify_downloader
 from sabnzbd.constants import NORMAL_PRIORITY, VALID_ARCHIVES, GIGI, \
-     REPAIR_REQUEST, QUEUE_FILE_NAME, QUEUE_VERSION, QUEUE_FILE_TMPL
+    REPAIR_REQUEST, QUEUE_FILE_NAME, QUEUE_VERSION, QUEUE_FILE_TMPL
 import sabnzbd.getipaddress as getipaddress
 
 LINUX_POWER = powersup.HAVE_DBUS
@@ -177,10 +173,10 @@ __SHUTTING_DOWN__ = False
 ##############################################################################
 def sig_handler(signum=None, frame=None):
     global SABSTOP, WINTRAY
-    if sabnzbd.WIN32 and type(signum) != type(None) and DAEMON and signum == 5:
+    if sabnzbd.WIN32 and signum is not None and DAEMON and signum == 5:
         # Ignore the "logoff" event when running as a Win32 daemon
         return True
-    if type(signum) != type(None):
+    if signum is not None:
         logging.warning(T('Signal %s caught, saving and exiting...'), signum)
     try:
         save_state()
@@ -580,12 +576,9 @@ def unpause_all():
 
 
 ##############################################################################
-# NZB_LOCK Methods
+# NZB Saving Methods
 ##############################################################################
-NZB_LOCK = Lock()
 
-
-@synchronized(NZB_LOCK)
 def backup_exists(filename):
     """ Return True if backup exists and no_dupes is set """
     path = cfg.nzb_backup_dir.get_path()
@@ -599,7 +592,6 @@ def backup_nzb(filename, data):
         save_compressed(path, filename, data)
 
 
-@synchronized(NZB_LOCK)
 def save_compressed(folder, filename, data):
     """ Save compressed NZB file in folder """
     # Need to go to the save folder to
@@ -625,9 +617,9 @@ def save_compressed(folder, filename, data):
 
 
 ##############################################################################
-# CV synchronized (notifies downloader)
+# Unsynchronized methods
 ##############################################################################
-@synchronized_CV
+
 def add_nzbfile(nzbfile, pp=None, script=None, cat=None, priority=NORMAL_PRIORITY, nzbname=None, reuse=False, password=None):
     """ Add disk-based NZB file, optional attributes,
         'reuse' flag will suppress duplicate detection
@@ -697,9 +689,6 @@ def add_nzbfile(nzbfile, pp=None, script=None, cat=None, priority=NORMAL_PRIORIT
                                  keep=keep, reuse=reuse, password=password)
 
 
-##############################################################################
-# Unsynchronized methods
-##############################################################################
 def enable_server(server):
     """ Enable server (scheduler only) """
     try:
@@ -809,7 +798,6 @@ def change_queue_complete_action(action, new=True):
 
     # keep the name of the action for matching the current select in queue.tmpl
     QUEUECOMPLETE = action
-
     QUEUECOMPLETEACTION = _action
     QUEUECOMPLETEARG = _argument
 
@@ -865,7 +853,6 @@ def CheckFreeSpace():
 # Data IO                                                                      #
 ################################################################################
 
-@synchronized(IO_LOCK)
 def get_new_id(prefix, folder, check_list=None):
     """ Return unique prefixed admin identifier within folder
         optionally making sure that id is not in the check_list.
@@ -886,7 +873,6 @@ def get_new_id(prefix, folder, check_list=None):
     raise IOError
 
 
-@synchronized(IO_LOCK)
 def save_data(data, _id, path, do_pickle=True, silent=False):
     """ Save data to a diskfile """
     if not silent:
@@ -906,7 +892,10 @@ def save_data(data, _id, path, do_pickle=True, silent=False):
                     data_file.write(data)
             break
         except:
-            if t == 2:
+            if silent:
+                # This can happen, probably a removed folder
+                pass
+            elif t == 2:
                 logging.error(T('Saving %s failed'), path)
                 logging.info("Traceback: ", exc_info=True)
             else:
@@ -914,7 +903,6 @@ def save_data(data, _id, path, do_pickle=True, silent=False):
                 time.sleep(0.1)
 
 
-@synchronized(IO_LOCK)
 def load_data(_id, path, remove=True, do_pickle=True, silent=False):
     """ Read data from disk file """
     path = os.path.join(path, _id)
@@ -946,7 +934,6 @@ def load_data(_id, path, remove=True, do_pickle=True, silent=False):
     return data
 
 
-@synchronized(IO_LOCK)
 def remove_data(_id, path):
     """ Remove admin file """
     path = os.path.join(path, _id)
@@ -958,7 +945,6 @@ def remove_data(_id, path):
         logging.debug("Failed to remove %s", path)
 
 
-@synchronized(IO_LOCK)
 def save_admin(data, _id):
     """ Save data in admin folder in specified format """
     path = os.path.join(cfg.admin_dir.get_path(), _id)
@@ -982,7 +968,6 @@ def save_admin(data, _id):
                 time.sleep(0.1)
 
 
-@synchronized(IO_LOCK)
 def load_admin(_id, remove=False, silent=False):
     """ Read data in admin folder in specified format """
     path = os.path.join(cfg.admin_dir.get_path(), _id)
@@ -1170,10 +1155,6 @@ def highest_server(me):
     return sabnzbd.downloader.Downloader.do.highest_server(me)
 
 
-def proxy_pre_queue(name, pp, cat, script, priority, size, groups):
-    return sabnzbd.newsunpack.pre_queue(name, pp, cat, script, priority, size, groups)
-
-
 def test_ipv6():
     """ Check if external IPv6 addresses are reachable """
     if not cfg.selftest_host():

sabnzbd/api.py

@@ -27,7 +27,7 @@ import time
 import json
 import cherrypy
 import locale
-import socket
+
 from threading import Thread
 try:
     locale.setlocale(locale.LC_ALL, "")
@@ -40,15 +40,14 @@ try:
 except ImportError:
     pass
 
-
 import sabnzbd
 from sabnzbd.constants import VALID_ARCHIVES, Status, \
-     TOP_PRIORITY, REPAIR_PRIORITY, HIGH_PRIORITY, HIGH_PRIORITY, NORMAL_PRIORITY, LOW_PRIORITY, \
+     TOP_PRIORITY, REPAIR_PRIORITY, HIGH_PRIORITY, NORMAL_PRIORITY, LOW_PRIORITY, \
      KIBI, MEBI, GIGI, JOB_ADMIN
 import sabnzbd.config as config
 import sabnzbd.cfg as cfg
 from sabnzbd.downloader import Downloader
-from sabnzbd.nzbqueue import NzbQueue, set_priority, sort_queue, scan_jobs, repair_job
+from sabnzbd.nzbqueue import NzbQueue
 import sabnzbd.scheduler as scheduler
 from sabnzbd.skintext import SKIN_TEXT
 from sabnzbd.utils.json import JsonWriter
@@ -165,14 +164,8 @@ def _api_del_config(name, output, kwargs):
 
 def _api_qstatus(name, output, kwargs):
     """ API: accepts output """
-    if output == 'json':
-        # Compatibility Fix:
-        # Old qstatus did not have a keyword, so do not use one now.
-        keyword = ''
-    else:
-        keyword = 'queue'
     info, pnfo_list, bytespersec = build_queue()
-    return report(output, keyword='', data=remove_callable(info))
+    return report(output, data=remove_callable(info))
 
 
 def _api_queue(name, output, kwargs):
@@ -253,7 +246,7 @@ def _api_queue_priority(output, value, kwargs):
                 priority = int(value2)
             except:
                 return report(output, _MSG_INT_VALUE)
-            pos = set_priority(value, priority)
+            pos = NzbQueue.do.set_priority(value, priority)
             # Returns the position in the queue, -1 is incorrect job-id
             return report(output, keyword='position', data=pos)
         except:
@@ -267,7 +260,7 @@ def _api_queue_sort(output, value, kwargs):
     sort = kwargs.get('sort')
     direction = kwargs.get('dir', '')
     if sort:
-        sort_queue(sort, direction)
+        NzbQueue.do.sort_queue(sort, direction)
         return report(output)
     else:
         return report(output, _MSG_NO_VALUE2)
@@ -686,7 +679,7 @@ def _api_osx_icon(name, output, kwargs):
 
 def _api_rescan(name, output, kwargs):
     """ API: accepts output """
-    scan_jobs(all=False, action=True)
+    NzbQueue.do.scan_jobs(all=False, action=True)
     return report(output)
 
 
@@ -1196,7 +1189,7 @@ def build_status(skip_dashboard=False, output=None):
     info['logfile'] = sabnzbd.LOGFILE
     info['weblogfile'] = sabnzbd.WEBLOGFILE
     info['loglevel'] = str(cfg.log_level())
-    info['folders'] = [xml_name(item) for item in sabnzbd.nzbqueue.scan_jobs(all=False, action=False)]
+    info['folders'] = [xml_name(item) for item in NzbQueue.do.scan_jobs(all=False, action=False)]
     info['configfn'] = xml_name(config.get_filename())
 
     # Dashboard: Speed of System
@@ -1340,7 +1333,6 @@ def build_queue(start=0, limit=0, trans=False, output=None, search=None):
         priority = pnfo.priority
         mbleft = (bytesleft / MEBI)
         mb = (bytes / MEBI)
-        missing = pnfo.missing
 
         slot = {'index': n, 'nzo_id': str(nzo_id)}
         slot['unpackopts'] = str(sabnzbd.opts_to_pp(pnfo.repair, pnfo.unpack, pnfo.delete))
@@ -1548,7 +1540,7 @@ def retry_job(job, new_nzb, password):
         else:
             path = history_db.get_path(job)
             if path:
-                nzo_id = repair_job(platform_encode(path), new_nzb, password)
+                nzo_id = NzbQueue.do.repair_job(platform_encode(path), new_nzb, password)
                 history_db.remove_history(job)
                 return nzo_id
     return None
@@ -1592,6 +1584,7 @@ def Tspec(txt):
     else:
         return txt
 
+
 _SKIN_CACHE = {}    # Stores pre-translated acronyms
 # This special is to be used in interface.py for template processing
 # to be passed for the $T function: so { ..., 'T' : Ttemplate, ...}
@@ -1662,7 +1655,6 @@ def build_header(webdir='', output=None):
         header['session'] = cfg.api_key()
         header['new_release'], header['new_rel_url'] = sabnzbd.NEW_VERSION
 
-
     header['version'] = sabnzbd.__version__
     header['paused'] = Downloader.do.paused or Downloader.do.postproc
     header['pause_int'] = scheduler.pause_int()
@@ -1812,9 +1804,6 @@ def build_history(start=None, limit=None, verbose=False, verbose_list=None, sear
     cookie = cherrypy.request.cookie
     if 'history_verbosity' in cookie:
         k = cookie['history_verbosity'].value
-        c_path = cookie['history_verbosity']['path']
-        c_age = cookie['history_verbosity']['max-age']
-        c_version = cookie['history_verbosity']['version']
 
         if k == 'all':
             details_show_all = True

sabnzbd/articlecache.py

@@ -30,24 +30,26 @@ from sabnzbd.constants import GIGI, ANFO
 
 ARTICLE_LOCK = threading.Lock()
 
-
 class ArticleCache(object):
+    """ Operations on lists/dicts are atomic enough that we
+        do not have to put locks. Only the cache-size needs
+        a lock since the integer needs to stay synced.
+        With less locking, the decoder and assembler do not
+        have to wait on each other.
+    """
     do = None
 
     def __init__(self):
         self.__cache_limit_org = 0
         self.__cache_limit = 0
         self.__cache_size = 0
-
         self.__article_list = []    # List of buffered articles
         self.__article_table = {}   # Dict of buffered articles
         ArticleCache.do = self
 
-    @synchronized(ARTICLE_LOCK)
     def cache_info(self):
         return ANFO(len(self.__article_list), abs(self.__cache_size), self.__cache_limit_org)
 
-    @synchronized(ARTICLE_LOCK)
     def new_limit(self, limit):
         """ Called when cache limit changes """
         self.__cache_limit_org = limit
@@ -57,23 +59,28 @@ class ArticleCache(object):
             self.__cache_limit = min(limit, GIGI)
 
     @synchronized(ARTICLE_LOCK)
+    def increase_cache_size(self, value):
+        self.__cache_size += value
+
+    @synchronized(ARTICLE_LOCK)
+    def decrease_cache_size(self, value):
+        self.__cache_size -= value
+
     def reserve_space(self, data):
         """ Is there space left in the set limit? """
         data_size = sys.getsizeof(data) * 64
-        self.__cache_size += data_size
+        self.increase_cache_size(data_size)
         if self.__cache_size + data_size > self.__cache_limit:
             return False
         else:
             return True
 
-    @synchronized(ARTICLE_LOCK)
     def free_reserve_space(self, data):
         """ Remove previously reserved space """
         data_size = sys.getsizeof(data) * 64
-        self.__cache_size -= data_size
+        self.decrease_cache_size(data_size)
         return self.__cache_size + data_size < self.__cache_limit
 
-    @synchronized(ARTICLE_LOCK)
     def save_article(self, article, data):
         nzf = article.nzf
         nzo = nzf.nzo
@@ -81,8 +88,6 @@ class ArticleCache(object):
         if nzo.is_gone():
             # Do not discard this article because the
             # file might still be processed at this moment!!
-            if sabnzbd.LOG_ALL:
-                logging.debug("%s is discarded", article)
             return
 
         saved_articles = article.nzf.nzo.saved_articles
@@ -93,7 +98,6 @@ class ArticleCache(object):
         if self.__cache_limit:
             if self.__cache_limit < 0:
                 self.__add_to_cache(article, data)
-
             else:
                 data_size = len(data)
 
@@ -102,7 +106,7 @@ class ArticleCache(object):
                     # Flush oldest article in cache
                     old_article = self.__article_list.pop(0)
                     old_data = self.__article_table.pop(old_article)
-                    self.__cache_size -= len(old_data)
+                    self.decrease_cache_size(len(old_data))
                     # No need to flush if this is a refreshment article
                     if old_article != article:
                         self.__flush_article(old_article, old_data)
@@ -116,7 +120,6 @@ class ArticleCache(object):
         else:
             self.__flush_article(article, data)
 
-    @synchronized(ARTICLE_LOCK)
     def load_article(self, article):
         data = None
         nzo = article.nzf.nzo
@@ -124,9 +127,7 @@ class ArticleCache(object):
         if article in self.__article_list:
             data = self.__article_table.pop(article)
             self.__article_list.remove(article)
-            self.__cache_size -= len(data)
-            if sabnzbd.LOG_ALL:
-                logging.debug("Loaded %s from cache", article)
+            self.decrease_cache_size(len(data))
         elif article.art_id:
             data = sabnzbd.load_data(article.art_id, nzo.workpath, remove=True,
                                      do_pickle=False, silent=True)
@@ -136,23 +137,19 @@ class ArticleCache(object):
 
         return data
 
-    @synchronized(ARTICLE_LOCK)
     def flush_articles(self):
-        self.__cache_size = 0
         while self.__article_list:
             article = self.__article_list.pop(0)
             data = self.__article_table.pop(article)
             self.__flush_article(article, data)
+        self.__cache_size = 0
 
-    @synchronized(ARTICLE_LOCK)
     def purge_articles(self, articles):
-        if sabnzbd.LOG_ALL:
-            logging.debug("Purgeable articles -> %s", articles)
         for article in articles:
             if article in self.__article_list:
                 self.__article_list.remove(article)
                 data = self.__article_table.pop(article)
-                self.__cache_size -= len(data)
+                self.decrease_cache_size(len(data))
             if article.art_id:
                 sabnzbd.remove_data(article.art_id, article.nzf.nzo.workpath)
 
@@ -163,14 +160,10 @@ class ArticleCache(object):
         if nzo.is_gone():
             # Do not discard this article because the
             # file might still be processed at this moment!!
-            if sabnzbd.LOG_ALL:
-                logging.debug("%s is discarded", article)
             return
 
         art_id = article.get_art_id()
         if art_id:
-            if sabnzbd.LOG_ALL:
-                logging.debug("Flushing %s to disk", article)
             # Save data, but don't complain when destination folder is missing
             # because this flush may come after completion of the NZO.
             sabnzbd.save_data(data, art_id, nzo.workpath, do_pickle=False, silent=True)
@@ -179,14 +172,12 @@ class ArticleCache(object):
 
     def __add_to_cache(self, article, data):
         if article in self.__article_table:
-            self.__cache_size -= len(self.__article_table[article])
+            self.decrease_cache_size(len(self.__article_table[article]))
         else:
             self.__article_list.append(article)
 
         self.__article_table[article] = data
-        self.__cache_size += len(data)
-        if sabnzbd.LOG_ALL:
-            logging.debug("Added %s to cache", article)
+        self.increase_cache_size(len(data))
 
 
 # Create the instance