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

+#
 # This is an object based representation of a parset, and will verify itself
 # and extract itself, if possible.
 ################################################################################
-import os, glob
+import os, glob, re
 class parset:
     def __init__(self, par_filename):
         self.parfile = par_filename
         self.extra_pars = []
         # remove all of the extra pars
         for i in self.extra_pars:
             os.remove(i)
         # remove any rars that are associated (leave EVERYTHING else)
+        # This regex matches both old and new style rar(s).
+        regex = re.compile('^.*\.(rar|r\d\d)$')
         for i in self.files:
-            if i[-3:] == 'rar':
+            if regex.match(i):
                 os.remove(i)
         # remove any .0?? files (from parjoin)
         if self.used_parjoin:
             for i in os.listdir(os.getcwd()):
     par2files += glob.glob('*.PAR2')
     parsets = []
     for i in par2files:
+        try:
-        filenames = get_par2_filenames(i)
+            filenames = get_par2_filenames(i)
-        create_new = True
+            create_new = True
+        except EnvironmentError:
+            print 'CORRUPT PARFILE: %s' % (i, )
+            continue
         # if we already have an instance for this set, append
         # this par file to the extra_pars field
         for j in parsets:
             if j.files == filenames:

Subversion Repositories programming