takino
/
ordigi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add dry-run action

This commit is contained in:
Cédric Leporcq 2021-06-12 21:34:39 +02:00
parent 04f2ac6738
commit 6b2d2b31c3
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
elodie.py
View File

@ -34,7 +34,7 @@ from elodie import constants
FILESYSTEM = FileSystem() FILESYSTEM = FileSystem()
def import_file(_file, destination, db, album_from_folder, trash, allow_duplicates): def import_file(_file, destination, db, album_from_folder, action, trash, allow_duplicates):
"""Set file metadata and move it to destination. """Set file metadata and move it to destination.
""" """
@ -57,7 +57,7 @@ def import_file(_file, destination, db, album_from_folder, trash, allow_duplicat
return return
dest_path = FILESYSTEM.process_file(_file, destination, db, dest_path = FILESYSTEM.process_file(_file, destination, db,
media, album_from_folder, allowDuplicate=allow_duplicates, move=False) media, album_from_folder, action, allowDuplicate=allow_duplicates)
if dest_path: if dest_path:
log.all('%s -> %s' % (_file, dest_path)) log.all('%s -> %s' % (_file, dest_path))
if trash: if trash:
@ -91,12 +91,20 @@ def _batch(debug):
help='Import the file even if it\'s already been imported.') help='Import the file even if it\'s already been imported.')
@click.option('--debug', default=False, is_flag=True, @click.option('--debug', default=False, is_flag=True,
help='Override the value in constants.py with True.') help='Override the value in constants.py with True.')
@click.option('--dry-run', default=False, is_flag=True,
help='Dry run only, no change made to the filesystem.')
@click.option('--exclude-regex', default=set(), multiple=True, @click.option('--exclude-regex', default=set(), multiple=True,
help='Regular expression for directories or files to exclude.') help='Regular expression for directories or files to exclude.')
@click.argument('paths', nargs=-1, type=click.Path()) @click.argument('paths', nargs=-1, type=click.Path())
def _import(destination, source, file, album_from_folder, trash, allow_duplicates, debug, exclude_regex, paths): def _import(destination, source, file, album_from_folder, trash,
allow_duplicates, debug, dry_run, exclude_regex, paths):
"""Import files or directories by reading their EXIF and organizing them accordingly. """Import files or directories by reading their EXIF and organizing them accordingly.
""" """
if dry_run:
action = 'dry_run'
else:
action = 'copy'
constants.debug = debug constants.debug = debug
has_errors = False has_errors = False
result = Result() result = Result()
@ -134,7 +142,7 @@ def _import(destination, source, file, album_from_folder, trash, allow_duplicate
for current_file in files: for current_file in files:
dest_path = import_file(current_file, destination, db, dest_path = import_file(current_file, destination, db,
album_from_folder, trash, allow_duplicates) album_from_folder, action, trash, allow_duplicates)
result.append((current_file, dest_path)) result.append((current_file, dest_path))
has_errors = has_errors is True or not dest_path has_errors = has_errors is True or not dest_path
else: else:
@ -336,7 +344,7 @@ def _update(album, location, time, title, paths, debug):
original_base_name.replace('-%s' % original_title, '')) original_base_name.replace('-%s' % original_title, ''))
dest_path = FILESYSTEM.process_file(current_file, destination, db, dest_path = FILESYSTEM.process_file(current_file, destination, db,
updated_media, False, move=True, allowDuplicate=True) updated_media, False, action='move', allowDuplicate=True)
log.info(u'%s -> %s' % (current_file, dest_path)) log.info(u'%s -> %s' % (current_file, dest_path))
log.all('{"source":"%s", "destination":"%s"}' % (current_file, log.all('{"source":"%s", "destination":"%s"}' % (current_file,
dest_path)) dest_path))

12
elodie/filesystem.py
View File

@ -615,14 +615,8 @@ class FileSystem(object):
)) ))
return checksum return checksum
def process_file(self, _file, destination, db, media, album_from_folder, **kwargs): def process_file(self, _file, destination, db, media, album_from_folder,
move = False action, **kwargs):
if('move' in kwargs):
if kwargs['move']:
action = 'move'
else:
action = 'copy'
allow_duplicate = False allow_duplicate = False
if('allowDuplicate' in kwargs): if('allowDuplicate' in kwargs):
allow_duplicate = kwargs['allowDuplicate'] allow_duplicate = kwargs['allowDuplicate']
@ -675,7 +669,7 @@ class FileSystem(object):
elif action == 'copy': elif action == 'copy':
shutil.copy2(_file, dest_path) shutil.copy2(_file, dest_path)
if action != 'dry-run': if action != 'dry_run':
# Set the utime based on what the original file contained # Set the utime based on what the original file contained
# before we made any changes. # before we made any changes.
# Then set the utime on the destination file based on metadata. # Then set the utime on the destination file based on metadata.