WebSVN – programming – Diff – /projects/rarslave/rarslave.py

 # - Fixed the rar command so that it can extract files whose names begin
 #   with a hyphen.
+#
 # - 2006-03-08
 # - Make an interactive mode which asks the user before deleting files.
+# - Make multi-file parjoin work.
+#
 ################################################################################
 # REQUIREMENTS:
+#
             if retval == False:
                 # Failed to verify fast, so try it slow, maybe it needs repair
                 retval = self.__slow_verify()
-        # If we've got a video file, maybe we should try to parjoin it
+        # If we've got video files, maybe we should try to parjoin them
-        elif self.__has_video_file():
+        elif self.__number_of_video_files() > 0:
             retval = self.__parjoin()
         else: #not all there, maybe we can slow-repair
             retval = self.__slow_verify()
             return True #success
         return False #failure
     def __parjoin(self):
-        retval = os.system('lxsplit -j "%s.001"' % (self.files[0], ))
+        # Join all of the files
+        for f in self.files:
+            if self.__is_video_file(f):
+                self.__parjoin_single(f)
+        # Re-verify the parset
         retval = self.__fast_verify()
         if retval == False:
             # Failed to verify fast, so try it slow, maybe it needs repair
             retval = self.__slow_verify()
-        if retval == False: # failed to verify, so remove the lxsplit created file
+        # Failed to verify, so remove all of the lxsplit created files
+        if retval == False:
+            for f in self.files:
+                if self.__is_video_file(f):
-            try:
+                    try:
-                os.remove(self.files[0])
+                        os.remove(f)
-            except OSError:
+                    except OSError:
-                print 'Failed to remove file: %s' % (self.files[0], )
+                        print 'Failed to remove file: %s' % (f, )
         self.used_parjoin = retval
         self.verified = retval
         return self.verified
+    def __parjoin_single(self, base_file):
+        parjoinable = False
+        regex = re.compile("^%s\.001$" % (re.escape(base_file), ), re.IGNORECASE)
+        for f in os.listdir(os.getcwd()):
+            if regex.match(f):
+                parjoinable = True
+                break
+        if parjoinable:
+            retval = os.system('lxsplit -j "%s.001"' % (base_file, ))
+            return retval
+        return False
-    def __has_video_file(self):
+    def __is_video_file(self, file):
         regex = re.compile(
                 config.get_value('regular expressions', 'video_file_regex'),
                 re.IGNORECASE)
-        for f in self.files:
-            if regex.match(f):
+        if regex.match(file):
-                return True
+            return True
         return False
+    def __number_of_video_files(self):
+        count = 0
+        for f in self.files:
+            if self.__is_video_file(f):
+                count += 1
+        return count
+    def __remove_split_files(self, base_name, files_to_remove):
+        """Store base_name.{001,002, ... , 999} files in the list
+        $files_to_remove"""
+        base_name_regex = "^%s\.\d\d\d$" % (re.escape(base_name), )
+        regex = re.compile(base_name_regex, re.IGNORECASE)
+        for f in os.listdir(os.getcwd()):
+            if regex.match(f):
+                files_to_remove.append(f)
     def __remove_currentset(self):
         """Remove all of the files that are extractable, as well as the pars.
         Leave everything else alone"""
         if not self.extracted:
             if regex.match(i):
                 files_to_remove.append(i)
         # remove any .{001,002,...} files (from parjoin)
         if self.used_parjoin:
-            for i in os.listdir(os.getcwd()):
+            for f in self.files:
-                if i != self.files[0] and self.files[0] in i:
+                self.__remove_split_files(f, files_to_remove)
-                    files_to_remove.append(i)
         # remove any temp repair files
         regex = re.compile(
                 config.get_value('regular expressions', 'temp_repair_regex'),
                 re.IGNORECASE)

Subversion Repositories programming

(root)/projects/rarslave/rarslave.py – Rev 277 → 278