forked/osxphotos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed cleanup for #629

Browse Source
This commit is contained in:
Rhet Turnbull
2022-02-11 06:18:17 -08:00
parent cb11967eac
commit 49a7b80680
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osxphotos/cli.py
View File

@@ -2087,6 +2087,8 @@ def export(
# cleanup files and do report if needed # cleanup files and do report if needed
if cleanup: if cleanup:
db_file = str(pathlib.Path(export_db_path).resolve())
db_files = [db_file, db_file + "-wal", db_file + "-shm"]
all_files = ( all_files = (
results.exported results.exported
+ results.skipped + results.skipped
@@ -2105,7 +2107,7 @@ def export(
+ results.missing + results.missing
# include files that have error in case they exist from previous export # include files that have error in case they exist from previous export
+ [r[0] for r in results.error] + [r[0] for r in results.error]
+ [str(pathlib.Path(export_db_path).resolve())] + db_files
) )
click.echo(f"Cleaning up {dest}") click.echo(f"Cleaning up {dest}")
cleaned_files, cleaned_dirs = cleanup_files(dest, all_files, fileutil) cleaned_files, cleaned_dirs = cleanup_files(dest, all_files, fileutil)