Convert all return values to use rsutil package

[rarslave2.git] / PAR2Set / Base.py

diff --git a/PAR2Set/Base.py b/PAR2Set/Base.py
index 46a69de..772e4a5 100644 (file)
--- a/PAR2Set/Base.py
+++ b/PAR2Set/Base.py
@@ -87,9 +87,9 @@ class Base (object):
                # check the result
                if ret != 0:
                        logging.critical ('PAR2 Check / Repair failed: %s' % self.p2file)
                # check the result
                if ret != 0:
                        logging.critical ('PAR2 Check / Repair failed: %s' % self.p2file)

-                       return -ECHECK
+                       return -rsutil.common.ECHECK

 
 

-               return SUCCESS
+               return rsutil.common.SUCCESS

 
        def find_deleteable_files (self):
                DELETE_REGEX = rsutil.common.config_get_value ('regular expressions', 'delete_regex')
 
        def find_deleteable_files (self):
                DELETE_REGEX = rsutil.common.config_get_value ('regular expressions', 'delete_regex')


@@ -117,7 +117,7 @@ class Base (object):
                                        done = True
 
                        if s in valid_n:
                                        done = True
 
                        if s in valid_n:

-                               return SUCCESS
+                               return rsutil.common.SUCCESS

 
                for f in files:
                        try:
 
                for f in files:
                        try:


@@ -125,9 +125,9 @@ class Base (object):
                                logging.debug ('Deleteing: %s' % os.path.join (dir, f))
                        except:
                                logging.error ('Failed to delete: %s' % os.path.join (dir, f))
                                logging.debug ('Deleteing: %s' % os.path.join (dir, f))
                        except:
                                logging.error ('Failed to delete: %s' % os.path.join (dir, f))

-                               return -EDELETE
+                               return -rsutil.common.EDELETE

 
 

-               return SUCCESS
+               return rsutil.common.SUCCESS

 
        def runDelete (self):
                deleteable_files = self.find_deleteable_files ()
 
        def runDelete (self):
                deleteable_files = self.find_deleteable_files ()


@@ -141,46 +141,46 @@ class Base (object):
                # Repair Stage
                ret = self.runVerifyAndRepair ()
 
                # Repair Stage
                ret = self.runVerifyAndRepair ()
 

-               if ret != SUCCESS:
+               if ret != rsutil.common.SUCCESS:

                        logging.critical ('Repair stage failed for: %s' % self.p2file)
                        logging.critical ('Repair stage failed for: %s' % self.p2file)

-                       return -ECHECK
+                       return -rsutil.common.ECHECK

 
                self.update_matches ()
 
                # Extraction Stage
                ret = self.runExtract ()
 
 
                self.update_matches ()
 
                # Extraction Stage
                ret = self.runExtract ()
 

-               if ret != SUCCESS:
+               if ret != rsutil.common.SUCCESS:

                        logging.critical ('Extraction stage failed for: %s' % self.p2file)
                        logging.critical ('Extraction stage failed for: %s' % self.p2file)

-                       return -EEXTRACT
+                       return -rsutil.common.EEXTRACT

 
                self.update_matches ()
 
                # Deletion Stage
                ret = self.runDelete ()
 
 
                self.update_matches ()
 
                # Deletion Stage
                ret = self.runDelete ()
 

-               if ret != SUCCESS:
+               if ret != rsutil.common.SUCCESS:

                        logging.critical ('Deletion stage failed for: %s' % self.p2file)
                        logging.critical ('Deletion stage failed for: %s' % self.p2file)

-                       return -EDELETE
+                       return -rsutil.common.EDELETE

 
                logging.info ('Successfully completed: %s' % self.p2file)
 
                logging.info ('Successfully completed: %s' % self.p2file)

-               return SUCCESS
+               return rsutil.common.SUCCESS

 
        def safe_create_directory (self, dir):
                if dir == None:
 
        def safe_create_directory (self, dir):
                if dir == None:

-                       return SUCCESS
+                       return rsutil.common.SUCCESS

 
                if os.path.isdir (dir):
 
                if os.path.isdir (dir):

-                       return SUCCESS
+                       return rsutil.common.SUCCESS

 
                try:
                        os.makedirs (dir)
                        logging.info ('Created directory: %s' % dir)
                except OSError:
                        logging.critical ('FAILED to create directory: %s' % dir)
 
                try:
                        os.makedirs (dir)
                        logging.info ('Created directory: %s' % dir)
                except OSError:
                        logging.critical ('FAILED to create directory: %s' % dir)

-                       return -ECREATE
+                       return -rsutil.common.ECREATE

 
 

-               return SUCCESS
+               return rsutil.common.SUCCESS

 
        def runExtract (self, todir=None):
                """Extract all heads of this set"""
 
        def runExtract (self, todir=None):
                """Extract all heads of this set"""


@@ -192,8 +192,8 @@ class Base (object):
                # Create the directory $todir if it doesn't exist
                ret = self.safe_create_directory (todir)
 
                # Create the directory $todir if it doesn't exist
                ret = self.safe_create_directory (todir)
 

-               if ret != SUCCESS:
-                       return -EEXTRACT
+               if ret != rsutil.common.SUCCESS:
+                       return -rsutil.common.EEXTRACT

 
                # Call the extraction function on each head
                for h in self.find_extraction_heads ():
 
                # Call the extraction function on each head
                for h in self.find_extraction_heads ():


@@ -202,11 +202,11 @@ class Base (object):
                        logging.debug ('Extraction Function returned: %d' % ret)
 
                        # Check error code
                        logging.debug ('Extraction Function returned: %d' % ret)
 
                        # Check error code

-                       if ret != SUCCESS:
+                       if ret != rsutil.common.SUCCESS:

                                logging.critical ('Failed extracting: %s' % h)
                                logging.critical ('Failed extracting: %s' % h)

-                               return -EEXTRACT
+                               return -rsutil.common.EEXTRACT

 
 

-               return SUCCESS
+               return rsutil.common.SUCCESS

 
        def find_extraction_heads (self):
                assert False # You MUST override this on a per-type basis
 
        def find_extraction_heads (self):
                assert False # You MUST override this on a per-type basis