Add support for Join sets where the parity protects the split files

[rarslave2.git] / PAR2Set / NewRAR.py

diff --git a/PAR2Set/NewRAR.py b/PAR2Set/NewRAR.py
index 763c025..fc55d1c 100644 (file)
--- a/PAR2Set/NewRAR.py
+++ b/PAR2Set/NewRAR.py
@@ -1,54 +1,62 @@
 #!/usr/bin/env python
 # vim: set ts=4 sts=4 sw=4 textwidth=92:
 
-import PAR2Set
-from RarslaveCommon import *
+"""Holds the NewRAR class.
 
+This is a new-style rar type.
+
+It will detect sets like the following:
+X.par2
+X.vol0+1.par2
+...
+
+Y.part01.rar
+Y.part02.rar
+...
+
+Where the PAR2 files protect the rar files directly. Y can (but is not required
+to be) the same as X.
+"""
+
+__author__    = "Ira W. Snyder (devel@irasnyder.com)"
+__copyright__ = "Copyright (c) 2006,2007 Ira W. Snyder (devel@irasnyder.com)"
+__license__   = "GNU GPL v2 (or, at your option, any later version)"
+
+#    NewRAR.py -- detect and work with a new-style rar set
 #
-# This is an new-style rar type
-#
-# It will detect sets like the following:
-# X.par2
-# X.vol0+1.par2
-# X.vol1+2.par2
-# X.part01.rar
-# X.part02.rar
-# X.part03.rar
-#
-# OR
+#    Copyright (C) 2006,2007  Ira W. Snyder (devel@irasnyder.com)
 #
-# ABC.part01.rar
-# ABC.part02.rar
-# ABC.part03.rar
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
-# Where the PAR2 files protect all files that do not match in basename
-# with the PAR2 file itself.
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
 #
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-def detect_NEWRAR (name_files, prot_files):
-       return has_a_match ('^.*\.part0*1\.rar$', prot_files)
-
-
-class PAR2Set_NEWRAR (PAR2Set.PAR2Set):
+from PAR2Set import Base, utils
 
-       def __repr__ (self):
-               return 'NEWRAR'
+class NewRAR(Base):
 
-       def find_extraction_heads (self):
-               return find_matches ('^.*\.part0*1\.rar$', self.all_files)
+    ############################################################################
 
-       def extraction_function (self, file, todir):
-               assert os.path.isfile (file)
-               assert os.path.isdir (todir)
+    def detect(self):
+        if not utils.hasAMatch('^.*\.part0*1\.rar$', self.protectedFiles):
+            raise TypeError
 
-               RAR_CMD = config_get_value ('commands', 'unrar')
+    ############################################################################
 
-               cmd = '%s \"%s\"' % (RAR_CMD, file)
-               ret = run_command (cmd, todir)
+    def extract(self):
+        files = utils.findMatches('^.*\.part0*1\.rar$', self.protectedFiles)
 
-               # Check error code
-               if ret != 0:
-                       return -EEXTRACT
+        for f in files:
+            utils.runCommand(['unrar', 'x', '-o+', f], self.directory)
 
-               return SUCCESS
+    ############################################################################