From: Ira W. Snyder <devel@irasnyder.com>
Date: Thu, 28 Dec 2006 07:19:23 +0000 (-0800)
Subject: [RARSLAVE] Have find_deleteable_files() search when called
X-Git-Tag: v2.0.0~25
X-Git-Url: https://www.irasnyder.com/gitweb/?a=commitdiff_plain;h=f5a404ef1e7f10d59e575b387bf3dfc0a4b46699;p=rarslave2.git

[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
--- 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: