Ticket #617: haikuporter-7z-support-with-attribution.diff

trunk/haikuporter

@@ -6 +6 @@
 # copyright 2009 Alexander Deynichenko
 # copyright 2009 HaikuBot (aka RISC)
 # copyright 2010-2011 Jack Laxson (Jrabbit)
+# copyright 2012 Sam Toyer (qxcv)
 
 info = {}
 info['version'] = 'r' + '$Rev$'[6:-2]
@@ -27 +28 @@
 from subprocess import check_call, Popen, CalledProcessError
 from optparse import OptionParser
 
+try:
+    import py7zlib
+except ImportError:
+    py7zlib = None
+
 # -- HaikuPorts options -------------------------------------------------------
 
 # location of haikuports.conf
@@ -685 +691 @@
         # unpack source archive
         print 'Unpacking ' + self.src_local
         archiveFullPath = self.downloadDir + '/' + self.src_local
+        extension = archiveFullPath.split('/')[-1].split('.')[-1]
         if tarfile.is_tarfile(archiveFullPath):
             tf = tarfile.open(self.downloadDir + '/' + self.src_local,
                               'r')
@@ -695 +702 @@
                                   + self.src_local, 'r')
             zf.extractall(self.workDir)
             zf.close()
-        elif archiveFullPath.split('/')[-1].split('.')[-1] == 'xz':
+        elif extension == 'xz':
             xz = 0
             try:
                 xz = Popen(['xz', '-d', '-k', archiveFullPath])
@@ -711 +718 @@
                 tf = tarfile.open(tar, 'r')
                 tf.extractall(self.workDir)
                 tf.close()
+        elif extension == '7z':
+            fp = open(archiveFullPath)
+            if py7zlib is None:
+                if not self.prompt_installer('pylzma'):
+                    sys.exit()
+                archive = __import__('py7zlib').Archive7z(fp)
+            else:
+                archive = py7zlib.Archive7z(fp)
+            for item in archive.files:
+                out_filename = os.path.join(self.workDir, item.filename)
+                out_fp = open(out_filename, 'w')
+                out_fp.write(item.read())
+                out_fp.close()
+            fp.close()
         else:
             sys.exit('Error: Unrecognized archive type.')
 
@@ -957 +978 @@
             'hg': 'mercurial',
             'cvs': 'cvs',
             'bzr': 'bazaar',
+            'pylzma': 'pylzma',
             }
         if self.options.yes:
             check_call('installoptionalpackage' + ' '