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

Fix FileExistsError when filename differs only in case and export-as-hardlink

Browse Source 
When exporting with --export-as-hardlink (and without --overwrite), an
exception is thrown in os.link (FileExistsError: [Errno 17] File exists)

This can happen if filenames differ only in case (on a case-insensitive
filesystem), so the similar filename is not incremented.

This fix uses `findfiles` (to glob in a case-insensitive way) instead of `glob`.
This commit is contained in:
Pablo 'merKur' Kohan
2020-07-22 19:26:32 +03:00
parent 927e25911e
commit d52b387a29
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osxphotos/photoinfo/_photoinfo_export.py
View File

@@ -34,7 +34,7 @@ from .._constants import (
from .._export_db import ExportDBNoOp from .._export_db import ExportDBNoOp
from ..exiftool import ExifTool from ..exiftool import ExifTool
from ..fileutil import FileUtil from ..fileutil import FileUtil
from ..utils import dd_to_dms_str from ..utils import dd_to_dms_str, findfiles
ExportResults = namedtuple( ExportResults = namedtuple(
"ExportResults", ["exported", "new", "updated", "skipped", "exif_updated"] "ExportResults", ["exported", "new", "updated", "skipped", "exif_updated"]
@@ -428,11 +428,10 @@ def export2(
# dest will be file1 (1).jpeg even though file1.jpeg doesn't exist to prevent sidecar collision # dest will be file1 (1).jpeg even though file1.jpeg doesn't exist to prevent sidecar collision
if not update and increment and not overwrite: if not update and increment and not overwrite:
count = 1 count = 1
glob_str = str(dest.parent / f"{dest.stem}*") dest_files = findfiles(f"{dest.stem}*", str(dest.parent))
dest_files = glob.glob(glob_str) dest_files = [pathlib.Path(f).stem.lower() for f in dest_files]
dest_files = [pathlib.Path(f).stem for f in dest_files]
dest_new = dest.stem dest_new = dest.stem
while dest_new in dest_files: while dest_new.lower() in dest_files:
dest_new = f"{dest.stem} ({count})" dest_new = f"{dest.stem} ({count})"
count += 1 count += 1
dest = dest.parent / f"{dest_new}{dest.suffix}" dest = dest.parent / f"{dest_new}{dest.suffix}"