Migrate all PAR2Set-derived classes to the package notation

[rarslave2.git] / RarslaveDetector.py

diff --git a/RarslaveDetector.py b/RarslaveDetector.py
index 85316ca..0339336 100644 (file)
--- a/RarslaveDetector.py
+++ b/RarslaveDetector.py
@@ -4,24 +4,26 @@
 from RarslaveCommon import *
 
 # PAR2Set-derived types
-import PAR2Set_JOIN
-import PAR2Set_ZIP
-import PAR2Set_OLDRAR
-import PAR2Set_NEWRAR
-import PAR2Set_EF_OLDRAR
-import PAR2Set_EF_NEWRAR
+import PAR2Set.Join
+import PAR2Set.ZIP
+import PAR2Set.OldRAR
+import PAR2Set.NewRAR
+import PAR2Set.ExtractFirstOldRAR
+import PAR2Set.ExtractFirstNewRAR
+
+import logging
 
 class RarslaveDetector (object):
 
        # A tuple of tuples with the following definition:
        # (TYPE_NAME, DETECTION_FUNCTION, PAR2Set-derived class)
 
-       TYPES = (       (PAR2Set_JOIN.detect_JOIN, PAR2Set_JOIN.PAR2Set_JOIN),
-                               (PAR2Set_ZIP.detect_ZIP, PAR2Set_ZIP.PAR2Set_ZIP),
-                               (PAR2Set_OLDRAR.detect_OLDRAR, PAR2Set_OLDRAR.PAR2Set_OLDRAR),
-                               (PAR2Set_NEWRAR.detect_NEWRAR, PAR2Set_NEWRAR.PAR2Set_NEWRAR),
-                               (PAR2Set_EF_OLDRAR.detect_EF_OLDRAR, PAR2Set_EF_OLDRAR.PAR2Set_EF_OLDRAR),
-                               (PAR2Set_EF_NEWRAR.detect_EF_NEWRAR, PAR2Set_EF_NEWRAR.PAR2Set_EF_NEWRAR),
+       TYPES = (       (PAR2Set.Join.detector,   PAR2Set.Join.Join),
+                               (PAR2Set.ZIP.detector,    PAR2Set.ZIP.ZIP),
+                               (PAR2Set.OldRAR.detector, PAR2Set.OldRAR.OldRAR),
+                               (PAR2Set.NewRAR.detector, PAR2Set.NewRAR.NewRAR),
+                               (PAR2Set.ExtractFirstOldRAR.detector, PAR2Set.ExtractFirstOldRAR.ExtractFirstOldRAR),
+                               (PAR2Set.ExtractFirstNewRAR.detector, PAR2Set.ExtractFirstNewRAR.ExtractFirstNewRAR),
                        )
 
        def __init__ (self, dir, p2file):
@@ -53,7 +55,7 @@ class RarslaveDetector (object):
                                p2set = classname (self.dir, self.p2file)
 
                                detected = True
-                               debugMessage ('Detected type: %s' % p2set)
+                               logging.debug ('Detected type: %s' % p2set)
 
                                # Try to have rarslave do it's thing
                                ret = p2set.runAll ()
@@ -63,19 +65,19 @@ class RarslaveDetector (object):
                                if ret == SUCCESS:
                                        break
                                else:
-                                       fatalMessage ('Detected type failed for: %s' % self.p2file)
+                                       logging.error ('Detected type failed for: %s' % self.p2file)
 
                # Make sure we detected at least one valid type
                if not detected:
-                       fatalMessage ('Unable to determine type: %s' % self.p2file)
-                       verboseMessage ('The following information will help in writing a detector:')
-                       verboseMessage ('name_matches: %s' % self.name_matched_files)
-                       verboseMessage ('prot_matches: %s' % self.prot_matched_files)
+                       logging.warning ('Unable to determine type: %s' % self.p2file)
+                       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
 
                # Make sure that something worked
                if ret != SUCCESS:
-                       fatalMessage ('All types failed for: %s' % self.p2file)
+                       logging.critical ('All types failed for: %s' % self.p2file)
 
                return ret