Migrate all PAR2Set-derived classes to the package notation

[rarslave2.git] / RarslaveDetector.py

diff --git a/RarslaveDetector.py b/RarslaveDetector.py
index 9f14261..0339336 100644 (file)
--- a/RarslaveDetector.py
+++ b/RarslaveDetector.py
@@ -4,12 +4,12 @@
 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
 
@@ -18,12 +18,12 @@ 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):