cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Some refactoring:

Browse source 
* rename archive -> arcfile (where it's a file descriptor)
* additional return
* simplify logic around 'archive?' flag
* maintain os separator after arcroot
* use function instead of lambda for filter, ensure file exists before file.cmp'ing it
* track errored files and fail if there are any
This commit is contained in:
Ben Doherty 2016-05-31 18:31:07 -04:00 • committed by Matt Clay
parent d4b51adf72
commit 102ee6a3b4
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/ansible/modules/extras/files/archive.py
View file

@ -148,11 +148,11 @@ def main():
expanded_paths.append(path) expanded_paths.append(path)
if len(expanded_paths) == 0: if len(expanded_paths) == 0:
module.fail_json(path=', '.join(paths), expanded_paths=', '.join(expanded_paths), msg='Error, no source paths were found') return module.fail_json(path=', '.join(paths), expanded_paths=', '.join(expanded_paths), msg='Error, no source paths were found')
# If we actually matched multiple files or TRIED to, then # If we actually matched multiple files or TRIED to, then
# treat this as a multi-file archive # treat this as a multi-file archive
archive = globby or len(expanded_paths) > 1 or any(os.path.isdir(path) for path in expanded_paths) archive = globby or os.path.isdir(expanded_paths[0]) or len(expanded_paths) > 1
# Default created file name (for single-file archives) to # Default created file name (for single-file archives) to
# <file>.<compression> # <file>.<compression>
@ -181,6 +181,8 @@ def main():
if i < len(arcroot): if i < len(arcroot):
arcroot = os.path.dirname(arcroot[0:i+1]) arcroot = os.path.dirname(arcroot[0:i+1])
arcroot += os.sep
# Don't allow archives to be created anywhere within paths to be removed # Don't allow archives to be created anywhere within paths to be removed
if remove and os.path.isdir(path) and creates.startswith(path): if remove and os.path.isdir(path) and creates.startswith(path):
module.fail_json(path=', '.join(paths), msg='Error, created archive can not be contained in source paths when remove=True') module.fail_json(path=', '.join(paths), msg='Error, created archive can not be contained in source paths when remove=True')
@ -219,7 +221,9 @@ def main():
try: try:
# Easier compression using tarfile module # Easier compression using tarfile module
if compression == 'gz' or compression == 'bz2': if compression == 'gz' or compression == 'bz2':
archive = tarfile.open(creates, 'w|' + compression) arcfile = tarfile.open(creates, 'w|' + compression)
arcfile.add(arcroot, os.path.basename(arcroot), recursive=False)
for path in archive_paths: for path in archive_paths:
basename = '' basename = ''
@ -228,12 +232,23 @@ def main():
if os.path.isdir(path) and not path.endswith(os.sep + '.'): if os.path.isdir(path) and not path.endswith(os.sep + '.'):
basename = os.path.basename(path) + os.sep basename = os.path.basename(path) + os.sep
archive.add(path, path[len(arcroot):], filter=lambda f: not filecmp.cmp(f.name, creates) and f) try:
successes.append(path) def exclude_creates(f):
if os.path.exists(f.name) and not filecmp.cmp(f.name, creates):
return f
return None
arcfile.add(path, basename + path[len(arcroot):], filter=exclude_creates)
successes.append(path)
except:
e = get_exception()
errors.append('error adding %s: %s' % (path, str(e)))
# Slightly more difficult (and less efficient!) compression using zipfile module # Slightly more difficult (and less efficient!) compression using zipfile module
elif compression == 'zip': elif compression == 'zip':
archive = zipfile.ZipFile(creates, 'w', zipfile.ZIP_DEFLATED) arcfile = zipfile.ZipFile(creates, 'w', zipfile.ZIP_DEFLATED)
for path in archive_paths: for path in archive_paths:
basename = '' basename = ''
@ -244,23 +259,26 @@ def main():
for dirpath, dirnames, filenames in os.walk(path, topdown=True): for dirpath, dirnames, filenames in os.walk(path, topdown=True):
for dirname in dirnames: for dirname in dirnames:
archive.write(dirpath + os.sep + dirname, basename + dirname) arcfile.write(dirpath + os.sep + dirname, basename + dirname)
for filename in filenames: for filename in filenames:
fullpath = dirpath + os.sep + filename fullpath = dirpath + os.sep + filename
if not filecmp.cmp(fullpath, creates): if not filecmp.cmp(fullpath, creates):
archive.write(fullpath, basename + filename) arcfile.write(fullpath, basename + filename)
successes.append(path) successes.append(path)
except OSError: except OSError:
e = get_exception() e = get_exception()
module.fail_json(msg='Error when writing zip archive at %s: %s' % (creates, str(e))) module.fail_json(msg='Error when writing %s archive at %s: %s' % (compression == 'zip' and 'zip' or ('tar.' + compression), creates, str(e)))
if archive: if arcfile:
archive.close() arcfile.close()
state = 'archive' state = 'archive'
if len(errors) > 0:
module.fail_json(msg='Errors when writing archive at %s: %s' % (creates, '; '.join(errors)))
if state in ['archive', 'incomplete'] and remove: if state in ['archive', 'incomplete'] and remove:
for path in successes: for path in successes:
try: try: