voussoir/etiquette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use get_photos_from_args in export to reduce dupe code.

Browse source
This commit is contained in:
voussoir 2021-01-28 17:04:38 -08:00
parent 60ac8116aa
commit 1511852e94
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
frontends/etiquette_cli.py
View file

@ -235,29 +235,23 @@ def export_symlinks_argparse(args):
total_paths = set() total_paths = set()
albums = [] if args.album_id_args or args.album_search_args:
if args.album_id_args: albums = get_albums_from_args(args)
albums.extend(photodb.get_albums_by_id(args.album_id_args)) export = export_symlinks_albums(
if args.album_search_args: albums,
albums.extend(search_by_argparse(args.album_search_args, yield_albums=True)) destination,
export = export_symlinks_albums( dry_run=args.dry_run,
albums, )
destination, total_paths.update(export)
dry_run=args.dry_run,
)
total_paths.update(export)
photos = [] if args.photo_id_args or args.photo_search_args:
if args.photo_id_args: photos = get_photos_from_args(args)
photos.extend(photodb.get_photos_by_id(args.photo_id_args)) export = export_symlinks_photos(
if args.photo_search_args: photos,
photos.extend(search_by_argparse(args.photo_search_args, yield_photos=True)) destination,
export = export_symlinks_photos( dry_run=args.dry_run,
photos, )
destination, total_paths.update(export)
dry_run=args.dry_run,
)
total_paths.update(export)
if args.prune and not args.dry_run: if args.prune and not args.dry_run:
symlinks = set(file for file in spinal.walk_generator(destination) if file.is_link) symlinks = set(file for file in spinal.walk_generator(destination) if file.is_link)