Set version to 2.1.0 and make identical to develop

If the last bps measurment was very long ago, this could cause thousands of zeros to be pre-loaded. This could cause MemoryErrors on low-spec devices: 
https://forums.sabnzbd.org/viewtopic.php?f=3&t=22709&p=112149

ABOUT.txt

@@ -1,5 +1,5 @@
 *******************************************
-*** This is SABnzbd 2.0.1               ***
+*** This is SABnzbd 2.1.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.0.1
+                                SABnzbd 2.1.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.0.1
-Summary: SABnzbd-2.0.1
+Version: 2.1.0
+Summary: SABnzbd-2.1.0
 Home-page: http://sabnzbd.org
 Author: The SABnzbd Team
 Author-email: team@sabnzbd.org

README.mkd

@@ -1,28 +1,22 @@
-Release Notes  -  SABnzbd 2.0.1
+Release Notes  -  SABnzbd 2.1.0
 =========================================================
 
-## Changes since 2.0.0
-- No longer change ports if the configured port is not available during startup.
-- 'Proof' files also ignored when Ignore Samples is enabled.
-- Redundant SFV and RAR checks no longer performed if par2 verification failed.
-- More repair/unpack info is retained in the History information.
-- Windows: remove option to start SABnzbd from installer, it would start the
-  program as administrator.
+## 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)
+  "Extra Par2 Parameters" are also passed to MultiPar
+  For example: Set "/lc32" to enable GPU for repair (can also be slower!)
+- Minimal macOS version set to 10.9 (Mavericks)
+- Human readable history date/time default setting in Glitter (x hours ago, etc)
+- Post-processing script execution can be aborted
+- Removed Specials settings: never_repair, nr_decoders, prio_sort_list,
+  create_group_folder, enable_par_cleanup, enable_quickcheck, allow_64bit_tools
 
-## Bugfixes since 2.0.0
-- Some users experienced slower download speeds.
-- Revert changes to handling of missing articles introduced in 2.0.0 that
-  turned out to be slow for some users.
-- Missing first par2-file would cause repair to be skipped.
-- Better handling of 7zip unpacking.
-- Log X-Forwarded-For of API calls and logins.
-- Handle more URLGrabber exceptions.
-- Command-line parameters were not listed correctly.
-- Queue-finish-action picker in Glitter more stable.
-- Custom Pause interpreter in Glitter more reliable.
-- Pre-check would fail if download was on SMBv3 share.
-- Windows: NZB-icon association lost sometimes.
-- Windows: Unrar could fail on some archives containing very long paths.
+# Bugfixes
+- File join would fail incorrectly
+- Catch and show 'Disk full' messages from PAR2/MultiPar
+- MemoryError occurred when opening the interface after long period of inactivity
 
 ## Upgrading from 0.7.x and older
 - Finish queue
@@ -30,7 +24,7 @@ Release Notes  -  SABnzbd 2.0.1
 - Install new version
 - Start SABnzbd
 
-## Upgrade notices
+## Upgrade notices (from pre-2.x.x)
 - Windows: When starting the Post-Processing script, the path to the job folder
   is no longer in short-path notation but includes the full path. To support
   long paths (>255), you might need to alter them to long-path notation (\\?\).
@@ -43,9 +37,6 @@ Release Notes  -  SABnzbd 2.0.1
 ## Known problems and solutions
 - Read the file "ISSUES.txt"
 
-## Translations
-- Numerous translations updated, thanks to our translators!
-
 ## About
   SABnzbd is an open-source cross-platform binary newsreader.
   It simplifies the process of downloading from Usenet dramatically, thanks

SABnzbd.py

@@ -433,6 +433,9 @@ def print_modules():
     if sabnzbd.newsunpack.PAR2C_COMMAND:
         logging.info("par2cmdline binary... found (%s)", sabnzbd.newsunpack.PAR2C_COMMAND)
 
+    if sabnzbd.newsunpack.MULTIPAR_COMMAND:
+        logging.info("MultiPar binary... found (%s)", sabnzbd.newsunpack.MULTIPAR_COMMAND)
+
     if sabnzbd.newsunpack.RAR_COMMAND:
         logging.info("UNRAR binary... found (%s)", sabnzbd.newsunpack.RAR_COMMAND)
 
@@ -1059,7 +1062,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

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#-->

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">

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">

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">
@@ -159,11 +159,11 @@
                         <input type="checkbox" name="enable_all_par" id="enable_all_par" value="1" <!--#if int($enable_all_par) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-enable_all_par').replace('. ', '.<br/>')</span>
                     </div>
-                    <!--#if $have_multicore#-->
+                    <!--#if $nt#-->
                     <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>
+                        <label class="config" for="multipar">$T('opt-par2_multipar')</label>
+                        <input type="checkbox" name="multipar" id="multipar" value="1" <!--#if int($multipar) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-par2_multipar')</span>
                     </div>
                     <!--#end if#-->
                     <div class="field-pair">

interfaces/Glitter/templates/static/javascripts/glitter.history.js

@@ -297,11 +297,11 @@ function HistoryModel(parent, data) {
     self.processingDownload = ko.pureComputed(function() {
         var status = self.status();
         // When we can cancel
-        if (status === 'Extracting' || status === 'Verifying' || status == 'Repairing') {
+        if (status === 'Extracting' || status === 'Verifying' || status == 'Repairing' || status === 'Running') {
             return 2
         }
         // These cannot be cancelled
-        if(status === 'Moving' ||  status === 'Running') {
+        if(status === 'Moving') {
             return 1
         }
         return false;

interfaces/Glitter/templates/static/javascripts/glitter.main.js

@@ -12,7 +12,7 @@ function ViewModel() {
     self.isRestarting = ko.observable(false);
     self.useGlobalOptions = ko.observable(true).extend({ persist: 'useGlobalOptions' });
     self.refreshRate = ko.observable(1).extend({ persist: 'pageRefreshRate' });
-    self.dateFormat = ko.observable('DD/MM/YYYY HH:mm').extend({ persist: 'pageDateFormat' });
+    self.dateFormat = ko.observable('fromNow').extend({ persist: 'pageDateFormat' });
     self.displayTabbed = ko.observable().extend({ persist: 'displayTabbed' });
     self.displayCompact = ko.observable(false).extend({ persist: 'displayCompact' });
     self.confirmDeleteQueue = ko.observable(true).extend({ persist: 'confirmDeleteQueue' });
@@ -173,8 +173,8 @@ function ViewModel() {
         }
 
         // Did we exceed the space?
-        self.diskSpaceExceeded1(parseInt(response.queue.mbleft)/1024 > parseInt(response.queue.diskspace1))
-        self.diskSpaceExceeded2(parseInt(response.queue.mbleft)/1024 > parseInt(response.queue.diskspace2))
+        self.diskSpaceExceeded1(parseInt(response.queue.mbleft)/1024 > parseFloat(response.queue.diskspace1))
+        self.diskSpaceExceeded2(parseInt(response.queue.mbleft)/1024 > parseFloat(response.queue.diskspace2))
 
         // Quota
         self.quotaLimit(response.queue.quota)

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.*");

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.
+

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. ;-)

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/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

@@ -43,7 +43,7 @@ except ImportError:
 ##############################################################################
 # Determine platform flags
 ##############################################################################
-WIN32 = DARWIN = DARWIN_INTEL = POSIX = FOUNDATION = WIN64 = False
+WIN32 = DARWIN = POSIX = FOUNDATION = WIN64 = False
 KERNEL32 = None
 
 if os.name == 'nt':
@@ -61,20 +61,14 @@ elif os.name == 'posix':
     import platform
     if platform.system().lower() == 'darwin':
         DARWIN = True
+        # 12 = Sierra, 11 = ElCaptain, 10 = Yosemite, 9 = Mavericks, 8 = MountainLion
+        DARWIN_VERSION = int(platform.mac_ver()[0].split('.')[1])
         try:
             import Foundation
             FOUNDATION = True
         except:
             pass
-        if '86' in platform.machine():
-            DARWIN_INTEL = True
 
-if DARWIN:
-    # 10 = Yosemite, 9 = Mavericks, 8 = MountainLion, 7 = Lion, 6 = SnowLeopard, 5 = Leopard
-    DARWIN_VERSION = int(platform.mac_ver()[0].split('.')[1])
-    DARWIN_64 = platform.mac_ver()[2] == 'x86_64'
-else:
-    DARWIN_VERSION = 0
 
 ##############################################################################
 # SSL CHECKS