Skip to content

Commit 0c4187c

Browse files
author
Kazuki Suzuki Przyborowski
committed
Update pycatfile.py
1 parent cd46b90 commit 0c4187c

1 file changed

Lines changed: 9 additions & 36 deletions

File tree

pycatfile.py

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,7 @@ def decode_unicode_escape(value):
520520
mimetypes.add_type(archivefile_zlib_mimetype, __file_format_extension__+".zlib", strict=True)
521521
archivefile_zz_mimetype = archivefile_zlib_mimetype
522522
archivefile_zl_mimetype = archivefile_zlib_mimetype
523-
archivefile_extensions = [__file_format_extension__, __file_format_extension__+".gz", __file_format_extension__+".bz2", __file_format_extension__+".zst", __file_format_extension__+".lz4", __file_format_extension__ +
524-
".lzo", __file_format_extension__+".lzop", __file_format_extension__+".lzma", __file_format_extension__+".xz", __file_format_extension__+".zz", __file_format_extension__+".zl", __file_format_extension__+".zlib"]
523+
archivefile_extensions = [__file_format_extension__, __file_format_extension__+".gz", __file_format_extension__+".bz2", __file_format_extension__+".zst", __file_format_extension__+".lz4", __file_format_extension__ + ".lzo", __file_format_extension__+".lzop", __file_format_extension__+".lzma", __file_format_extension__+".xz", __file_format_extension__+".zz", __file_format_extension__+".zl", __file_format_extension__+".zlib"]
525524

526525
if __name__ == "__main__":
527526
import subprocess
@@ -1643,51 +1642,25 @@ def TarFileCheck(infile):
16431642
if is_tarfile(infile):
16441643
return True
16451644
else:
1646-
return False
1645+
pass
16471646
except TypeError:
16481647
try:
16491648
# Check if the input is a file object
16501649
if hasattr(infile, "read"):
16511650
# Save the current file position
16521651
current_position = infile.tell()
16531652
# Attempt to open the file object as a tar file
1654-
tar = tarfile.open(fileobj=infile)
1655-
tar.close()
1653+
with tarfile.open(fileobj=infile) as tar:
1654+
pass
16561655
# Restore the file position
16571656
infile.seek(current_position)
1658-
return True
16591657
else:
1660-
# Assume it's a filename
1661-
tar = tarfile.open(name=infile)
1662-
tar.close()
1663-
return True
1664-
except tarfile.TarError:
1665-
return False
1666-
1667-
1668-
def TarFileCheckAlt(infile):
1669-
try:
1670-
if is_tarfile(infile):
1658+
# Assume it's a filename and attempt to open it as a tar file
1659+
with tarfile.open(name=infile) as tar:
1660+
pass
16711661
return True
1672-
except TypeError:
1673-
pass
1674-
try:
1675-
# Check if the input is a file-like object
1676-
if hasattr(infile, "read"):
1677-
# Save the current file position
1678-
current_position = infile.tell()
1679-
# Attempt to open the file object as a tar file
1680-
with tarfile.open(fileobj=infile) as tar:
1681-
pass
1682-
# Restore the file position
1683-
infile.seek(current_position)
1684-
else:
1685-
# Assume it's a filename and attempt to open it as a tar file
1686-
with tarfile.open(name=infile) as tar:
1687-
pass
1688-
return True
1689-
except (tarfile.TarError, AttributeError, IOError):
1690-
return False
1662+
except (tarfile.TarError, AttributeError, IOError):
1663+
return False
16911664

16921665

16931666
def ZipFileCheck(infile):

0 commit comments

Comments
 (0)