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

Fixed touch tests

Browse Source
This commit is contained in:
Rhet Turnbull
2020-08-23 11:06:01 -07:00
parent 6e5ea8e013
commit 1bf7105737
2 changed files with 100 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osxphotos/photoinfo/_photoinfo_export.py
View File

@@ -867,7 +867,7 @@ def _export_photo(
exported_files.append(dest_str)
if touch_file:
sig = fileutil.file_sig(src)
sig = (sig[0], sig[1], self.date.timestamp())
sig = (sig[0], sig[1], int(self.date.timestamp()))
if not fileutil.cmp_file_sig(src, sig):
touched_files.append(dest_str)
else: # updating
@@ -886,7 +886,7 @@ def _export_photo(
cmp_touch = fileutil.cmp_file_sig(dest_str, sig_exif)
else:
cmp_orig = fileutil.cmp(src, dest)
cmp_touch = fileutil.cmp(src, dest, mtime1=self.date.timestamp())
cmp_touch = fileutil.cmp(src, dest, mtime1=int(self.date.timestamp()))
sig_cmp = cmp_touch if touch_file else cmp_orig