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

--touch-file now working with --update

Browse Source
This commit is contained in:
Rhet Turnbull
2020-08-22 08:12:26 -07:00
parent c9c9202205
commit 6c11e3fa5b
3 changed files with 179 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osxphotos/__main__.py
View File

@@ -1623,7 +1623,7 @@ def export(
# print summary results
if update:
photo_str_new = "photos" if len(results_new) != 1 else "photo"
photo_str_updated = "photos" if len(results_new) != 1 else "photo"
photo_str_updated = "photos" if len(results_updated) != 1 else "photo"
photo_str_skipped = "photos" if len(results_skipped) != 1 else "photo"
photo_str_touched = "photos" if len(results_touched) != 1 else "photo"
photo_str_exif_updated = (
@@ -2217,6 +2217,8 @@ def export_photo(
verbose(f"Exported updated file {updated}")
for skipped in export_results.skipped:
verbose(f"Skipped up to date file {skipped}")
for touched in export_results.touched:
verbose(f"Touched date on file {touched}")
# if export-edited, also export the edited version
# verify the photo has adjustments and valid path to avoid raising an exception

23
osxphotos/photoinfo/_photoinfo_export.py
View File

@@ -850,7 +850,10 @@ def _export_photo(
logging.debug(f"Exporting file with {op_desc} {src} {dest}")
exported_files.append(dest_str)
if touch_file:
touched_files.append(dest_str)
sig = fileutil.file_sig(src)
sig = (sig[0], sig[1], self.date.timestamp())
if not fileutil.cmp_file_sig(src, sig):
touched_files.append(dest_str)
else: # updating
if not dest_exists:
# update, destination doesn't exist (new file)
@@ -860,10 +863,9 @@ def _export_photo(
touched_files.append(dest_str)
else:
# update, destination exists, but we might not need to replace it...
if touch_file:
sig_cmp = fileutil.cmp(src, dest, mtime1=self.date.timestamp())
else:
sig_cmp = fileutil.cmp(src, dest)
cmp_orig = fileutil.cmp(src, dest)
cmp_touch = fileutil.cmp(src, dest, mtime1=self.date.timestamp())
sig_cmp = cmp_touch if touch_file else cmp_orig
if (export_as_hardlink and dest.samefile(src)) or (
not export_as_hardlink
and not dest.samefile(src)
@@ -877,18 +879,19 @@ def _export_photo(
or (not exiftool and sig_cmp)
)
):
# destination exists but its signature is "identical"
# call set_stat because code can reach this spot if no export DB but exporting a RAW or live photo
# potentially re-writes the data in the database but ensures database is complete
export_db.set_stat_orig_for_file(dest_str, fileutil.file_sig(dest_str))
update_skipped_files.append(dest_str)
else:
# destination exists but signature is different
if touch_file and fileutil.cmp(src, dest) and not sig_cmp:
if touch_file and cmp_orig and not cmp_touch:
# destination exists, signature matches original but does not match expected touch time
# skip exporting but update touch time
update_skipped_files.append(dest_str)
touched_files.append(dest_str)
elif not touch_file and cmp_touch and not cmp_orig:
# destination exists, signature matches expected touch but not original
# user likely exported with touch_file and is now exporting without touch_file
# don't update the file because it's same but leave touch time
update_skipped_files.append(dest_str)
else:
# destination exists but is different
update_updated_files.append(dest_str)