simplify code

ciromattia · Aug 5, 2024 · 3e90dd6 · 3e90dd6
1 parent 9e09898
commit 3e90dd6
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/kindlecomicconverter/comicarchive.py b/kindlecomicconverter/comicarchive.py
@@ -52,9 +52,7 @@ def type(self):
                 for line in process.stdout.splitlines():
                     if b'Type =' in line:
                         return line.rstrip().decode().split(' = ')[1].upper()
-            except FileNotFoundError:
-                pass
-            except CalledProcessError:
+            except (FileNotFoundError, CalledProcessError):
                 pass
 
         raise OSError(EXTRACTION_ERROR)
@@ -67,7 +65,6 @@ def extract(self, targetdir):
             ['tar', '-xf', self.filepath, '-C', targetdir],
             ['7z', 'x', '-y', '-xr!__MACOSX', '-xr!.DS_Store', '-xr!thumbs.db', '-xr!Thumbs.db', '-o' + targetdir, self.filepath],
         ]
-        missing = []
 
         if distro.id() == 'fedora':
             extraction_commands.append(
@@ -78,15 +75,10 @@ def extract(self, targetdir):
             try:
                 subprocess_run(cmd, capture_output=True, check=True)
                 return targetdir
-            except FileNotFoundError:
-                missing.append(cmd[0])
-            except CalledProcessError:
+            except (FileNotFoundError, CalledProcessError):
                 pass
-
-        if missing:
-            raise OSError(f'Extraction failed, try downloading {missing}')
-        else:
-            raise OSError(EXTRACTION_ERROR)
+
+        raise OSError(EXTRACTION_ERROR)
 
     def addFile(self, sourcefile):
         if self.type in ['RAR', 'RAR5']: