Convert all return values to use rsutil package

All of the return values used values defined in the rsutil package. This
fixes all of them so that rsutil is used.

Signed-off-by: Ira W. Snyder <devel@irasnyder.com>

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)
-                       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')
@@ -117,7 +117,7 @@ class Base (object):
                                        done = True
 
                        if s in valid_n:
-                               return SUCCESS
+                               return rsutil.common.SUCCESS
 
                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))
-                               return -EDELETE
+                               return -rsutil.common.EDELETE
 
-               return SUCCESS
+               return rsutil.common.SUCCESS
 
        def runDelete (self):
                deleteable_files = self.find_deleteable_files ()
@@ -141,46 +141,46 @@ class Base (object):
                # Repair Stage
                ret = self.runVerifyAndRepair ()
 
-               if ret != SUCCESS:
+               if ret != rsutil.common.SUCCESS:
                        logging.critical ('Repair stage failed for: %s' % self.p2file)
-                       return -ECHECK
+                       return -rsutil.common.ECHECK
 
                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)
-                       return -EEXTRACT
+                       return -rsutil.common.EEXTRACT
 
                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)
-                       return -EDELETE
+                       return -rsutil.common.EDELETE
 
                logging.info ('Successfully completed: %s' % self.p2file)
-               return SUCCESS
+               return rsutil.common.SUCCESS
 
        def safe_create_directory (self, dir):
                if dir == None:
-                       return SUCCESS
+                       return rsutil.common.SUCCESS
 
                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)
-                       return -ECREATE
+                       return -rsutil.common.ECREATE
 
-               return SUCCESS
+               return rsutil.common.SUCCESS
 
        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)
 
-               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 ():
@@ -202,11 +202,11 @@ class Base (object):
                        logging.debug ('Extraction Function returned: %d' % ret)
 
                        # Check error code
-                       if ret != SUCCESS:
+                       if ret != rsutil.common.SUCCESS:
                                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

diff --git a/PAR2Set/ExtractFirstBase.py b/PAR2Set/ExtractFirstBase.py
index 4ebbfc8..909b91d 100644 (file)
--- a/PAR2Set/ExtractFirstBase.py
+++ b/PAR2Set/ExtractFirstBase.py
@@ -28,28 +28,28 @@ class ExtractFirstBase (PAR2Set.Base.Base):
                # Extraction Stage
                ret = self.runExtract ()
 
-               if ret != SUCCESS:
+               if ret != rsutil.common.SUCCESS:
                        logging.critical ('Extraction stage failed for: %s' % self.p2file)
-                       return -EEXTRACT
+                       return -rsutil.common.EEXTRACT
 
                self.update_matches ()
 
                # Repair Stage
                ret = self.runVerifyAndRepair ()
 
-               if ret != SUCCESS:
+               if ret != rsutil.common.SUCCESS:
                        logging.critical ('Repair stage failed for: %s' % self.p2file)
-                       return -ECHECK
+                       return -rsutil.common.ECHECK
 
                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)
-                       return -EDELETE
+                       return -rsutil.common.EDELETE
 
                logging.info ('Successfully completed: %s' % self.p2file)
-               return SUCCESS
+               return rsutil.common.SUCCESS
 

diff --git a/PAR2Set/Join.py b/PAR2Set/Join.py
index 58648fa..234ca2b 100644 (file)
--- a/PAR2Set/Join.py
+++ b/PAR2Set/Join.py
@@ -53,9 +53,9 @@ class Join (PAR2Set.Base.Base):
                # 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_extraction_heads (self):
                return self.prot_matched_files
@@ -67,14 +67,14 @@ class Join (PAR2Set.Base.Base):
 
                # Make sure that both files are not the same file. If they are, don't run at all.
                if os.path.samefile (file, os.path.join (todir, file)):
-                       return SUCCESS
+                       return rsutil.common.SUCCESS
 
                cmd = NOEXTRACT_CMD % (file, todir)
                ret = rsutil.common.run_command (cmd)
 
                # Check error code
                if ret != 0:
-                       return -EEXTRACT
+                       return -rsutil.common.EEXTRACT
 
-               return SUCCESS
+               return rsutil.common.SUCCESS
 

diff --git a/PAR2Set/NewRAR.py b/PAR2Set/NewRAR.py
index e780ec8..272700a 100644 (file)
--- a/PAR2Set/NewRAR.py
+++ b/PAR2Set/NewRAR.py
@@ -48,7 +48,7 @@ class NewRAR (PAR2Set.Base.Base):
 
                # Check error code
                if ret != 0:
-                       return -EEXTRACT
+                       return -rsutil.common.EEXTRACT
 
-               return SUCCESS
+               return rsutil.common.SUCCESS
 

diff --git a/PAR2Set/OldRAR.py b/PAR2Set/OldRAR.py
index a2639a3..9b1c68a 100644 (file)
--- a/PAR2Set/OldRAR.py
+++ b/PAR2Set/OldRAR.py
@@ -48,7 +48,7 @@ class OldRAR (PAR2Set.Base.Base):
 
                # Check error code
                if ret != 0:
-                       return -EEXTRACT
+                       return -rsutil.common.EEXTRACT
 
-               return SUCCESS
+               return rsutil.common.SUCCESS
 

diff --git a/PAR2Set/ZIP.py b/PAR2Set/ZIP.py
index 35bc73f..6795d0c 100644 (file)
--- a/PAR2Set/ZIP.py
+++ b/PAR2Set/ZIP.py
@@ -38,7 +38,7 @@ class ZIP (PAR2Set.Base.Base):
 
                # Check error code
                if ret != 0:
-                       return -EEXTRACT
+                       return -rsutil.common.EEXTRACT
 
-               return SUCCESS
+               return rsutil.common.SUCCESS
 

diff --git a/RarslaveDetector.py b/RarslaveDetector.py
index e9988f9..08a0b66 100644 (file)
--- a/RarslaveDetector.py
+++ b/RarslaveDetector.py
@@ -62,7 +62,7 @@ class RarslaveDetector (object):
 
                                # If something already worked, there is no need to continue,
                                # since we've already finished!
-                               if ret == SUCCESS:
+                               if ret == rsutil.common.SUCCESS:
                                        break
                                else:
                                        logging.error ('Detected type failed for: %s' % self.p2file)
@@ -73,10 +73,10 @@ class RarslaveDetector (object):
                        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
+                       return -rsutil.common.EDETECT
 
                # Make sure that something worked
-               if ret != SUCCESS:
+               if ret != rsutil.common.SUCCESS:
                        logging.critical ('All types failed for: %s' % self.p2file)
 
                return ret