[RARSLAVE] Have find_deleteable_files() search when called

Changes the function find_deleteable_files() to do a search when it is
called, rather than operating on old (and probably out-of-date) data.

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

diff --git a/rarslave.py b/rarslave.py
index 27db583..bd79779 100644 (file)
--- a/rarslave.py
+++ b/rarslave.py
@@ -335,13 +335,12 @@ def is_noextract (files):
        # TODO: Add others ???
        return generic_matcher (files, '^.*\.001$')
 
-def find_deleteable_files (files):
-       # Deleteable types regex should come from the config
-       dfiles = []
+def find_deleteable_files (dir, p2file):
+       likely = find_likely_files (dir, p2file)
        DELETE_REGEX = config.get_value ('regular expressions', 'delete_regex')
        dregex = re.compile (DELETE_REGEX, re.IGNORECASE)
 
-       return [f for f in files if dregex.match (f)]
+       return [f for f in likely if dregex.match (f)]
 
 def printlist (li):
        for f in li:
@@ -402,7 +401,7 @@ class PAR2Set (object):
 
                # Deletion Stage
                DELETE_INTERACTIVE = options.interactive
-               deleteable_files = find_deleteable_files (self.likely_files)
+               deleteable_files = find_deleteable_files (self.dir, par2head)
                ret = delete_list (self.dir, deleteable_files, DELETE_INTERACTIVE)
 
                if ret != SUCCESS: