HA
/
patool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more archive argument checks and refactor.

This commit is contained in:
Bastian Kleineidam 2012-05-11 21:04:22 +02:00
parent 26727ee20a
commit 3bd8441fa5
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patoolib/__init__.py
View File

@ -396,14 +396,26 @@ def cleanup_outdir (outdir):
return outdir, "`%s' (%s)" % (outdir, msg) return outdir, "`%s' (%s)" % (outdir, msg)
def _handle_archive (archive, command, *args, **kwargs): def check_archive_arguments (archive, command, *args):
"""Handle archive command; raising PatoolError on errors.""" """Check for invalid archive command arguments."""
# check arguments
if command == 'create': if command == 'create':
util.check_archive_filelist(args) util.check_archive_filelist(args)
util.check_new_filename(archive) util.check_new_filename(archive)
elif command == 'repack':
util.check_existing_filename(archive)
if not args:
raise PatoolError("missing target archive filename for repack")
util.check_new_filename(args[0])
if util.is_same_filename(archive, args[0]):
msg = "cannot repack identical archives `%s' and `%s'"
raise util.PatoolError(msg % (archive1, archive2))
else: else:
util.check_existing_filename(archive) util.check_existing_filename(archive)
def _handle_archive (archive, command, *args, **kwargs):
"""Handle archive command; raising PatoolError on errors."""
check_archive_arguments(archive, command, *args)
format, encoding = kwargs.get("format"), kwargs.get("encoding") format, encoding = kwargs.get("format"), kwargs.get("encoding")
if format is None: if format is None:
format, encoding = get_archive_format(archive) format, encoding = get_archive_format(archive)
@ -496,9 +508,6 @@ def _diff_archives (archive1, archive2, **kwargs):
def _repack_archive (archive1, archive2, **kwargs): def _repack_archive (archive1, archive2, **kwargs):
"""Repackage an archive to a different format.""" """Repackage an archive to a different format."""
if util.is_same_file(archive1, archive2):
msg = "cannot repack identical archives `%s' and `%s'"
raise util.PatoolError(msg % (archive1, archive2))
tmpdir = util.tmpdir() tmpdir = util.tmpdir()
try: try:
_handle_archive(archive1, 'extract', outdir=tmpdir, **kwargs) _handle_archive(archive1, 'extract', outdir=tmpdir, **kwargs)