The function runCheckAndRepair() was broken for files that needed to be
joined, because it was including protected files on the par2 command line.
This patch fixes the behavior so that only split pieces are added.
Signed-off-by: Ira W. Snyder <devel@irasnyder.com>
self.name_matched_files = self.__find_name_matches (self.dir, self.basename)
self.name_matched_files = self.__find_name_matches (self.dir, self.basename)
+ def __is_joinfile (self, filename):
+ regex = re.compile ('^.*\.\d\d\d$', re.IGNORECASE)
+ if regex.match (filename):
+ return True
+
+ return False
+
def __should_be_joined (self, files):
def __should_be_joined (self, files):
- regex = re.compile ('^.*\.001$', re.IGNORECASE)
+ if self.__is_joinfile (f):
return True
def runCheckAndRepair (self):
return True
def runCheckAndRepair (self):
if f != self.p2file:
command += "\"%s\" " % os.path.split (f)[1]
if f != self.p2file:
command += "\"%s\" " % os.path.split (f)[1]
+ # Only needed when using par2 to join
if join:
for f in all_files:
if join:
for f in all_files:
- if f not in self.p2files:
+ if self.__is_joinfile (f):
command += "\"%s\" " % os.path.split (f)[1]
# run the command
command += "\"%s\" " % os.path.split (f)[1]
# run the command