From: Ira W. Snyder <devel@irasnyder.com>
Date: Mon, 1 Jan 2007 08:56:06 +0000 (-0800)
Subject: [PAR2SET_JOIN] Fix detection code
X-Git-Tag: v2.0.0~15
X-Git-Url: https://www.irasnyder.com/gitweb/?a=commitdiff_plain;h=da7b8d45c3d4971219c4ce2f38e3ce64229f5eb8;p=rarslave2.git

[PAR2SET_JOIN] Fix detection code

This makes the detection code more exact. This will now properly fail when
a set with the following files comes along:

Name matches:
X.par2
X.vol0+1.par2
X.001
X.002
...

Protection matches:
X.001
X.002
...

This new type will have to be handled in a seperate PAR2Set-derived class.

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

diff --git a/PAR2Set_JOIN.py b/PAR2Set_JOIN.py
index 59b2c9b..3381e72 100644
--- a/PAR2Set_JOIN.py
+++ b/PAR2Set_JOIN.py
@@ -20,7 +20,8 @@ from RarslaveCommon import *
 #
 
 def detect_JOIN (name_files, prot_files):
-	return has_a_match ('^.*\.\d\d\d$', name_files)
+	return has_a_match ('^.*\.\d\d\d$', name_files) \
+			and not has_a_match ('^.*\.\d\d\d$', prot_files)
 
 
 class PAR2Set_JOIN (PAR2Set.PAR2Set):