gryf/mc_uadf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up imports

Browse Source
This commit is contained in:
gryf
2023-10-17 23:01:42 +02:00
parent 7105a98785
commit 09b2349152
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
uadf
View File

@@ -31,13 +31,13 @@ Version: 1.3
Licence: BSD Licence: BSD
""" """
import sys
import re
import os
import gzip import gzip
from subprocess import check_output, check_call, CalledProcessError import os
from tempfile import mkstemp, mkdtemp import re
import shutil import shutil
import subprocess
import sys
import tempfile
from extfslib import Archive, parse_args from extfslib import Archive, parse_args
@@ -88,7 +88,7 @@ class UAdf(Archive):
def _ungzip(self): def _ungzip(self):
"""Create temporary file for ungzipped adf file since unadf does not """Create temporary file for ungzipped adf file since unadf does not
accept gzipped content in any way including reading from stdin.""" accept gzipped content in any way including reading from stdin."""
fdesc, tmp_fname = mkstemp(suffix=".adf") fdesc, tmp_fname = tempfile.mkstemp(suffix=".adf")
os.close(fdesc) os.close(fdesc)
with gzip.open(self._arch) as gobj: with gzip.open(self._arch) as gobj:
@@ -99,14 +99,15 @@ class UAdf(Archive):
def _undms(self): def _undms(self):
"""Create temporary adf file extracted from dms.""" """Create temporary adf file extracted from dms."""
fdesc, tmp_fname = mkstemp(suffix=".adf") fdesc, tmp_fname = tempfile.mkstemp(suffix=".adf")
os.close(fdesc) os.close(fdesc)
try: try:
check_call([self.DMS, b'-q', b'u', self._arch, "+" + tmp_fname]) subprocess.check_call([self.DMS, b'-q', b'u', self._arch,
"+" + tmp_fname])
self._arch = tmp_fname self._arch = tmp_fname
self._clean = False self._clean = False
except (CalledProcessError, OSError): except (subprocess.CalledProcessError, OSError):
pass pass
def _get_dir(self): def _get_dir(self):
@@ -114,9 +115,10 @@ class UAdf(Archive):
contents = [] contents = []
with open(os.devnull, "w") as fnull: with open(os.devnull, "w") as fnull:
try: try:
out = check_output([self.ARCHIVER, self.CMDS['list'], out = subprocess.check_output([self.ARCHIVER,
self.CMDS['list'],
self._arch], stderr=fnull) self._arch], stderr=fnull)
except CalledProcessError: except subprocess.CalledProcessError:
return contents return contents
for line in out.split(b"\n"): for line in out.split(b"\n"):
@@ -168,7 +170,7 @@ class UAdf(Archive):
" extract desired files.\n") " extract desired files.\n")
return 1 return 1
extract_dir = mkdtemp() extract_dir = tempfile.mkdtemp()
cmd = [self.ARCHIVER, self._arch, real_src, b"-d", extract_dir] cmd = [self.ARCHIVER, self._arch, real_src, b"-d", extract_dir]
if check_call(cmd, stdout=open(os.devnull, 'wb'), if check_call(cmd, stdout=open(os.devnull, 'wb'),
stderr=open(os.devnull, 'wb')) != 0: stderr=open(os.devnull, 'wb')) != 0: