X-Git-Url: https://www.irasnyder.com/gitweb/?p=rarslave2.git;a=blobdiff_plain;f=RarslaveDetector.py;h=0895e460d51ff1fbe1ba64401712a5f50bd7db39;hp=e9988f983f29aec74d84c7f160e7acd220cd7ae0;hb=8a063b3c5c7910db244bdab28e0409cde2ff551c;hpb=a41f0878f0745f3026f4f610eeb52cba42f03da1 diff --git a/RarslaveDetector.py b/RarslaveDetector.py index e9988f9..0895e46 100644 --- a/RarslaveDetector.py +++ b/RarslaveDetector.py @@ -10,6 +10,7 @@ import PAR2Set.OldRAR import PAR2Set.NewRAR import PAR2Set.ExtractFirstOldRAR import PAR2Set.ExtractFirstNewRAR +import PAR2Set.NoExtract import logging @@ -24,6 +25,7 @@ class RarslaveDetector (object): (PAR2Set.NewRAR.detector, PAR2Set.NewRAR.NewRAR), (PAR2Set.ExtractFirstOldRAR.detector, PAR2Set.ExtractFirstOldRAR.ExtractFirstOldRAR), (PAR2Set.ExtractFirstNewRAR.detector, PAR2Set.ExtractFirstNewRAR.ExtractFirstNewRAR), + (PAR2Set.NoExtract.detector, PAR2Set.NoExtract.NoExtract), ) def __init__ (self, dir, p2file): @@ -62,7 +64,7 @@ class RarslaveDetector (object): # If something already worked, there is no need to continue, # since we've already finished! - if ret == SUCCESS: + if ret == rsutil.common.SUCCESS: break else: logging.error ('Detected type failed for: %s' % self.p2file) @@ -73,10 +75,10 @@ class RarslaveDetector (object): logging.debug ('The following information will help in writing a detector:') logging.debug ('name_matches: %s' % self.name_matched_files) logging.debug ('prot_matches: %s' % self.prot_matched_files) - return -EDETECT + return -rsutil.common.EDETECT # Make sure that something worked - if ret != SUCCESS: + if ret != rsutil.common.SUCCESS: logging.critical ('All types failed for: %s' % self.p2file) return ret