Removed archive from utils

fs_uae_wrapper/utils.py

@@ -11,18 +11,7 @@ except ImportError:
     import ConfigParser as configparser
 
 from fs_uae_wrapper import message
-
+from fs_uae_wrapper import file_archive
-
-ARCHIVERS = {'.tar': ['tar', 'xf'],
-             '.tgz':  ['tar', 'xf'],
-             '.tar.gz':  ['tar', 'xf'],
-             '.tar.bz2':  ['tar', 'xf'],
-             '.tar.xz':  ['tar', 'xf'],
-             '.rar':  ['unrar', 'x'],
-             '.7z':  ['7z', 'x'],
-             '.zip':  ['7z', 'x'],
-             '.lha':  ['lha', 'x'],
-             '.lzx':  ['unlzx']}
 
 
 class CmdOption(dict):
@@ -73,16 +62,11 @@ def extract_archive(arch_name, title=''):
     Extract provided archive to current directory
     """
 
-    if not os.path.exists(arch_name):
+    archiver = file_archive.get_archiver(arch_name)
-        sys.stderr.write("Archive `%s' doesn't exists.\n" % arch_name)
-        return False
 
-    _, ext = os.path.splitext(arch_name)
+    if archiver is None:
-
+        sys.stderr.write("Unable find archive type for `%s' or executable "
-    cmd = ARCHIVERS.get(ext)
+                         "doesn't exists.\n" % arch_name)
-
-    if cmd is None:
-        sys.stderr.write("Unable find archive type for `%s'.\n" % arch_name)
         return False
 
     msg = message.Message("Extracting files for `%s'. Please be "
@@ -90,18 +74,13 @@ def extract_archive(arch_name, title=''):
     if title:
         msg.show()
 
-    try:
+    res = archiver.extract(arch_name)
-        subprocess.check_call(cmd + [arch_name])
-    except OSError:
-        sys.stderr.write("Error executing `%s'.\n" % cmd)
-        msg.close()
-        return False
-    except subprocess.CalledProcessError:
-        sys.stderr.write("Error during extracting archive `%s'.\n" % arch_name)
     msg.close()
+
+    if not res:
+        sys.stderr.write("Error extracting `%s'.\n" % arch_name)
         return False
 
-    msg.close()
     return True
 
 

tests/test_utils.py

@@ -91,8 +91,8 @@ class TestUtils(TestCase):
             fobj.write("\n")
         self.assertFalse(utils.extract_archive('supported-archive.7z'))
 
-    @mock.patch('subprocess.check_call')
+    @mock.patch('fs_uae_wrapper.file_archive.Archive.extract')
-    def test_extract_archive_positive(self, sp_check_call):
+    def test_extract_archive_positive(self, arch_extract):
 
         os.chdir(self.dirname)
         # archive is known, and extraction should succeed
@@ -100,8 +100,7 @@ class TestUtils(TestCase):
         with open(arch_name, 'w') as fobj:
             fobj.write("\n")
         self.assertTrue(utils.extract_archive(arch_name))
-        sp_check_call.assert_called_once_with(utils.ARCHIVERS['.7z'] +
+        arch_extract.assert_called_once_with(arch_name)
-                                              [arch_name])
 
     def test_merge_all_options(self):