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

Fix error during cleanup, #987 (#993)

Browse Source
This commit is contained in:
Rhet Turnbull
2023-02-19 22:51:52 -08:00
committed by GitHub
parent 06b02b4a23
commit a46f8bd244
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osxphotos/cli/export.py
View File

@@ -2489,8 +2489,12 @@ def cleanup_files(dest_path, files_to_keep, dirs_to_keep, fileutil, verbose):
for p in pathlib.Path(dest_path).rglob("*"): for p in pathlib.Path(dest_path).rglob("*"):
if p.is_file() and normalize_fs_path(str(p).lower()) not in keepers: if p.is_file() and normalize_fs_path(str(p).lower()) not in keepers:
verbose(f"Deleting [filepath]{p}") verbose(f"Deleting [filepath]{p}")
try:
fileutil.unlink(p) fileutil.unlink(p)
deleted_files.append(str(p)) deleted_files.append(str(p))
except OSError as e:
# ignore errors deleting files, #987
verbose(f"Error deleting file {p}: {e}")
# delete empty directories # delete empty directories
deleted_dirs = [] deleted_dirs = []
@@ -2501,8 +2505,12 @@ def cleanup_files(dest_path, files_to_keep, dirs_to_keep, fileutil, verbose):
if not list(pathlib.Path(dirpath).glob("*")): if not list(pathlib.Path(dirpath).glob("*")):
# directory and directory is empty # directory and directory is empty
verbose(f"Deleting empty directory {dirpath}") verbose(f"Deleting empty directory {dirpath}")
try:
fileutil.rmdir(dirpath) fileutil.rmdir(dirpath)
deleted_dirs.append(str(dirpath)) deleted_dirs.append(str(dirpath))
except OSError as e:
# ignore errors deleting directories, #987
verbose(f"Error deleting directory {dirpath}: {e}")
return (deleted_files, deleted_dirs) return (deleted_files, deleted_dirs)