[JOIN] Fix removal of protected files

[rarslave2.git] / PAR2Set / Join.py

diff --git a/PAR2Set/Join.py b/PAR2Set/Join.py
index b764c49..34c4996 100644 (file)
--- a/PAR2Set/Join.py
+++ b/PAR2Set/Join.py
@@ -42,6 +42,7 @@ __license__   = "GNU GPL v2 (or, at your option, any later version)"
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

+import re

 import os
 import logging
 import PAR2Set.Base
 import os
 import logging
 import PAR2Set.Base


@@ -97,6 +98,16 @@ class Join (PAR2Set.Base.Base):
 
                return rsutil.common.SUCCESS
 
 
                return rsutil.common.SUCCESS
 

+       def find_deleteable_files (self):
+               """Find all files which are deletable by using the regular expression from the
+                  configuration file"""
+
+               DELETE_REGEX = rsutil.common.config_get_value ('regular expressions', 'delete_regex')
+               dregex = re.compile (DELETE_REGEX, re.IGNORECASE)
+
+               return [f for f in self.all_files if dregex.match (f) and \
+                               f not in self.prot_matched_files]
+

        def find_extraction_heads (self):
                """Find the extraction heads. Since this should not be an extractable set,
                   we return the files which are protected directly by the PAR2 files."""
        def find_extraction_heads (self):
                """Find the extraction heads. Since this should not be an extractable set,
                   we return the files which are protected directly by the PAR2 files."""