Move common functionality into rsutil package

[rarslave2.git] / PAR2Set / ZIP.py

diff --git a/PAR2Set/ZIP.py b/PAR2Set/ZIP.py
index f7ddc54..35bc73f 100644 (file)
--- a/PAR2Set/ZIP.py
+++ b/PAR2Set/ZIP.py
@@ -2,7 +2,7 @@
 # vim: set ts=4 sts=4 sw=4 textwidth=92:
 
 import PAR2Set.Base
-from RarslaveCommon import *
+import rsutil.common
 
 #
 # This is a regular zip file type
@@ -18,8 +18,8 @@ from RarslaveCommon import *
 #
 
 def detector (name_files, prot_files):
-       all_files = no_duplicates (name_files + prot_files)
-       return has_a_match ('^.*\.zip$', all_files)
+       all_files = rsutil.common.no_duplicates (name_files + prot_files)
+       return rsutil.common.has_a_match ('^.*\.zip$', all_files)
 
 
 class ZIP (PAR2Set.Base.Base):
@@ -28,13 +28,13 @@ class ZIP (PAR2Set.Base.Base):
                return 'ZIP'
 
        def find_extraction_heads (self):
-               return find_matches ('^.*\.zip', self.all_files)
+               return rsutil.common.find_matches ('^.*\.zip', self.all_files)
 
        def extraction_function (self, file, todir):
-               ZIP_CMD = self.config_get_value ('commands', 'unzip')
+               ZIP_CMD = rsutil.common.config_get_value ('commands', 'unzip')
 
                cmd = ZIP_CMD % (file, todir)
-               ret = run_command (cmd)
+               ret = rsutil.common.run_command (cmd)
 
                # Check error code
                if ret != 0: