Correctly log the rar-files used by DirectUnpack

Not just assume we used them all.

sabnzbd/directunpacker.py

@@ -29,8 +29,8 @@ import logging
 import sabnzbd
 import sabnzbd.cfg as cfg
 from sabnzbd.misc import int_conv, clip_path, remove_all, globber, format_time_string, has_win_device
-from sabnzbd.encoding import unicoder
+from sabnzbd.encoding import TRANS, unicoder
-from sabnzbd.newsunpack import build_command
+from sabnzbd.newsunpack import build_command, EXTRACTFROM_RE, rar_volumelist
 from sabnzbd.postproc import prepare_extraction_path
 from sabnzbd.utils.rarfile import RarFile
 from sabnzbd.utils.diskspeed import diskspeedmeasure
@@ -65,7 +65,7 @@ class DirectUnpacker(threading.Thread):
         self.total_volumes = {}
         self.unpack_time = 0.0
 
-        self.success_sets = []
+        self.success_sets = {}
         self.next_sets = []
 
         nzo.direct_unpacker = self
@@ -149,6 +149,7 @@ class DirectUnpacker(threading.Thread):
         linebuf = ''
         last_volume_linebuf = ''
         unrar_log = []
+        rarfiles = []
         start_time = time.time()
 
         # Need to read char-by-char because there's no newline after new-disk message
@@ -171,6 +172,11 @@ class DirectUnpacker(threading.Thread):
                 logging.info('Error in DirectUnpack of %s', self.cur_setname)
                 self.abort()
 
+            if linebuf.startswith('Extracting from') and linebuf.endswith('\n'):
+                filename = TRANS((re.search(EXTRACTFROM_RE, linebuf.strip()).group(1)))
+                if filename not in rarfiles:
+                    rarfiles.append(filename)
+
             # Did we reach the end?
             if linebuf.endswith('All OK'):
                 # Stop timer and finish
@@ -178,15 +184,17 @@ class DirectUnpacker(threading.Thread):
                 ACTIVE_UNPACKERS.remove(self)
 
                 # Add to success
-                self.success_sets.append(self.cur_setname)
+                rarfile_path = os.path.join(self.nzo.downpath, self.rarfile_nzf.filename)
+                self.success_sets[self.cur_setname] = rar_volumelist(rarfile_path, self.nzo.password, rarfiles)
                 logging.info('DirectUnpack completed for %s', self.cur_setname)
                 self.nzo.set_action_line(T('Direct Unpack'), T('Completed'))
 
-                # Write current log
+                # Write current log and clear
                 unrar_log.append(linebuf.strip())
                 linebuf = ''
                 logging.debug('DirectUnpack Unrar output %s', '\n'.join(unrar_log))
                 unrar_log = []
+                rarfiles = []
 
                 # Are there more files left?
                 while self.nzo.files and not self.next_sets:
@@ -351,7 +359,7 @@ class DirectUnpacker(threading.Thread):
 
             # No new sets
             self.next_sets = []
-            self.success_sets = []
+            self.success_sets = {}
 
             # Remove files
             if self.unpack_dir_info:

sabnzbd/newsunpack.py

@@ -33,7 +33,7 @@ from sabnzbd.encoding import TRANS, UNTRANS, unicoder, platform_encode, deunicod
 import sabnzbd.utils.rarfile as rarfile
 from sabnzbd.misc import format_time_string, find_on_path, make_script_path, int_conv, \
     real_path, globber, globber_full, get_all_passwords, renamer, clip_path, \
-    has_win_device, calc_age
+    has_win_device, calc_age, long_path
 from sabnzbd.tvsort import SeriesSorter
 import sabnzbd.cfg as cfg
 from sabnzbd.constants import Status
@@ -491,11 +491,10 @@ def rar_unpack(nzo, workdir, workdir_complete, delete, one_folder, rars):
         # Did we already direct-unpack it? Not when recursive-unpacking
         if nzo.direct_unpacker and rar_set in nzo.direct_unpacker.success_sets:
             logging.info("Set %s completed by DirectUnpack", rar_set)
-            fail = 0
+            fail = False
-            success = 1
+            success = True
-            rars = rar_sets[rar_set]
+            rars = nzo.direct_unpacker.success_sets.pop(rar_set)
             newfiles = globber(extraction_path)
-            nzo.direct_unpacker.success_sets.remove(rar_set)
         else:
             logging.info("Extracting rarfile %s (belonging to %s) to %s",
                          rarpath, rar_set, extraction_path)
@@ -504,7 +503,7 @@ def rar_unpack(nzo, workdir, workdir_complete, delete, one_folder, rars):
                                              one_folder, nzo, rar_set, extraction_path)
                 # Was it aborted?
                 if not nzo.pp_active:
-                    fail = 1
+                    fail = True
                     break
                 success = not fail
             except:
@@ -623,8 +622,6 @@ def rar_extract_core(rarfile_path, numrars, one_folder, nzo, setname, extraction
 
     # Get list of all the volumes part of this set
     logging.debug("Analyzing rar file ... %s found", rarfile.is_rarfile(rarfile_path))
-    rarfiles = rarfile.RarFile(rarfile_path).volumelist()
-
     logging.debug("Running unrar %s", command)
     p = Popen(command, shell=need_shell, stdin=subprocess.PIPE,
                          stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
@@ -639,6 +636,7 @@ def rar_extract_core(rarfile_path, numrars, one_folder, nzo, setname, extraction
     # Loop over the output from rar!
     curr = 0
     extracted = []
+    rarfiles = []
     fail = 0
     inrecovery = False
     lines = []
@@ -788,6 +786,9 @@ def rar_extract_core(rarfile_path, numrars, one_folder, nzo, setname, extraction
         proc.close()
     p.wait()
 
+    # Which files did we use to extract this?
+    rarfiles = rar_volumelist(rarfile_path, password, rarfiles)
+
     logging.debug('UNRAR output %s', '\n'.join(lines))
     nzo.fail_msg = ''
     msg = T('Unpacked %s files/folders in %s') % (str(len(extracted)), format_time_string(time.time() - start))
@@ -2007,6 +2008,7 @@ def userxbit(filename):
     xbitset = (rwxbits & userxbit) > 0
     return xbitset
 
+
 def build_command(command):
     """ Prepare list from running an external program """
     if not sabnzbd.WIN32:
@@ -2058,6 +2060,28 @@ def build_command(command):
     return stup, need_shell, command, creationflags
 
 
+def rar_volumelist(rarfile_path, password, known_volumes):
+    """ Extract volumes that are part of this rarset
+        and merge them with existing list, removing duplicates
+    """
+    zf = rarfile.RarFile(rarfile_path)
+    if password:
+        try:
+            # setpassword can fail due to bugs in RarFile
+            zf.setpassword(password)
+        except:
+            pass
+    zf_volumes = zf.volumelist()
+
+    # Remove duplicates
+    known_volumes_base = [os.path.basename(vol) for vol in known_volumes]
+    for zf_volume in zf_volumes:
+        if os.path.basename(zf_volume) not in known_volumes_base:
+            # Long-path notation just to be sure
+            known_volumes.append(long_path(zf_volume))
+    return known_volumes
+
+
 # Sort the various RAR filename formats properly :\
 def rar_sort(a, b):
     """ Define sort method for rar file names """