X-Git-Url: https://irasnyder.com/gitweb/?a=blobdiff_plain;f=PAR2Set%2FExtractFirstNewRAR.py;h=caed58f9947fae21108c7923fea2a66e5d72d0be;hb=a41f0878f0745f3026f4f610eeb52cba42f03da1;hp=6b90591486852d35fdacc5e09a57c307ce06f120;hpb=915d5e7efd472b541ca06bd4b28ce3ab2e0e7efc;p=rarslave2.git

diff --git a/PAR2Set/ExtractFirstNewRAR.py b/PAR2Set/ExtractFirstNewRAR.py
index 6b90591..caed58f 100644
--- a/PAR2Set/ExtractFirstNewRAR.py
+++ b/PAR2Set/ExtractFirstNewRAR.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # vim: set ts=4 sts=4 sw=4 textwidth=92:
 
-import PAR2Set_NEWRAR
-import PAR2Set_EXTRACTFIRST
-from RarslaveCommon import *
+import PAR2Set.ExtractFirstBase
+import PAR2Set.NewRAR
+import rsutil.common
 
 #
 # This is an old-style rar type
@@ -26,13 +26,13 @@ from RarslaveCommon import *
 # with the PAR2 file itself.
 #
 
-def detect_EF_NEWRAR (name_files, prot_files):
-	return has_a_match ('^.*\.part0*1\.rar$', name_files) \
-			and not has_a_match ('^.*\.part0*1\.rar$', prot_files)
+def detector (name_files, prot_files):
+	return rsutil.common.has_a_match ('^.*\.part0*1\.rar$', name_files) \
+			and not rsutil.common.has_a_match ('^.*\.part0*1\.rar$', prot_files)
 
 
-class PAR2Set_EF_NEWRAR (PAR2Set_EXTRACTFIRST.PAR2Set_EXTRACTFIRST,
-							PAR2Set_NEWRAR.PAR2Set_NEWRAR):
+class ExtractFirstNewRAR (PAR2Set.ExtractFirstBase.ExtractFirstBase, \
+		PAR2Set.NewRAR.NewRAR):
 
 	def __repr__ (self):
 		return 'EXTRACTFIRST NEWRAR'