Update text files for 0.7.7

When re-using RSS entries from memory, use the original feed order and not
Python's random dictionary order.

ABOUT.txt

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

CHANGELOG.txt

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------------------
+ 0.7.7Final by The SABnzbd-Team
+-------------------------------------------------------------------------------
+- Windows/OSX: Update unrar to 4.20
+- Fix some issues with orphaned items
+- Generic sort didn't always rename media files in multi-part jobs properly
+- Optional web-ui watchdog
+- Always show RSS items in the same order as the original RSS feed
+- Remove unusable folders from folder selector (Plush skin)
+- Remove newzbin support
 -------------------------------------------------------------------------------
  0.7.6Final by The SABnzbd-Team
 -------------------------------------------------------------------------------

INSTALL.txt

@@ -1,4 +1,4 @@
-                                SABnzbd 0.7.6
+                                SABnzbd 0.7.7
 
 -------------------------------------------------------------------------------
 0) LICENSE

PKG-INFO

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

README.mkd

@@ -1,19 +1,15 @@
-Release Notes  -  SABnzbd 0.7.6
+Release Notes  -  SABnzbd 0.7.7
 ===============================
 
 ## Features
-- Properly handle par2-sets that were renamed after creation by the poster
-- Recursive scanning when re-queuing downloaded NZB files
+- Updated unrar to 4.20 (OSX/Windows)
+- Optional web-ui watchdog (diagnostic tool)
+- Removed account support for defunct indexers
 
 ## Bug fixes
-- Prevent blocking assembly of completed files, (this resulted in excessive CPU and memory usage)
-- Fix speed issues with some Usenet servers due to unreachable IPv6 addresses
-- Fix issues with SFV-base checks
-- Successfully pre-checked job lost its attributes when those were changed during check
-- No longer check version when looking for a running instance of SABnzbd (this prevents unintended multiple instances).
-- A damaged base par2 file could block download of more par2 files
-- Fix evaluation of schedules at startup
-- Fix possible failing startup when running as a Windows Service
+- Fix some issues with orphaned items
+- Generic sort didn't always rename media files in multi-part jobs properly
+- Always show RSS items in the same order as the original RSS feed
 
 ## What's new in 0.7.0
 

SABnzbd.py

@@ -686,12 +686,12 @@ def attach_server(host, port, cert=None, key=None, chain=None):
         adapter.subscribe()
 
 
-def is_sabnzbd_running(url):
+def is_sabnzbd_running(url, timeout=None):
     """ Return True when there's already a SABnzbd instance running.
     """
     try:
         url = '%s&mode=version' % (url)
-        ver = sabnzbd.newsunpack.get_from_url(url)
+        ver = sabnzbd.newsunpack.get_from_url(url, timeout=timeout)
         return bool(ver and re.search(r'\d+\.\d+\.', ver))
     except:
         return False
@@ -1563,7 +1563,7 @@ def main():
             add_local(f)
 
     # Have to keep this running, otherwise logging will terminate
-    timer = 0
+    timer = timer5 = 0
     while not sabnzbd.SABSTOP:
         if sabnzbd.WIN_SERVICE:
             rc = win32event.WaitForMultipleObjects((sabnzbd.WIN_SERVICE.hWaitStop,
@@ -1603,6 +1603,15 @@ def main():
             if sabnzbd.WIN_SERVICE and mail:
                 mail.send('active')
 
+            if timer5 > 9:
+                ### 5 minute polling tasks
+                timer5 = 0
+                if sabnzbd.cfg.web_watchdog() and not is_sabnzbd_running('%s/api?tickleme=1' % sabnzbd.BROWSER_URL, 120):
+                    autorestarted = True
+                    cherrypy.engine.execv = True
+            else:
+                timer5 += 1
+
         else:
             timer += 1
 

interfaces/Classic/templates/config_indexers.tmpl

@@ -6,59 +6,6 @@
 <!--#set global $submenu="newzbin"#-->
 <!--#include $webdir + "/inc_cmenu.tmpl"#-->
 
-<h2>Newzbin</h2>
-$T('explain-newzbin')<br/><br/>
-<form action="saveNewzbin" method="post" autocomplete="off">
-<div class="EntryBlock">
-<fieldset class="EntryFieldSet">
-<legend>$T('accountInfo')</legend>
-<strong>$T('opt-username_newzbin'):</strong><br>
-$T('explain-username_newzbin')<br>
-<input type="text" name="username_newzbin" value="$username_newzbin">
-<br>
-<br>
-<strong>$T('opt-password_newzbin'):</strong><br>
-$T('explain-password_newzbin')<br>
-<input type="password" name="password_newzbin" value="$password_newzbin">
-</fieldset>
-</div>
-
-<div class="EntryBlock">
-<fieldset class="EntryFieldSet">
-<legend>$T('newzbinBookmarks')</legend>
-<label><input type="checkbox" name="newzbin_bookmarks" value="1" <!--#if $newzbin_bookmarks > 0 then "checked=1" else ""#--> <strong>$T('opt-newzbin_bookmarks'):</strong></label><br>
-$T('explain-newzbin_bookmarks')<br>
-<a href="getBookmarks?session=$session">$T('link-getBookmarks')</a>
-<br>
-<!--#if $bookmarks_list#-->
-  <a href="hideBookmarks?session=$session">$T('link-HideBM')</a>
-<!--#else#-->
-  <a href="showBookmarks?session=$session">$T('link-ShowBM')</a>
-<!--#end if#-->
-<br/>
-<br/>
-<label><input type="checkbox" name="newzbin_unbookmark" value="1" <!--#if $newzbin_unbookmark > 0 then "checked=1" else ""#--> /> <strong>$T('opt-newzbin_unbookmark'):</strong></label><br>
-$T('explain-newzbin_unbookmark')<br>
-<br/>
-<strong>$T('opt-bookmark_rate'):</strong><br>
-$T('explain-bookmark_rate')<br>
-<input type="text" name="bookmark_rate" value="$bookmark_rate">
-</fieldset>
-</div>
-<!--#if $bookmarks_list#-->
-  <fieldset class="EntryFieldSet">
-  <legend>$T('processedBM')</legend>
-  <!--#for $msgid in $bookmarks_list#-->
-    <a href="https://$newzbin_url/browse/post/$msgid/" target="_blank">$msgid</a>&nbsp;
-  <!--#end for#-->
-  </fieldset>
-<!--#end if#-->
-<input type="hidden" name="session" value="$session">
-<p><input type="submit" value="$T('button-saveChanges')"></p>
-</form>
-
-<hr/>
-
 <h2>NzbMatrix</h2>
 $T('explain-nzbmatrix')<br/><br/>
 

interfaces/Classic/templates/inc_cmenu.tmpl

@@ -47,11 +47,13 @@
   <a href="$cpath/notify/">$T('cmenu-notif')</a> |
 <!--#end if#-->
 
+<!--#if 0#-->
 <!--#if $submenu=="indexers"#-->
   <a class="current" href="./">$T('cmenu-newzbin')</a> |
 <!--#else#-->
   <a href="$cpath/indexers/">$T('cmenu-newzbin')</a> |
 <!--#end if#-->
+<!--#end if#-->
 
 <!--#if $submenu=="categories"#-->
   <a class="current" href="./">$T('cmenu-cat')</a> |

interfaces/Classic/templates/main.tmpl

@@ -17,8 +17,7 @@
 <div class="EntryBlock">
   <form action="addID" method="get">
   <fieldset class="EntryFieldSet">
-    <legend>$T('add')
-    <!--#if $varExists('newzbinDetails')#--> $T('reportId') / <!--#end if#-->URL</legend>
+    <legend>$T('add') URL</legend>
     <input type="text" name="id">
     <!--#if $cat_list#-->
       <select name="cat" >

interfaces/Config/templates/_inc_header_uc.tmpl

@@ -128,9 +128,11 @@
             <a href="${root}config/notify/">
                 <div #if $pane == "Email" then 'class="active"' else ""#>$T('cmenu-notif')</div>
             </a>
+            <!--#if 0#-->
             <a href="${root}config/indexers/">
                 <div #if $pane == "Index Sites" then 'class="active"' else ""#>$T('cmenu-newzbin')</div>
             </a>
+            <!--#end if#-->
             <a href="${root}config/categories/">
                 <div #if $pane == "Categories" then 'class="active"' else ""#>$T('cmenu-cat')</div>
             </a>

interfaces/Config/templates/config_general.tmpl

@@ -157,7 +157,7 @@
                 </div>
                 <div class="field-pair alt">
                     <label class="config" for="cleanup_list">$T('opt-cleanup_list')</label>
-                    <input type="text" name="cleanup_list" id="cleanup_list" value="$cleanup_list" size="50" placeholder=".nfo, .sfv" />
+                    <input type="text" name="cleanup_list" id="cleanup_list" value="$cleanup_list" size="50"/>
                     <span class="desc">$T('explain-cleanup_list')</span>
                 </div>
                 <div class="field-pair">

interfaces/Config/templates/config_indexers.tmpl

@@ -33,84 +33,6 @@
             </fieldset>
         </div><!-- /col1 -->
     </div><!-- /section -->
-    <div class="section">
-        <div class="col2">
-            <h3>Newzbin $T('accountInfo')</h3>
-            <p>$T('explain-newzbin')</p>
-        </div><!-- /col2 -->
-        <div class="col1">
-            <fieldset>
-                <div class="field-pair alt">
-                    <label class="config" for="username_newzbin">$T('opt-username_newzbin')</label>
-                    <input type="text" name="username_newzbin" id="username_newzbin" value="$username_newzbin" size="30" />
-                    <span class="desc">$T('explain-username_newzbin')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="password_newzbin">$T('opt-password_newzbin')</label>
-                    <input type="password" name="password_newzbin" id="password_newzbin" value="$password_newzbin" size="30" />
-                    <span class="desc">$T('explain-password_newzbin')</span>
-                </div>
-                <div class="field-pair">
-                    <input type="submit" value="$T('button-saveChanges')" class="saveButton" />
-                </div>
-            </fieldset>
-        </div><!-- /col1 -->
-    </div><!-- /section -->
-    <div class="section">
-        <div class="col2">
-            <h3>Newzbin $T('newzbinBookmarks')</h3>
-            <p>
-                <input type="button" id="getBookmarks" value="$T('link-getBookmarks')" />
-                <span id="getBookmarks-result" class="icon">&nbsp;</span>
-                <br/><br/>
-                <!--#if $bookmarks_list#-->
-                <input type="button" id="hideBookmarks" value="$T('link-HideBM')" />
-                <!--#else#-->
-                <input type="button" id="showBookmarks" value="$T('link-ShowBM')" />
-                <!--#end if#-->
-            </p>
-        </div><!-- /col2 -->
-        <div class="col1">
-            <fieldset>
-                <div class="field-pair alt">
-                    <label class="config" for="newzbin_bookmarks">$T('opt-newzbin_bookmarks')</label>
-                    <input type="checkbox" name="newzbin_bookmarks" id="newzbin_bookmarks" value="1" <!--#if int($newzbin_bookmarks) > 0 then 'checked="checked"' else ""#--> />
-                    <span class="desc">$T('explain-newzbin_bookmarks')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="newzbin_unbookmark">$T('opt-newzbin_unbookmark')</label>
-                    <input type="checkbox" name="newzbin_unbookmark" id="newzbin_unbookmark" value="1" <!--#if int($newzbin_unbookmark) > 0 then 'checked="checked"' else ""#--> />
-                    <span class="desc">$T('explain-newzbin_unbookmark')</span>
-                </div>
-                <div class="field-pair alt">
-                    <label class="config" for="bookmark_rate">$T('opt-bookmark_rate')</label>
-                    <input type="number" name="bookmark_rate" id="bookmark_rate" value="$bookmark_rate" size="8" min="15" max="1440" />
-                    <span class="desc">$T('explain-bookmark_rate')</span>
-                </div>
-                <div class="field-pair">
-                    <input type="submit" value="$T('button-saveChanges')" class="saveButton" />
-                </div>
-            </fieldset>
-        </div><!-- /col1 -->
-    </div><!-- /section -->
-    <!--#if $bookmarks_list#-->
-    <div class="section">
-        <div class="col2">
-            <h3>Newzbin Bookmarks</h3>
-        </div><!-- /col2 -->
-        <div class="col1">
-            <fieldset>
-            <!--#set $odd = False#-->
-            <!--#for $msgid in $bookmarks_list#-->
-                <!--#set $odd = not $odd#-->
-                <div class="field-pair <!--#if $odd then "alt" else ""#-->">
-                    <a href="https://$newzbin_url/browse/post/$msgid/" target="_blank">$msgid</a><br/>
-                </div>
-            <!--#end for#-->
-            </fieldset>
-        </div><!-- /col1 -->
-    </div><!-- /section -->
-    <!--#end if#-->
     <div class="padding alt">
         <input type="submit" value="$T('button-saveChanges')" class="saveButton" />
         <input type="button" value="$T('button-restart') SABnzbd" class="sabnzbd_restart" />

interfaces/Config/templates/config_server.tmpl

@@ -155,10 +155,10 @@
         <div class="col2"  style="display:block;">
         <!--#if 'amounts' in $servers[$server]#-->
             <b>$T('srv-bandwidth'):</b><br/>
-            $T('total'): $servers[$server]['amounts'][0]<br/>
-            $T('today'): $servers[$server]['amounts'][3]<br/>
-            $T('thisWeek'): $servers[$server]['amounts'][2]<br/>
-            $T('thisMonth'): $servers[$server]['amounts'][1]
+            $T('total'): $(servers[$server]['amounts'][0])B<br/>
+            $T('today'): $(servers[$server]['amounts'][3])B<br/>
+            $T('thisWeek'): $(servers[$server]['amounts'][2])B<br/>
+            $T('thisMonth'): $(servers[$server]['amounts'][1])B
         <!--#end if#-->
         </div>
     </div><!-- /section -->

interfaces/Plush/templates/_inc_header.tmpl

@@ -126,8 +126,10 @@
         <div class="config_sprite_container sprite_config_nav_scheduling">$T('Plush-cmenu-scheduling')</div></a></li>
       <li><a class="#if $pane=="Email"#nav_active#end if#" id="config_nav_email" href="${path}config/notify/">
         <div class="config_sprite_container sprite_config_nav_email">$T('cmenu-notif')</div></a></li>
+      <!--#if 0#-->
       <li><a class="#if $pane=="Index Sites"#nav_active#end if#" id="config_nav_index_sites" href="${path}config/indexers/">
         <div class="config_sprite_container sprite_config_nav_indexsites">$T('cmenu-newzbin')</div></a></li>
+      <!--#end if#-->
       <li><a class="#if $pane=="Categories"#nav_active#end if#" id="config_nav_categories" href="${path}config/categories/">
         <div class="config_sprite_container sprite_config_nav_categories">$T('cmenu-cat')</div></a></li>
       <li><a class="#if $pane=="Sorting"#nav_active#end if#" id="config_nav_sorting" href="${path}config/sorting/">

interfaces/Plush/templates/config_indexers.tmpl

@@ -43,90 +43,6 @@
     </fieldset>
   </div><!-- /component-group1 -->
 
-  <div id="core-component-group2" class="component-group clearfix">
-    <div class="component-group-desc">
-      <h3>Newzbin $T('accountInfo')</h3>
-      <p>$T('explain-newzbin')</p>
-    </div>
-    <fieldset class="component-group-list">
-      <div class="field-pair">
-        <label class="nocheck clearfix" for="username_newzbin">
-          <span class="component-title">$T('opt-username_newzbin')</span>
-          <input type="text" name="username_newzbin" id="username_newzbin" value="$username_newzbin"/>
-        </label>
-        <label class="nocheck clearfix">
-          <span class="component-title">&nbsp;</span>
-          <span class="component-desc">$T('explain-username_newzbin')</span>
-        </label>
-      </div>
-      <div class="field-pair alt">
-        <label class="nocheck clearfix" for="password_newzbin">
-          <span class="component-title">$T('opt-password_newzbin')</span>
-          <input type="password" name="password_newzbin" id="password_newzbin" value="$password_newzbin"/>
-        </label>
-        <label class="nocheck clearfix">
-          <span class="component-title">&nbsp;</span>
-          <span class="component-desc">$T('explain-password_newzbin')</span>
-        </label>
-      </div>
-    </fieldset>
-  </div><!-- /component-group2 -->
-
-  <div id="core-component-group3" class="component-group clearfix">
-    <div class="component-group-desc">
-      <h3>Newzbin $T('newzbinBookmarks')</h3>
-      <p>
-        <input type="button" class="juiButton" id="getBookmarks" value="$T('link-getBookmarks')" />
-        <br/><br/>
-        <!--#if $bookmarks_list#-->
-        <input type="button" class="juiButton" id="hideBookmarks" value="$T('link-HideBM')" />
-        <!--#else#-->
-        <input type="button" class="juiButton" id="showBookmarks" value="$T('link-ShowBM')" />
-        <!--#end if#-->
-      </p>
-    </div>
-    <fieldset class="component-group-list">
-      <div class="field-pair">
-        <input type="checkbox" name="newzbin_bookmarks" id="newzbin_bookmarks" value="1" <!--#if $newzbin_bookmarks > 0 then "checked=1" else ""#--> />
-        <label class="clearfix" for="newzbin_bookmarks">
-          <span class="component-title">$T('opt-newzbin_bookmarks')</span>
-          <span class="component-desc">$T('explain-newzbin_bookmarks')</span>
-        </label>
-      </div>
-      <div class="field-pair alt">
-        <input type="checkbox" name="newzbin_unbookmark" id="newzbin_unbookmark" value="1" <!--#if $newzbin_unbookmark > 0 then "checked=1" else ""#--> />
-        <label class="clearfix" for="newzbin_unbookmark">
-          <span class="component-title">$T('opt-newzbin_unbookmark')</span>
-          <span class="component-desc">$T('explain-newzbin_unbookmark')</span>
-        </label>
-      </div>
-      <div class="field-pair">
-        <label class="nocheck clearfix" for="bookmark_rate">
-          <span class="component-title">$T('opt-bookmark_rate')</span>
-          <input type="text" name="bookmark_rate" id="bookmark_rate" size="6" value="$bookmark_rate"/>
-        </label>
-        <label class="nocheck clearfix">
-          <span class="component-title">&nbsp;</span>
-          <span class="component-desc">$T('explain-bookmark_rate')</span>
-        </label>
-      </div>
-    </fieldset>
-  </div><!-- /component-group3 -->
-
-  <!--#if $bookmarks_list#-->
-  <div id="core-component-group4" class="component-group clearfix">
-    <div class="component-group-desc">
-      <h3>Newzbin $T('accountInfo')</h3>
-      <p>$T('explain-newzbin')</p>
-    </div>
-    <fieldset class="component-group-list">
-      <!--#for $msgid in $bookmarks_list#-->
-      <a href="https://$newzbin_url/browse/post/$msgid/" target="_blank">$msgid</a><br/>
-      <!--#end for#-->
-    </fieldset>
-  </div><!-- /component-group4 -->
-  <!--#end if#-->
-
   <div class="component-group-last clearfix">
     <div class="component-group-desc">
       <h3>&nbsp;</h3>

interfaces/Plush/templates/main.tmpl

@@ -26,7 +26,6 @@
             <a class="sf-with-ul">$T('menu-queue')</a>
             <ul>
               <!--#if $have_quota#--><li><a id="reset_quota_now" class="pointer">$T('link-resetQuota')</a></li><!--#end if#-->
-              <!--#if $varExists('newzbinDetails')#--><li><a id="get_bookmarks_now" class="pointer">$T('link-getBookmarks')</a></li><!--#end if#-->
               <!--#if $have_rss_defined#--><li><a id="get_rss_now" class="pointer">$T('button-rssNow')</a></li><!--#end if#-->
               <!--#if $have_watched_dir#--><li><a id="get_watched_now" class="pointer">$T('sch-scan_folder')</a></li><!--#end if#-->
               <li><a id="topmenu_toggle" class="pointer">$T('Plush-topMenu')</a></li>

interfaces/smpl/templates/config_indexers.tmpl

@@ -1,69 +1,4 @@
-<a href="${helpuri}Configure+Indexers-0-7" id="help" target="_blank">$T('menu-help')</a><h3>Newzbin</h3>
-<form id="configNewzbin" class="cmxform" autocomplete="off">
-
-$T('explain-newzbin')<br/>
-<br/>
-<div class="EntryBlock">
-
-
-<fieldset class="EntryFieldSet">
-<legend>$T('accountInfo')</legend>
-  <hr />
-    <label class="label">$T('opt-username_newzbin'):</label>
-    <input type="text" name="username_newzbin" value="$username_newzbin">
-    <span class="tips">$T('explain-username_newzbin')</span>
-  <br class="clear" />
-
-
-  <label class="label">$T('opt-password_newzbin'):</label>
-  <input type="password" name="password_newzbin" value="$password_newzbin">
-  <span class="tips">$T('explain-password_newzbin')</span>
-<br class="clear" />
-</fieldset>
-
-
-<fieldset class="EntryFieldSet">
-<legend>$T('newzbinBookmarks')</legend>
-  <hr />
-
-  <label><span class="label">$T('newzbinBookmarks'):</span>
-  <input class="radio" type="checkbox" name="newzbin_bookmarks" value="1" <!--#if $newzbin_bookmarks > 0 then "checked=1" else ""#--> />
-  <span class="tips">$T('explain-newzbin_bookmarks')</span></label>
-<br class="clear" />
-
-  <label><span class="label">$T('opt-newzbin_unbookmark'):</span>
-  <input class="radio" type="checkbox" name="newzbin_unbookmark" value="1" <!--#if $newzbin_unbookmark > 0 then "checked=1" else ""#--> />
-  <span class="tips">$T('explain-newzbin_unbookmark')</span></label>
-<br class="clear" />
-
-  <label class="label">$T('opt-bookmark_rate'):</label>
-  <input type="text" name="bookmark_rate" value="$bookmark_rate">
-  <span class="tips">$T('explain-bookmark_rate')</span>
-<br class="clear" />
-</fieldset>
-
-<a class="config" onClick="getBookmarks();">$T('link-getBookmarks')</a>
-<!--#if $bookmarks_list#-->
-  <a class="config" onClick="lr('config/indexers/hideBookmarks');">$T('link-HideBM')</a>
-<!--#else#-->
-  <a class="config" onClick="lr('config/indexers/showBookmarks');">$T('link-ShowBM')</a>
-<!--#end if#-->
-
-<!--#if $bookmarks_list#-->
-<fieldset class="EntryFieldSet">
-<legend>$T('processedBM')</legend>
-  <hr />
-    <!--#for $msgid in $bookmarks_list#-->
-      <a href="https://$newzbin_url/browse/post/$msgid/" target="_blank">$msgid</a>&nbsp;
-  <!--#end for#-->
-  <br class="clear" />
-</fieldset>
-<!--#end if#-->
-
-
-</div>
-
-<br/><hr/>
+<a href="${helpuri}Configure+Indexers-0-7" id="help" target="_blank">$T('menu-help')</a>
 <h3>NzbMatrix</h3><br/>
 
 $T('explain-nzbmatrix')<br/>

interfaces/smpl/templates/main.tmpl

@@ -1133,7 +1133,9 @@ function loadingJSON(){
           <li><a class="config" href="$prefix/config/scheduling/" onclick="lr('config/scheduling/','', 0, 0);">$T('cmenu-scheduling')</a> </li>
           <li><a class="config" href="$prefix/config/rss/" onclick="lr('config/rss/','', 0, 0);">$T('cmenu-rss')</a> </li>
           <li><a class="config" href="$prefix/config/notify/" onclick="lr('config/notify/','', 0, 0);">$T('cmenu-notif')</a></li>
+          <!--#if 0#-->
           <li><a class="config" href="$prefix/config/indexers/" onclick="lr('config/indexers/', '', 0, 0);">$T('cmenu-newzbin')</a></li>
+          <!--#end if#-->
           <li><a class="config" href="$prefix/config/categories/" onclick="lr('config/categories/', '', 0, 0);">$T('cmenu-cat')</a></li>
           <li><a class="config" href="$prefix/config/sorting/" onclick="lr('config/sorting/', '', 0, 0);">$T('cmenu-sorting')</a></li>
         </ul>
@@ -1152,9 +1154,6 @@ function loadingJSON(){
           <li><a class="config" onclick="javascript:timedPause()">$T("smpl-custom")</a></li>
 
   </ul>
-  <!--#if $varExists('newzbinDetails')#-->
-  <li><a onclick="getBookmarks()">$T('smpl-getbookmarks')</a></li>
-  <!--#end if#-->
   <!--#if $have_quota#-->
   <li><a onclick="resetQuota()">$T('link-resetQuota')</a></li>
   <!--#end if#-->
@@ -1183,7 +1182,7 @@ function loadingJSON(){
   <div id="RightContainer" class="left-border">
 <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')<!--#if $varExists('newzbinDetails') then $T('enterID') else '' #-->" onfocus="clearForm(this, 'Enter URL<!--#if $varExists('newzbinDetails') then " or Report ID" else "" #-->')" onblur="setForm(this, 'Enter URL<!--#if $varExists('newzbinDetails') then " or Report ID" else "" #-->')">
+    <input type="text" style="width:218px;" name="id" value="$T('enterURL')" onfocus="clearForm(this, 'Enter URL<!--#if $varExists('newzbinDetails') then " or Report ID" else "" #-->')" onblur="setForm(this, 'Enter URL<!--#if $varExists('newzbinDetails') then " or Report ID" else "" #-->')">
     <!--#if $cat_list#-->
       <select name="cat" >
         <optgroup label="$T('category')">

interfaces/wizard/four.html

@@ -1,34 +0,0 @@
-<!--#include $webdir + "/inc_top.tmpl"#-->
-<script type="text/javascript" src="static/javascript/jquery.js"></script>
-<script type="text/javascript" src="static/javascript/restart.js"></script>
-<br/><br/>
-<h4 id="restarting" class="align-center">$T('wizard-restarting')</h4>
-<h4 id="complete" class="align-center success hidden">$T('wizard-complete')</h4>
-<br />
-<br/>
-<div id="tips" class="hidden">
-$T('wizard-tip1') <span class="bold">$T('wizard-tip2')</span><br/>
-<!--#set $tip3 = $T('wizard-tip3') % ''#-->
-$tip3<br/><br/>
-<div class="quoteBlock">
-<!--#set $i = 0#-->
-<!--#for $url in $urls#-->
-  <!--#set $i = $i+1#-->
-  <a href="$url">$url</a><!--#if $i != len($urls)#--><br /><!--#end if#-->
-<!--#end for#-->
-</div><br/>
-$T('wizard-tip4')
-<br/><br/>
-$T('wizard-tip-wiki') <a href="$helpuri">wiki</a>
-</div>
-</div>
-<hr /><br/>
-<div class="full-width">
-<table class="full-width">
-  <tr class="align-center">
-    <td><input type="hidden" name="session" id="apikey" value="$session"><input class="bigbutton disabled" type="button" onclick="document.location ='$access_url'" value="$T('wizard-goto')" disabled="disabled"/></td>
-  </tr>
-</table>
-</div>
-
-<!--#include $webdir + "/inc_bottom.tmpl"#-->

interfaces/wizard/three.html

@@ -1,39 +1,34 @@
 <!--#include $webdir + "/inc_top.tmpl"#-->
-
-<form action="./four" method="post" autocomplete="off">
-<p>$T('wizard-index-explain')</p>
-<div id="serverDetails">
-<h3><a href="http://$newzbin_url" target="_blank">Newzbin2.es</a> ($T('wizard-optional'))</h3>
-  <label class="label">$T('srv-username'):</label><input type="text" size="20" value="$newzbin_user" name="newzbin_user">
-  <br class="clear" />
-  <label class="label">$T('srv-password'):</label><input type="password" size="20" value="$newzbin_pass" name="newzbin_pass">
-  <br class="clear" />
-  <input type="checkbox" name="newzbin_bookmarks" id="newzbin_bookmarks" value="1" <!--#if $newzbin_bookmarks == 1 then 'checked="checked"' else ''#-->> <label for="newzbin_bookmarks">$T('wizard-index-bookmark')</label><br />
-
-
-<h3><a href="http://nzbmatrix.com" target="_blank">NZBMatrix.com</a> ($T('wizard-optional'))</h3>
-  <label class="label">$T('srv-username'):</label><input type="text" size="20" value="$matrix_user" name="matrix_user">
-  <br class="clear" />
-  <label class="label">$T('opt-apikey'):</label><input type="text" size="20" value="$matrix_apikey" name="matrix_apikey">
-</div></div>
-
+<script type="text/javascript" src="static/javascript/jquery.js"></script>
+<script type="text/javascript" src="static/javascript/restart.js"></script>
+<br/><br/>
+<h4 id="restarting" class="align-center">$T('wizard-restarting')</h4>
+<h4 id="complete" class="align-center success hidden">$T('wizard-complete')</h4>
+<br />
+<br/>
+<div id="tips" class="hidden">
+$T('wizard-tip1') <span class="bold">$T('wizard-tip2')</span><br/>
+<!--#set $tip3 = $T('wizard-tip3') % ''#-->
+$tip3<br/><br/>
+<div class="quoteBlock">
+<!--#set $i = 0#-->
+<!--#for $url in $urls#-->
+  <!--#set $i = $i+1#-->
+  <a href="$url">$url</a><!--#if $i != len($urls)#--><br /><!--#end if#-->
+<!--#end for#-->
+</div><br/>
+$T('wizard-tip4')
+<br/><br/>
+$T('wizard-tip-wiki') <a href="$helpuri">wiki</a>
+</div>
+</div>
 <hr /><br/>
 <div class="full-width">
 <table class="full-width">
-  <tr>
-    <td><input class="bigbutton" type="button" onclick="document.location ='./two'" value="&lsaquo; $T('wizard-previous')" /></td>
-    <td>
-      <div class="align-center">
-        <!--#for $step in xrange($steps)#-->
-          <!--#set $step = $step + 1#-->
-            <span class="<!--#if $step == $number then 'selected' else 'unselected'#-->">$step</span>
-        <!--#end for#-->
-      </div>
-    </td>
-    <td class="align-right"><input class="bigbutton" type="submit" value="$T('wizard-next') &raquo;" /></td>
+  <tr class="align-center">
+    <td><input type="hidden" name="session" id="apikey" value="$session"><input class="bigbutton disabled" type="button" onclick="document.location ='$access_url'" value="$T('wizard-goto')" disabled="disabled"/></td>
   </tr>
 </table>
 </div>
-</form>
 
-<!--#include $webdir + "/inc_bottom.tmpl"#-->
+<!--#include $webdir + "/inc_bottom.tmpl"#-->

package.py

@@ -382,7 +382,7 @@ if target == 'app':
     DATA_FILES = ['interfaces', 'locale', 'email', ('', glob.glob("osx/resources/*"))]
 
     NZBFILE = dict(
-            CFBundleTypeExtensions = [ "nzb","zip","rar" ],
+            CFBundleTypeExtensions = [ "nzb" ],
             CFBundleTypeIconFile = 'nzbfile.icns',
             CFBundleTypeMIMETypes = [ "text/nzb" ],
             CFBundleTypeName = 'NZB File',

sabnzbd/cfg.py

@@ -255,6 +255,7 @@ marker_file = OptionStr('misc', 'nomedia_marker', '')
 wait_ext_drive = OptionNumber('misc', 'wait_ext_drive', 5, 1, 60)
 history_limit = OptionNumber('misc', 'history_limit', 50, 0)
 show_sysload = OptionNumber('misc', 'show_sysload', 2, 0, 2)
+web_watchdog = OptionBool('misc', 'web_watchdog', False)
 
 #------------------------------------------------------------------------------
 # Set root folders for Folder config-items

sabnzbd/interface.py

@@ -415,8 +415,9 @@ class MainPage(object):
     def api(self, **kwargs):
         """Handler for API over http, with explicit authentication parameters
         """
-        logging.debug('API-call from %s [%s] %s', cherrypy.request.remote.ip, \
-                      cherrypy.request.headers.get('User-Agent', '??'), kwargs)
+        if not kwargs.get('tickleme') or not cfg.web_watchdog():
+            logging.debug('API-call from %s [%s] %s', cherrypy.request.remote.ip, \
+                          cherrypy.request.headers.get('User-Agent', '??'), kwargs)
         if kwargs.get('mode', '') not in ('version', 'auth'):
             msg = check_apikey(kwargs)
             if msg: return msg
@@ -885,9 +886,11 @@ class HistoryPage(object):
         #history_items, total_bytes, bytes_beginning = sabnzbd.history_info()
         #history['bytes_beginning'] = "%.2f" % (bytes_beginning / GIGI)
 
+        postfix = T('B') #: Abbreviation for bytes, as in GB
         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)
+               to_units(grand, postfix=postfix), to_units(month, postfix=postfix), \
+               to_units(week, postfix=postfix), to_units(day, postfix=postfix)
 
         history['lines'], history['fetched'], history['noofslots'] = build_history(limit=limit, start=start, verbose=self.__verbose, verbose_list=self.__verbose_list, search=search, failed_only=failed_only)
 
@@ -1089,12 +1092,14 @@ class ConfigPage(object):
 def orphan_delete(kwargs):
     path = kwargs.get('name')
     if path:
+        path = platform_encode(path)
         path = os.path.join(cfg.download_dir.get_path(), path)
         remove_all(path, recursive=True)
 
 def orphan_add(kwargs):
     path = kwargs.get('name')
     if path:
+        path = platform_encode(path)
         path = os.path.join(cfg.download_dir.get_path(), path)
         sabnzbd.nzbqueue.repair_job(path, None)
 
@@ -1212,7 +1217,8 @@ SPECIAL_BOOL_LIST = \
               'queue_complete_pers', 'api_warnings', 'allow_64bit_tools', 'par2_multicore',
               'never_repair', 'allow_streaming', 'ignore_unrar_dates', 'rss_filenames', 'news_items',
               'osx_menu', 'osx_speed', 'win_menu', 'uniconfig', 'use_pickle', 'allow_incomplete_nzb',
-              'randomize_server_ip', 'no_ipv6', 'keep_awake', 'overwrite_files', 'empty_postproc'
+              'randomize_server_ip', 'no_ipv6', 'keep_awake', 'overwrite_files', 'empty_postproc',
+              'web_watchdog'
             )
 SPECIAL_VALUE_LIST = \
             ( 'size_limit', 'folder_max_length', 'fsys_type', 'movie_rename_limit', 'nomedia_marker',
@@ -2009,6 +2015,8 @@ class ConfigScheduling(object):
         minute = kwargs.get('minute')
         hour = kwargs.get('hour')
         days_of_week = ''.join([str(x) for x in kwargs.get('daysofweek', '')])
+        if not days_of_week:
+            days_of_week = '1234567'
         action = kwargs.get('action')
         arguments = kwargs.get('arguments')
 

sabnzbd/misc.py

@@ -631,7 +631,7 @@ def from_units(val):
     else:
         return 0.0
 
-def to_units(val, spaces=0, dec_limit=2):
+def to_units(val, spaces=0, dec_limit=2, postfix=''):
     """ Convert number to K/M/G/T/P notation
         Add "spaces" if not ending in letter
         dig_limit==1 show single decimal for M and higher
@@ -660,8 +660,8 @@ def to_units(val, spaces=0, dec_limit=2):
     else:
         decimals = 0
 
-    format = '%%s%%.%sf %%s' % decimals
-    return format % (sign, val, unit)
+    format = '%%s%%.%sf %%s%%s' % decimals
+    return format % (sign, val, unit, postfix)
 
 #------------------------------------------------------------------------------
 def same_file(a, b):

sabnzbd/newsunpack.py

@@ -32,7 +32,7 @@ from sabnzbd.encoding import TRANS, UNTRANS, unicode2local, name_fixer, \
      reliable_unpack_names, unicoder, latin1, platform_encode
 from sabnzbd.utils.rarfile import RarFile, is_rarfile
 from sabnzbd.misc import format_time_string, find_on_path, make_script_path, int_conv, \
-                         flag_file
+                         flag_file, real_path
 from sabnzbd.tvsort import SeriesSorter
 import sabnzbd.cfg as cfg
 from sabnzbd.constants import Status, QCHECK_FILE, RENAMES_FILE
@@ -637,7 +637,7 @@ def rar_extract_core(rarfile, numrars, one_folder, nzo, setname, extraction_path
         else:
             m = re.search(r'^(Extracting|Creating|...)\s+(.*?)\s+OK\s*$', line)
             if m:
-                extracted.append(TRANS(m.group(2)))
+                extracted.append(real_path(extraction_path, TRANS(m.group(2))))
 
         if fail:
             if proc:
@@ -1141,6 +1141,17 @@ def PAR_Verify(parfile, parfile_nzf, nzo, setname, joinables, classic=False):
                 # Hit a bug in par2-tbb, retry with par2-classic
                 retry_classic = True
 
+            elif ' cannot be renamed to ' in line:
+                if not classic and sabnzbd.WIN32:
+                    # Hit a bug in par2-tbb, retry with par2-classic
+                    retry_classic = True
+                else:
+                    msg = unicoder(line.strip())
+                    nzo.fail_msg = msg
+                    msg = u'[%s] %s' % (unicoder(setname), msg)
+                    nzo.set_unpack_info('Repair', msg, set=setname)
+                    nzo.status = Status.FAILED
+
             # File: "oldname.rar" - is a match for "newname.rar".
             elif 'is a match for' in line:
                 m = _RE_IS_MATCH_FOR.search(line)
@@ -1515,7 +1526,10 @@ def list2cmdline(lst):
 #------------------------------------------------------------------------------
 # Work-around for the failure of Python2.5 on Windows to support IPV6 with HTTPS
 
-def get_from_url(url):
+def get_from_url(url, timeout=None):
+    """ Retrieve URL and return content
+        `timeout` sets non-standard timeout and skips when on Windows
+    """
     if 'https:' in url and sabnzbd.WIN32 and sys.version_info < (2,6) and sabnzbd.newsunpack.CURL_COMMAND:
         command = [sabnzbd.newsunpack.CURL_COMMAND, "-k", url]
         stup, need_shell, command, creationflags = build_command(command)
@@ -1527,6 +1541,12 @@ def get_from_url(url):
         p.wait()
     else:
         import urllib2
-        s = urllib2.urlopen(url)
-        output = s.read()
+        try:
+            if timeout:
+                s = urllib2.urlopen(url, timeout=timeout)
+            else:
+                s = urllib2.urlopen(url)
+            output = s.read()
+        except:
+            output = None
     return output

sabnzbd/nzbstuff.py

@@ -935,6 +935,7 @@ class NzbObject(TryList):
                 if (nzf.filename == filename) or (subject == filename) or (filename in subject):
                     nzf.filename = filename
                     nzf.completed = True
+                    nzf.bytes_left = 0
                     self.handle_par2(nzf, file_done=True)
                     self.remove_nzf(nzf)
                     nzfs.remove(nzf)
@@ -952,6 +953,7 @@ class NzbObject(TryList):
                 self.bytes += nzf.bytes
                 nzf.filename = filename
                 nzf.completed = True
+                nzf.bytes_left = 0
                 self.handle_par2(nzf, file_done=True)
                 self.remove_nzf(nzf)
                 logging.info('File %s added to job', filename)
@@ -1574,8 +1576,10 @@ def get_attrib_file(path, size):
         return [None for n in xrange(size)]
 
     for n in xrange(size):
-        line = f.readline().strip('\n ')
+        line = f.readline().strip('\r\n ')
         if line:
+            if line.lower() == 'none':
+                line = None
             try:
                 line = int(line)
             except:

sabnzbd/postproc.py

@@ -559,7 +559,7 @@ def parring(nzo, workdir):
                 parfile_nzf = par_table[setname]
                 need_re_add, res = par2_repair(parfile_nzf, nzo, workdir, setname)
                 re_add = re_add or need_re_add
-                if not res and cfg.sfv_check():
+                if not res and not need_re_add and cfg.sfv_check():
                     res = try_sfv_check(nzo, workdir, setname)
                 verified[setname] = res
                 par_error = par_error or not res

sabnzbd/rss.py

@@ -348,6 +348,9 @@ class RSSQueue(object):
                 return unicoder(msg)
         else:
             entries = jobs.keys()
+            # Sort in the order the jobs came from the feed
+            entries.sort(lambda x, y: jobs[x].get('order', 0) - jobs[y].get('order', 0))
+
 
         order = 0
         # Filter out valid new links

sabnzbd/tvsort.py

@@ -440,7 +440,7 @@ class SeriesSorter(object):
                 except:
                     logging.error("Failed to rename: %s to %s", current_path, newpath)
                     logging.info("Traceback: ", exc_info = True)
-                rename_similar(current_path, self.ext, self.filename_set)
+                rename_similar(current_path, self.ext, self.filename_set, ())
             else:
                 logging.debug('Current path already exists, skipping rename, %s', newpath)
         else:
@@ -690,7 +690,7 @@ class GenericSorter(object):
                 except:
                     logging.error(Ta('Failed to rename: %s to %s'), filepath, newpath)
                     logging.info("Traceback: ", exc_info = True)
-                rename_similar(current_path, ext, self.filename_set)
+                rename_similar(current_path, ext, self.filename_set, ())
 
         ## Sequence File Handling
         # if there is more than one extracted file check for CD1/1/A in the title
@@ -699,8 +699,10 @@ class GenericSorter(object):
             # rename files marked as in a set
             if matched_files:
                 logging.debug("Renaming a series of generic files (%s)", matched_files)
+                renamed = matched_files.values()
                 for index, file in matched_files.iteritems():
                     filepath = os.path.join(current_path, file)
+                    renamed.append(filepath)
                     tmp, ext = os.path.splitext(file)
                     self.fname = tmp
                     name = '%s%s' % (self.filename_set, self.extra)
@@ -713,7 +715,7 @@ class GenericSorter(object):
                     except:
                         logging.error(Ta('Failed to rename: %s to %s'), filepath, newpath)
                         logging.info("Traceback: ", exc_info = True)
-                    rename_similar(current_path, ext, self.filename_set)
+                rename_similar(current_path, ext, self.filename_set, renamed)
             else:
                 logging.debug("Movie files not in sequence %s", _files)
 
@@ -1094,10 +1096,11 @@ def strip_folders(path):
     return os.path.normpath('/'.join([strip_all(x) for x in f]))
 
 
-def rename_similar(folder, skip_ext, name):
+def rename_similar(folder, skip_ext, name, skipped_files):
     """ Rename all other files in the 'folder' hierarchy after 'name'
         and move them to the root of 'folder'.
         Files having extension 'skip_ext' will be moved, but not renamed.
+        Don't touch files in list `skipped_files`
     """
     logging.debug('Give files in set "%s" matching names.', name)
     folder = os.path.normpath(folder)
@@ -1106,6 +1109,8 @@ def rename_similar(folder, skip_ext, name):
     for root, dirs, files in os.walk(folder):
         for f in files:
             path = os.path.join(root, f)
+            if path in skipped_files:
+                continue
             org, ext = os.path.splitext(f)
             if ext.lower() == skip_ext:
                 # Move file, but do not rename

sabnzbd/urlgrabber.py

@@ -428,7 +428,7 @@ _MATRIX_MAP = {
 
 def get_matrix_category(url, category):
     category = _MATRIX_MAP.get(category, category)
-    if 'nzbxxx.com' in url:
+    if category and 'nzbxxx.com' in url:
         return 'XXX: ' + category
     else:
         return category

sabnzbd/utils/pathbrowser.py

@@ -30,6 +30,12 @@ else:
 
 import sabnzbd
 
+_JUNKFOLDERS = (
+        'boot', 'bootmgr', 'cache', 'msocache', 'recovery', '$recycle.bin', 'recycler',
+        'system volume information', 'temporary internet files', # windows specific
+        '.fseventd', '.spotlight', '.trashes', '.vol', 'cachedmessages', 'caches', 'trash' # osx specific
+        )
+
 # this is for the drive letter code, it only works on windows
 if os.name == 'nt':
     from ctypes import windll
@@ -91,6 +97,7 @@ def folders_at_path(path, include_parent = False):
             if doit:
                 file_list.append({ 'name': unicoder(filename), 'path': unicoder(fpath) })
         file_list = filter(lambda entry: os.path.isdir(entry['path']), file_list)
+        file_list = filter(lambda entry: entry['name'].lower() not in _JUNKFOLDERS, file_list)
         file_list = sorted(file_list, lambda x, y: cmp(os.path.basename(x['name']).lower(), os.path.basename(y['path']).lower()))
     except:
         # No access, ignore

sabnzbd/wizard.py

@@ -41,7 +41,7 @@ class Wizard(object):
         self.__web_dir = sabnzbd.WIZARD_DIR
         self.__prim = prim
         self.info = {'webdir': sabnzbd.WIZARD_DIR,
-                     'steps':4, 'version':sabnzbd.__version__,
+                     'steps':3, 'version':sabnzbd.__version__,
                      'T': T}
 
     @cherrypy.expose
@@ -162,46 +162,19 @@ class Wizard(object):
             if not cfg.username() or not cfg.password():
                 sabnzbd.interface.set_auth(cherrypy.config)
 
-        # Create Indexers page
-        info = self.info.copy()
-        info['num'] = '» %s' % T('Step Three')
-        info['number'] = 3
-        info['newzbin_user'] = cfg.newzbin_username()
-        info['newzbin_pass'] = cfg.newzbin_password.get_stars()
-        info['newzbin_bookmarks'] = cfg.newzbin_bookmarks()
-        info['newzbin_url'] = cfg.newzbin_url()
-        info['matrix_user'] = cfg.matrix_username()
-        info['matrix_apikey'] = cfg.matrix_apikey()
-        info['T'] = Ttemplate
-        template = Template(file=os.path.join(self.__web_dir, 'three.html'),
-                            searchList=[info], compilerSettings=sabnzbd.interface.DIRECTIVES)
-        return template.respond()
-
-    @cherrypy.expose
-    def four(self, **kwargs):
-        """ Accept Indexers and show Restart screen """
-        if kwargs:
-            if 'newzbin_user' in kwargs and 'newzbin_pass' in kwargs:
-                cfg.newzbin_username.set(kwargs.get('newzbin_user',''))
-                cfg.newzbin_password.set(kwargs.get('newzbin_pass',''))
-            cfg.newzbin_bookmarks.set(kwargs.get('newzbin_bookmarks', '0'))
-            if 'matrix_user' in kwargs and 'matrix_apikey' in kwargs:
-                cfg.matrix_username.set(kwargs.get('matrix_user',''))
-                cfg.matrix_apikey.set(kwargs.get('matrix_apikey',''))
-
         config.save_config()
 
         # Show Restart screen
         info = self.info.copy()
-        info['num'] = '» %s' % T('Step Four')
-        info['number'] = 4
+        info['num'] = '» %s' % T('Step Three')
+        info['number'] = 3
         info['helpuri'] = 'http://wiki.sabnzbd.org/'
         info['session'] = cfg.api_key()
 
         info['access_url'], info['urls'] = self.get_access_info()
         info['T'] = Ttemplate
 
-        template = Template(file=os.path.join(self.__web_dir, 'four.html'),
+        template = Template(file=os.path.join(self.__web_dir, 'three.html'),
                             searchList=[info], compilerSettings=sabnzbd.interface.DIRECTIVES)
         return template.respond()