X-Git-Url: https://www.irasnyder.com/gitweb/?p=rarslave2.git;a=blobdiff_plain;f=rarslave.py;h=6ffe57ffd8926bcb651c0c06422fa250fd7193b3;hp=27db58374f93f5b35d78ee89c429fa010b58a7f1;hb=ff34f5ee9df8449f200b68b9e62d302e87651cd3;hpb=7a4c46ed562d59d2f04c37d1184bdcd36d737f1d

diff --git a/rarslave.py b/rarslave.py
index 27db583..6ffe57f 100644
--- a/rarslave.py
+++ b/rarslave.py
@@ -335,13 +335,14 @@ 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)]
+	dfiles = [f for f in likely if dregex.match (f)]
+	dset = set(dfiles) # to eliminate dupes
+	return list(dset)
 
 def printlist (li):
 	for f in li:
@@ -402,7 +403,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: