Set version to 2.0.0

Because the source-distribution on PyPi failed (missing .h file), on pypi are not allowed to replace a file for a release.

ABOUT.txt

@@ -12,9 +12,6 @@ and offers a complete API for third-party applications to hook into.
 There is an extensive Wiki on the use of SABnzbd.
 https://sabnzbd.org/wiki/
 
-IMPORTANT INFORMATION about release 1.x.x:
-https://sabnzbd.org/wiki/new-features-and-changes
-
 Please also read the file "ISSUES.txt"
 
 The organization of the download queue is different from 0.7.x (and older).

INSTALL.txt

@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 -------------------------------------------------------------------------------
-1) INSTALL with the Win32 installer
+1) INSTALL with the Windows installer
 -------------------------------------------------------------------------------
 Just run the downloaded EXE file and the installer will start.
 It's just a simple standard installer.
@@ -32,7 +32,7 @@ Use the "Help" button in the web-interface to be directed to the Help Wiki.
 
 
 -------------------------------------------------------------------------------
-2) INSTALL pre-built Win32 binaries
+2) INSTALL pre-built Windows binaries
 -------------------------------------------------------------------------------
 Unzip pre-built version to any folder of your liking.
 Start the SABnzbd.exe program.
@@ -41,11 +41,11 @@ Use the "Help" button in the web-interface to be directed to the Help Wiki.
 
 
 -------------------------------------------------------------------------------
-3) INSTALL pre-built OSX binaries
+3) INSTALL pre-built macOS binaries
 -------------------------------------------------------------------------------
 Download the DMG file, mount and drag the SABnzbd icon to Programs.
 Just like you do with so many apps.
-Make sure you pick the right folder, depending on your OSX version.
+Make sure you pick the right folder, depending on your macOS version.
 
 
 -------------------------------------------------------------------------------
@@ -55,12 +55,9 @@ Make sure you pick the right folder, depending on your OSX version.
 You need to have Python installed plus some non-standard Python modules
 and a few tools.
 
-Unix/Linux/OSX
+Unix/Linux/macOS
     Python-2.7.latest       http://www.python.org (2.7.9+ recommended)
 
-OSX Mavericks or newer
-    Apple Python 2.7        Included in OSX (default)
-
 Windows
     Python-2.7.latest       http://www.python.org (2.7.9+ recommended)
     PyWin32                 use "pip install pypiwin32"
@@ -69,18 +66,19 @@ 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
     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 >= 2.7.0        use "pip install sabyenc" - https://sabnzbd.org/sabyenc
-    openssl => 1.0.0        http://www.openssl.org/
+    sabyenc == 3.0.2        use "pip install sabyenc" - 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"
                             Enables certificate generation and detection of encrypted RAR-files
 
-Optional modules Unix/Linux/OSX
+Optional modules Unix/Linux/macOS
     pynotify                Should be part of GTK for Python support on Debian/Ubuntu
                             If not, you cannot use the NotifyOSD feature.
     python-dbus             Enable option to Shutdown/Restart/Standby PC on queue finish.

PKG-INFO

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

README.md

@@ -1,37 +1,25 @@
 SABnzbd - The automated Usenet download tool
 ============================================
 
-This Unicode release is not compatible with 0.7.x queues!
-
-There is also an issue with upgrading of the "sabnzbd.ini" file.
-Make sure that you have a backup!
-
-Saved queues may not be compatible after updates.
-
-----
-
 SABnzbd is an Open Source Binary Newsreader written in Python.
 
 It's totally free, incredibly easy to use, and works practically everywhere.
-
-SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.
-
+SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an `.nzb`. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.
 If you want to know more you can head over to our website: http://sabnzbd.org.
 
 ## Resolving Dependencies
 
-SABnzbd has a good deal of dependencies you'll need before you can get running. If you've previously run SABnzbd from one of the various Linux packages floating around (Ubuntu, Debian, Fedora, etc), then you likely already have all the needed dependencies. If not, here's what you're looking for:
+SABnzbd has a good deal of dependencies you'll need before you can get running. If you've previously run SABnzbd from one of the various Linux packages, then you likely already have all the needed dependencies. If not, here's what you're looking for:
 
 - `python` (only 2.7.x and higher, but not 3.x.x)
 - `python-cheetah`
 - `python-support`
-- `par2` (Multi-threaded par2 installation guide can be found [here](https://forums.sabnzbd.org/viewtopic.php?f=16&t=18793#p99702))
+- `par2` (Multi-threaded par2 installation guide can be found [here](https://sabnzbd.org/wiki/installation/multicore-par2))
 - `unrar` (Make sure you get the "official" non-free version of unrar)
+- `sabyenc` (installation guide can be found [here](https://sabnzbd.org/sabyenc))
 
 Optional:
-
 - `python-cryptography` (enables certificate generation and detection of encrypted RAR-files during download)
-- `python-yenc`
 - `python-dbus` (enable option to Shutdown/Restart/Standby PC on queue finish)
 - `7zip`
 - `unzip`
@@ -43,13 +31,13 @@ Your package manager should supply these. If not, we've got links in our more in
 Once you've sorted out all the dependencies, simply run:
 
 ```
-python SABnzbd.py
+python -OO SABnzbd.py
 ```
 
 Or, if you want to run in the background:
 
 ```
-python SABnzbd.py -d -f /path/to/sabnzbd.ini
+python -OO SABnzbd.py -d -f /path/to/sabnzbd.ini
 ```
 
 If you want multi-language support, run:
@@ -68,7 +56,7 @@ Basically:
 - `develop` is the target for integration and is **not** intended for end-users.
 - `1.1.x` is a release and maintenance branch for 1.1.x (1.1.0 -> 1.1.1 -> 1.1.2) and is **not** intended for end-users.
 - `feature/my_feature` is a temporary feature branch based on `develop`.
-- `hotfix/my_hotfix` is an optional temporary branch for bugfix(es) based on `develop`.
+- `bugfix/my_bugfix` is an optional temporary branch for bugfix(es) based on `develop`.
 
 Conditions:
 - Merging of a stable release into `master` will be simple: the release branch is always right.

README.mkd

@@ -1,31 +1,57 @@
-Release Notes  -  SABnzbd 2.0.0 Alpha 1
+Release Notes  -  SABnzbd 2.0.0
 =========================================================
 
 ## New in 2.0.0: SABYenc
-  To improve SABnzbd's performance on systems where CPU power is limiting
-  download speed, we developed a new module called SABYenc to accelerate the
-  decoding of usenet articles. Depending on the hardware, download speed can
-  greatly increase.
+- To improve SABnzbd's performance on systems where CPU power is limiting
+  download speed, we developed a new C-module called SABYenc to accelerate the
+  decoding of usenet articles that can use multiple threads and is more efficient.
+  Not only low-powered systems like NAS's or Raspberry Pi's benefit, with this
+  new module speeds can increase up to 2x compared to 1.x.x releases on any
+  system where the connection/newsserver capacity was not fully used.
   The Windows and macOS releases automatically include this module, for other
-  platforms you can read more on: https://sabnzbd.org/sabyenc
-  If you experience issues, please report them on our Forums!
-  The module is not mandatory, the _yenc module will continue to work and
-  its performance will be similar.
+  platforms an installation guide can be found here: https://sabnzbd.org/sabyenc
 
-## What's new in 2.0.0
-- Post-processing scripts now get additional job information via SAB_*
-  environment variables - See: https://github.com/sabnzbd/sabnzbd/issues/785
-- Certificate Validation set to Strict for newly added newsservers
+## Changes/improvements in 2.0.0:
+- Windows and macOS releases now also come in 64bit versions.
+  The installers will install the appropriate version automatically.
+  Therefore, on 64bit Windows the installation directory will change to
+  'Program Files' instead of 'Program Files (x86)'.
+  On Windows our tests showed an additional 5-10% gain in download speed
+  when using 64bit SABnzbd on 64bit Windows.
+- Linux: Detect if Multicore Par2 is installed.
+  Multicore Par2 is now easily available through the PPA and other channels:
+  https://sabnzbd.org/wiki/installation/multicore-par2
+- Post-processing scripts now get additional job information via SAB environment
+  variables. https://sabnzbd.org/wiki/scripts/post-processing-scripts
+- Certificate Validation set to 'Strict' for newly added newsservers
+  The insecure Certificate Verification level 'Default' is now called 'Minimal'.
+  In case of problems, see: https://sabnzbd.org/certificate-errors
+- Removed Secondary Web Interface option.
+
+## Smaller changes/improvements in 2.0.0
 - Schedule items can now be enabled and disabled
-- Remove Secondary Web Interface option
 - HTTP-redirects in interface are now relative URL's
 - Moved some lesser used settings to Config->Specials
 - Cache usage is now updated continuously in the Status Window
 - On macOS SABnzbd was set to have low IO-priority, this is now set to normal
+- Previously set password is now shown on Retry
+- Remove listquote module dependency
+- Warn if Complete folder is on FAT filesystem (4GB size limit)
 
 ## Bug fixes in 2.0.0
-- Warn in case encoding is not set to UTF-8
+- Malformed articles could break the Downloader
+- Unexpected characters in CRC part of an article could crash the Decoder
 - Retry ADMIN-data saving 3x before giving error
+- Checking for encryption during downloading could fail
+- QuickCheck could crash when renaming already renamed files
+- `skip_dashboard` set to 1 by default in `fullstatus` API-call
+- Top-only switch now really only downloads top job
+- Unblock Server button did not work
+- par2cmdline would fail to repair jobs with split posts (.001, etc)
+- Fixed QuickCheck renaming issues
+- Show warning if job is paused because it appears cloaked
+- Linux: Warn in case encoding is not set to UTF-8
+- Windows: Incomplete folders would sometimes end in a dot
 
 ## Upgrade notices
 - Windows: When starting the Post-Processing script, the path to the job folder
@@ -33,7 +59,7 @@ Release Notes  -  SABnzbd 2.0.0 Alpha 1
   long paths (>255), you might need to alter them to long-path notation (\\?\).
 - Schedule items are converted when upgrading to 2.x.x and will break when
   reverted back to pre-2.x.x releases.
-- The organization of the download queue is different from pre-1.x.x releases.
+- The organization of the download queue is different from 0.7.x releases.
   So 2.x.x will not see the existing queue, but you can go to Status->QueueRepair
   and "Repair" the old queue.
 
@@ -49,6 +75,9 @@ Release Notes  -  SABnzbd 2.0.0 Alpha 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

@@ -405,11 +405,19 @@ def GetProfileInfo(vista_plus):
 
 def print_modules():
     """ Log all detected optional or external modules """
-    if sabnzbd.decoder.HAVE_SABYENC:
-        logging.info("SABYenc module (v%s)... found!", sabnzbd.constants.SABYENC_VERSION)
+    if sabnzbd.decoder.SABYENC_ENABLED:
+        # Yes, we have SABYenc, and it's the correct version, so it's enabled
+        logging.info("SABYenc module (v%s)... found!", sabnzbd.constants.SABYENC_VERSION_REQUIRED)
     else:
-        logging.error("SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc", sabnzbd.constants.SABYENC_VERSION)
-        # Only now we care about old-yEnc
+        # Something wrong with SABYenc, so let's determine and print what:
+        if sabnzbd.decoder.SABYENC_VERSION:
+            # We have a VERSION, thus a SABYenc module, but it's not the correct version
+            logging.warning(T("SABYenc disabled: no correct version found! (Found v%s, expecting v%s)") % (sabnzbd.decoder.SABYENC_VERSION, sabnzbd.constants.SABYENC_VERSION_REQUIRED))
+        else:
+            # No SABYenc module at all
+            logging.warning(T("SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc") % sabnzbd.constants.SABYENC_VERSION_REQUIRED)
+
+        # No correct SABYenc version or no SABYenc at all, so now we care about old-yEnc
         if sabnzbd.decoder.HAVE_YENC:
             logging.info("_yenc module... found!")
         else:
@@ -431,8 +439,15 @@ def print_modules():
     if sabnzbd.newsunpack.RAR_COMMAND:
         logging.info("UNRAR binary... found (%s)", sabnzbd.newsunpack.RAR_COMMAND)
 
+        # Report problematic unrar
+        if sabnzbd.newsunpack.RAR_PROBLEM and not sabnzbd.cfg.ignore_wrong_unrar():
+            have_str = '%.2f' % (float(sabnzbd.newsunpack.RAR_VERSION) / 100)
+            want_str = '%.2f' % (float(sabnzbd.constants.REC_RAR_VERSION) / 100)
+            logging.warning(T('Your UNRAR version is %s, we recommend version %s or higher.<br />') % (have_str, want_str))
+        elif not (sabnzbd.WIN32 or sabnzbd.DARWIN):
+            logging.debug('UNRAR binary version %.2f', (float(sabnzbd.newsunpack.RAR_VERSION) / 100))
     else:
-        logging.warning(T('unrar binary... NOT found'))
+        logging.error(T('unrar binary... NOT found'))
 
     if sabnzbd.newsunpack.ZIP_COMMAND:
         logging.info("unzip binary... found (%s)", sabnzbd.newsunpack.ZIP_COMMAND)
@@ -633,7 +648,7 @@ def attach_server(host, port, cert=None, key=None, chain=None):
         http_server = cherrypy._cpserver.Server()
         http_server.bind_addr = (host, port)
         if cert and key:
-            http_server.ssl_provider = 'builtin'
+            http_server.ssl_module = 'builtin'
             http_server.ssl_certificate = cert
             http_server.ssl_private_key = key
             http_server.ssl_certificate_chain = chain
@@ -760,7 +775,7 @@ def commandline_handler(frozen=True):
     info.extend(sys.argv[slice:])
 
     try:
-        opts, args = getopt.getopt(info, "phdvncw:l:s:f:t:b:2:",
+        opts, args = getopt.getopt(info, "phdvncwl:s:f:t:b:2:",
                                    ['pause', 'help', 'daemon', 'nobrowser', 'clean', 'logging=',
                                     'weblogging', 'server=', 'templates', 'ipv6_hosting=',
                                     'template2', 'browser=', 'config-file=', 'force',
@@ -1301,7 +1316,7 @@ def main():
             cherryport = https_port
         elif multilocal:
             # Extra HTTPS port for secondary localhost
-            attach_server(hosts[1], cherryport, https_cert, https_key)
+            attach_server(hosts[1], cherryport, https_cert, https_key, https_chain)
 
         cherrypy.config.update({'server.ssl_module': 'builtin',
                                 'server.ssl_certificate': https_cert,

cherrypy/wsgiserver/ssl_builtin.py

@@ -85,8 +85,8 @@ class BuiltinSSLAdapter(wsgiserver.SSLAdapter):
 
                 # Check if it's one of the known errors
                 # Errors that are caught by PyOpenSSL, but thrown by built-in ssl
-                _block_errors = ('unknown protocol', 'unknown ca', 'unknown_ca',
-                                 'inappropriate fallback', 'wrong version number',
+                _block_errors = ('unknown protocol', 'unknown ca', 'unknown_ca', 'unknown error',
+                                 'https proxy request', 'inappropriate fallback', 'wrong version number',
                                  'no shared cipher', 'certificate unknown', 'ccs received early')
                 for error_text in _block_errors:
                     if error_text in e.args[1].lower():

interfaces/Config/templates/config.tmpl

@@ -45,6 +45,15 @@
                     </td>
                 </tr>
                 <!--#end if#-->
+                <!--#if not $have_mt_par2#-->
+                <tr>
+                    <th scope="row">Multicore Par2</th>
+                    <td>
+                        <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2mt')
+                        <a href="${helpuri}installation/multicore-par2" target="_blank">${helpuri}installation/multicore-par2</a>
+                    </td>
+                </tr>
+                <!--#end if#-->
                 <!--#if not $have_cryptography #-->
                 <tr>
                     <th scope="row">Python Cryptography:</th>

interfaces/Config/templates/config_cat.tmpl

@@ -17,7 +17,7 @@
                             <th>$T('category')</th>
                             <th>$T('priority')</th>
                             <th>$T('mode')</th>
-                            <!--#if $script_list#-->
+                            <!--#if $scripts#-->
                             <th>$T('script')</th>
                             <!--#end if#-->
                             <th>$T('catFolderPath')</th>
@@ -61,10 +61,10 @@
                                     <option value="3" <!--#if $slot.pp=="3" then 'selected="selected"' else ""#-->>$T('pp-delete')</option>
                                 </select>
                             </td>
-                            <!--#if $script_list#-->
+                            <!--#if $scripts#-->
                             <td>
                                 <select name="script">
-                                    <!--#for $sc in $script_list#-->
+                                    <!--#for $sc in $scripts#-->
                                         <!--#if not ($sc == 'Default' and $slot.name == '*')#-->
                                         <option value="$sc" <!--#if $slot.script.lower()==$sc.lower() then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
                                         <!--#end if#-->

interfaces/Config/templates/config_notify.tmpl

@@ -340,7 +340,7 @@
                 <div class="field-pair">
                     <label class="config" for="nscript_script">$T('opt-nscript_script')</label>
                     <select name="nscript_script">
-                        <!--#for $sc in $script_list#-->
+                        <!--#for $sc in $scripts#-->
                         <option value="$sc" <!--#if $nscript_script == $sc then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
                         <!--#end for#-->
                     </select>

interfaces/Config/templates/config_rss.tmpl

@@ -163,7 +163,7 @@
                             <!--#if $rss[$feed]['pick_cat']#-->
                             <td>
                                 <select name="cat">
-                                    <!--#for $ct in $cat_list#-->
+                                    <!--#for $ct in $categories#-->
                                         <option value="$ct" <!--#if $ct==$rss[$feed]['cat'] then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
                                     <!--#end for#-->
                                 </select>
@@ -191,7 +191,7 @@
                             <!--#if $rss[$feed]['pick_script']#-->
                             <td>
                                 <select name="script">
-                                    <!--#for $sc in $script_list#-->
+                                    <!--#for $sc in $scripts#-->
                                         <option value="$sc" <!--#if $sc==$rss[$feed]['script'] then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
                                     <!--#end for#-->
                                 </select>
@@ -236,7 +236,7 @@
                             <!--#if $rss[$feed]['pick_cat']#-->
                             <td>
                                 <select name="cat">
-                                    <!--#for $ct in $cat_list#-->
+                                    <!--#for $ct in $categories#-->
                                         <option value="$ct" <!--#if $ct=='Default' then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
                                     <!--#end for#-->
                                 </select>
@@ -264,7 +264,7 @@
                             <!--#if $rss[$feed]['pick_script']#-->
                             <td>
                                 <select name="script">
-                                    <!--#for $sc in $script_list#-->
+                                    <!--#for $sc in $scripts#-->
                                         <option value="$sc" <!--#if $sc=='Default' then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
                                     <!--#end for#-->
                                 </select>
@@ -312,7 +312,7 @@
                                 <!--#if $rss[$feed]['pick_cat']#-->
                                 <td>
                                     <select name="cat">
-                                        <!--#for $ct in $cat_list#-->
+                                        <!--#for $ct in $categories#-->
                                             <option value="$ct" <!--#if $ct==$filter[0] then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
                                         <!--#end for#-->
                                     </select>
@@ -340,7 +340,7 @@
                                 <!--#if $rss[$feed]['pick_script']#-->
                                 <td>
                                     <select name="script">
-                                        <!--#for $sc in $script_list#-->
+                                        <!--#for $sc in $scripts#-->
                                             <option value="$sc" <!--#if $sc==$filter[2] then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
                                         <!--#end for#-->
                                     </select>

interfaces/Config/templates/config_server.tmpl

@@ -62,9 +62,9 @@
                 <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>
                     <select name="ssl_verify" id="ssl_verify" <!--#if int($have_ssl_context) == 0 then "disabled=\"disabled\"" else ""#-->>
-                          <option value="0">$T('ssl_verify-disabled')</option>
-                          <option value="1">$T('ssl_verify-normal')</option>
-                          <option value="2" selected>$T('ssl_verify-strict')</option>
+                        <option value="2" selected>$T('ssl_verify-strict')</option>
+                        <option value="1">$T('ssl_verify-normal')</option>
+                        <option value="0">$T('ssl_verify-disabled')</option>
                     </select>
                     <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
                 </div>
@@ -183,9 +183,9 @@
                 <div class="field-pair <!--#if int($have_ssl_context) == 0 then "disabled" else ""#--> advanced-settings">
                     <label class="config" for="ssl_verify$cur">$T('opt-ssl_verify')</label>
                     <select name="ssl_verify" id="ssl_verify$cur" <!--#if int($have_ssl_context) == 0 then "disabled=\"disabled\"" else ""#-->>
-                          <option value="0" <!--#if $server['ssl_verify'] == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
-                          <option value="1" <!--#if $server['ssl_verify'] == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-normal')</option>
-                          <option value="2" <!--#if $server['ssl_verify'] == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
+                        <option value="2" <!--#if $server['ssl_verify'] == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
+                        <option value="1" <!--#if $server['ssl_verify'] == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-normal')</option>
+                        <option value="0" <!--#if $server['ssl_verify'] == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
                     </select>
                     <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
                 </div>

interfaces/Config/templates/config_sorting.tmpl

@@ -12,7 +12,7 @@
                 <p>
                     <b>$T('affectedCat')</b><br/>
                     <select name="tv_cat" multiple="multiple" class="multiple_cats">
-                        <!--#for $ct in $cat_list#-->
+                        <!--#for $ct in $categories#-->
                         <option value="$ct" <!--#if $ct in $tv_categories then 'selected="selected"' else ""#--> >$Tspec($ct)</option>
                         <!--#end for#-->
                     </select>
@@ -165,7 +165,7 @@
                 <p>
                     <b>$T('affectedCat')</b><br/>
                     <select name="movie_cat" multiple="multiple" class="multiple_cats">
-                        <!--#for $ct in $cat_list#-->
+                        <!--#for $ct in $categories#-->
                         <option value="$ct" <!--#if $ct in $movie_categories then 'selected="selected"' else ""#--> >$Tspec($ct)</option>
                         <!--#end for#-->
                     </select>
@@ -303,7 +303,7 @@
                 <p>
                     <b>$T('affectedCat')</b><br/>
                     <select name="date_cat" multiple="multiple" class="multiple_cats">
-                        <!--#for $ct in $cat_list#-->
+                        <!--#for $ct in $categories#-->
                         <option value="$ct" <!--#if $ct in $date_categories then 'selected="selected"' else ""#--> >$Tspec($ct)</option>
                         <!--#end for#-->
                     </select>

interfaces/Config/templates/config_switches.tmpl

@@ -58,7 +58,7 @@
                     <div class="field-pair">
                         <label class="config" for="pre_script">$T('opt-pre_script')</label>
                         <select name="pre_script" id="pre_script">
-                        <!--#for $sc in $script_list#-->
+                        <!--#for $sc in $scripts#-->
                             <!--#if $sc.lower() == $pre_script.lower()#-->
                                 <option value="$sc" selected="selected">$Tspec($sc)</option>
                             <!--#else#-->

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

@@ -273,7 +273,7 @@ function do_restart() {
                     error: function(status, text) {
                         failureCounter = failureCounter+1;
                         // Too many failuers and we give up
-                        if(failureCounter >= 7) {
+                        if(failureCounter >= 6) {
                             // If the port has changed 'Access-Control-Allow-Origin' header will not allow
                             // us to check if the server is back up. So after 7 failures we redirect
                             // anyway in the hopes it works anyway..
@@ -281,7 +281,7 @@ function do_restart() {
                         }
                     }
                 })
-            }, 3000)
+            }, 4000)
 
             // Exception if we go from HTTPS to HTTP
             // (this is not allowed by browsers and all of the above will be ignored)

interfaces/Glitter/templates/include_overlays.tmpl

@@ -207,7 +207,7 @@
                                 <div class="row" data-bind="visible: servererror()">
                                     <div class="col-sm-12">
                                         <div class="alert alert-danger">
-                                            <a href="#" data-bind="visible: !serveractive(), click: function() { \$parent.unblockServer(servername()) }" class="btn btn-default"><span class="glyphicon glyphicon-share-alt"></span> $T('Glitter-unblockServer')</a>
+                                            <a href="#" data-bind="visible: !serveractive(), click: function() { \$parent.unblockServer(servername) }" class="btn btn-default"><span class="glyphicon glyphicon-share-alt"></span> $T('Glitter-unblockServer')</a>
                                             <span class="glyphicon glyphicon-exclamation-sign"></span>
                                             <span data-bind="text: servererror()"></span>
                                         </div>

interfaces/Glitter/templates/include_queue.tmpl

@@ -152,7 +152,7 @@
                             </li>
                             <li title="$T('eoq-scripts')" data-tooltip="true" data-placement="left">
                                 <span class="glyphicon glyphicon-flash"></span>
-                                <select name="Post-processing" class="form-control" data-bind="options: parent.scriptsList, value: script, event: { change: changeScript }, enable: (parent.scriptsList().length > 0)"></select>
+                                <select name="Post-processing" class="form-control" data-bind="options: parent.scriptsList, value: script, event: { change: changeScript }, enable: (parent.scriptsList().length > 1)"></select>
                             </li>
                         </ul>
                         <!-- /ko -->

interfaces/Glitter/templates/static/javascripts/glitter.filelist.pagination.js

@@ -55,15 +55,10 @@ function Fileslisting(parent) {
             $.each(response.files, function(index, slot) {
                 // Existing or updating?
                 var existingItem = ko.utils.arrayFirst(self.fileItems(), function(i) {
-                    return i.filename() == slot.filename;
+                    return i.nzf_id() == slot.nzf_id;
                 });
 
                 if(existingItem) {
-                    // We skip queued files!
-                    // They cause problems because they can have the same filename
-                    // as files that we do want to be updated.. The slot.id is not unique!
-                    if(slot.status == "queued") return false;
-
                     // Update the rest
                     existingItem.updateFromData(slot);
                 } else {
@@ -203,7 +198,7 @@ function FileslistingModel(parent, data) {
     self.file_age = ko.observable(data.age);
     self.mb = ko.observable(data.mb);
     self.percentage = ko.observable(fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)));
-    self.canselect = ko.observable(data.nzf_id !== undefined);
+    self.canselect = ko.observable(data.status != "finished" && data.status != "queued");
     self.isdone =  ko.observable(data.status == "finished");
 
     // Update internally
@@ -213,7 +208,7 @@ function FileslistingModel(parent, data) {
         self.file_age(data.age)
         self.mb(data.mb)
         self.percentage(fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)));
-        self.canselect(data.nzf_id !== undefined)
+        self.canselect(data.status != "finished" && data.status != "queued")
         self.isdone(data.status == "finished")
     }
 }

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

@@ -356,10 +356,17 @@ function HistoryModel(parent, data) {
         return displayDateTime(self.completed(), parent.parent.dateFormat(), 'X')
     });
 
+    // Subscribe to retryEvent so we can load the password
+    self.canRetry.subscribe(function() {
+        self.updateAllHistory = true;
+    })
+
     // Re-try button
     self.retry = function() {
         // Set JOB-id
         $('#modal-retry-job input[name="retry_job_id"]').val(self.nzo_id)
+        // Set password
+        $('#retry_job_password').val(self.historyStatus.password())
         // Open modal
         $('#modal-retry-job').modal("show")
     };

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

@@ -171,7 +171,7 @@ function QueueListModel(parent) {
 
     // Do we show search box. So it doesn't dissapear when nothing is found
     self.hasQueueSearch = ko.pureComputed(function() {
-        return (self.pagination.hasPagination() || self.searchTerm())
+        return (self.pagination.hasPagination() || self.searchTerm() || (self.parent.hasQueue() && self.isMultiEditing()))
     })
 
     // Searching in queue (rate-limited in decleration)
@@ -652,7 +652,7 @@ function QueueModel(parent, data) {
     }
     self.changeScript = function(item) {
         // Not on empty handlers
-        if(!item.script()) return;
+        if(!item.script() || parent.scriptsList().length <= 1) return;
         callAPI({
             mode: 'change_script',
             value: item.id,

interfaces/Plush/templates/_inc_header.tmpl

@@ -102,7 +102,6 @@
         <span id="warning_box"><b><a href="${path}status/#tabs-warnings" id="last_warning" title="#echo $last_warning.replace("\n"," ").replace('"',"'") #"><span id="have_warnings">$have_warnings</span> $T('warnings')</a></b></span>
         #if $pane=="Main"#
           #if $new_release#&sdot; <a href="$new_rel_url" id="new_release" target="_blank">$T('Plush-updateAvailable').replace(' ','&nbsp;')</a>#end if#
-          #if $warning#&sdot; <a id="warning_message">$warning.replace(' ','&nbsp;')</a>#end if#
         #end if#
       </div>
     </div>

interfaces/Plush/templates/_inc_modals.tmpl

@@ -84,10 +84,10 @@ $T('Plush-containerWidth'):
     <div id="add_nzb_hr"><hr></div>
       <i>$T('pp'):</i>
       <table id="add_nzb_pp">
-        #if $cat_list#
+        #if $categories#
         <tr><td style="text-align:right">$T('category'):</td>
           <td><select id="addID_cat" name="cat">
-            #for $ct in $cat_list#
+            #for $ct in $categories#
             <option value="$ct">$Tspec($ct)</option>
             #end for#
             </select>
@@ -111,10 +111,10 @@ $T('Plush-containerWidth'):
             <option value="3">$T('pp-delete')</option>
             </select>
         </td></tr>
-        #if $script_list#
+        #if $scripts#
         <tr><td style="text-align:right">$T('script'):</td>
           <td><select id="addID_script" name="script">
-            #for $sc in $script_list#
+            #for $sc in $scripts#
             <option value="$sc">$Tspec($sc)</option>
             #end for#
             </select>
@@ -186,7 +186,7 @@ $T('Plush-containerWidth'):
         <option value='www.newshosting.com'>NewsHosting</option>
         <option value='www.readnews.com'>Readnews</option>
         <option value='www.supernews.com'>SuperNews</option>
-        <option value='www.thundernews.com'>ThunderNews</option>        
+        <option value='www.thundernews.com'>ThunderNews</option>
         <option value='www.tweaknews.eu'>Tweaknews</option>
         <option value='www.usenetserver.com'>UsenetServer</option>
         <option value='www.xentech.net'>XenTech</option>

interfaces/Plush/templates/main.tmpl

@@ -46,9 +46,9 @@
                       <option value="hibernate_pc" <!--#if $finishaction == 'hibernate_pc' then 'selected' else ''#-->>$T('hibernatePc')</option>
                       <!--#end if#-->
                     </optgroup>
-                    <!--#if $script_list#-->
+                    <!--#if $scripts#-->
                     <optgroup label="$T('eoq-scripts')">
-                      <!--#for $sc in $script_list#-->
+                      <!--#for $sc in $scripts#-->
                       <!--#if $sc != 'None'#-->
                       <option value="script_$sc" <!--#if $finishaction == 'script_'+$sc then 'selected' else ''#-->>$sc</option>
                       <!--#end if#-->
@@ -136,10 +136,10 @@
       <option value="pause">$T('sch-pause')</option>
       <option value="resume">$T('sch-resume')</option>
     </optgroup></select>
-<!--#if $cat_list#-->
+<!--#if $categories#-->
   <select id="multi_cat"><optgroup label="$T('category')">
     <option value="">$T('category')</option>
-  <!--#for $ct in $cat_list#-->
+  <!--#for $ct in $categories#-->
     <option value="$ct">$Tspec($ct)</option>
   <!--#end for#-->
   </optgroup></select>
@@ -158,10 +158,10 @@
     <option value="2">$T('pp-unpack')</option>
     <option value="3">$T('pp-delete')</option>
   </optgroup></select>
-<!--#if $script_list#-->
+<!--#if $scripts#-->
   <select id="multi_script"><optgroup label="$T('script')">
     <option value="">$T('script')</option>
-  <!--#for $sc in $script_list#-->
+  <!--#for $sc in $scripts#-->
     <!--#if $sc != "Default"#--><option value="$sc">$Tspec($sc)</option><!--#end if#-->
   <!--#end for#-->
   </optgroup></select>

interfaces/Plush/templates/nzo.tmpl

@@ -15,9 +15,9 @@
     <option value=$i <!--#if $i == $index then "selected" else ""#-->>$i</option>
   <!--#end for#-->
   </select>
-  <!--#if $cat_list#-->
+  <!--#if $categories#-->
   <select name="cat"><optgroup label="$T('category')">
-    <!--#for $ct in $cat_list#-->
+    <!--#for $ct in $categories#-->
     <option value="$ct" <!--#if $slot.cat.lower() == $ct.lower() then "selected" else ""#-->>$Tspec($ct)</option>
     <!--#end for#-->
   </optgroup></select>
@@ -35,9 +35,9 @@
     <option value="2" <!--#if $slot.unpackopts == "2" then "selected" else ""#-->>$T('pp-unpack')</option>
     <option value="3" <!--#if $slot.unpackopts == "3" then "selected" else ""#-->>$T('pp-delete')</option>
   </optgroup></select>
-  <!--#if $script_list#-->
+  <!--#if $scripts#-->
   <select name="script"><optgroup label="$T('script')">
-    <!--#for $sc in $script_list#-->
+    <!--#for $sc in $scripts#-->
     <option value="$sc" <!--#if $slot.script.lower() == $sc.lower() then "selected" else ""#-->>$Tspec($sc)</option>
     <!--#end for#-->
   </optgroup></select>

interfaces/Plush/templates/queue.tmpl

@@ -75,7 +75,7 @@
       <td></td>
     <!--#end if#-->
   <!--#end if#-->
-  
+
   <td>
     <div class="main_sprite_container sprite_progressbar_bg">
       <div class="main_sprite_container sprite_progress_done" style="background-position: -<!--#if $slot.mb == "0.00" then "120" else int(120 - 120.0 / 100.0 * int(100 - float($slot.mbleft) / float($slot.mb) * 100))#-->px -401px">
@@ -94,9 +94,9 @@
   </td>
 
   <td class="options nowrap">
-    <!--#if $cat_list#-->
+    <!--#if $categories#-->
     <select class="change_cat"><optgroup label="$T('category')">
-      <!--#for $ct in $cat_list#-->
+      <!--#for $ct in $categories#-->
       <option value="$ct" <!--#if $slot.cat.lower() == $ct.lower() then "selected" else ""#-->>$Tspec($ct)</option>
       <!--#end for#-->
     </optgroup></select>
@@ -114,9 +114,9 @@
       <option value="2" <!--#if $slot.unpackopts == "2" then "selected " else ""#-->>$T('pp-unpack')</option>
       <option value="3" <!--#if $slot.unpackopts == "3" then "selected " else ""#-->>$T('pp-delete')</option>
     </optgroup></select>
-    <!--#if $script_list#-->
+    <!--#if $scripts#-->
     <select class="change_script"><optgroup label="$T('script')">
-      <!--#for $sc in $script_list#-->
+      <!--#for $sc in $scripts#-->
       <option value="$sc"  <!--#if $slot.script == $sc then "selected" else ""#-->>$Tspec($sc)</option>
       <!--#end for#-->
     </optgroup></select>

interfaces/smpl/templates/main.tmpl

@@ -13,7 +13,7 @@
   <!--#end if#-->
   <link href="rss?mode=history&apikey=$session" rel="alternate" type="application/rss+xml" title="SABnzbd History" />
   <link rel="shortcut icon" href="./staticcfg/ico/favicon.ico?v=1.1.0" />
-  
+
   <meta name="apple-mobile-web-app-title" content="SABnzbd" />
   <link rel="apple-touch-icon" sizes="76x76" href="./staticcfg/ico/apple-touch-icon-76x76-precomposed.png" />
   <link rel="apple-touch-icon" sizes="120x120" href="./staticcfg/ico/apple-touch-icon-120x120-precomposed.png" />
@@ -973,14 +973,14 @@ function loadingJSON(){
   clearTimeout ( jsontimeout );
   jsontimeout = setTimeout("loadingJSON();", RefreshTime*1000);
   }
-  var url = "tapi?mode=qstatus&output=json&_dc="+Math.random()+"&session="+session;
+  var url = "tapi?mode=queue&output=json&_dc="+Math.random()+"&session="+session;
   var d = loadJSONDoc(url);
   var gotMetadata = function (info)
   {
     //alert(info["kbpersec"]);
-
+  info = info["queue"]
   speed = info["speed"];
-  kbpersec = info["kbpersec"].toFixed(0);
+  kbpersec = info["kbpersec"];
   var paused = info["paused"];
   var pause_int = info["pause_int"];
   //if (paused==true) speed = '';
@@ -1017,10 +1017,10 @@ function loadingJSON(){
   }
 
   document.getElementById("speed").innerHTML = speed;
-  document.getElementById("mbleft").innerHTML = info["mbleft"].toFixed(2);
-  document.getElementById("mbtotal").innerHTML = info["mb"].toFixed(2);
-  document.getElementById("ds1").innerHTML = info["diskspace1"].toFixed(2);
-  document.getElementById("ds2").innerHTML = info["diskspace2"].toFixed(2);
+  document.getElementById("mbleft").innerHTML = info["mbleft"];
+  document.getElementById("mbtotal").innerHTML = info["mb"];
+  document.getElementById("ds1").innerHTML = info["diskspace1"];
+  document.getElementById("ds2").innerHTML = info["diskspace2"];
   document.getElementById("have_warnings").innerHTML = info["have_warnings"];
   load = document.getElementById("loadavg")
   if (load) load.innerHTML = info["loadavg"];
@@ -1155,10 +1155,10 @@ function loadingJSON(){
 <div id="addNew" class="centerLinks" style="overflow: hidden; display: none;">
   <form action="addID" method="get">
     <input type="text" style="width:218px;" name="id" value="$T('enterURL')" onfocus="clearForm(this, 'Enter URL')" onblur="setForm(this, 'Enter URL')">
-    <!--#if $cat_list#-->
+    <!--#if $categories#-->
       <select name="cat" >
         <optgroup label="$T('category')">
-          <!--#for $ct in $cat_list#-->
+          <!--#for $ct in $categories#-->
             <option value="$ct">$Tspec($ct)</option>
           <!--#end for#-->
         </optgroup>
@@ -1166,17 +1166,17 @@ function loadingJSON(){
     <!--#end if#-->
     <select name="pp">
       <optgroup label="$T('pp')">
-        <option value="-1" <!--#if $cat_list then "selected" else ""#-->>$T('default')</option>
+        <option value="-1" <!--#if $categories then "selected" else ""#-->>$T('default')</option>
         <option value="0">$T('none')</option>
         <option value="1">$T('pp-repair')</option>
         <option value="2">$T('pp-unpack')</option>
-        <option value="3" <!--#if $cat_list then "" else "selected"#-->>$T('pp-delete')</option>
+        <option value="3" <!--#if $categories then "" else "selected"#-->>$T('pp-delete')</option>
       </optgroup>
     </select>
-    <!--#if $script_list#-->
+    <!--#if $scripts#-->
       <select name="script">
         <optgroup label="$T('script')">
-          <!--#for $sc in $script_list#-->
+          <!--#for $sc in $scripts#-->
             <option value="$sc">$Tspec($sc)</option>
           <!--#end for#-->
         </optgroup>
@@ -1196,10 +1196,10 @@ function loadingJSON(){
   </form>
   <form action="addFile" method="post" enctype="multipart/form-data">
     <input type="file" style="width:221px" name="nzbfile">
-    <!--#if $cat_list#-->
+    <!--#if $categories#-->
       <select name="cat">
         <optgroup label="$T('category')">
-          <!--#for $ct in $cat_list#-->
+          <!--#for $ct in $categories#-->
             <option value="$ct">$Tspec($ct)</option>
           <!--#end for#-->
         </optgroup>
@@ -1207,17 +1207,17 @@ function loadingJSON(){
     <!--#end if#-->
     <select name="pp">
       <optgroup label="$T('pp')">
-        <option value="-1" <!--#if $cat_list then "selected" else ""#-->>$T('default')</option>
+        <option value="-1" <!--#if $categories then "selected" else ""#-->>$T('default')</option>
         <option value="0">$T('none')</option>
         <option value="1">$T('pp-repair')</option>
         <option value="2">$T('pp-unpack')</option>
-        <option value="3" <!--#if $cat_list then "" else "selected"#-->>$T('pp-delete')</option>
+        <option value="3" <!--#if $categories then "" else "selected"#-->>$T('pp-delete')</option>
       </optgroup>
     </select>
-    <!--#if $script_list#-->
+    <!--#if $scripts#-->
       <select name="script">
         <optgroup label="$T('script')">
-          <!--#for $sc in $script_list#-->
+          <!--#for $sc in $scripts#-->
             <option value="$sc">$Tspec($sc)</option>
           <!--#end for#-->
         </optgroup>
@@ -1255,10 +1255,6 @@ function loadingJSON(){
     <option value="0" >$T("none")</option>
   </select>
   <br />SABnzbd $T('version'): $version | smpl skin</a></p>
-    <!--#if $warning#-->
-    <h2>$T('ft-warning')</h2>
-    <b>$warning</b><br />
-    <!--#end if#-->
     <!--#if $new_release#-->
     <!--#set $msg=$T('ft-newRelease@1')%($new_release)#-->
     <b>$msg <a href="$new_rel_url" target="_blank">SF.net</a></b><br/>

interfaces/smpl/templates/nzo.tmpl

@@ -30,20 +30,20 @@
     </select>
   <!--#end if#-->
 
-  <!--#if $script_list#-->
+  <!--#if $scripts#-->
     <br class="clear" />
     <label class="label">$T('script'):</label>
     <select name="script">
-      <!--#for $sc in $script_list#-->
+      <!--#for $sc in $scripts#-->
       <option value="$sc" <!--#if $slot.script.lower() == $sc.lower() then "selected" else ""#-->>$Tspec($sc)</option>
       <!--#end for#-->
     </select>
   <!--#end if#-->
-  <!--#if $cat_list#-->
+  <!--#if $categories#-->
     <br class="clear" />
     <label class="label">$T('category'):</label>
     <select name="cat">
-      <!--#for $ct in $cat_list#-->
+      <!--#for $ct in $categories#-->
       <option value="$ct" <!--#if $slot.cat.lower() == $ct.lower() then "selected" else ""#-->>$Tspec($ct)</option>
       <!--#end for#-->
     </select>

interfaces/smpl/templates/queue.tmpl

@@ -14,9 +14,9 @@ $T('onQueueFinish'):
     <!--#end if#-->
     <option value="shutdown_program" <!--#if $finishaction == 'shutdown_program' then 'selected' else ''#-->>Shutdown SABnzbd</option>
   </optgroup>
-<!--#if $script_list#-->
+<!--#if $scripts#-->
   <optgroup label="$T('eoq-scripts')">
-  <!--#for $sc in $script_list#-->
+  <!--#for $sc in $scripts#-->
     <!--#if $sc != 'None'#-->
     <option value="script_$sc" <!--#if $finishaction == 'script_'+$sc then 'selected' else ''#-->>$sc</option>
     <!--#end if#-->
@@ -90,20 +90,20 @@ $T('smpl-timeleft'): <strong>$timeleft</strong> $T('eta'): <strong>$eta</strong>
     </optgroup>
   </select>
   <!--#end if#-->
-<!--#if $script_list#-->
+<!--#if $scripts#-->
   <select onfocus="pauseQueueDeferer(this.parentNode.parentNode.id)" onblur="javascript:lr('queue/','limit=$limit&start=$start', 1,-1, this.parentNode.parentNode.id);" onchange="javascript:changequeuedetails('queue/change_script?nzo_id=$slot.nzo_id&script='+this.options[this.selectedIndex].value, 'limit=$limit&start=$start');">
   <optgroup label="$T('script')">
-  <!--#for $sc in $script_list#-->
+  <!--#for $sc in $scripts#-->
     <option value="$sc" <!--#if $slot.script.lower() == $sc.lower() then "selected" else ""#-->>$Tspec($sc)</option>
   <!--#end for#-->
   </optgroup>
   </select>
 <!--#end if#-->
 
-  <!--#if $cat_list#-->
+  <!--#if $categories#-->
   <select onfocus="pauseQueueDeferer(this.parentNode.parentNode.id)" onblur="javascript:lr('queue/','limit=$limit&start=$start', 1,-1, this.parentNode.parentNode.id);" onchange="javascript:changequeuedetails('queue/change_cat?nzo_id=$slot.nzo_id&cat='+this.options[this.selectedIndex].value, 'limit=$limit&start=$start');">
     <optgroup label="$T('category')">
-    <!--#for $ct in $cat_list#-->
+    <!--#for $ct in $categories#-->
       <option value="$ct" <!--#if $slot.cat.lower() == $ct.lower() then "selected" else ""#-->>$Tspec($ct)</option>
     <!--#end for#-->
     </optgroup>

interfaces/wizard/one.html

@@ -68,9 +68,9 @@
                                 <label for="ssl_verify" class="col-sm-4 control-label">$T('opt-ssl_verify')</label>
                                 <div class="col-sm-8">
                                     <select name="ssl_verify" id="ssl_verify" class="form-control" <!--#if int($have_ssl_context) == 0 then "disabled=\"disabled\"" else ""#-->>
-                                        <option value="0" <!--#if $ssl_verify == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
-                                        <option value="1" <!--#if $ssl_verify == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-normal')</option>
                                         <option value="2" <!--#if $ssl_verify == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
+                                        <option value="1" <!--#if $ssl_verify == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-normal')</option>
+                                        <option value="0" <!--#if $ssl_verify == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
                                     </select>
                                 </div>
                             </div>

licenses/License-OrderedDict.txt

@@ -1,30 +0,0 @@
-The Backport of OrderedDict() is coming from ActiveState's Python recipe website.
-It has been written by Raymond Hettinger.
-
-
-Home of the module:
-http://code.activestate.com/recipes/576693-ordered-dictionary-for-py24/
-
-It is covered by the MIT License.
-===================
-(c) 2009 Raymond Hettinger
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

licenses/License-listquote.txt

@@ -1,41 +0,0 @@
-The module listquote.py is written by Michael Foord.
-
-Home of the module:
-http://www.voidspace.org.uk/python/configobj-api/pythonutils.listquote-pysrc.html
-
-It is covered by the following license.
-
--------------------------------------------------------------------------
-Copyright (c) 2003-2007, Michael Foord
-All rights reserved.
-E-mail : fuzzyman AT voidspace DOT org DOT uk
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Michael Foord nor the name of Voidspace
-      may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------

po/nsis/SABnsis.pot

@@ -1,11 +1,11 @@
 #
 # SABnzbd Translation Template file NSIS
-# Copyright (C) 2011-2015 by the SABnzbd Team
+# Copyright 2011-2017 The SABnzbd-Team
 #   team@sabnzbd.org
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-0.8.x\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: shypike@sabnzbd.org\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,67 +13,71 @@ msgstr ""
 "Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 7bit\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr ""
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr ""
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr ""
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr ""
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr ""
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr ""
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr ""
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr ""
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr ""
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr ""
 
-#: NSIS_Installer.nsi:436
+#: 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 ""
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr ""
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr ""
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr ""
 
-#: NSIS_Installer.nsi:444
+#: 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 ""
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr ""
 

po/nsis/da.po

@@ -7,57 +7,65 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
-"PO-Revision-Date: 2013-05-05 14:50+0000\n"
-"Last-Translator: Steffen Thomsen <urskov@gmail.com>\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
+"PO-Revision-Date: 2017-03-14 16:11+0000\n"
+"Last-Translator: Rene <Unknown>\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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Gå til SABnzbd Wiki"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Vis udgivelsesbemærkninger"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Støt projektet, donér!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Luk venligst \"SABnzbd.exe\" først"
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+"Installationsmappen er ændret (nu i  \"Program Files \"). \\Hvis du kører "
+"SABnzbd som en tjeneste, skal du opdatere tjenesteindstillingerne."
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Dette vil afinstallere SABnzbd fra dit system"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Kør ved opstart"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Skrivebordsikon"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "NZB filtilknytning"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Slet program"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Slet indstillinger"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +73,19 @@ msgstr ""
 "Dette system kræver, at Microsoft runtime biblioteket VC90 skal installeres "
 "først. Ønsker du at gøre det nu?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Downloader Microsoft runtime installationsfil..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Download fejl, prøv igen?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Kan ikke installere uden runtime bibliotek, prøv igen?"
 
-#: NSIS_Installer.nsi:444
+#: 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."
@@ -86,10 +94,13 @@ msgstr ""
 "fjerne den tidligere version eller `Annuller` for at annullere denne "
 "opgradering."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Dine indstillinger og data vil blive bevaret."
 
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Gå til SABnzbd Wiki"
+
 #~ msgid ""
 #~ "                  >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the "
 #~ "release notes or go to http://wiki.sabnzbd.org/introducing-0-7-0 !"

po/nsis/de.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\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"
 "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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Gehen Sie auf die SABnzbd Wiki-Seite"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Versionshinweise anzeigen"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Bitte unterstützen Sie das Projekt durch eine Spende!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Schliessen Sie bitte zuerst \"SABnzbd.exe\"."
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Dies entfernt SABnzbd von Ihrem System"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Beim Systemstart ausführen"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Desktop-Symbol"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Mit NZB-Dateien verknüpfen"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Programm löschen"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Einstellungen löschen"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,22 +71,22 @@ msgstr ""
 "Dieses System erfordert die Installation der Laufzeitbibliothek VC90 von "
 "Microsoft. Möchten Sie die Installation jetzt durchführen?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr ""
 "Installationsprogramm für Microsoft-Laufzeitbibliothek wird "
 "heruntergeladen..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Download-Fehler. Erneut versuchen?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr ""
 "Installation ohne Laufzeitbibliothek nicht möglich. Erneut versuchen?"
 
-#: NSIS_Installer.nsi:444
+#: 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."
@@ -89,7 +95,7 @@ msgstr ""
 "Sie 'OK', um die vorherige Version zu entfernen oder 'Abbrechen' um die "
 "Aktualisierung abzubrechen."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Ihre Einstellungen und Daten bleiben erhalten."
 
@@ -100,3 +106,6 @@ msgstr "Ihre Einstellungen und Daten bleiben erhalten."
 #~ "                  >>>> WARNING <<<<\\r\\n\\r\\nBitte lesen Sie zuerst die "
 #~ "Versionshinweise oder gehen Sie zu http://wiki.sabnzbd.org/introducing-0-7-0 "
 #~ "!"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Gehen Sie auf die SABnzbd Wiki-Seite"

po/nsis/es.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Victor Herrero <victorhera@gmail.com>\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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Ir al wiki de SABnzbd"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Mostrar notas de la versión"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "¡Apoye el proyecto, haga una  donación!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Por favor cierre primero \"SABnzbd.exe\""
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Esto desinstalará SABnzbd de su sistema"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Ejecutar al inicio"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Icono del escritorio"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Asociación de archivos NZB"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Eliminar programa"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Eliminar Ajustes"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,20 +71,20 @@ msgstr ""
 "Este sistema requiere la ejecución de la biblioteca Microsoft runtime VC90 "
 "que debe ser instalada. ¿Quieres hacerlo ahora?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Descargando el instalador de Microsoft runtime..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Error en la descarga, ¿probamos de nuevo?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr ""
 "No se puede instalar sin la biblioteca runtime, ¿Lo volvemos a intentar?"
 
-#: NSIS_Installer.nsi:444
+#: 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."
@@ -86,10 +92,13 @@ msgstr ""
 "No es posible sobrescribir una instalación existente. \\n\\nPresione `OK' "
 "para quitar la versión anterior o 'Cancelar' para cancelar la actualización."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Tus ajustes y datos se mantendrán intactos."
 
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Ir al wiki de SABnzbd"
+
 #~ msgid ""
 #~ "                  >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the "
 #~ "release notes or go to http://wiki.sabnzbd.org/introducing-0-7-0 !"

po/nsis/fi.po

@@ -7,57 +7,65 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
-"PO-Revision-Date: 2013-05-05 14:50+0000\n"
-"Last-Translator: Matti Ylönen <Unknown>\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
+"PO-Revision-Date: 2017-04-02 07:38+0000\n"
+"Last-Translator: Paavo Rissanen <paavo.rissanen@outlook.com>\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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-04-05 07:19+0000\n"
+"X-Generator: Launchpad (build 18335)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Siirry SABnzbd wikiin"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Näytä julkaisutiedot"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr "Käynnistä SABnzbd"
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Tue projektia, lahjoita!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Ole hyvä ja sulje \"SABnzbd.exe\" ensin"
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+"Asennuskansio on muuttunut (nykyisin \"Program Files\"). \\nJos suoritat "
+"SABnzbd:ta palveluna, sinun täytyy päivittää palvelun asetukset."
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Tämä poistaa SABnzbd:n tietokoneestasi"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Suorita käynnistyksen yhteydessä"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Työpöydän kuvake"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "NZB tiedostosidos"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Poista sovellus"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Poista asetukset"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +73,19 @@ msgstr ""
 "Tämä järjestelmä vaatii, että Microsoft runtime kirjasto VC90 täytyy asentaa "
 "ensin. Haluatko asentaa sen nyt?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Ladataan Microsoft runtime asennusta..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Latausvirhe, yritä uudelleen?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Ei voida asentaa ilman runtime kirjastoa, yritä uudelleen?"
 
-#: NSIS_Installer.nsi:444
+#: 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."
@@ -85,10 +93,13 @@ msgstr ""
 "Et voi asentaa tätä vanhan asennuksen päälle. \\n\\nPaina `OK` poistaaksesi "
 "edellisen version tai paina `Peruuta` peruuttaaksesi tämän päivityksen."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Asetuksiasi ja tietojasi ei poisteta."
 
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Siirry SABnzbd wikiin"
+
 #~ msgid ""
 #~ "                  >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the "
 #~ "release notes or go to http://wiki.sabnzbd.org/introducing-0-7-0 !"

po/nsis/fr.po

@@ -7,57 +7,66 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
-"PO-Revision-Date: 2015-12-07 07:47+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
+"PO-Revision-Date: 2017-03-21 08:58+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: 2015-12-08 05:47+0000\n"
-"X-Generator: Launchpad (build 17862)\n"
+"X-Launchpad-Export-Date: 2017-03-22 06:58+0000\n"
+"X-Generator: Launchpad (build 18334)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Aller sur le Wiki de SABnzbd"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Afficher les notes de version"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr "Démarrer SABnzbd"
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Soutenez le projet, faites un don !"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Merci de fermer \"SABnzbd.exe\" avant l'installation"
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+"Le répertoire d'installation a changé (maintenant dans \"Program Files\"). \\"
+"nSi vous exécutez SABnzbd en tant que service, vous devez mettre à jour les "
+"paramètres du service."
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Ceci désinstallera SABnzbd de votre système"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Lancer au démarrage"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Icône sur le Bureau"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Association des fichiers NZB"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Supprimer le programme"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Supprimer les paramètres"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +74,19 @@ msgstr ""
 "Ce système nécessite que la bibliothèque d'exécution Microsoft vc90 soit "
 "installée en premier. Voulez-vous le faire maintenant?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Téléchargement de Microsoft runtime installer..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Erreur de téléchargement, réessayer ?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Impossible d'installer sans moteur d'exécution, réessayer?"
 
-#: NSIS_Installer.nsi:444
+#: 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."
@@ -86,7 +95,7 @@ msgstr ""
 "pour supprimer la version précédente ou `Annuler` pour annuler cette mise à "
 "niveau."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Vos paramètres et données seront conservés."
 
@@ -97,3 +106,6 @@ msgstr "Vos paramètres et données seront conservés."
 #~ "                  >>>> AVERTISSEMENT <<<<\\r\\n\\r\\nS'il vous plaît, "
 #~ "vérifiez d'abord les notes de version ou consultez "
 #~ "http://wiki.sabnzbd.org/introducing-0-7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Aller sur le Wiki de SABnzbd"

po/nsis/nb.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Gå til SABnzbd Wiki"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Vis versjonsmerknader"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Støtt prosjektet, donèr!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Vennligst lukk \"SABnzbd.exe\" først"
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Dette vil avinstallere SABnzbd fra ditt system"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Kjør ved oppstart"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Skrivebordsikon"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "NZB-filassosiering"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Fjern program"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Slett innstillinger"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +71,19 @@ msgstr ""
 "Dette sytemet krever at Microsoft runtime library VC90 er installert først. "
 "Ønsker du å gjøre dette nå?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Laster ned Microsoft runtime installer..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Nedlasting feilet, prøve på nytt?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Kan ikke installere uten runtime library, prøve på nytt?"
 
-#: NSIS_Installer.nsi:444
+#: 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."
@@ -86,7 +92,7 @@ msgstr ""
 "fjerne tidligere installasjon, eller 'Avbryt' for å avbryte denne "
 "oppgraderingen."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Dine innstillinger og data vil bli tatt vare på."
 
@@ -97,3 +103,6 @@ msgstr "Dine innstillinger og data vil bli tatt vare på."
 #~ "                  >>>> ADVARSEL <<<<\\r\\n\\r\\nVennligst sjekk "
 #~ "versjonsmerknadene først, eller gå til http://wiki.sabnzbd.org/introducing-0-"
 #~ "7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Gå til SABnzbd Wiki"

po/nsis/nl.po

@@ -7,57 +7,66 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
-"PO-Revision-Date: 2015-09-10 07:52+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
+"PO-Revision-Date: 2017-03-19 09:47+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: 2015-09-11 06:02+0000\n"
-"X-Generator: Launchpad (build 17720)\n"
+"X-Launchpad-Export-Date: 2017-03-20 06:21+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Ga naar de SABnzbd-Wiki"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Toon opmerkingen bij deze uitgave"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr "Start SABnzbd"
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Steun het project, doneer!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Sluit \"SABnzbd.exe\" eerst af"
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+"De installatie map is veranderd (nu in \"Program Files\").\\nIndien je "
+"SABnzbd als een service draait, zul je de service instellingen moeten "
+"aanpassen."
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Dit verwijdert SABnzbd van je systeem"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Starten met Windows"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Bureaubladpictogram"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "NZB-bestanden openen met SABnzbd"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Programma verwijderen"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Verwijder alle instellingen"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +74,19 @@ msgstr ""
 "Op dit systeem moeten eerst de Microsoft runtime bibliotheek VC90 "
 "geïnstalleerd worden. Wilt u dat nu doen?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Downloaden van de Microsoft bibliotheek"
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Download mislukt, opnieuw proberen?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Installeren heeft geen zin zonder de bibliotheek, opnieuw proberen?"
 
-#: NSIS_Installer.nsi:444
+#: 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."
@@ -85,7 +94,7 @@ msgstr ""
 "U kunt geen bestaande installatie overschrijven.\\n\\nKlik op `OK` om de "
 "vorige versie te verwijderen of op `Annuleren` om te stoppen."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Je instellingen en bestanden blijven behouden."
 
@@ -95,3 +104,6 @@ msgstr "Je instellingen en bestanden blijven behouden."
 #~ msgstr ""
 #~ "                  >>>> WAARSCHUWING <<<<\\\\r\\\\n\\\\r\\\\nLees eerst het "
 #~ "vrijgave bericht of ga naar http://wiki.sabnzbd.org/introducing-0-7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Ga naar de SABnzbd-Wiki"

po/nsis/pl.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Tomasz 'Zen' Napierala <tomasz@napierala.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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Idź do wiki SABnzbd"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Pokaż informacje o wydaniu"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Wspomóż projekt!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Najpierw zamknij SABnzbd.exe"
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "To odinstaluje SABnzbd z systemu"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Uruchom wraz z systemem"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Ikona pulpitu"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "powiązanie pliku NZB"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Usuń program"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Skasuj obecne ustawienia"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +71,19 @@ msgstr ""
 "Ten system wymaga najpierw zainstalowania bibliotek Microsoft VC90. Czy "
 "chcesz wykonać teraz instalację?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Pobieranie instalatora bibliotek Microsoft..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Problem z pobieraniem, spróbować ponownie?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Nie można wykonać instalacji bez bibliotek, spróbować ponownie?"
 
-#: NSIS_Installer.nsi:444
+#: 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."
@@ -85,7 +91,7 @@ msgstr ""
 "Nie można nadpisać istniejącej instalacji. \\n\\n Naciśnij `OK`, aby usunąć "
 "poprzednia wersję lub `Anuluj` aby anulować aktualizację."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Twoje ustawienia i dane zostaną zachowane."
 
@@ -95,3 +101,6 @@ msgstr "Twoje ustawienia i dane zostaną zachowane."
 #~ msgstr ""
 #~ "                  >>>> UWAGA <<<<\\r\\n\\r\\nNajpierw przeczytaj informacje "
 #~ "o wydaniu lub odwiedź http://wiki.sabnzbd.org/introducing-0-7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Idź do wiki SABnzbd"

po/nsis/pt_BR.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Vá para a Wiki do SABnzbd"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Mostrar Notas de Lançamento"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Apoie o projeto. Faça uma doação!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Por favor, feche \"SABnzbd.exe\" primeiro"
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Isso irá desinstalar SABnzbd de seu sistema"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Executar na inicialização"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Ícone na Área de Trabalho"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Associação com Arquivos NZB"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Excluir o Programa"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Apagar Configurações"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +71,19 @@ msgstr ""
 "Este sistema precisa que a biblioteca runtime Microsoft VC90 seja instalada "
 "antes. Você quer fazer isso agora?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Baixando o instalador runtime da Microsoft ..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Houve um erro de download. Quer tentar novamente?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Não é possível instalar sem a biblioteca runtime. Quer repetir?"
 
-#: NSIS_Installer.nsi:444
+#: 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."
@@ -85,7 +91,7 @@ msgstr ""
 "Você não pode substituir uma instalação existente. \\n\\nClique `OK` para "
 "remover a versão anterior ou `Cancelar` para cancelar esta atualização."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Suas configurações e os dados serão preservados."
 
@@ -95,3 +101,6 @@ msgstr "Suas configurações e os dados serão preservados."
 #~ msgstr ""
 #~ "                  >>>> ATENÇÃO <<<<\\r\\n\\r\\nPor favor, verifique primeiro "
 #~ "as notas de lançamento ou vá até http://wiki.sabnzbd.org/introducing-0-7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Vá para a Wiki do SABnzbd"

po/nsis/ro.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Dute la Wiki SABnzbd"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Arată Notele de Publicare"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Susţine proiectul, Donează!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Închideţi mai întâi \"SABnzbd.exe\""
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Acest lucru va dezinstala SABnzbd din sistem"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Executare la pornire"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Icoană Desktop"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Asociere cu Fişierele NZB"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Şterge Program"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Ştergeţi Setări"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +71,19 @@ msgstr ""
 "Acest sistem necesită librăria Microsoft VC90 instalată. Dortiți să faceți "
 "asta acum ?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Descărcare rutină instalare Microsoft..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Eroare descărcare, încerc din nou?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Nu pot instala fără rutină librărie, încerc din nou?"
 
-#: NSIS_Installer.nsi:444
+#: 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."
@@ -85,7 +91,7 @@ msgstr ""
 "Nu puteți suprascrie instalarea existentă. \\n\\nClick `OK` pentru a elimina "
 "versiunea anterioară sau `Anulare` pentru a anula actualizarea."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Setările şi informaţiile vor fi salvate."
 
@@ -96,3 +102,6 @@ msgstr "Setările şi informaţiile vor fi salvate."
 #~ "                  >>>> ATENŢIE <<<<\\r\\n\\r\\nVă rugăm, să verificaţi mai "
 #~ "întâi notele de publicare sau să vizitaţi "
 #~ "http://wiki.sabnzbd.org/introducing-0-7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Dute la Wiki SABnzbd"

po/nsis/ru.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Pavel Maryanov <Unknown>\n"
 "Language-Team: Russian <gnu@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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr ""
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Показать заметки о выпуске"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Поддержите проект. Сделайте пожертвование!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Завершите сначала работу процесса SABnzbd.exe"
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Приложение SABnzbd будет удалено из вашей системы"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Запускать вместе с системой"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Значок на рабочем столе"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Ассоциировать с файлами NZB"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Удалить программу"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Удалить параметры"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,21 +71,21 @@ msgstr ""
 "Для этой системы сначала необходимо установить библиотеку времени выполнения "
 "Microsoft VC90. Сделать это сейчас?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Загрузка программы установки Microsoft..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Ошибка загрузки. Повторить попытку?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr ""
 "Не удаётся выполнить установку без библиотеки времени выполнения. Повторить "
 "попытку?"
 
-#: NSIS_Installer.nsi:444
+#: 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."
@@ -88,6 +94,6 @@ msgstr ""
 "удалить предыдущую версию, нажмите кнопку «ОК». Чтобы отменить обновление, "
 "нажмите кнопку «Отмена»."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Ваши параметры и данные будут сохранены."

po/nsis/sr.po

@@ -7,92 +7,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Ozzii <Unknown>\n"
 "Language-Team: Launchpad Serbian Translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 "Language: sr\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Иди на SABnzbd Вики"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Прикажи белешке о издању"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Подржите пројекат, дајте добровољан прилог!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Прво затворите „SABnzbd.exe“"
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Ово ће уклонити САБнзбд са вашег система"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Покрени са системом"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Иконица радне површи"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Придруживање НЗБ датотеке"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Обриши програм"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Обриши подешавања"
 
-#: NSIS_Installer.nsi:436
+#: 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. Да ли желите то да урадите?"
+"Овај систем захтева да буде прво инсталирана Мајкрософтова извршна "
+"библиотека „VC90“. Да ли желите то да урадите?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
-msgstr "Преузимам Мајкрософтов извршивачки програм за инсталацију..."
+msgstr "Преузимам Мајкрософтов извршни програм за инсталацију..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Грешка у преузимању, да поновим?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
-msgstr "Не могу да инсталирам без извршивачке библиотеке, да поновим?"
+msgstr "Не могу да инсталирам без извршне библиотеке, да поновим?"
 
-#: NSIS_Installer.nsi:444
+#: 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Кликните „У реду“ да "
+"Не можете да препишете постојећу инсталацију. \\n\\nПритисните „У реду“ да "
 "уклоните претходно издање или „Откажи“ да поништите ову надоградњу."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
-msgstr "Ваша подешавања и податка ће бити сачувана."
+msgstr "Ваша подешавања и подаци биће сачувани."
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Иди на вики САБнзбд-а"
 
 #~ msgid ""
 #~ "                  >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the "
 #~ "release notes or go to http://wiki.sabnzbd.org/introducing-0-7-0 !"
 #~ msgstr ""
-#~ "                  >>>> ПАЖЊА <<<<\\r\\n\\r\\nПрво проверите белешке о "
-#~ "верзији или идите на http://wiki.sabnzbd.org/introducing-0-7-0 !"
+#~ "                  >>>> ПАЖЊА <<<<\\r\\n\\r\\nПрво проверите белешке о издању "
+#~ "или идите на „http://wiki.sabnzbd.org/introducing-0-7-0“ !"

po/nsis/sv.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Andreas Lindberg <andypandyswe@gmail.com>\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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Gå till SABnzbd Wiki"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Visa releasenoteringar"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Donera och stöd detta projekt!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Var vänlig stäng \"SABnzbd.exe\" först"
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Detta kommer att avinstallera SABnzbd från systemet"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Kör vid uppstart"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Skrivbordsikon"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "NZB Filassosication"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Radera programmet"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Radera inställningar"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +71,19 @@ msgstr ""
 "Detta system kräver att Microsofts runtimebibliotek VC90 är installerat. "
 "Vill du göra detta nu?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Laddar ned Microsofts runtimeinstaller..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Misslyckat nedladdningsförsök, försök igen?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Kan inte installera utan runtimebibliotek, försök igen?"
 
-#: NSIS_Installer.nsi:444
+#: 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."
@@ -86,10 +92,13 @@ msgstr ""
 "avinstallera tidigare version eller 'Avbryt' för att avbryta denna "
 "uppgradering."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Dina inställningar och ditt data kommer att bevaras."
 
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Gå till SABnzbd Wiki"
+
 #~ msgid ""
 #~ "                  >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the "
 #~ "release notes or go to http://wiki.sabnzbd.org/introducing-0-7-0 !"

po/nsis/zh_CN.po

@@ -7,81 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\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"
 "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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "访问 SABnzbd Wiki"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "显示版本说明"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "支持该项目，捐助!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "请先关闭 \"SABnzbd.exe\""
 
-#: NSIS_Installer.nsi:424
+#: 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 ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "这将从您的系统中卸载 SABnzbd"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "启动时运行"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "桌面图标"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "NZB 文件关联"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "删除程序"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "删除设置"
 
-#: NSIS_Installer.nsi:436
+#: 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 "该系统需要先安装 Microsoft 运行时库 VC90。是否希望立即安装?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "正在下载 Microsoft 运行时安装程序..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "下载出错，重试?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "没有运行时库无法安装，重试?"
 
-#: NSIS_Installer.nsi:444
+#: 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:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "您的设置及数据将会保留。"
 
@@ -91,3 +97,6 @@ msgstr "您的设置及数据将会保留。"
 #~ msgstr ""
 #~ "                  >>>> *警告* <<<<\\r\\n\\r\\n请首先查看版本说明或访问 "
 #~ "http://wiki.sabnzbd.org/introducing-0-7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "访问 SABnzbd Wiki"

sabnzbd/__init__.py

@@ -128,7 +128,7 @@ START = datetime.datetime.now()
 MY_NAME = None
 MY_FULLNAME = None
 RESTART_ARGS = []
-NEW_VERSION = None
+NEW_VERSION = (None, None)
 DIR_HOME = None
 DIR_APPDATA = None
 DIR_LCLDATA = None
@@ -217,7 +217,6 @@ def connect_db(thread_index=0):
     return cherrypy.thread_data.history_db
 
 
-
 @synchronized(INIT_LOCK)
 def initialize(pause_downloader=False, clean_up=False, evalSched=False, repair=0):
     global __INITIALIZED__, __SHUTTING_DOWN__,\
@@ -441,7 +440,6 @@ def halt():
         except:
             logging.error(T('Fatal error at saving state'), exc_info=True)
 
-
         # The Scheduler cannot be stopped when the stop was scheduled.
         # Since all warm-restarts have been removed, it's not longer
         # needed to stop the scheduler.
@@ -453,8 +451,13 @@ def halt():
         __INITIALIZED__ = False
 
 
-def trigger_restart():
+def trigger_restart(timeout=None):
     """ Trigger a restart by setting a flag an shutting down CP """
+    # Sometimes we need to wait a bit to send good-bye to the browser
+    if timeout:
+        time.sleep(timeout)
+
+    # Add extra arguments
     if sabnzbd.downloader.Downloader.do.paused:
         sabnzbd.RESTART_ARGS.append('-p')
     sys.argv = sabnzbd.RESTART_ARGS
@@ -517,6 +520,7 @@ def guard_fsys_type():
     """ Callback for change of file system naming type """
     sabnzbd.encoding.change_fsys(cfg.fsys_type())
 
+
 def set_https_verification(value):
     prev = False
     try:
@@ -1148,11 +1152,12 @@ def wait_for_download_folder():
         logging.debug('Waiting for "incomplete" folder')
         time.sleep(2.0)
 
+
 def check_old_queue():
     """ Check for old queue (when a new queue is not present) """
     old = False
     if not os.path.exists(os.path.join(cfg.admin_dir.get_path(), QUEUE_FILE_NAME)):
-        for ver in (QUEUE_VERSION -1 , QUEUE_VERSION - 2, QUEUE_VERSION - 3):
+        for ver in (QUEUE_VERSION - 1, QUEUE_VERSION - 2, QUEUE_VERSION - 3):
             data = load_admin(QUEUE_FILE_TMPL % str(ver))
             if data:
                 break
@@ -1160,8 +1165,7 @@ def check_old_queue():
             old = bool(data and isinstance(data, tuple) and len(data[1]))
         except (TypeError, IndexError):
             pass
-        if old and sabnzbd.WIN32 and ver < 10 and sabnzbd.DIR_LCLDATA != sabnzbd.DIR_HOME \
-            and misc.is_relative_path(cfg.download_dir()):
+        if old and sabnzbd.WIN32 and ver < 10 and sabnzbd.DIR_LCLDATA != sabnzbd.DIR_HOME and misc.is_relative_path(cfg.download_dir()):
             # For Windows and when version < 10: adjust old default location
             cfg.download_dir.set('Documents/' + cfg.download_dir())
     return old

sabnzbd/api.py

@@ -28,6 +28,7 @@ import json
 import cherrypy
 import locale
 import socket
+from threading import Thread
 try:
     locale.setlocale(locale.LC_ALL, "")
 except:
@@ -97,6 +98,7 @@ else:
 # Flag for using the fast json encoder, unless it fails
 FAST_JSON = True
 
+
 def api_handler(kwargs):
     """ API Dispatcher """
     mode = kwargs.get('mode', '')
@@ -105,7 +107,7 @@ def api_handler(kwargs):
     callback = kwargs.get('callback', '')
 
     # Extend the timeout of API calls to 10minutes
-    cherrypy.response.timeout = 60*10
+    cherrypy.response.timeout = 600
 
     if isinstance(mode, list):
         mode = mode[0]
@@ -139,6 +141,7 @@ def _api_set_config(name, output, kwargs):
     res, data = config.get_dconfig(kwargs.get('section'), kwargs.get('keyword'))
     return report(output, keyword='config', data=data)
 
+
 def _api_set_config_default(name, output, kwargs):
     """ API: Reset requested config variables back to defaults. Currently only for misc-section """
     keywords = kwargs.get('keyword', [])
@@ -168,7 +171,8 @@ def _api_qstatus(name, output, kwargs):
         keyword = ''
     else:
         keyword = 'queue'
-    return report(output, keyword=keyword, data=qstatus_data())
+    info, pnfo_list, bytespersec = build_queue()
+    return report(output, keyword='', data=remove_callable(info))
 
 
 def _api_queue(name, output, kwargs):
@@ -271,21 +275,12 @@ def _api_queue_sort(output, value, kwargs):
 
 def _api_queue_default(output, value, kwargs):
     """ API: accepts output, sort, dir, start, limit """
-    sort = kwargs.get('sort')
-    direction = kwargs.get('dir', '')
     start = int_conv(kwargs.get('start'))
     limit = int_conv(kwargs.get('limit'))
-    trans = kwargs.get('trans')
     search = kwargs.get('search')
 
     if output in ('xml', 'json'):
-        if sort and sort != 'index':
-            reverse = direction.lower() == 'desc'
-            sort_queue(sort, reverse)
-
-        info, pnfo_list, bytespersec = build_queue(start=start, limit=limit, output=output, trans=trans, search=search)
-        info['categories'] = info.pop('cat_list')
-        info['scripts'] = info.pop('script_list')
+        info, pnfo_list, bytespersec = build_queue(start=start, limit=limit, output=output, search=search)
         return report(output, keyword='queue', data=remove_callable(info))
     elif output == 'rss':
         return rss_qstatus()
@@ -385,6 +380,7 @@ def _api_retry(name, output, kwargs):
     else:
         return report(output, _MSG_NO_ITEM)
 
+
 def _api_cancel_pp(name, output, kwargs):
     """ API: accepts name, output, value(=nzo_id) """
     nzo_id = kwargs.get('value')
@@ -393,6 +389,7 @@ def _api_cancel_pp(name, output, kwargs):
     else:
         return report(output, _MSG_NO_ITEM)
 
+
 def _api_addlocalfile(name, output, kwargs):
     """ API: accepts name, output, pp, script, cat, priority, nzbname """
     if name and isinstance(name, list):
@@ -485,7 +482,7 @@ def _api_change_opts(name, output, kwargs):
 
 def _api_fullstatus(name, output, kwargs):
     """ API: full history status"""
-    status = build_status(skip_dashboard=kwargs.get('skip_dashboard'), output=output)
+    status = build_status(skip_dashboard=kwargs.get('skip_dashboard', 1), output=output)
     return report(output, keyword='status', data=remove_callable(status))
 
 
@@ -533,9 +530,7 @@ def _api_history(name, output, kwargs):
         else:
             return report(output, _MSG_NO_VALUE)
     elif not name:
-        history = build_header()
-        if 'noofslots_total' in history:
-            del history['noofslots_total']
+        history = {}
         grand, month, week, day = BPSMeter.do.get_sums()
         history['total_size'], history['month_size'], history['week_size'], history['day_size'] = \
                to_units(grand), to_units(month), to_units(week), to_units(day)
@@ -545,6 +540,7 @@ def _api_history(name, output, kwargs):
                                                                               categories=categories,
                                                                               output=output)
         history['last_history_update'] = int(sabnzbd.LAST_HISTORY_UPDATE)
+        history['version'] = sabnzbd.__version__
         return report(output, keyword='history', data=remove_callable(history))
     else:
         return report(output, _MSG_NOT_IMPLEMENTED)
@@ -607,6 +603,7 @@ def _api_resume(name, output, kwargs):
 
 def _api_shutdown(name, output, kwargs):
     """ API: accepts output """
+    logging.info('Shutdown requested by API')
     sabnzbd.halt()
     cherrypy.engine.exit()
     sabnzbd.SABSTOP = True
@@ -660,12 +657,15 @@ def _api_auth(name, output, kwargs):
 
 def _api_restart(name, output, kwargs):
     """ API: accepts output """
-    sabnzbd.trigger_restart()
+    logging.info('Restart requested by API')
+    # Do the shutdown async to still send goodbye to browser
+    Thread(target=sabnzbd.trigger_restart, kwargs={'timeout': 1}).start()
     return report(output)
 
 
 def _api_restart_repair(name, output, kwargs):
     """ API: accepts output """
+    logging.info('Queue repair requested by API')
     sabnzbd.request_repair()
     sabnzbd.trigger_restart()
     return report(output)
@@ -753,12 +753,14 @@ def _api_test_email(name, output, kwargs):
         res = None
     return report(output, error=res)
 
+
 def _api_test_windows(name, output, kwargs):
     """ API: send a test to Windows, return result """
     logging.info("Sending test notification")
     res = sabnzbd.notifier.send_windows('SABnzbd', T('Test Notification'), 'other')
     return report(output, error=res)
 
+
 def _api_test_notif(name, output, kwargs):
     """ API: send a test to Notification Center, return result """
     logging.info("Sending test notification")
@@ -800,12 +802,14 @@ def _api_test_pushbullet(name, output, kwargs):
     res = sabnzbd.notifier.send_pushbullet('SABnzbd', T('Test Notification'), 'other', force=True, test=kwargs)
     return report(output, error=res)
 
+
 def _api_test_nscript(name, output, kwargs):
     """ API: execute a test notification script, return result """
     logging.info("Executing notification script")
     res = sabnzbd.notifier.send_nscript('SABnzbd', T('Test Notification'), 'other', force=True, test=kwargs)
     return report(output, error=res)
 
+
 def _api_undefined(name, output, kwargs):
     """ API: accepts output """
     return report(output, _MSG_NOT_IMPLEMENTED)
@@ -1292,6 +1296,7 @@ def build_status(skip_dashboard=False, output=None):
 
     return info
 
+
 def build_queue(start=0, limit=0, trans=False, output=None, search=None):
     if output:
         converter = unicoder
@@ -1299,7 +1304,7 @@ def build_queue(start=0, limit=0, trans=False, output=None, search=None):
         converter = xml_name
 
     # build up header full of basic information
-    info, pnfo_list, bytespersec, q_size, bytes_left_previous_page = build_queue_header(search=search, start=start, limit=limit)
+    info, pnfo_list, bytespersec, q_size, bytes_left_previous_page = build_queue_header(search=search, start=start, limit=limit, output=output)
 
     datestart = datetime.datetime.now()
     priorities = {TOP_PRIORITY: 'Force', REPAIR_PRIORITY: 'Repair', HIGH_PRIORITY: 'High', NORMAL_PRIORITY: 'Normal', LOW_PRIORITY: 'Low'}
@@ -1307,8 +1312,8 @@ def build_queue(start=0, limit=0, trans=False, output=None, search=None):
     start = int_conv(start)
 
     info['refresh_rate'] = str(cfg.refresh_rate()) if cfg.refresh_rate() > 0 else ''
-    info['script_list'] = list_scripts()
-    info['cat_list'] = list_cats(output is None)
+    info['scripts'] = list_scripts()
+    info['categories'] = list_cats(output is None)
     info['rating_enable'] = bool(cfg.rating_enable())
     info['noofslots'] = q_size
     info['start'] = start
@@ -1363,7 +1368,8 @@ def build_queue(start=0, limit=0, trans=False, output=None, search=None):
                 slot['status'] = Status.DOWNLOADING
         else:
             # ensure compatibility of API status
-            if status in (Status.DELETED, ): status = Status.DOWNLOADING
+            if status in (Status.DELETED, ):
+                status = Status.DOWNLOADING
             slot['status'] = "%s" % (status)
 
         if (Downloader.do.paused or Downloader.do.postproc or is_propagating or  \
@@ -1412,60 +1418,6 @@ def fast_queue():
     return paused, bytes_left, bpsnow, time_left
 
 
-def qstatus_data():
-    """ Build up the queue status as a nested object and output as a JSON object """
-
-    qnfo = NzbQueue.do.queue_info()
-    pnfo_list = qnfo.list
-
-    jobs = []
-    bytesleftprogess = 0
-    bpsnow = BPSMeter.do.get_bps()
-    for pnfo in pnfo_list:
-        filename = pnfo.filename
-        bytesleft = pnfo.bytes_left / MEBI
-        bytesleftprogess += pnfo.bytes_left
-        bytes = pnfo.bytes / MEBI
-        nzo_id = pnfo.nzo_id
-        jobs.append({"id": nzo_id,
-                        "mb": bytes,
-                        "mbleft": bytesleft,
-                        "filename": unicoder(filename),
-                        "timeleft": calc_timeleft(bytesleftprogess, bpsnow)})
-
-    state = "IDLE"
-    if Downloader.do.paused:
-        state = Status.PAUSED
-    elif qnfo.bytes_left / MEBI > 0:
-        state = Status.DOWNLOADING
-
-    speed_limit = Downloader.do.get_limit()
-    if speed_limit <= 0:
-        speed_limit = 100
-
-    status = {
-        "state": state,
-        "pp_active": not PostProcessor.do.empty(),
-        "paused": Downloader.do.paused,
-        "pause_int": scheduler.pause_int(),
-        "kbpersec": bpsnow / KIBI,
-        "speed": to_units(bpsnow, dec_limit=1),
-        "mbleft": qnfo.bytes_left / MEBI,
-        "mb": qnfo.bytes / MEBI,
-        "noofslots": len(pnfo_list),
-        "noofslots_total": qnfo.q_fullsize,
-        "have_warnings": str(sabnzbd.GUIHANDLER.count()),
-        "diskspace1": diskspace(cfg.download_dir.get_path())[1],
-        "diskspace2": diskspace(cfg.complete_dir.get_path())[1],
-        "timeleft": calc_timeleft(qnfo.bytes_left, bpsnow),
-        "loadavg": loadavg(),
-        "speedlimit": "{1:0.{0}f}".format(int(speed_limit % 1 > 0), speed_limit),
-        "speedlimit_abs": str(Downloader.do.get_limit_abs() or ''),
-        "jobs": jobs
-    }
-    return status
-
-
 def build_file_list(nzo_id):
     """ Build file lists for specified job
     """
@@ -1478,27 +1430,23 @@ def build_file_list(nzo_id):
         active_files = pnfo.active_files
         queued_files = pnfo.queued_files
 
-        n = 0
         for nzf in finished_files:
             jobs.append({'filename': xml_name(nzf.filename if nzf.filename else nzf.subject),
                          'mbleft': "%.2f" % (nzf.bytes_left / MEBI),
                          'mb': "%.2f" % (nzf.bytes / MEBI),
                          'bytes': "%.2f" % nzf.bytes,
                          'age': calc_age(nzf.date),
-                         'id': str(n),
+                         'nzf_id': nzf.nzf_id,
                          'status': 'finished'})
-            n += 1
 
         for nzf in active_files:
             jobs.append({'filename': xml_name(nzf.filename if nzf.filename else nzf.subject),
                          'mbleft': "%.2f" % (nzf.bytes_left / MEBI),
                          'mb': "%.2f" % (nzf.bytes / MEBI),
                          'bytes': "%.2f" % nzf.bytes,
-                         'nzf_id': nzf.nzf_id,
                          'age': calc_age(nzf.date),
-                         'id': str(n),
+                         'nzf_id': nzf.nzf_id,
                          'status': 'active'})
-            n += 1
 
         for nzf in queued_files:
             jobs.append({'filename': xml_name(nzf.filename if nzf.filename else nzf.subject),
@@ -1507,12 +1455,12 @@ def build_file_list(nzo_id):
                          'mb': "%.2f" % (nzf.bytes / MEBI),
                          'bytes': "%.2f" % nzf.bytes,
                          'age': calc_age(nzf.date),
-                         'id': str(n),
+                         'nzf_id': nzf.nzf_id,
                          'status': 'queued'})
-            n += 1
 
     return jobs
 
+
 def rss_qstatus():
     """ Return a RSS feed with the queue status """
     qnfo = NzbQueue.do.queue_info()
@@ -1592,7 +1540,8 @@ def retry_job(job, new_nzb, password):
         history_db = sabnzbd.connect_db()
         futuretype, url, pp, script, cat = history_db.get_other(job)
         if futuretype:
-            if pp == 'X': pp = None
+            if pp == 'X':
+                pp = None
             sabnzbd.add_url(url, pp, script, cat)
             history_db.remove_history(job)
         else:
@@ -1665,17 +1614,13 @@ def clear_trans_cache():
     sabnzbd.WEBUI_READY = True
 
 
-def build_header(webdir=''):
+def build_header(webdir='', output=None):
     """ Build the basic header """
     try:
         uptime = calc_age(sabnzbd.START)
     except:
         uptime = "-"
 
-    header = {'T': Ttemplate, 'Tspec': Tspec, 'Tx': Ttemplate, 'version': sabnzbd.__version__,
-               'paused': Downloader.do.paused or Downloader.do.postproc,
-               'pause_int': scheduler.pause_int(), 'paused_all': sabnzbd.PAUSED_ALL,
-               'uptime': uptime, 'color_scheme': sabnzbd.WEB_COLOR or ''}
     speed_limit = Downloader.do.get_limit()
     if speed_limit <= 0:
         speed_limit = 100
@@ -1686,7 +1631,42 @@ def build_header(webdir=''):
     disk_total1, disk_free1 = diskspace(cfg.download_dir.get_path())
     disk_total2, disk_free2 = diskspace(cfg.complete_dir.get_path())
 
-    header['helpuri'] = 'https://sabnzbd.org/wiki/'
+    header = {}
+
+    # We don't output everything for API
+    if not output:
+        header['T'] = Ttemplate
+        header['Tspec'] = Tspec
+        header['Tx'] = Ttemplate
+        header['uptime'] = uptime
+        header['color_scheme'] = sabnzbd.WEB_COLOR or ''
+        header['helpuri'] = 'https://sabnzbd.org/wiki/'
+
+        header['restart_req'] = sabnzbd.RESTART_REQ
+        header['pid'] = os.getpid()
+
+        header['last_warning'] = sabnzbd.GUIHANDLER.last().replace('WARNING', ('WARNING:')).replace('ERROR', T('ERROR:'))
+        header['active_lang'] = cfg.language()
+
+        header['my_lcldata'] = sabnzbd.DIR_LCLDATA
+        header['my_home'] = sabnzbd.DIR_HOME
+        header['webdir'] = webdir or sabnzbd.WEB_DIR
+
+        header['nt'] = sabnzbd.WIN32
+        header['darwin'] = sabnzbd.DARWIN
+
+        header['power_options'] = sabnzbd.WIN32 or sabnzbd.DARWIN or sabnzbd.LINUX_POWER
+        header['pp_pause_event'] = sabnzbd.scheduler.pp_pause_event()
+
+        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()
+    header['paused_all'] = sabnzbd.PAUSED_ALL
+
     header['diskspace1'] = "%.2f" % disk_free1
     header['diskspace2'] = "%.2f" % disk_free2
     header['diskspace1_norm'] = to_units(disk_free1 * GIGI)
@@ -1694,25 +1674,11 @@ def build_header(webdir=''):
     header['diskspacetotal1'] = "%.2f" % disk_total1
     header['diskspacetotal2'] = "%.2f" % disk_total2
     header['loadavg'] = loadavg()
-    # Special formatting so only decimal points when needed
     header['speedlimit'] = "{1:0.{0}f}".format(int(speed_limit % 1 > 0), speed_limit)
     header['speedlimit_abs'] = "%s" % speed_limit_abs
-    header['restart_req'] = sabnzbd.RESTART_REQ
+
     header['have_warnings'] = str(sabnzbd.GUIHANDLER.count())
-    header['last_warning'] = sabnzbd.GUIHANDLER.last().replace('WARNING', ('WARNING:')).replace('ERROR', T('ERROR:'))
-    header['active_lang'] = cfg.language()
-    header['my_lcldata'] = sabnzbd.DIR_LCLDATA
-    header['my_home'] = sabnzbd.DIR_HOME
-
-    header['webdir'] = webdir or sabnzbd.WEB_DIR
-    header['pid'] = os.getpid()
-
     header['finishaction'] = sabnzbd.QUEUECOMPLETE
-    header['nt'] = sabnzbd.WIN32
-    header['darwin'] = sabnzbd.DARWIN
-    header['power_options'] = sabnzbd.WIN32 or sabnzbd.DARWIN or sabnzbd.LINUX_POWER
-
-    header['session'] = cfg.api_key()
 
     header['quota'] = to_units(BPSMeter.do.quota)
     header['have_quota'] = bool(BPSMeter.do.quota > 0.0)
@@ -1723,22 +1689,13 @@ def build_header(webdir=''):
     header['cache_size'] = format_bytes(anfo.cache_size)
     header['cache_max'] = str(anfo.cache_limit)
 
-    header['pp_pause_event'] = sabnzbd.scheduler.pp_pause_event()
-
-    if sabnzbd.NEW_VERSION:
-        header['new_release'], header['new_rel_url'] = sabnzbd.NEW_VERSION
-    else:
-        header['new_release'] = ''
-        header['new_rel_url'] = ''
-
     return header
 
 
-
-def build_queue_header(search=None, start=0, limit=0):
+def build_queue_header(search=None, start=0, limit=0, output=None):
     """ Build full queue header """
 
-    header = build_header()
+    header = build_header(output=output)
 
     bytespersec = BPSMeter.do.get_bps()
     qnfo = NzbQueue.do.queue_info(search=search, start=start, limit=limit)
@@ -1932,21 +1889,6 @@ def build_history(start=None, limit=None, verbose=False, verbose_list=None, sear
     return (items, fetched_items, total_items)
 
 
-def format_history_for_queue():
-    """ Retrieves the information on currently active history items, and formats them for displaying in the queue """
-    slotinfo = []
-    history_items = get_active_history()
-
-    for item in history_items:
-        slot = {'nzo_id': item['nzo_id'],
-                'bookmark': '', 'filename': xml_name(item['name']), 'loaded': False,
-                'stages': item['stage_log'], 'status': item['status'], 'bytes': item['bytes'],
-                'size': item['size']}
-        slotinfo.append(slot)
-
-    return slotinfo
-
-
 def get_active_history(queue=None, items=None):
     """ Get the currently in progress and active history queue. """
     if items is None:
@@ -1961,7 +1903,7 @@ def get_active_history(queue=None, items=None):
             item['url'], item['status'], item['nzo_id'], item['storage'], item['path'], item['script_log'], \
             item['script_line'], item['download_time'], item['postproc_time'], item['stage_log'], \
             item['downloaded'], item['completeness'], item['fail_message'], item['url_info'], item['bytes'], \
-            dummy, dummy = history
+            dummy, dummy, item['password'] = history
         item['action_line'] = nzo.action_line
         item = unpack_history_info(item)
 

sabnzbd/articlecache.py

@@ -25,7 +25,7 @@ import threading
 
 import sabnzbd
 from sabnzbd.decorators import synchronized
-from sabnzbd.constants import GIGI, ANFO, Status
+from sabnzbd.constants import GIGI, ANFO
 
 
 ARTICLE_LOCK = threading.Lock()
@@ -59,7 +59,7 @@ class ArticleCache(object):
     @synchronized(ARTICLE_LOCK)
     def reserve_space(self, data):
         """ Is there space left in the set limit? """
-        data_size = sys.getsizeof(data)*64
+        data_size = sys.getsizeof(data) * 64
         self.__cache_size += data_size
         if self.__cache_size + data_size > self.__cache_limit:
             return False
@@ -69,11 +69,10 @@ class ArticleCache(object):
     @synchronized(ARTICLE_LOCK)
     def free_reserve_space(self, data):
         """ Remove previously reserved space """
-        data_size = sys.getsizeof(data)*64
+        data_size = sys.getsizeof(data) * 64
         self.__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
@@ -148,7 +147,7 @@ class ArticleCache(object):
     @synchronized(ARTICLE_LOCK)
     def purge_articles(self, articles):
         if sabnzbd.LOG_ALL:
-            logging.debug("Purgable articles -> %s", articles)
+            logging.debug("Purgeable articles -> %s", articles)
         for article in articles:
             if article in self.__article_list:
                 self.__article_list.remove(article)

sabnzbd/assembler.py

@@ -283,7 +283,7 @@ def ParseFilePacket(f, header):
 
 
 RE_SUBS = re.compile(r'\W+sub|subs|subpack|subtitle|subtitles(?![a-z])', re.I)
-def is_cloaked(path, names):
+def is_cloaked(nzo, path, names):
     """ Return True if this is likely to be a cloaked encrypted post """
     fname = unicoder(os.path.split(path)[1]).lower()
     fname = os.path.splitext(fname)[0]
@@ -291,10 +291,16 @@ def is_cloaked(path, names):
         name = os.path.split(name.lower())[1]
         name, ext = os.path.splitext(unicoder(name))
         if ext == u'.rar' and fname.startswith(name) and (len(fname) - len(name)) < 8 and len(names) < 3 and not RE_SUBS.search(fname):
-            logging.debug('File %s is probably encrypted due to RAR with same name inside this RAR', fname)
+            # Only warn once
+            if nzo.encrypted == 0:
+                logging.warning(T('Job "%s" is probably encrypted due to RAR with same name inside this RAR'), nzo.final_name)
+                nzo.encrypted = 1
             return True
         elif 'password' in name:
-            logging.debug('RAR %s is probably encrypted: "password" in filename %s', fname, name)
+            # Only warn once
+            if nzo.encrypted == 0:
+                logging.warning(T('Job "%s" is probably encrypted: "password" in filename "%s"'), nzo.final_name, name)
+                nzo.encrypted = 1
             return True
     return False
 
@@ -313,16 +319,17 @@ def check_encrypted_and_unwanted_files(nzo, filepath):
 
             # Is it even a rarfile?
             if rarfile.is_rarfile(filepath):
+                # Open the rar
+                rarfile.UNRAR_TOOL = sabnzbd.newsunpack.RAR_COMMAND
                 zf = rarfile.RarFile(filepath, all_names=True)
 
                 # Check for encryption
-                if nzo.encrypted == 0 and cfg.pause_on_pwrar() and (zf.needs_password() or is_cloaked(filepath, zf.namelist())):
+                if nzo.encrypted == 0 and cfg.pause_on_pwrar() and (zf.needs_password() or is_cloaked(nzo, filepath, zf.namelist())):
                     # Load all passwords
                     passwords = get_all_passwords(nzo)
 
                     # Cloaked job?
-                    if is_cloaked(filepath, zf.namelist()):
-                        nzo.encrypted = 1
+                    if is_cloaked(nzo, filepath, zf.namelist()):
                         encrypted = True
                     elif not sabnzbd.HAVE_CRYPTOGRAPHY and not passwords:
                         # if no cryptography installed, only error when no password was set
@@ -333,7 +340,6 @@ def check_encrypted_and_unwanted_files(nzo, filepath):
                     elif sabnzbd.HAVE_CRYPTOGRAPHY:
                         # Lets test if any of the password work
                         password_hit = False
-                        rarfile.UNRAR_TOOL = sabnzbd.newsunpack.RAR_COMMAND
 
                         for password in passwords:
                             if password:

sabnzbd/bpsmeter.py

@@ -22,7 +22,6 @@ sabnzbd.bpsmeter - bpsmeter
 import time
 import logging
 import re
-from math import floor
 
 import sabnzbd
 from sabnzbd.constants import BYTES_FILE_NAME, BYTES_FILE_NAME_OLD, KIBI
@@ -244,7 +243,7 @@ class BPSMeter(object):
             if self.have_quota and self.quota_enabled:
                 self.left -= amount
                 if self.left <= 0.0:
-                    if sabnzbd.downloader.Downloader.do and not Downloader.do.paused:
+                    if sabnzbd.downloader.Downloader.do and not sabnzbd.downloader.Downloader.do.paused:
                         sabnzbd.downloader.Downloader.do.pause()
                         logging.warning(T('Quota spent, pausing downloading'))
 
@@ -333,15 +332,15 @@ class BPSMeter(object):
             return None
 
         # Calculate the variance in the speed
-        avg = sum(self.bps_list[-timespan:])/timespan
+        avg = sum(self.bps_list[-timespan:]) / timespan
         vari = 0
         for bps in self.bps_list[-timespan:]:
             vari += abs(bps - avg)
-        vari = vari/timespan
+        vari = vari / timespan
 
         try:
             # See if the variance is less than 5%
-            if (vari / (self.bps/KIBI)) < 0.05:
+            if (vari / (self.bps / KIBI)) < 0.05:
                 return avg
             else:
                 return False
@@ -350,7 +349,6 @@ class BPSMeter(object):
             pass
         return None
 
-
     def reset_quota(self, force=False):
         """ Check if it's time to reset the quota, optionally resuming
             Return True, when still paused

sabnzbd/config.py

@@ -26,7 +26,6 @@ import threading
 import shutil
 import sabnzbd.misc
 from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER
-from sabnzbd.utils import listquote
 from sabnzbd.utils import configobj
 from sabnzbd.decorators import synchronized
 
@@ -43,6 +42,8 @@ database = {}               # Holds the option dictionary
 modified = False            # Signals a change in option dictionary
                             # Should be reset after saving to settings file
 
+paramfinder = re.compile(r'''(?:'.*?')|(?:".*?")|(?:[^'",\s][^,]*)''')
+
 
 class Option(object):
     """ Basic option class, basic fields """
@@ -260,7 +261,7 @@ class OptionList(Option):
                 if '"' not in value and ',' not in value:
                     value = value.split()
                 else:
-                    value = listquote.simplelist(value)
+                    value = paramfinder.findall(value)
             if self.__validation:
                 error, value = self.__validation(value)
             if not error:
@@ -275,6 +276,14 @@ class OptionList(Option):
         else:
             return ', '.join(lst)
 
+    def default_string(self):
+        """ Return the default list as a comma-separated string """
+        lst = self.default()
+        if isinstance(lst, basestring):
+            return lst
+        else:
+            return ', '.join(lst)
+
 
 class OptionStr(Option):
     """ String class """
@@ -377,7 +386,7 @@ class ConfigServer(object):
         self.password = OptionPassword(name, 'password', '', add=False)
         self.connections = OptionNumber(name, 'connections', 1, 0, 100, add=False)
         self.ssl = OptionBool(name, 'ssl', False, add=False)
-        self.ssl_verify = OptionNumber(name, 'ssl_verify', 2, add=False) # 0=No, 1=Normal, 2=Strict (hostname verification)
+        self.ssl_verify = OptionNumber(name, 'ssl_verify', 2, add=False)  # 0=No, 1=Normal, 2=Strict (hostname verification)
         self.enable = OptionBool(name, 'enable', True, add=False)
         self.optional = OptionBool(name, 'optional', False, add=False)
         self.retention = OptionNumber(name, 'retention', add=False)
@@ -542,7 +551,7 @@ class OptionFilters(Option):
                 if isinstance(val, list):
                     filters.append(val)
                 else:
-                    filters.append(listquote.simplelist(val))
+                    filters.append(paramfinder.findall(val))
                 while len(filters[-1]) < 7:
                     filters[-1].append('1')
                 if not filters[-1][6]:
@@ -813,9 +822,11 @@ def save_config(force=False):
                 except KeyError:
                     CFG[sec] = {}
                 value = database[section][option]()
-                if type(value) == type(True):
+                # bool is a subclass of int, check first
+                if isinstance(value, bool):
+                    # convert bool to int when saving so we store 0 or 1
                     CFG[sec][kw] = str(int(value))
-                elif type(value) == type(0):
+                elif isinstance(value, int):
                     CFG[sec][kw] = str(value)
                 else:
                     CFG[sec][kw] = value

sabnzbd/constants.py

@@ -52,7 +52,7 @@ RENAMES_FILE = '__renames__'
 ATTRIB_FILE = 'SABnzbd_attrib'
 REPAIR_REQUEST = 'repair-all.sab'
 
-SABYENC_VERSION = '2.7.0'
+SABYENC_VERSION_REQUIRED = '3.0.2'
 
 DB_HISTORY_VERSION = 1
 DB_QUEUE_VERSION = 1
@@ -102,7 +102,7 @@ PAUSED_PRIORITY = -2
 DUP_PRIORITY = -3
 STOP_PRIORITY = -4
 
-STAGES = { 'Source' : 0, 'Download' : 1, 'Servers' : 2, 'Repair' : 3, 'Filejoin' : 4, 'Unpack' : 5, 'Script' : 6 }
+STAGES = {'Source': 0, 'Download': 1, 'Servers': 2, 'Repair': 3, 'Filejoin': 4, 'Unpack': 5, 'Script': 6}
 
 VALID_ARCHIVES = ('.zip', '.rar', '.7z')
 
@@ -134,7 +134,7 @@ class Status():
     COMPLETED = 'Completed'         # PP: Job is finished
     CHECKING = 'Checking'           # Q:  Pre-check is running
     DOWNLOADING = 'Downloading'     # Q:  Normal downloading
-    EXTRACTING = 'Extracting'       # PP: Archives are being extraced
+    EXTRACTING = 'Extracting'       # PP: Archives are being extracted
     FAILED = 'Failed'               # PP: Job has failed, now in History
     FETCHING = 'Fetching'           # Q:  Job is downloading extra par2 files
     GRABBING = 'Grabbing'           # Q:  Getting an NZB from an external site

sabnzbd/database.py

@@ -40,6 +40,7 @@ from sabnzbd.constants import DB_HISTORY_NAME, STAGES
 from sabnzbd.encoding import unicoder
 from sabnzbd.bpsmeter import this_week, this_month
 from sabnzbd.decorators import synchronized
+from sabnzbd.misc import get_all_passwords
 
 DB_LOCK = threading.RLock()
 
@@ -111,6 +112,12 @@ class HistoryDB(object):
             _ = self.execute('PRAGMA user_version = 1;') and \
                 self.execute('ALTER TABLE "history" ADD COLUMN series TEXT;') and \
                 self.execute('ALTER TABLE "history" ADD COLUMN md5sum TEXT;')
+        if version < 2:
+            # Add any missing columns added since second DB version
+            # Use "and" to stop when database has been reset due to corruption
+            _ = self.execute('PRAGMA user_version = 2;') and \
+                self.execute('ALTER TABLE "history" ADD COLUMN password TEXT;')
+
 
     def execute(self, command, args=(), save=False):
         ''' Wrapper for executing SQL commands '''
@@ -184,10 +191,11 @@ class HistoryDB(object):
             "bytes" INTEGER,
             "meta" TEXT,
             "series" TEXT,
-            "md5sum" TEXT
+            "md5sum" TEXT,
+            "password" TEXT
         )
         """)
-        self.execute('PRAGMA user_version = 1;')
+        self.execute('PRAGMA user_version = 2;')
 
     def save(self):
         """ Save database to disk """
@@ -244,8 +252,8 @@ class HistoryDB(object):
 
         if self.execute("""INSERT INTO history (completed, name, nzb_name, category, pp, script, report,
         url, status, nzo_id, storage, path, script_log, script_line, download_time, postproc_time, stage_log,
-        downloaded, completeness, fail_message, url_info, bytes, series, md5sum)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""", t):
+        downloaded, completeness, fail_message, url_info, bytes, series, md5sum, password)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""", t):
             self.save()
 
     def fetch_history(self, start=None, limit=None, search=None, failed_only=0, categories=None):
@@ -469,9 +477,15 @@ def build_history_info(nzo, storage='', downpath='', postproc_time=0, script_out
         if seriesname and season and episode:
             series = u'%s/%s/%s' % (seriesname.lower(), season, episode)
 
+    # See whatever the first password was, for the Retry
+    password = ''
+    passwords = get_all_passwords(nzo)
+    if passwords:
+        password = passwords[0]
+
     return (completed, name, nzb_name, category, pp, script, report, url, status, nzo_id, storage, path,
             script_log, script_line, download_time, postproc_time, stage_log, downloaded, completeness,
-            fail_message, url_info, bytes, series, nzo.md5sum)
+            fail_message, url_info, bytes, series, nzo.md5sum, password)
 
 
 

sabnzbd/decoder.py

@@ -27,7 +27,7 @@ from time import sleep
 from threading import Thread
 
 import sabnzbd
-from sabnzbd.constants import Status, MAX_DECODE_QUEUE, LIMIT_DECODE_QUEUE, SABYENC_VERSION
+from sabnzbd.constants import Status, MAX_DECODE_QUEUE, LIMIT_DECODE_QUEUE, SABYENC_VERSION_REQUIRED
 import sabnzbd.articlecache
 import sabnzbd.downloader
 import sabnzbd.nzbqueue
@@ -35,20 +35,25 @@ import sabnzbd.cfg as cfg
 from sabnzbd.encoding import yenc_name_fixer
 from sabnzbd.misc import match_str
 
+# Check for basic-yEnc
 try:
     import _yenc
     HAVE_YENC = True
 except ImportError:
     HAVE_YENC = False
 
+# Check for correct SABYenc version
+SABYENC_VERSION = None
 try:
     import sabyenc
-    HAVE_SABYENC = True
+    SABYENC_ENABLED = True
+    SABYENC_VERSION = sabyenc.__version__
     # Verify version
-    if sabyenc.__version__ != SABYENC_VERSION:
+    if SABYENC_VERSION != SABYENC_VERSION_REQUIRED:
         raise ImportError
 except ImportError:
-    HAVE_SABYENC = False
+    SABYENC_ENABLED = False
+
 
 class CrcError(Exception):
 
@@ -166,7 +171,7 @@ class Decoder(Thread):
                     if nzo.precheck:
                         if found and not killed:
                             # Pre-check, proper article found, just register
-                            logging.debug('Server has article %s', art_id)
+                            logging.debug('Server %s has article %s', article.fetcher, art_id)
                             register = True
                     elif not killed and not found:
                         logme = T('Badly formed yEnc article in %s') % art_id
@@ -210,13 +215,9 @@ class Decoder(Thread):
 YDEC_TRANS = ''.join([chr((i + 256 - 42) % 256) for i in xrange(256)])
 def decode(article, data, raw_data):
     # Do we have SABYenc? Let it do all the work
-    if sabnzbd.decoder.HAVE_SABYENC:
+    if sabnzbd.decoder.SABYENC_ENABLED:
         decoded_data, output_filename, crc, crc_expected, crc_correct = sabyenc.decode_usenet_chunks(raw_data, article.bytes)
 
-        # CRC check
-        if not crc_correct:
-            raise CrcError(crc_expected, crc, decoded_data)
-
         # Assume it is yenc
         article.nzf.type = 'yenc'
 
@@ -224,6 +225,10 @@ def decode(article, data, raw_data):
         if output_filename:
             article.nzf.filename = output_filename
 
+        # CRC check
+        if not crc_correct:
+            raise CrcError(crc_expected, crc, decoded_data)
+
         return decoded_data
 
     # Continue for _yenc or Python-yEnc
@@ -284,7 +289,7 @@ def decode(article, data, raw_data):
                 crcname = 'crc32'
 
             if crcname in yend:
-                _partcrc = '0' * (8 - len(yend[crcname])) + yend[crcname].upper()
+                _partcrc = yenc_name_fixer('0' * (8 - len(yend[crcname])) + yend[crcname].upper())
             else:
                 _partcrc = None
                 logging.debug("Corrupt header detected => yend: %s", yend)

sabnzbd/dirscanner.py

@@ -76,9 +76,9 @@ def is_archive(path):
             return -1, None, ''
     elif rarfile.is_rarfile(path):
         try:
-            zf = rarfile.RarFile(path)
             # Set path to tool to open it
             rarfile.UNRAR_TOOL = sabnzbd.newsunpack.RAR_COMMAND
+            zf = rarfile.RarFile(path)
             return 0, zf, '.rar'
         except:
             return -1, None, ''

sabnzbd/downloader.py

@@ -90,7 +90,7 @@ class Server(object):
         self.errormsg = ''
         self.warning = ''
         self.info = None     # Will hold getaddrinfo() list
-        self.ssl_info = '' # Will hold the type and cipher of SSL connection
+        self.ssl_info = ''  # Will hold the type and cipher of SSL connection
         self.request = False  # True if a getaddrinfo() request is pending
         self.have_body = 'free.xsusenet.com' not in host
         self.have_stat = True  # Assume server has "STAT", until proven otherwise
@@ -107,7 +107,7 @@ class Server(object):
             2 - and self.info has more than 1 entry (read: IP address): Return the quickest IP based on the happyeyeballs algorithm
             In case of problems: return the host name itself
         """
-        # Check if already a succesfull ongoing connection
+        # Check if already a successful ongoing connection
         if self.busy_threads and self.busy_threads[0].nntp:
             # Re-use that IP
             logging.debug('%s: Re-using address %s', self.host, self.busy_threads[0].nntp.host)
@@ -202,7 +202,7 @@ class Downloader(Thread):
 
         # Initialize decoders, only 1 for non-SABYenc
         self.decoder_workers = []
-        nr_decoders = cfg.nr_decoders() if sabnzbd.decoder.HAVE_SABYENC else 1
+        nr_decoders = cfg.nr_decoders() if sabnzbd.decoder.SABYENC_ENABLED else 1
         for i in range(nr_decoders):
             self.decoder_workers.append(Decoder(self.servers, self.decoder_queue))
 
@@ -531,17 +531,17 @@ class Downloader(Thread):
             if readkeys or writekeys:
                 read, write, error = select.select(readkeys, writekeys, (), 1.0)
 
-                # Why check so often when so few things happend?
+                # Why check so often when so few things happened?
                 if self.can_be_slowed and len(readkeys) >= 8 and len(read) <= 2:
                     time.sleep(0.05)
 
-                # Need to initalize the check during first 20 seconds
+                # Need to initialize the check during first 20 seconds
                 if self.can_be_slowed is None or self.can_be_slowed_timer:
                     # Wait for stable speed to start testing
                     if not self.can_be_slowed_timer and BPSMeter.do.get_stable_speed(timespan=10):
                         self.can_be_slowed_timer = time.time()
 
-                    # Check 10 seconds after enabeling slowdown
+                    # Check 10 seconds after enabling slowdown
                     if self.can_be_slowed_timer and time.time() > self.can_be_slowed_timer + 10:
                         # Now let's check if it was stable in the last 10 seconds
                         self.can_be_slowed = (BPSMeter.do.get_stable_speed(timespan=10) > 0)
@@ -622,8 +622,7 @@ class Downloader(Thread):
                             nw.finish_connect(nw.status_code)
                             if sabnzbd.LOG_ALL:
                                 logging.debug("%s@%s last message -> %s", nw.thrdnum, nw.server.id, nntp_to_msg(nw.data))
-                            nw.lines = []
-                            nw.data = []
+                            nw.clear_data()
                         except NNTPPermanentError, error:
                             # Handle login problems
                             block = False
@@ -708,16 +707,12 @@ class Downloader(Thread):
                     elif nw.status_code == '223':
                         done = True
                         logging.debug('Article <%s> is present', article.article)
-                        self.decode(article, nw.lines, nw.data)
 
                     elif nw.status_code == '211':
                         done = False
-
-                        logging.debug("group command ok -> %s",
-                                      nntp_to_msg(nw.data))
+                        logging.debug("group command ok -> %s", nntp_to_msg(nw.data))
                         nw.group = nw.article.nzf.nzo.group
-                        nw.lines = []
-                        nw.data = []
+                        nw.clear_data()
                         self.__request_article(nw)
 
                     elif nw.status_code in ('411', '423', '430'):
@@ -729,7 +724,6 @@ class Downloader(Thread):
                         if not self.search_new_server(article):
                             sabnzbd.nzbqueue.NzbQueue.do.register_article(article, False)
 
-
                     elif nw.status_code == '480':
                         if server.active:
                             server.active = False
@@ -748,8 +742,7 @@ class Downloader(Thread):
                             # Assume "BODY" command is not supported
                             server.have_body = False
                             logging.debug('Server %s does not support BODY', server.id)
-                        nw.lines = []
-                        nw.data = []
+                        nw.clear_data()
                         self.__request_article(nw)
 
                 if done:
@@ -856,10 +849,10 @@ class Downloader(Thread):
         article.add_to_try_list(article.fetcher)
         for server in self.servers:
             if server.active and not article.server_in_try_list(server):
-                if not sabnzbd.highest_server(server):
+                if server.priority >= article.fetcher.priority:
                     article.fetcher = None
                     article.tries = 0
-                    # Allow all servers to iterate over this nzo and nzf again
+                    # Allow all servers for this nzo and nzf again (but not for this article)
                     sabnzbd.nzbqueue.NzbQueue.do.reset_try_lists(article.nzf, article.nzf.nzo)
                     return True
 

sabnzbd/interface.py

@@ -28,6 +28,7 @@ import urllib
 import json
 import re
 import hashlib
+from threading import Thread
 from random import randint
 from xml.sax.saxutils import escape
 
@@ -54,14 +55,13 @@ from sabnzbd.downloader import Downloader
 from sabnzbd.nzbqueue import NzbQueue
 import sabnzbd.wizard
 from sabnzbd.utils.servertests import test_nntp_server_dict
-from sabnzbd.decoder import HAVE_YENC, HAVE_SABYENC
+from sabnzbd.decoder import HAVE_YENC, SABYENC_ENABLED
 from sabnzbd.utils.sslinfo import ssl_version, ssl_protocols_labels
 from sabnzbd.utils.diskspeed import diskspeedmeasure
 from sabnzbd.utils.getperformance import getpystone
 
 from sabnzbd.constants import \
-    REC_RAR_VERSION, NORMAL_PRIORITY, \
-    MEBI, DEF_SKIN_COLORS, DEF_STDINTF, DEF_STDCONFIG, DEF_MAIN_TMPL, \
+    NORMAL_PRIORITY, MEBI, DEF_SKIN_COLORS, DEF_STDINTF, DEF_STDCONFIG, DEF_MAIN_TMPL, \
     DEFAULT_PRIORITY
 
 from sabnzbd.lang import list_languages, set_language
@@ -265,11 +265,6 @@ def check_apikey(kwargs, nokey=False):
     name = kwargs.get('name', '')
     callback = kwargs.get('callback')
 
-    # Don't give a visible warning: these commands are used by some
-    # external utilities to detect if username/password is required
-    # The cfg item can suppress all visible warnings
-    special = mode in ('get_scripts', 'qstatus') or not cfg.api_warnings.get()
-
     # Lookup required access level
     req_access = sabnzbd.api.api_level(mode, name)
 
@@ -285,7 +280,7 @@ def check_apikey(kwargs, nokey=False):
         if not key:
             key = kwargs.get('session')
         if not key:
-            if not special:
+            if cfg.api_warnings():
                 log_warning(T('API Key missing, please enter the api key from Config->General into your 3rd party program:'))
             return report(output, 'API Key Required', callback=callback)
         elif req_access == 1 and key == cfg.nzb_key():
@@ -301,7 +296,7 @@ def check_apikey(kwargs, nokey=False):
         if check_login() or (kwargs.get('ma_username') == cfg.username() and kwargs.get('ma_password') == cfg.password()):
             pass
         else:
-            if not special:
+            if cfg.api_warnings():
                 log_warning(T('Authentication missing, please enter username/password from Config->General into your 3rd party program:'))
             return report(output, 'Missing authentication', callback=callback)
     return None
@@ -344,11 +339,11 @@ class MainPage(object):
         if kwargs.get('skip_wizard') or config.get_servers():
             info = build_header()
 
-            info['script_list'] = list_scripts(default=True)
+            info['scripts'] = list_scripts(default=True)
             info['script'] = 'Default'
 
             info['cat'] = 'Default'
-            info['cat_list'] = list_cats(True)
+            info['categories'] = list_cats(True)
             info['have_rss_defined'] = bool(config.get_rss())
             info['have_watched_dir'] = bool(cfg.dirscan_dir())
 
@@ -358,25 +353,10 @@ class MainPage(object):
             bytespersec_list = BPSMeter.do.get_bps_list()
             info['bytespersec_list'] = ','.join([str(bps) for bps in bytespersec_list])
 
-            info['warning'] = ''
-            if cfg.enable_unrar():
-                version = sabnzbd.newsunpack.RAR_VERSION
-                if version and version < REC_RAR_VERSION and not cfg.ignore_wrong_unrar():
-                    have_str = '%.2f' % (float(version) / 100)
-                    want_str = '%.2f' % (float(REC_RAR_VERSION) / 100)
-                    info['warning'] = T('Your UNRAR version is %s, we recommend version %s or higher.<br />') % \
-                                         (have_str, want_str)
-                if not sabnzbd.newsunpack.RAR_COMMAND:
-                    info['warning'] = T('No UNRAR program found, unpacking RAR files is not possible<br />')
-            if not sabnzbd.newsunpack.PAR2_COMMAND:
-                info['warning'] = T('No PAR2 program found, repairs not possible<br />')
-
             # For Glitter we pre-load the JSON output
             if 'Glitter' in sabnzbd.WEB_DIR:
                 # Queue
                 queue = build_queue(limit=cfg.queue_limit(), output='json')[0]
-                queue['categories'] = info.pop('cat_list')
-                queue['scripts'] = info.pop('script_list')
 
                 # History
                 history = {}
@@ -449,13 +429,13 @@ class MainPage(object):
             msg = "Incorrect PID for this instance, remove PID from URL to initiate shutdown."
 
         if msg:
-            yield msg
+            return msg
         else:
-            yield "Initiating shutdown..."
+            logging.info('Shutdown requested by interface')
             sabnzbd.halt()
-            yield "<br>SABnzbd-%s shutdown finished" % sabnzbd.__version__
             cherrypy.engine.exit()
             sabnzbd.SABSTOP = True
+            return T('SABnzbd shutdown finished')
 
     @cherrypy.expose
     def pause(self, **kwargs):
@@ -585,10 +565,14 @@ class LoginPage(object):
         if kwargs.get('username') == cfg.username() and kwargs.get('password') == cfg.password():
             # Save login cookie
             set_login_cookie(remember_me=kwargs.get('remember_me', False))
+            # Log the succes
+            logging.info('Successful login from %s', cherrypy.request.remote.ip)
             # Redirect
             raise Raiser(cherrypy.request.script_name + '/')
         elif kwargs.get('username') or kwargs.get('password'):
             info['error'] = T('Authentication failed, check username/password.')
+            # Warn about the potential security problem
+            logging.warning(T('Unsuccessful login attempt from %s') % cherrypy.request.remote.ip)
 
         # Show login
         template = Template(file=os.path.join(sabnzbd.WEB_DIR_CONFIG, 'login', 'main.tmpl'),
@@ -692,8 +676,8 @@ class NzoPage(object):
             n += 1
 
         info['slot'] = slot
-        info['script_list'] = list_scripts()
-        info['cat_list'] = list_cats()
+        info['scripts'] = list_scripts()
+        info['categories'] = list_cats()
         info['noofslots'] = len(pnfo_list)
 
         return info
@@ -757,7 +741,7 @@ class NzoPage(object):
         if priority is not None and nzo.priority != int(priority):
             NzbQueue.do.set_priority(nzo_id, priority)
 
-        raise Raiser(cherrypy.lib.httputil.urljoin(self.__root, '../queue/'), {})
+        raise Raiser(cherrypy.lib.httputil.urljoin(self.__root, '../queue/'))
 
     def bulk_operation(self, nzo_id, kwargs):
         self.__cached_selection = kwargs
@@ -911,13 +895,13 @@ class QueuePage(object):
     def shutdown(self, **kwargs):
         msg = check_session(kwargs)
         if msg:
-            yield msg
+            return msg
         else:
-            yield "Initiating shutdown..."
+            logging.info('Shutdown requested by interface')
             sabnzbd.halt()
-            yield "<br>SABnzbd-%s shutdown finished" % sabnzbd.__version__
             cherrypy.engine.exit()
             sabnzbd.SABSTOP = True
+            return T('SABnzbd shutdown finished')
 
     @cherrypy.expose
     def pause(self, **kwargs):
@@ -1235,7 +1219,8 @@ class ConfigPage(object):
         conf['have_7zip'] = bool(sabnzbd.newsunpack.SEVEN_COMMAND)
         conf['have_cryptography'] = bool(sabnzbd.HAVE_CRYPTOGRAPHY)
         conf['have_yenc'] = HAVE_YENC
-        conf['have_sabyenc'] = HAVE_SABYENC
+        conf['have_sabyenc'] = SABYENC_ENABLED
+        conf['have_mt_par2'] = sabnzbd.newsunpack.PAR2_MT
 
         conf['have_ssl_context'] = sabnzbd.HAVE_SSL_CONTEXT
         conf['ssl_version'] = ssl_version()
@@ -1256,22 +1241,25 @@ class ConfigPage(object):
     def restart(self, **kwargs):
         msg = check_session(kwargs)
         if msg:
-            yield msg
+            return msg
         else:
-            yield T('Initiating restart...<br />')
-            yield T('&nbsp<br />SABnzbd shutdown finished.<br />Wait for about 5 second and then click the button below.<br /><br /><strong><a href="..">Refresh</a></strong><br />')
-            sabnzbd.trigger_restart()
+            logging.info('Restart requested by interface')
+            # Do the shutdown async to still send goodbye to browser
+            Thread(target=sabnzbd.trigger_restart, kwargs={'timeout': 1}).start()
+            return T('&nbsp<br />SABnzbd shutdown finished.<br />Wait for about 5 second and then click the button below.<br /><br /><strong><a href="..">Refresh</a></strong><br />')
 
     @cherrypy.expose
     def repair(self, **kwargs):
         msg = check_session(kwargs)
         if msg:
-            yield msg
+            return msg
         else:
+            logging.info('Queue repair requested by interface')
             sabnzbd.request_repair()
-            yield T('Initiating restart...<br />')
-            yield T('&nbsp<br />SABnzbd shutdown finished.<br />Wait for about 5 second and then click the button below.<br /><br /><strong><a href="..">Refresh</a></strong><br />')
-            sabnzbd.trigger_restart()
+            # Do the shutdown async to still send goodbye to browser
+            Thread(target=sabnzbd.trigger_restart, kwargs={'timeout': 1}).start()
+            return T('&nbsp<br />SABnzbd shutdown finished.<br />Wait for about 5 second and then click the button below.<br /><br /><strong><a href="..">Refresh</a></strong><br />')
+
 
     @cherrypy.expose
     def delete(self, **kwargs):
@@ -1420,7 +1408,7 @@ class ConfigSwitches(object):
             conf[kw] = config.get_config('misc', kw)()
         conf['unwanted_extensions'] = cfg.unwanted_extensions.get_string()
 
-        conf['script_list'] = list_scripts() or ['None']
+        conf['scripts'] = list_scripts() or ['None']
 
         template = Template(file=os.path.join(sabnzbd.WEB_DIR_CONFIG, 'config_switches.tmpl'),
                             filter=FILTER, searchList=[conf], compilerSettings=DIRECTIVES)
@@ -1490,7 +1478,7 @@ class ConfigSpecial(object):
 
         conf['switches'] = [(kw, config.get_config('misc', kw)(), config.get_config('misc', kw).default()) for kw in SPECIAL_BOOL_LIST]
         conf['entries'] = [(kw, config.get_config('misc', kw)(), config.get_config('misc', kw).default()) for kw in SPECIAL_VALUE_LIST]
-        conf['entries'].extend([(kw, config.get_config('misc', kw).get_string(), '') for kw in SPECIAL_LIST_LIST])
+        conf['entries'].extend([(kw, config.get_config('misc', kw).get_string(), config.get_config('misc', kw).default_string()) for kw in SPECIAL_LIST_LIST])
 
         template = Template(file=os.path.join(sabnzbd.WEB_DIR_CONFIG, 'config_special.tmpl'),
                             filter=FILTER, searchList=[conf], compilerSettings=DIRECTIVES)
@@ -1515,7 +1503,7 @@ class ConfigSpecial(object):
 
 ##############################################################################
 GENERAL_LIST = (
-    'host', 'port', 'username', 'password', 'refresh_rate', 'cache_limit',
+    'host', 'port', 'username', 'refresh_rate', 'cache_limit',
     'local_ranges', 'inet_exposure', 'enable_https', 'https_port',
     'https_cert', 'https_key', 'https_chain', 'enable_https_verification',
     'auto_browser', 'check_new_rel'
@@ -1588,6 +1576,7 @@ class ConfigGeneral(object):
                     wlist.append(rweb)
         conf['web_list'] = wlist
         conf['web_dir'] = add_color(cfg.web_dir(), cfg.web_color())
+        conf['password'] = cfg.password.get_stars()
 
         conf['language'] = cfg.language()
         lang_list = list_languages()
@@ -1630,10 +1619,7 @@ class ConfigGeneral(object):
             set_language(language)
             sabnzbd.api.clear_trans_cache()
 
-        cleanup_list = kwargs.get('cleanup_list')
-        if cleanup_list and sabnzbd.WIN32:
-            cleanup_list = cleanup_list.lower()
-        cfg.cleanup_list.set(cleanup_list)
+        cfg.password.set(kwargs.get('password'))
 
         web_dir = kwargs.get('web_dir')
         change_web_dir(web_dir)
@@ -1878,11 +1864,11 @@ class ConfigRss(object):
 
         conf = build_header(sabnzbd.WEB_DIR_CONFIG)
 
-        conf['script_list'] = list_scripts(default=True)
-        pick_script = conf['script_list'] != []
+        conf['scripts'] = list_scripts(default=True)
+        pick_script = conf['scripts'] != []
 
-        conf['cat_list'] = list_cats(default=True)
-        pick_cat = conf['cat_list'] != []
+        conf['categories'] = list_cats(default=True)
+        pick_cat = conf['categories'] != []
 
         conf['rss_rate'] = cfg.rss_rate()
 
@@ -2401,7 +2387,7 @@ class ConfigCats(object):
 
         conf = build_header(sabnzbd.WEB_DIR_CONFIG)
 
-        conf['script_list'] = list_scripts(default=True)
+        conf['scripts'] = list_scripts(default=True)
         conf['defdir'] = cfg.complete_dir.get_path()
 
         categories = config.get_ordered_categories()
@@ -2479,7 +2465,7 @@ class ConfigSorting(object):
 
         for kw in SORT_LIST:
             conf[kw] = config.get_config('misc', kw)()
-        conf['cat_list'] = list_cats(False)
+        conf['categories'] = list_cats(False)
 
         template = Template(file=os.path.join(sabnzbd.WEB_DIR_CONFIG, 'config_sorting.tmpl'),
                             filter=FILTER, searchList=[conf], compilerSettings=DIRECTIVES)
@@ -2518,9 +2504,9 @@ class ConfigSorting(object):
 ##############################################################################
 LOG_API_RE = re.compile(r"(apikey|api)(=|:)[\w]+", re.I)
 LOG_API_JSON_RE = re.compile(r"u'(apikey|api)': u'[\w]+'", re.I)
-LOG_USER_RE = re.compile(r"(user|username)\s?=\s?[\w]+", re.I)
-LOG_PASS_RE = re.compile(r"(password)\s?=\s?[\w]+", re.I)
-LOG_INI_HIDE_RE = re.compile(r"(email_pwd|rating_api_key|pushover_token|pushover_userkey|pushbullet_apikey|prowl_apikey|growl_password|growl_server)\s?=\s?[\w]+", re.I)
+LOG_USER_RE = re.compile(r"(user|username)\s?=\s?[\S]+", re.I)
+LOG_PASS_RE = re.compile(r"(password)\s?=\s?[\S]+", re.I)
+LOG_INI_HIDE_RE = re.compile(r"(email_pwd|rating_api_key|pushover_token|pushover_userkey|pushbullet_apikey|prowl_apikey|growl_password|growl_server|IPv[4|6] address)\s?=\s?[\S]+", re.I)
 LOG_HASH_RE = re.compile(r"([a-fA-F\d]{25})", re.I)
 
 class Status(object):
@@ -2869,7 +2855,7 @@ class ConfigNotify(object):
         conf['have_growl'] = True
         conf['have_ntfosd'] = sabnzbd.notifier.have_ntfosd()
         conf['have_ncenter'] = sabnzbd.DARWIN_VERSION > 7 and bool(sabnzbd.notifier.ncenter_path())
-        conf['script_list'] = list_scripts(default=False, none=True)
+        conf['scripts'] = list_scripts(default=False, none=True)
 
         for kw in LIST_EMAIL:
             conf[kw] = config.get_config('misc', kw).get_string()

sabnzbd/misc.py

@@ -330,19 +330,21 @@ def sanitize_foldername(name, limit=True):
         else:
             lst.append(ch)
     name = ''.join(lst)
-
     name = name.strip()
-    if name != '.' and name != '..':
-        name = name.rstrip('.')
-    if not name:
-        name = 'unknown'
 
     if sabnzbd.WIN32 or cfg.sanitize_safe():
         name = replace_win_devices(name)
 
     maxlen = cfg.folder_max_length()
     if limit and len(name) > maxlen:
-        name = name[:maxlen]
+        # Folders can't end on a dot in Windows
+        name = name[:maxlen].strip('.')
+
+    # And finally, make sure it doesn't end in a dot
+    if name != '.' and name != '..':
+        name = name.rstrip('.')
+    if not name:
+        name = 'unknown'
 
     return name
 
@@ -780,7 +782,7 @@ def exit_sab(value):
     sys.stdout.flush()
     if getattr(sys, 'frozen', None) == 'macosx_app':
         sabnzbd.SABSTOP = True
-        from PyObjCTools import AppHelper  # @UnresolvedImport
+        from PyObjCTools import AppHelper
         AppHelper.stopEventLoop()
     sys.exit(value)
 

sabnzbd/newsunpack.py

@@ -80,6 +80,7 @@ ZIP_COMMAND = None
 SEVEN_COMMAND = None
 IONICE_COMMAND = None
 RAR_PROBLEM = False
+PAR2_MT = True
 RAR_VERSION = 0
 
 
@@ -144,12 +145,13 @@ def find_programs(curdir):
         sabnzbd.newsunpack.PAR2C_COMMAND = sabnzbd.newsunpack.PAR2_COMMAND
 
     if not (sabnzbd.WIN32 or sabnzbd.DARWIN):
+        # Run check on rar version
         version, original = unrar_check(sabnzbd.newsunpack.RAR_COMMAND)
-        sabnzbd.newsunpack.RAR_PROBLEM = not original or version < 380
+        sabnzbd.newsunpack.RAR_PROBLEM = not original or version < sabnzbd.constants.REC_RAR_VERSION
         sabnzbd.newsunpack.RAR_VERSION = version
-        logging.debug('UNRAR binary version %.2f', (float(version) / 100))
-        if sabnzbd.newsunpack.RAR_PROBLEM:
-            logging.info('Problematic UNRAR')
+
+        # Run check on par2-multicore
+        sabnzbd.newsunpack.PAR2_MT = par2_mt_check(sabnzbd.newsunpack.PAR2_COMMAND)
 
 
 ENV_NZO_FIELDS = ['bytes', 'bytes_downloaded', 'bytes_tried', 'cat', 'duplicate', 'encrypted',
@@ -652,6 +654,14 @@ def rar_extract_core(rarfile_path, numrars, one_folder, nzo, setname, extraction
             logging.warning(T('ERROR: CRC failed in "%s"'), setname)
             fail = 2  # Older unrar versions report a wrong password as a CRC error
 
+        elif line.startswith('File too large'):
+            nzo.fail_msg = T('Unpacking failed, file too large for filesystem (FAT?)')
+            msg = (u'[%s] ' + T('Unpacking failed, file too large for filesystem (FAT?)')) % setname
+            nzo.set_unpack_info('Unpack', unicoder(msg), set=setname)
+            # ERROR: File too large for file system (bigfile-5000MB)
+            logging.error(T('ERROR: File too large for filesystem (%s)'), setname)
+            fail = 1
+
         elif line.startswith('Write error'):
             nzo.fail_msg = T('Unpacking failed, write error or disk is full?')
             msg = (u'[%s] ' + T('Unpacking failed, write error or disk is full?')) % setname
@@ -662,6 +672,8 @@ def rar_extract_core(rarfile_path, numrars, one_folder, nzo, setname, extraction
         elif line.startswith('Cannot create') and sabnzbd.WIN32 and extraction_path.startswith('\\\\?\\'):
             # Can be due to Unicode problems on Windows, let's retry
             fail = 4
+            # Kill the process (can stay in endless loop on Windows Server)
+            p.kill()
 
         elif line.startswith('Cannot create'):
             line2 = proc.readline()
@@ -820,13 +832,12 @@ def unzip(nzo, workdir, workdir_complete, delete, one_folder, zips):
 
 def ZIP_Extract(zipfile, extraction_path, one_folder):
     """ Unzip single zip set 'zipfile' to 'extraction_path' """
-    if one_folder or cfg.flat_unpack():
-        option = '-j'  # Unpack without folders
-    else:
-        option = '-qq'  # Dummy option
-    command = ['%s' % ZIP_COMMAND, '-o', '-qq', option, '-Pnone', '%s' % zipfile,
+    command = ['%s' % ZIP_COMMAND, '-o', '-Pnone', '%s' % clip_path(zipfile),
                '-d%s' % extraction_path]
 
+    if one_folder or cfg.flat_unpack():
+        command.insert(3, '-j')  # Unpack without folders
+
     stup, need_shell, command, creationflags = build_command(command)
     logging.debug('Starting unzip: %s', command)
     p = subprocess.Popen(command, shell=need_shell, stdin=subprocess.PIPE,
@@ -834,7 +845,7 @@ def ZIP_Extract(zipfile, extraction_path, one_folder):
                          startupinfo=stup, creationflags=creationflags)
 
     output = p.stdout.read()
-    logging.debug('unzip output: %s', output)
+    logging.debug('unzip output: \n%s', output)
 
     ret = p.wait()
 
@@ -1334,18 +1345,29 @@ def PAR_Verify(parfile, parfile_nzf, nzo, setname, joinables, classic=False, sin
                     nzo.status = Status.FAILED
 
             elif line.startswith('You need'):
+                # Because par2cmdline doesn't handle split files correctly
+                # if there are joinables, let's join them first and try again
+                # Only when in the par2-detection also only 1 output-file was mentioned
+                if joinables and len(datafiles) == 1:
+                    error, newf = file_join(nzo, parfolder, parfolder, True, joinables)
+                    # Only do it again if we had a good join
+                    if newf:
+                        retry_classic = True
+                        # Save the renames in case of retry
+                        for jn in joinables:
+                            renames[datafiles[0]] = os.path.split(jn)[1]
+                        joinables = []
+                        # Need to set it to 1 so the renames get saved
+                        finished = 1
+                        break
+
                 chunks = line.split()
-
                 needed_blocks = int(chunks[2])
-
+                avail_blocks = 0
                 logging.info('Need to fetch %s more blocks, checking blocks', needed_blocks)
 
-                avail_blocks = 0
-
                 extrapars = parfile_nzf.extrapars
-
                 block_table = {}
-
                 for nzf in extrapars:
                     # Don't count extrapars that are completed already
                     if nzf.completed:
@@ -1445,8 +1467,15 @@ def PAR_Verify(parfile, parfile_nzf, nzo, setname, joinables, classic=False, sin
                         reconstructed.append(os.path.join(workdir, old_name))
 
             elif 'Could not write' in line and 'at offset 0:' in line and not classic:
-                # Hit a bug in par2-tbb, retry with par2-classic
-                retry_classic = sabnzbd.WIN32
+                # If there are joinables, this error will only happen in case of 100% complete files
+                # We can just skip the retry, because par2cmdline will fail in those cases
+                # becauses it refuses to scan the ".001" file
+                if joinables:
+                    finished = 1
+                    used_joinables = []
+                else:
+                    # Hit a bug in par2-tbb, retry with par2-classic
+                    retry_classic = sabnzbd.WIN32
 
             elif ' cannot be renamed to ' in line:
                 if not classic and sabnzbd.WIN32:
@@ -1761,14 +1790,9 @@ def QuickCheck(set, nzo):
     ignore_ext = cfg.quick_check_ext_ignore()
 
     for file in md5pack:
-        # Ignore these files
-        if os.path.splitext(file)[1].lower().replace('.', '') in ignore_ext:
-            logging.debug('Quick-check ignoring file %s', file)
-            result = True
-            continue
-
         found = False
         file_platform = platform_encode(file)
+        file_to_ignore = os.path.splitext(file_platform)[1].lower().replace('.', '') in ignore_ext
         for nzf in nzf_list:
             # Do a simple filename based check
             if file_platform == nzf.filename:
@@ -1776,6 +1800,10 @@ def QuickCheck(set, nzo):
                 if (nzf.md5sum is not None) and nzf.md5sum == md5pack[file]:
                     logging.debug('Quick-check of file %s OK', file)
                     result = True
+                elif file_to_ignore:
+                    # We don't care about these files
+                    logging.debug('Quick-check ignoring file %s', file)
+                    result = True
                 else:
                     logging.info('Quick-check of file %s failed!', file)
                     return False  # When any file fails, just stop
@@ -1783,15 +1811,24 @@ def QuickCheck(set, nzo):
 
             # Now lets do obfuscation check
             if nzf.md5sum == md5pack[file]:
-                renames[file_platform] = nzf.filename
-                logging.debug('Quick-check renamed %s to %s', nzf.filename, file_platform)
-                renamer(os.path.join(nzo.downpath, nzf.filename), os.path.join(nzo.downpath, file_platform))
-                nzf.filename = file_platform
-                result = True
-                found = True
-                break
+                try:
+                    logging.debug('Quick-check will rename %s to %s', nzf.filename, file_platform)
+                    renamer(os.path.join(nzo.downpath, nzf.filename), os.path.join(nzo.downpath, file_platform))
+                    renames[file_platform] = nzf.filename
+                    nzf.filename = file_platform
+                    result = True
+                    found = True
+                    break
+                except IOError:
+                    # Renamed failed for some reason, probably already done
+                    break
 
         if not found:
+            if file_to_ignore:
+                # We don't care about these files
+                logging.debug('Quick-check ignoring missing file %s', file)
+                continue
+
             logging.info('Cannot Quick-check missing file %s!', file)
             return False  # Missing file is failure
 
@@ -1843,6 +1880,18 @@ def unrar_check(rar):
     return version, original
 
 
+def par2_mt_check(par2_path):
+    """ Detect if we have multicore par2 variants """
+    try:
+        par2_version = run_simple([par2_path, '-h'])
+        # Look for a threads option
+        if '-t<' in par2_version:
+            return True
+    except:
+        pass
+    return False
+
+
 def sfv_check(sfv_path):
     """ Verify files using SFV file,
         input: full path of sfv, file are assumed to be relative to sfv

sabnzbd/newswrapper.py

@@ -49,6 +49,7 @@ socket.setdefaulttimeout(DEF_TIMEOUT)
 # to delayed starts and timeouts on connections.
 # Because of this, the results will be cached in the server object.
 
+
 def _retrieve_info(server):
     """ Async attempt to run getaddrinfo() for specified server """
     info = GetServerParms(server.host, server.port)
@@ -148,8 +149,6 @@ def con(sock, host, port, sslenabled, write_fds, nntp):
             nntp.error(e)
 
 
-
-
 def probablyipv4(ip):
     if ip.count('.') == 3 and re.sub('[0123456789.]', '', ip) == '':
         return True
@@ -248,7 +247,6 @@ class NNTP(object):
             finally:
                 self.error(e)
 
-
     def error(self, error):
         if 'SSL23_GET_SERVER_HELLO' in str(error) or 'SSL3_GET_RECORD' in str(error):
             error = T('This server does not allow SSL on this port')
@@ -283,6 +281,7 @@ class NewsWrapper(object):
         self.article = None
         self.data = []
         self.lines = []
+        self.last_line = ''
 
         self.nntp = None
         self.recv = None
@@ -415,11 +414,11 @@ class NewsWrapper(object):
                     return (0, False, True)
 
         # Data is processed differently depending on C-yEnc version
-        if sabnzbd.decoder.HAVE_SABYENC:
+        if sabnzbd.decoder.SABYENC_ENABLED:
             # Append so we can do 1 join(), much faster than multiple!
             self.data.append(chunk)
 
-            # Offical end-of-article is ".\r\n" but sometimes it can get lost between 2 chunks
+            # Official end-of-article is ".\r\n" but sometimes it can get lost between 2 chunks
             chunk_len = len(chunk)
             if chunk[-5:] == '\r\n.\r\n':
                 return (chunk_len, True, False)
@@ -433,27 +432,28 @@ class NewsWrapper(object):
             # Still in middle of data, so continue!
             return (chunk_len, False, False)
         else:
-            # Perform manditory splitting
-            new_lines = chunk.split('\n')
+            self.last_line += chunk
+            new_lines = self.last_line.split('\r\n')
+            # See if incorrect newline-only was used
+            # Do this as a special case to prevent using extra memory
+            # for normal articles
+            if len(new_lines) == 1 and '\r' not in self.last_line:
+                new_lines = self.last_line.split('\n')
+
+            self.last_line = new_lines.pop()
 
             # Already remove the starting dots
             for i in xrange(len(new_lines)):
                 if new_lines[i][:2] == '..':
                     new_lines[i] = new_lines[i][1:]
-                # Old Yenc can't handle newlines in it's data
-                if not sabnzbd.decoder.HAVE_YENC and new_lines[i]:
-                    if new_lines[i][0] == '\n':
-                        new_lines[i] = new_lines[i][1:]
-                    if new_lines[i][-1] == '\r':
-                        new_lines[i] = new_lines[i][:-1]
-
             self.lines.extend(new_lines)
 
             # For status-code purposes
             if not self.data:
                 self.data.append(chunk)
 
-            if self.lines and (self.lines[-1] == '.' or self.lines[-2] == '.\r' or self.lines[-2] == '.'):
+            if self.lines and self.lines[-1] == '.':
+                self.lines = self.lines[1:-1]
                 return (len(chunk), True, False)
             else:
                 return (len(chunk), False, False)
@@ -461,8 +461,12 @@ class NewsWrapper(object):
     def soft_reset(self):
         self.timeout = None
         self.article = None
+        self.clear_data()
+
+    def clear_data(self):
         self.data = []
         self.lines = []
+        self.last_line = ''
 
     def hard_reset(self, wait=True, quit=True):
         if self.nntp:

sabnzbd/notifier.py

@@ -120,6 +120,7 @@ def check_classes(gtype, section):
         logging.debug('Incorrect Notify option %s:%s_prio_%s', section, section, gtype)
         return False
 
+
 def get_prio(gtype, section):
     """ Check if `gtype` is enabled in `section` """
     try:
@@ -177,6 +178,7 @@ def send_notification(title, msg, gtype):
     if have_ntfosd() and sabnzbd.cfg.ntfosd_enable() and check_classes(gtype, 'ntfosd'):
         send_notify_osd(title, msg)
 
+
 def reset_growl():
     """ Reset Growl (after changing language) """
     global _GROWL, _GROWL_REG
@@ -517,6 +519,7 @@ def send_nscript(title, msg, gtype, force=False, test=None):
             return T('Notification script "%s" does not exist') % script_path
     return ''
 
+
 def send_windows(title, msg, gtype):
     if sabnzbd.WINTRAY and not sabnzbd.WINTRAY.terminate:
         try:

sabnzbd/nzbqueue.py

@@ -431,7 +431,7 @@ class NzbQueue:
             if not (quiet or nzo.status in ('Fetching',)):
                 notifier.send_notification(T('NZB added to queue'), nzo.filename, 'download')
 
-        if cfg.auto_sort():
+        if not quiet and cfg.auto_sort():
             self.sort_by_avg_age()
         return nzo.nzo_id
 
@@ -440,7 +440,7 @@ class NzbQueue:
         if nzo_id in self.__nzo_table:
             nzo = self.__nzo_table.pop(nzo_id)
             nzo.deleted = True
-            if cleanup and nzo.status not in (Status.COMPLETED, Status.FAILED):
+            if cleanup and not nzo.is_gone():
                 nzo.status = Status.DELETED
             self.__nzo_list.remove(nzo)
 
@@ -791,13 +791,13 @@ class NzbQueue:
                 # Check if past propagation delay, or forced
                 if not cfg.propagation_delay() or nzo.priority == TOP_PRIORITY or (nzo.avg_stamp + float(cfg.propagation_delay() * 60)) < time.time():
                     # Don't try to get an article if server is in try_list of nzo and category allowed by server
-                    if nzo.server_allowed(server) and not nzo.server_in_try_list(server):
-                        article = nzo.get_article(server, servers)
-                        if article:
-                            return article
+                    if nzo.server_allowed(server):
+                        if not nzo.server_in_try_list(server):
+                            article = nzo.get_article(server, servers)
+                            if article:
+                                return article
                     # Stop after first job that wasn't paused/propagating/etc
-                    # But make sure not to get stuck behind bad category
-                    if self.__top_only and not nzo.server_allowed(server):
+                    if self.__top_only:
                         return
 
     @synchronized(NZBQUEUE_LOCK)
@@ -809,7 +809,7 @@ class NzbQueue:
             logging.debug("Discarding article %s, no longer in queue", article.article)
             return
 
-        file_done, post_done, reset = nzo.remove_article(article, found)
+        file_done, post_done = nzo.remove_article(article, found)
 
         filename = nzf.filename
 
@@ -900,7 +900,7 @@ class NzbQueue:
                     bytes_left_previous_page += b_left
 
             if (not search) or search in nzo.final_name_pw_clean.lower():
-                if (not limit) or (start <= n < start+limit):
+                if (not limit) or (start <= n < start + limit):
                     pnfo_list.append(nzo.gather_info())
                 n += 1
 

sabnzbd/nzbstuff.py

@@ -233,7 +233,6 @@ class NzbFile(TryList):
     def finish_import(self):
         """ Load the article objects from disk """
         logging.debug("Finishing import on %s", self.subject)
-
         article_db = sabnzbd.load_data(self.nzf_id, self.nzo.workpath, remove=False)
         if article_db:
             for partnum in article_db:
@@ -245,8 +244,6 @@ class NzbFile(TryList):
                 self.articles.append(article)
                 self.decodetable[partnum] = article
 
-            # Look for article with lowest number
-            self.initial_article = self.decodetable[self.lowest_partnum]
             self.import_finished = True
 
     def remove_article(self, article, found):
@@ -257,18 +254,7 @@ class NzbFile(TryList):
                 self.bytes_left -= article.bytes
             self.nzo.bytes_tried += article.bytes
 
-        reset = False
-        if article.partnum == self.lowest_partnum and self.articles:
-            # Issue reset
-            self.initial_article = None
-            self.reset_try_list()
-            reset = True
-
-        done = True
-        if self.articles:
-            done = False
-
-        return (done, reset)
+        return (not self.articles)
 
     def set_par2(self, setname, vol, blocks):
         """ Designate this this file as a par2 file """
@@ -279,17 +265,11 @@ class NzbFile(TryList):
 
     def get_article(self, server, servers):
         """ Get next article to be downloaded """
-        if self.initial_article:
-            article = self.initial_article.get_article(server, servers)
+        for article in self.articles:
+            article = article.get_article(server, servers)
             if article:
                 return article
 
-        else:
-            for article in self.articles:
-                article = article.get_article(server, servers)
-                if article:
-                    return article
-
         self.add_to_try_list(server)
 
     def reset_all_try_lists(self):
@@ -303,11 +283,6 @@ class NzbFile(TryList):
         """ Is this file completed? """
         return self.import_finished and not bool(self.articles)
 
-    @property
-    def lowest_partnum(self):
-        """ Get lowest article number of this file """
-        return min(self.decodetable)
-
     def remove_admin(self):
         """ Remove article database from disk (sabnzbd_nzf_<id>)"""
         try:
@@ -909,7 +884,6 @@ class NzbObject(TryList):
             # Raise error, so it's not added
             raise TypeError
 
-
     def check_for_dupe(self, nzf):
         filename = nzf.filename
 
@@ -936,7 +910,6 @@ class NzbObject(TryList):
             self.servercount[serverid] = bytes
         self.bytes_downloaded += bytes
 
-
     @synchronized(IO_LOCK)
     def remove_nzf(self, nzf):
         if nzf in self.files:
@@ -1026,7 +999,7 @@ class NzbObject(TryList):
     @synchronized(IO_LOCK)
     def remove_article(self, article, found):
         nzf = article.nzf
-        file_done, reset = nzf.remove_article(article, found)
+        file_done = nzf.remove_article(article, found)
 
         if file_done:
             self.remove_nzf(nzf)
@@ -1034,21 +1007,18 @@ class NzbObject(TryList):
                 # set the nzo status to return "Queued"
                 self.status = Status.QUEUED
                 self.set_download_report()
-                self.fail_msg = T('Aborted, cannot be completed') +  ' - https://sabnzbd.org/not-complete'
+                self.fail_msg = T('Aborted, cannot be completed') + ' - https://sabnzbd.org/not-complete'
                 self.set_unpack_info('Download', self.fail_msg, unique=False)
                 logging.debug('Abort job "%s", due to impossibility to complete it', self.final_name_pw_clean)
                 # Update the last check time
                 sabnzbd.LAST_HISTORY_UPDATE = time.time()
-                return True, True, True
+                return True, True
 
         if not found:
-            # Add extra parfiles when there was a damaged article
-            if cfg.prospective_par_download() and self.extrapars:
+            # Add extra parfiles when there was a damaged article and not pre-checking
+            if cfg.prospective_par_download() and self.extrapars and not self.precheck:
                 self.prospective_add(nzf)
 
-        if reset:
-            self.reset_try_list()
-
         if file_done:
             self.handle_par2(nzf, file_done)
 
@@ -1059,7 +1029,7 @@ class NzbObject(TryList):
             self.status = Status.QUEUED
             self.set_download_report()
 
-        return (file_done, post_done, reset)
+        return (file_done, post_done)
 
     @synchronized(IO_LOCK)
     def remove_saved_article(self, article):
@@ -1153,8 +1123,8 @@ class NzbObject(TryList):
             if dif > 0:
                 prefix += T('WAIT %s sec') % dif + ' / '  # : Queue indicator for waiting URL fetch
         if (self.avg_stamp + float(cfg.propagation_delay() * 60)) > time.time() and self.priority != TOP_PRIORITY:
-            wait_time = int((self.avg_stamp + float(cfg.propagation_delay() * 60) - time.time())/60 + 0.5)
-            prefix += T('PROPAGATING %s min') % wait_time + ' / '  # : Queue indicator while waiting for propagtion of post
+            wait_time = int((self.avg_stamp + float(cfg.propagation_delay() * 60) - time.time()) / 60 + 0.5)
+            prefix += T('PROPAGATING %s min') % wait_time + ' / '  # : Queue indicator while waiting for propagation of post
         return '%s%s' % (prefix, self.final_name)
 
     @property
@@ -1222,7 +1192,6 @@ class NzbObject(TryList):
 
     __re_quick_par2_check = re.compile(r'\.par2\W*', re.I)
 
-
     @synchronized(IO_LOCK)
     def prospective_add(self, nzf):
         """ Add par2 files to compensate for missing articles
@@ -1258,7 +1227,6 @@ class NzbObject(TryList):
                     # Reset all try lists
                     self.reset_all_try_lists()
 
-
     def check_quality(self, req_ratio=0):
         """ Determine amount of articles present on servers
             and return (gross available, nett) bytes
@@ -1817,7 +1785,7 @@ def scan_password(name):
         # Is it maybe in 'name / password' notation?
         if slash == name.find(' / ') + 1:
             # Remove the extra space after name and before password
-            return name[:slash-1].strip('. '), name[slash + 2:]
+            return name[:slash - 1].strip('. '), name[slash + 2:]
         return name[:slash].strip('. '), name[slash + 1:]
 
     # Look for "name password=password"

sabnzbd/osxmenu.py

@@ -721,6 +721,7 @@ class SABnzbdDelegate(NSObject):
 
     def restartAction_(self, sender):
         self.setMenuTitle_("\n\n%s\n" % (T('Stopping...')))
+        logging.info('Restart requested by tray')
         sabnzbd.trigger_restart()
         self.setMenuTitle_("\n\n%s\n" % (T('Stopping...')))
 

sabnzbd/postproc.py

@@ -50,6 +50,7 @@ import sabnzbd.nzbqueue
 import sabnzbd.database as database
 import sabnzbd.notifier as notifier
 import sabnzbd.utils.rarfile as rarfile
+import sabnzbd.utils.checkdir
 
 
 class PostProcessor(Thread):
@@ -164,9 +165,16 @@ class PostProcessor(Thread):
         return None
 
     def run(self):
-        """ Actual processing """
-        check_eoq = False
+        """ Postprocessor loop """
+        # First we do a dircheck
+        complete_dir = sabnzbd.cfg.complete_dir.get_path()
+        if sabnzbd.utils.checkdir.isFAT(complete_dir):
+            logging.warning(T('Completed Download Folder %s is on FAT file system, limiting maximum file size to 4GB') % complete_dir)
+        else:
+            logging.info("Completed Download Folder %s is not on FAT", complete_dir)
 
+        # Start looping
+        check_eoq = False
         while not self.__stop:
             self.__busy = False
 
@@ -513,7 +521,6 @@ def process_job(nzo):
                 # No '(more)' button needed
                 nzo.set_unpack_info('Script', u'%s%s ' % (script_ret, script_line), unique=True)
 
-
         # Cleanup again, including NZB files
         if all_ok:
             cleanup_list(workdir_complete, False)
@@ -679,7 +686,7 @@ def parring(nzo, workdir):
                         par2_filename = nzf_path
 
                     # Rename so handle_par2() picks it up
-                    newpath = '%s.vol%d+%d.par2' % (par2_filename, par2_vol, par2_vol+1)
+                    newpath = '%s.vol%d+%d.par2' % (par2_filename, par2_vol, par2_vol + 1)
                     renamer(nzf_path, newpath)
                     nzf_try.filename = os.path.split(newpath)[1]
 
@@ -792,7 +799,7 @@ def try_rar_check(nzo, workdir, setname):
             return True
         except rarfile.Error as e:
             nzo.fail_msg = T('RAR files failed to verify')
-            msg = T('[%s] RAR-based verification failed: %s') % (unicoder(os.path.basename(rars[0])), unicoder(e.message.replace('\r\n',' ')))
+            msg = T('[%s] RAR-based verification failed: %s') % (unicoder(os.path.basename(rars[0])), unicoder(e.message.replace('\r\n', ' ')))
             nzo.set_unpack_info('Repair', msg, set=setname)
             logging.info(msg)
             return False

sabnzbd/sabtray.py

@@ -131,6 +131,7 @@ class SABTrayThread(SysTrayIconThread):
     # menu handler
     def restart(self, icon):
         self.hover_text = self.txt_restart
+        logging.info('Restart requested by tray')
         sabnzbd.trigger_restart()
 
     # menu handler
@@ -157,6 +158,7 @@ class SABTrayThread(SysTrayIconThread):
     # menu handler - adapted from interface.py
     def shutdown(self, icon):
         self.hover_text = self.txt_shutdown
+        logging.info('Shutdown requested by tray')
         sabnzbd.halt()
         cherrypy.engine.exit()
         sabnzbd.SABSTOP = True

sabnzbd/skintext.py

@@ -312,6 +312,7 @@ SKIN_TEXT = {
     'opt-enable_unzip' : TT('Enable Unzip'),
     'opt-enable_7zip' : TT('Enable 7zip'),
     'explain-nosslcontext' : TT('Secure (SSL) connections from SABnzbd to newsservers and HTTPS websites will be encrypted, however, validating a server\'s identity using its certificates is not possible. Python 2.7.9 or above, OpenSSL 1.0.2 or above and up-to-date local CA certificates are required.'),
+    'explain-getpar2mt': TT('Speed up repairs by installing multicore Par2, it is available for many platforms.'),
     'version' : TT('Version'),
     'uptime' : TT('Uptime'),
     'backup' : TT('Backup'), #: Indicates that server is Backup server in Status page
@@ -542,9 +543,9 @@ SKIN_TEXT = {
     'srv-ssl' : TT('SSL'), #: Server SSL tickbox
     'explain-ssl' : TT('Secure connection to server'), #: Server SSL tickbox
     'opt-ssl_verify' : TT('Certificate verification'),
-    'explain-ssl_verify' : TT('Default: when SSL is enabled, verify the identity of the server using its certificates. Strict: verify and enforce matching hostname.'),
+    'explain-ssl_verify' : TT('Minimal: when SSL is enabled, verify the identity of the server using its certificates. Strict: verify and enforce matching hostname.'),
     'ssl_verify-disabled' : TT('Disabled'),
-    'ssl_verify-normal' : TT('Default'),
+    'ssl_verify-normal' : TT('Minimal'),
     'ssl_verify-strict' : TT('Strict'),
     'srv-priority' : TT('Priority'), #: Server priority
     'explain-svrprio' : TT('0 is highest priority, 100 is the lowest priority'), #: Explain server priority

sabnzbd/utils/checkdir.py

@@ -0,0 +1,105 @@
+#!/usr/bin/env python
+
+"""
+Functions to check if the path filesystem uses FAT
+"""
+
+import sys
+import os
+import subprocess
+
+debug = False
+
+
+def isFAT(dir):
+
+# Check if "dir" is on FAT. FAT considered harmful (for big files)
+# Works for Linux, Windows, MacOS
+# NB: On Windows, full path with drive letter is needed!
+
+    FAT = False    # default: not FAT
+    # We're dealing with OS calls, so put everything in a try/except, just in case:
+    try:
+        if 'linux' in sys.platform:
+            # On Linux:
+            # df -T /home/sander/weg
+
+            '''
+            Example output of a 500GB external USB drive formatted with FAT:
+            $ df -T /media/sander/INTENSO
+            Filesystem     Type 1K-blocks      Used Available Use% Mounted on
+            /dev/sda1      vfat 488263616 163545248 324718368  34% /media/sander/INTENSO
+            '''
+
+            cmd = "df -T " + dir + " 2>&1"
+            for thisline in os.popen(cmd).readlines():
+                #print thisline
+                if thisline.find('/') == 0:
+                    # Starts with /, so a real, local device
+                    fstype = thisline.split()[1]
+                    if debug: print "File system type:", fstype
+                    if fstype.lower().find('fat') >= 0:
+                        FAT = True
+                        if debug: print "FAT found"
+                        break
+        elif 'win32' in sys.platform:
+            import win32api
+            if '?' in dir:
+                #  Remove \\?\ or \\?\UNC\ prefix from Windows path
+                dir = dir.replace(u'\\\\?\\UNC\\', u'\\\\', 1).replace(u'\\\\?\\', u'', 1)
+            try:
+                result = win32api.GetVolumeInformation(os.path.splitdrive(dir)[0])
+                if debug: print result
+                if(result[4].startswith("FAT")):
+                    FAT = True
+            except:
+                pass
+        elif 'darwin' in sys.platform:
+            # MacOS formerly known as OSX
+            '''
+            MacOS needs a two-step approach:
+            
+            # First: directory => device
+            server:~ sander$ df /Volumes/CARTUNES/Tuna/
+            Filesystem   512-blocks      Used Available Capacity iused ifree %iused  Mounted on
+            /dev/disk9s1  120815744 108840000  11975744    91%       0     0  100%   /Volumes/CARTUNES
+            
+            # Then: device => filesystem type
+            server:~ sander$ mount | grep /dev/disk9s1
+            /dev/disk9s1 on /Volumes/CARTUNES (msdos, local, nodev, nosuid, noowners)
+
+
+            '''
+            dfcmd = "df " + dir
+            device = ''
+            for thisline in os.popen(dfcmd).readlines():
+                if thisline.find('/')==0:
+                    if debug: print thisline
+                    # Starts with /, so a real, local device
+                    device = thisline.split()[0]
+                    mountcmd = "mount | grep " + device
+                    mountoutput = os.popen(mountcmd).readline().strip()
+                    if debug: print mountoutput
+                    if 'msdos' in mountoutput.split('(')[1]:
+                        FAT = True
+                    break
+
+    except:
+        pass
+    return FAT
+
+
+
+if __name__ == "__main__":
+    if debug: print sys.platform
+    try:
+        dir = sys.argv[1]
+    except:
+        print "Specify dir on the command line"
+        sys.exit(0)
+    if isFAT(dir):
+        print dir, "is on FAT"
+    else:
+        print dir, "is not on FAT"
+
+

sabnzbd/utils/diskspeed.py

@@ -39,7 +39,7 @@ def diskspeedmeasure(dirname):
         # On Windows, this crazy action is needed to
         # avoid a "permission denied" error
         try:
-            os.system('echo Hi >%s' % filename)
+            os.popen('echo Hi >%s' % filename)
         except:
             pass
 

sabnzbd/utils/getperformance.py

@@ -3,8 +3,7 @@ import platform, subprocess
 
 def getcpu():
     # find the CPU name (which needs a different method per OS), and return it
-    # return None if none found
-    # works on Linux, MacOS (aka OSX), Windows
+    # If none found, return platform.platform().
 
     cputype = None
 
@@ -25,15 +24,17 @@ def getcpu():
                     # model name      : Intel(R) Xeon(R) CPU           E5335  @ 2.00GHz
                     cputype = myline.split(":", 1)[1]	# get everything after the first ":"
                     break # we're done
-
     except:
         # An exception, maybe due to a subprocess call gone wrong
-        cputype = "Unknown"
         pass
 
     if cputype:
-        # remove unnneeded space:
+        # OK, found. Remove unnneeded spaces:
         cputype = " ".join(cputype.split())
+    else:
+        # Not found, so let's fall back to platform()
+        cputype = platform.platform()
+
     return cputype
 
 

sabnzbd/utils/listquote.py

@@ -1,856 +0,0 @@
-#  2005/08/28
-# v1.4.0
-# listquote.py
-
-# Lists 'n' Quotes
-# Handling lists and quoted strings
-# Can be used for parsing/creating lists - or lines in a CSV file
-# And also quoting or unquoting elements.
-
-# Homepage : http://www.voidspace.org.uk/python/modules.shtml
-
-# Copyright Michael Foord, 2004 & 2005.
-# Released subject to the BSD License
-# Please see http://www.voidspace.org.uk/python/license.shtml
-
-# For information about bugfixes, updates and support, please join the Pythonutils mailing list.
-# http://groups.google.com/group/pythonutils/
-# Comments, suggestions and bug reports welcome.
-# Scripts maintained at http://www.voidspace.org.uk/python/index.shtml
-# E-mail fuzzyman@voidspace.org.uk
-
-"""
-Having written modules to handle turning a string representation of a list back
-into a list (including nested lists) and also a very simple CSV parser, I
-realised I needed a more solid set of functions for handling lists (comma
-delimited lines) and quoting/unquoting elements of lists.
-
-The test stuff provides useful examples of how the functions work.
-"""
-
-# Pre-2.3 workaround for basestring.
-try:
-    basestring
-except NameError:
-    basestring = (str, unicode)
-
-import re
-inquotes = re.compile(r'''\s*(".*?"|'.*?')(.*)''')
-badchars = re.compile(r'''^[^'," \[\]\(\)#]+$''')
-##commented_line = re.compile(r'''\s*([^#]*)\s*(#.*)''')
-paramfinder = re.compile(r'''(?:'.*?')|(?:".*?")|(?:[^'",\s][^,]*)''')
-unquoted = re.compile(r'''
-    ([^\#,"'\(\)\[\]][^\#,\]\)]*)  # value
-    \s*                         # whitespace - XXX not caught
-    ([\#,\)\]].*)?                  # rest of the line
-    $''', re.VERBOSE)
-
-__all__ = [
-    'elem_quote',
-    'unquote',
-    'ListQuoteError',
-    'QuoteError',
-    'UnQuoteError',
-    'BadLineError',
-    'CommentError',
-    'quote_escape',
-    'quote_unescape',
-    'simplelist',
-    'LineParser',
-    'lineparse',
-    'csvread',
-    'csvwrite',
-    'list_stringify',
-    'makelist'
-    ]
-
-class ListQuoteError(SyntaxError):
-    """Base class for errors raised by the listquote module."""
-
-class QuoteError(ListQuoteError):
-    """This value can't be quoted."""
-
-class UnQuoteError(ListQuoteError):
-    """The value is badly quoted."""
-
-class BadLineError(ListQuoteError):
-    """A line is badly built."""
-
-class CommentError(BadLineError):
-    """A line contains a disallowed comment."""
-
-class CSVError(ListQuoteError):
-    """The CSV File contained errors."""
-
-#################################################################
-# functions for quoting and unquoting
-
-def elem_quote(member, nonquote=True, stringify=False, encoding=None):
-    """
-    Simple method to add the most appropriate quote to an element - either single
-    quotes or double quotes.
-
-    If member contains ``\n`` a ``QuoteError`` is raised - multiline values
-    can't be quoted by elem_quote.
-
-    If ``nonquote`` is set to ``True`` (the default), then if member contains none
-    of ``'," []()#;`` then it isn't quoted at all.
-
-    If member contains both single quotes *and* double quotes then all double
-    quotes (``"``) will be escaped as ``&mjf-quot;`` and member will then be quoted
-    with double quotes.
-
-    If ``stringify`` is set to ``True`` (the default is ``False``) then non string
-    (unicode or byte-string) values will be first converted to strings using the
-    ``str`` function. Otherwise elem_quote raises a ``TypeError``.
-
-    If ``encoding`` is not ``None`` and member is a byte string, then it will be
-    decoded into unicode using this encoding.
-
-    >>> elem_quote('hello')
-    'hello'
-    >>> elem_quote('hello', nonquote=False)
-    '"hello"'
-    >>> elem_quote('"hello"')
-    '\\'"hello"\\''
-    >>> elem_quote(3)
-    Traceback (most recent call last):
-    TypeError: Can only quote strings. "3"
-    >>> elem_quote(3, stringify=True)
-    '3'
-    >>> elem_quote('hello', encoding='ascii')
-    u'hello'
-    >>> elem_quote('\\n')
-    Traceback (most recent call last):
-    QuoteError: Multiline values can't be quoted.
-    "
-    "
-    """
-    if not isinstance(member, basestring):
-        if stringify:
-            member = str(member)
-        else:
-            # FIXME: is this the appropriate error message ?
-            raise TypeError('Can only quote strings. "%s"' % str(member))
-    if encoding and isinstance(member, str):
-        # from string to unicode
-        member = unicode(member, encoding)
-    if '\n' in member:
-        raise QuoteError('Multiline values can\'t be quoted.\n"%s"' % str(member))
-    #
-    if nonquote and badchars.match(member) is not None:
-        return member
-    # this ordering of tests determines which quote character will be used in
-    # preference - here we have \" first...
-    elif member.find('"') == -1:
-        return '"%s"' % member
-    # but we will use either... which may not suit some people
-    elif member.find("'") == -1:
-        return "'%s'" % member
-    else:
-        raise QuoteError('Value can\'t be quoted : "%s"' % member)
-
-def unquote(inline, fullquote=True, retain=False):
-    """
-    Unquote a value.
-
-    If the value isn't quoted it returns the value.
-
-    If the value is badly quoted it raises ``UnQuoteError``.
-
-    If retain is ``True`` (default is ``False``) then the quotes are left
-    around the value (but leading or trailing whitespace will have been
-    removed).
-
-    If fullquote is ``False`` (default is ``True``) then unquote will only
-    unquote the first part of the ``inline``. If there is anything after the
-    quoted element, this will be returned as well (instead of raising an
-    error).
-
-    In this case the return value is ``(value, rest)``.
-
-    >>> unquote('hello')
-    'hello'
-    >>> unquote('"hello"')
-    'hello'
-    >>> unquote('"hello')
-    Traceback (most recent call last):
-    UnQuoteError: Value is badly quoted: ""hello"
-    >>> unquote('"hello" fish')
-    Traceback (most recent call last):
-    UnQuoteError: Value is badly quoted: ""hello" fish"
-    >>> unquote("'hello'", retain=True)
-    "'hello'"
-    >>> unquote('"hello" fish', fullquote=False)
-    ('hello', ' fish')
-    """
-    mat = inquotes.match(inline)
-    if mat is None:
-        if inline.strip()[0] not in '\'\"': # not quoted
-            return inline
-        else:
-            # badly quoted
-            raise UnQuoteError('Value is badly quoted: "%s"' % inline)
-    quoted, rest = mat.groups()
-    if fullquote and rest.strip():
-        # badly quoted
-        raise UnQuoteError('Value is badly quoted: "%s"' % inline)
-    if not retain:
-        quoted = quoted[1:-1]
-    if not fullquote:
-        return quoted, rest
-    else:
-        return quoted
-
-def quote_escape(value, lf='&mjf-lf;', quot='&mjf-quot;'):
-    """
-    Escape a string so that it can safely be quoted. You should use this if the
-    value to be quoted *may* contain line-feeds or both single quotes and double
-    quotes.
-
-    If the value contains ``\n`` then it will be escaped using ``lf``. By
-    default this is ``&mjf-lf;``.
-
-    If the value contains single quotes *and* double quotes, then all double
-    quotes will be escaped using ``quot``. By default this is ``&mjf-quot;``.
-
-    >>> quote_escape('hello')
-    'hello'
-    >>> quote_escape('hello\\n')
-    'hello&mjf-lf;'
-    >>> quote_escape('hello"')
-    'hello"'
-    >>> quote_escape('hello"\\'')
-    "hello&mjf-quot;'"
-    >>> quote_escape('hello"\\'\\n', '&fish;', '&wobble;')
-    "hello&wobble;'&fish;"
-    """
-    if '\n' in value:
-        value = value.replace('\n', lf)
-    if '\'' in value and '\"' in value:
-        value = value.replace('"', quot)
-    return value
-
-def quote_unescape(value, lf='&mjf-lf;', quot='&mjf-quot;'):
-    """
-    Unescape a string escaped by ``quote_escape``.
-
-    If it was escaped using anything other than the defaults for ``lf`` and
-    ``quot`` you must pass them to this function.
-
-    >>> quote_unescape("hello&wobble;'&fish;",  '&fish;', '&wobble;')
-    'hello"\\'\\n'
-    >>> quote_unescape('hello')
-    'hello'
-    >>> quote_unescape('hello&mjf-lf;')
-    'hello\\n'
-    >>> quote_unescape("'hello'")
-    "'hello'"
-    >>> quote_unescape('hello"')
-    'hello"'
-    >>> quote_unescape("hello&mjf-quot;'")
-    'hello"\\''
-    >>> quote_unescape("hello&wobble;'&fish;",  '&fish;', '&wobble;')
-    'hello"\\'\\n'
-    """
-    return value.replace(lf, '\n').replace(quot, '"')
-
-def simplelist(inline):
-    """
-    Parse a string to a list.
-
-    A simple regex that extracts quoted items from a list.
-
-    It retains quotes around elements. (So unquote each element)
-
-    >>> simplelist('''hello, goodbye, 'title', "name", "I can't"''')
-    ['hello', 'goodbye', "'title'", '"name"', '"I can\\'t"']
-
-    FIXME:  This doesn't work fully (allows some badly formed lists):
-    e.g.
-    >>> simplelist('hello, fish, "wobble" bottom hooray')
-    ['hello', 'fish', '"wobble"', 'bottom hooray']
-    """
-    return paramfinder.findall(inline)
-
-##############################################
-# LineParser - a multi purpose line parser
-# handles lines with comma separated values on it, followed by a comment
-# correctly handles quoting
-# *and* can handle nested lists - marked between '[...]' or '(...)'
-# See the docstring for how this works
-# by default it returns a (list, comment) tuple !
-# There are several keyword arguments that control how LineParser works.
-
-class LineParser(object):
-    """An object to parse nested lists from strings."""
-
-    liststart = { '[' : ']', '(' : ')' }
-    quotes = ['\'', '"']
-
-    def __init__(self, options=None, **keywargs):
-        """Initialise the LineParser."""
-        self.reset(options, **keywargs)
-
-    def reset(self, options=None, **keywargs):
-        """Reset the parser with the specified options."""
-        if options is None:
-            options = {}
-        options.update(keywargs)
-        #
-        defaults = {
-                    'recursive': True,
-                    'comment': True,
-                    'retain': False,
-                    'force_list': False,
-                    'csv': False
-                    }
-        defaults.update(options)
-        if defaults['csv']:
-            defaults.update({
-                        'recursive': False,
-                        'force_list': True,
-                        'comment': False,
-                        })
-        # check all the options are valid
-        for entry in defaults.keys():
-            if entry not in ['comment',
-                            'retain',
-                            'csv',
-                            'recursive',
-                            'force_list']:
-                raise TypeError, ("'%s' is an invalid keyword argument for "
-                                    "this function" % entry)
-        #
-        self.recursive = defaults['recursive']
-        self.comment = defaults['comment']
-        self.retain = defaults['retain']
-        self.force_list = defaults['force_list']
-
-    def feed(self, inline, endchar=None):
-        """
-        Parse a single line (or fragment).
-
-        Uses the options set in the parser object.
-
-        Can parse lists - including nested lists. (If ``recursive`` is
-        ``False`` then nested lists will cause a ``BadLineError``).
-
-        Return value depends on options.
-
-        If ``comment`` is ``False`` it returns ``outvalue``
-
-        If ``comment`` is ``True`` it returns ``(outvalue, comment)``. (Even if
-        comment is just ``''``).
-
-        If ``force_list`` is ``False`` then ``outvalue`` may be a list or a
-        single item.
-
-        If ``force_list`` is ``True`` then ``outvalue`` will always be a list -
-        even if it has just one member.
-
-        List syntax :
-
-        * Comma separated lines ``a, b, c, d``
-        * Lists can optionally be between square or ordinary brackets
-            - ``[a, b, c, d]``
-            - ``(a, b, c, d)``
-        * Nested lists *must* be between brackets -  ``a, [a, b, c, d], c``
-        * A single element list can be shown by a trailing quote - ``a,``
-        * An empty list is shown by ``()`` or ``[]``
-
-        Elements can be quoted with single or double quotes (but can't contain
-        both).
-
-        The line can optionally end with a comment (preeded by a '#').
-        This depends on the ``comment`` attribute.
-
-        If the line is badly built then this method will raise one of : ::
-
-            CommentError, BadLineError, UnQuoteError
-
-        Using the ``csv`` option is the same as setting : ::
-
-                        'recursive': False
-                        'force_list': True
-                        'comment': False
-        """
-        # preserve the original line
-        # for error messages
-        if endchar is None:
-            self.origline = inline
-        inline = inline.lstrip()
-        #
-        outlist = []
-        comma_needed = False
-        found_comma = False
-        while inline:
-            # NOTE: this sort of operation would be quicker
-            # with lists - but then can't use regexes
-            thischar = inline[0]
-            if thischar == '#':
-                # reached a comment
-                # end of the line...
-                break
-            #
-            if thischar == endchar:
-                return outlist, inline[1:]
-            #
-            if comma_needed:
-                if thischar == ',':
-                    inline = inline[1:].lstrip()
-                    comma_needed = False
-                    found_comma = True
-                    continue
-                raise BadLineError('Line is badly built :\n%s' % self.origline)
-            #
-            try:
-                # the character that marks the end of the list
-                listend = self.liststart[thischar]
-            except KeyError:
-                pass
-            else:
-                if not self.recursive and endchar is not None:
-                    raise BadLineError('Line is badly built :\n%s' % self.origline)
-                newlist, inline = self.feed(inline[1:], endchar=listend)
-                outlist.append(newlist)
-                inline = inline.lstrip()
-                comma_needed = True
-                continue
-            #
-            if thischar in self.quotes:
-                # this might raise an error
-                # FIXME: trap the error and raise a more appropriate one ?
-                element, inline = unquote(inline, fullquote=False,
-                                                    retain=self.retain)
-                inline = inline.lstrip()
-                outlist.append(element)
-                comma_needed = True
-                continue
-            #
-            # must be an unquoted element
-            mat = unquoted.match(inline)
-            if mat is not None:
-                # FIXME: if the regex was better we wouldn't need an rstrip
-                element = mat.group(1).rstrip()
-                # group 2 will be ``None`` if we reach the end of the line
-                inline = mat.group(2) or ''
-                outlist.append(element)
-                comma_needed = True
-                continue
-            # or it's a badly built line
-            raise BadLineError('Line is badly built :\n%s' % self.origline)
-        #
-        # if we've been called recursively
-        # we shouldn't have got this far
-        if endchar is not None:
-            raise BadLineError('Line is badly built :\n%s' % self.origline)
-        #
-        if not found_comma:
-            # if we didn't find a comma
-            # the value could be a nested list
-            if outlist:
-                outlist = outlist[0]
-            else:
-                outlist = ''
-        if self.force_list and not isinstance(outlist, list):
-            if outlist:
-                outlist = [outlist]
-            else:
-                outlist = []
-        if not self.comment:
-            if inline:
-                raise CommentError('Comment not allowed :\n%s' % self.origline)
-            return outlist
-        return outlist, inline
-
-def lineparse(inline, options=None, **keywargs):
-    """
-    A compatibility function that mimics the old lineparse.
-
-    Also more convenient for single line use.
-
-    Note: It still uses the new ``LineParser`` - and so takes the same
-    keyword arguments as that.
-
-    >>> lineparse('''"hello", 'goodbye', "I can't do that", 'You "can" !' # a comment''')
-    (['hello', 'goodbye', "I can't do that", 'You "can" !'], '# a comment')
-    >>> lineparse('''"hello", 'goodbye', "I can't do that", 'You "can" !' # a comment''', comment=False)
-    Traceback (most recent call last):
-    CommentError: Comment not allowed :
-    "hello", 'goodbye', "I can't do that", 'You "can" !' # a comment
-    >>> lineparse('''"hello", 'goodbye', "I can't do that", 'You "can" !' # a comment''', recursive=False)
-    (['hello', 'goodbye', "I can't do that", 'You "can" !'], '# a comment')
-    >>> lineparse('''"hello", 'goodbye', "I can't do that", 'You "can" !' # a comment''', csv=True)
-    Traceback (most recent call last):
-    CommentError: Comment not allowed :
-    "hello", 'goodbye', "I can't do that", 'You "can" !' # a comment
-    >>> lineparse('''"hello", 'goodbye', "I can't do that", 'You "can" !' ''', comment=False)
-    ['hello', 'goodbye', "I can't do that", 'You "can" !']
-    >>> lineparse('')
-    ('', '')
-    >>> lineparse('', force_list=True)
-    ([], '')
-    >>> lineparse('[]')
-    ([], '')
-    >>> lineparse('()')
-    ([], '')
-    >>> lineparse('()', force_list=True)
-    ([], '')
-    >>> lineparse('1,')
-    (['1'], '')
-    >>> lineparse('"Yo"')
-    ('Yo', '')
-    >>> lineparse('"Yo"', force_list=True)
-    (['Yo'], '')
-    >>> lineparse('''h, i, j, (h, i, ['hello', "f"], [], ([]),), k''')
-    (['h', 'i', 'j', ['h', 'i', ['hello', 'f'], [], [[]]], 'k'], '')
-    >>> lineparse('''h, i, j, (h, i, ['hello', "f"], [], ([]),), k''', recursive=False)
-    Traceback (most recent call last):
-    BadLineError: Line is badly built :
-    h, i, j, (h, i, ['hello', "f"], [], ([]),), k
-    >>> lineparse('fish#dog')
-    ('fish', '#dog')
-    >>> lineparse('"fish"#dog')
-    ('fish', '#dog')
-    >>> lineparse('(((())))')
-    ([[[[]]]], '')
-    >>> lineparse('((((,))))')
-    Traceback (most recent call last):
-    BadLineError: Line is badly built :
-    ((((,))))
-    >>> lineparse('hi, ()')
-    (['hi', []], '')
-    >>> lineparse('"hello", "",')
-    (['hello', ''], '')
-    >>> lineparse('"hello", ,')
-    Traceback (most recent call last):
-    BadLineError: Line is badly built :
-    "hello", ,
-    >>> lineparse('"hello", ["hi", ""], ""')
-    (['hello', ['hi', ''], ''], '')
-    >>> lineparse('''"member 1", "member 2", ["nest 1", ("nest 2", 'nest 2b', ['nest 3', 'value'], nest 2c), nest1b]''')
-    (['member 1', 'member 2', ['nest 1', ['nest 2', 'nest 2b', ['nest 3', 'value'], 'nest 2c'], 'nest1b']], '')
-    >>> lineparse('''"member 1", "member 2", ["nest 1", ("nest 2", 'nest 2b', ['nest 3', 'value'], nest 2c), nest1b]]''')
-    Traceback (most recent call last):
-    BadLineError: Line is badly built :
-    "member 1", "member 2", ["nest 1", ("nest 2", 'nest 2b', ['nest 3', 'value'], nest 2c), nest1b]]
-    """
-    p = LineParser(options, **keywargs)
-    return p.feed(inline)
-
-############################################################################
-# a couple of functions to help build lists
-
-def list_stringify(inlist):
-    """
-    Recursively rebuilds a list - making sure all the members are strings.
-
-    Can take any iterable or a sequence as the argument and always
-    returns a list.
-
-    Useful before writing out lists.
-
-    Used by makelist if stringify is set.
-
-    Uses the ``str`` function for stringification.
-
-    Every element will be a string or a unicode object.
-
-    Doesn't handle decoding strings into unicode objects (or vice-versa).
-
-    >>> list_stringify([2, 2, 2, 2, (3, 3, 2.9)])
-    ['2', '2', '2', '2', ['3', '3', '2.9']]
-    >>> list_stringify(None)
-    Traceback (most recent call last):
-    TypeError: 'NoneType' object is not iterable
-    >>> list_stringify([])
-    []
-
-    FIXME: can receive any iterable - e.g. a sequence
-    >>> list_stringify('')
-    []
-    >>> list_stringify('Hello There')
-    ['H', 'e', 'l', 'l', 'o', ' ', 'T', 'h', 'e', 'r', 'e']
-    """
-    outlist = []
-    for item in inlist:
-        if not isinstance(item, (tuple, list)):
-            if not isinstance(item, basestring):
-                item = str(item)
-        else:
-            item = list_stringify(item)
-        outlist.append(item)
-    return outlist
-
-
-def makelist(inlist, listchar='', stringify=False, escape=False, encoding=None):
-    """
-    Given a list - turn it into a string that represents that list. (Suitable
-    for parsing by ``LineParser``).
-
-    listchar should be ``'['``, ``'('`` or ``''``. This is the type of bracket
-    used to enclose the list. (``''`` meaning no bracket of course).
-
-    If you have nested lists and listchar is ``''``, makelist will
-    automatically use ``'['`` for the nested lists.
-
-    If stringify is ``True`` (default is ``False``) makelist will stringify the
-    inlist first (using ``list_stringify``).
-
-    If ``escape`` is ``True`` (default is ``False``) makelist will call
-    ``quote_escape`` on each element before passing them to ``elem_quote`` to
-    be quoted.
-
-    If encoding keyword is not ``None``, all strings are decoded to unicode
-    with the specified encoding. Each item will then be a unicode object
-    instead of a string.
-
-    >>> makelist([])
-    '[]'
-    >>> makelist(['a', 'b', 'I can\\'t do it', 'Yes you "can" !'])
-    'a, b, "I can\\'t do it", \\'Yes you "can" !\\''
-    >>> makelist([3, 4, 5, [6, 7, 8]], stringify=True)
-    '3, 4, 5, [6, 7, 8]'
-    >>> makelist([3, 4, 5, [6, 7, 8]])
-    Traceback (most recent call last):
-    TypeError: Can only quote strings. "3"
-    >>> makelist(['a', 'b', 'c', ('d', 'e'), ('f', 'g')], listchar='(')
-    '(a, b, c, (d, e), (f, g))'
-    >>> makelist(['hi\\n', 'Quote "heck\\''], escape=True)
-    'hi&mjf-lf;, "Quote &mjf-quot;heck\\'"'
-    >>> makelist(['a', 'b', 'c', ('d', 'e'), ('f', 'g')], encoding='UTF8')
-    u'a, b, c, [d, e], [f, g]'
-    """
-    if stringify:
-        inlist = list_stringify(inlist)
-    listdict = {'[' : '[%s]', '(' : '(%s)', '' : '%s'}
-    outline = []
-    # this makes '[' the default for empty or single value lists
-    if len(inlist) < 2:
-        listchar = listchar or '['
-    for item in inlist:
-        if not isinstance(item, (list, tuple)):
-            if escape:
-                item = quote_escape(item)
-            outline.append(elem_quote(item, encoding=encoding))
-        else:
-            # recursive for nested lists
-            outline.append(makelist(item, listchar or '[',
-                                        stringify, escape, encoding))
-    return listdict[listchar] % (', '.join(outline))
-
-############################################################################
-# CSV functions
-# csvread, csvwrite
-
-def csvread(infile):
-    """
-    Given an infile as an iterable, return the CSV as a list of lists.
-
-    infile can be an open file object or a list of lines.
-
-    If any of the lines are badly built then a ``CSVError`` will be raised.
-    This has a ``csv`` attribute - which is a reference to the parsed CSV.
-    Every line that couldn't be parsed will have ``[]`` for it's entry.
-
-    The error *also* has an ``errors`` attribute. This is a list of all the
-    errors raised. Error in this will have an ``index`` attribute, which is the
-    line number, and a ``line`` attribute - which is the actual line that
-    caused the error.
-
-    Example of usage :
-
-    .. raw:: html
-
-        {+coloring}
-
-        handle = open(filename)
-        # remove the trailing '\n' from each line
-        the_file = [line.rstrip('\n') for line in handle.readlines()]
-        csv = csvread(the_file)
-
-        {-coloring}
-
-    >>> a = '''"object 1", 'object 2', object 3
-    ...     test 1 , "test 2" ,'test 3'
-    ...     'obj 1',obj 2,"obj 3"'''
-    >>> csvread(a.splitlines())
-    [['object 1', 'object 2', 'object 3'], ['test 1', 'test 2', 'test 3'], ['obj 1', 'obj 2', 'obj 3']]
-    >>> csvread(['object 1,'])
-    [['object 1']]
-    >>> try:
-    ...     csvread(['object 1, "hello', 'object 1, # a comment in a csv ?'])
-    ... except CSVError, e:
-    ...     for entry in e.errors:
-    ...         print entry.index, entry
-    0 Value is badly quoted: ""hello"
-    1 Comment not allowed :
-    object 1, # a comment in a csv ?
-    """
-    out_csv = []
-    errors = []
-    index = -1
-    p = LineParser(csv=True)
-    for line in infile:
-        index += 1
-        try:
-            values = p.feed(line)
-        except ListQuoteError, e:
-            values = []
-            e.line = line
-            e.index = index
-            errors.append(e)
-        #
-        out_csv.append(values)
-    #
-    if errors:
-        e = CSVError("Parsing CSV failed. See 'errors' attribute.")
-        e.csv = out_csv
-        e.errors = errors
-        raise e
-    return out_csv
-
-def csvwrite(inlist, stringify=False):
-    """
-    Given a list of lists it turns each entry into a line in a CSV.
-    (Given a list of lists it returns a list of strings).
-
-    The lines will *not* be ``\n`` terminated.
-
-    Set stringify to ``True`` (default is ``False``) to convert entries to
-    strings before creating the line.
-
-    If stringify is ``False`` then any non string value will raise a
-    ``TypeError``.
-
-    Every member will be quoted using ``elem_quote``, but no escaping is done.
-
-    Example of usage :
-
-    .. raw:: html
-
-        {+coloring}
-
-        # escape each entry in each line (optional)
-        for index in range(len(the_list)):
-            the_list[index] = [quote_escape(val) for val in the_list[index]]
-        #
-        the_file = csvwrite(the_list)
-        # add a '\n' to each line - ready to write to file
-        the_file = [line + '\n' for line in the_file]
-
-        {-coloring}
-
-    >>> csvwrite([['object 1', 'object 2', 'object 3'], ['test 1', 'test 2', 'test 3'], ['obj 1', 'obj 2', 'obj 3']])
-    ['"object 1", "object 2", "object 3"', '"test 1", "test 2", "test 3"', '"obj 1", "obj 2", "obj 3"']
-    >>> csvwrite([[3, 3, 3]])
-    Traceback (most recent call last):
-    TypeError: Can only quote strings. "3"
-    >>> csvwrite([[3, 3, 3]], True)
-    ['3, 3, 3']
-    """
-    out_list = []
-    for entry in inlist:
-        if stringify:
-            new_entry = []
-            for val in entry:
-                if not isinstance(val, basestring):
-                    val = str(val)
-                new_entry.append(val)
-            entry = new_entry
-        this_line = ', '.join([elem_quote(val) for val in entry])
-        out_list.append(this_line)
-    return out_list
-
-############################################################################
-
-def _test():
-    import doctest
-    doctest.testmod()
-
-if __name__ == "__main__":
-    _test()
-
-
-"""
-ISSUES/TODO
-===========
-
-Fix bug in simplelist
-
-Triple quote multiline values ?
-
-Doesn't allow Python style string escaping (but has '&mjf-quot;' and '&mjf-lf;').
-
-Uses both \' and \" as quotes and sometimes doesn't quote at all - see
-elem_quote - may not *always* be compatible with other programs.
-
-Allow space separated lists ? e.g. 10 5 100 20
-
-Lineparser could create tuples.
-
-Allow ',' as an empty list ?
-
-CHANGELOG
-=========
-
-2005/08/28 - Version 1.4.0
---------------------------
-
-* Greater use of regular expressions for added speed
-* Re-implemented ``lineparse`` as the ``LineParser`` object
-* Added doctests
-* Custom exceptions
-* Changed the behaviour of ``csvread`` and ``csvwrite``
-* Removed the CSV ``compare`` function and the ``uncomment`` function
-* Only ``'#'`` allowed for comments
-* ``elem_quote`` raises exceptions
-* Changed behaviour of ``unquote``
-* Added ``quote_escape`` and ``quote_unescape``
-* Removed the ``uni_conv`` option in the CSV functions
-
-.. note::
-
-    These changes are quite extensive. If any of them cause you problems then
-    let me know. I can provide a workaround in the next release.
-
-2005/06/01          Version 1.3.0
-Fixed bug in lineparse handling of empty list members.
-    Thnks to bug report and fix by Par Pandit <ppandit@yahoo.com>
-The 'unquote' function is now regex based.
-    (bugfix it now doesn't return a tuple if fullquote is 0)
-Added the simplelist regex/function.
-elem_quote and uncomment use a regex for clarity and speed.
-Added a bunch of asserts to the tests.
-
-2005/03/07          Version 1.2.1
-makelist improved - better handling of empty or single member lists
-
-2005/02/23          Version 1.2.0
-Added uncomment for ConfigObj 3.3.0
-Optimised unquote - not a character by character search any more.
-lineparse does full '&mjf..;' escape conversions - even when unquote isn't used
-makelist and elem_quote takes an 'encoding' keyword for string members to be used to decode strigns to unicode
-optimised makelist (including a minor bugfix)
-Change to lineparse - it wouldn't allow '[' or '(' inside elements unless they were quoted.
-
-2004/12/04          Version 1.1.2
-Changed the license (*again* - now OSI compatible).
-Empty values are now quoted by elem_quote.
-
-30-08-04            Version 1.1.1
-Removed the unicode hammer in csvread.
-Improved docs.
-
-16-08-04            Version 1.1.0
-Added handling for non-string elements in elem_quote (optional).
-Replaced some old += with lists and ''.join() for speed improvements...
-Using basestring and hasattr('__getitem__') tests instead of isinstance(list) and str in a couple of places.
-Changed license text.
-Made the tests useful.
-
-19-06-04            Version 1.0.0
-Seems to work ok. A worthy successor to listparse and csv_s - although not as elegant as it could be.
-
-"""

sabnzbd/utils/servertests.py

@@ -82,8 +82,7 @@ def test_nntp_server(host, port, server=None, username=None, password=None, ssl=
         nw = NewsWrapper(s, -1, block=True)
         nw.init_connect(None)
         while not nw.connected:
-            nw.lines = []
-            nw.data = []
+            nw.clear_data()
             nw.recv_chunk(block=True)
             #more ssl related: handle 1/n-1 splitting to prevent Rizzo/Duong-Beast
             read_sockets, _, _ = select.select([nw.nntp.sock], [], [], 0.1)
@@ -117,8 +116,7 @@ def test_nntp_server(host, port, server=None, username=None, password=None, ssl=
     if not username or not password:
         nw.nntp.sock.sendall('ARTICLE <test@home>\r\n')
         try:
-            nw.lines = []
-            nw.data = []
+            nw.clear_data()
             nw.recv_chunk(block=True)
         except:
             return False, unicode(sys.exc_info()[1])

sabnzbd/version.py

@@ -4,5 +4,5 @@
 
 # You MUST use double quotes (so " and not ')
 
-__version__ = "develop"
-__baseline__ = "unknown"
+__version__ = "2.0.0"
+__baseline__ = "55c4bef5247d51fa92db1c08ce3af6ec6601fdbf"

tools/extract_pot.py

@@ -130,15 +130,16 @@ if not os.path.exists(PO_DIR):
 path, exe = os.path.split(sys.executable)
 if os.name == 'nt':
     TOOL = os.path.join(path, r'Tools\i18n\pygettext.py')
+    TOOL = 'python ' + TOOL
 else:
     TOOL = os.path.join(path, 'pygettext.py')
-if not os.path.exists(TOOL):
-    TOOL = 'pygettext'
+    if not os.path.exists(TOOL):
+        TOOL = 'pygettext'
 
 
 cmd = '%s %s %s' % (TOOL, PARMS, FILES)
 print 'Create POT file'
-# print cmd
+#print cmd
 os.system(cmd)
 
 print 'Post-process the POT file'