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

More work on issue #265

Browse Source
This commit is contained in:
Rhet Turnbull
2020-11-26 10:15:09 -08:00
parent 382fca3f92
commit d5a9f76719
3 changed files with 115 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
osxphotos/export_db.py
View File

@@ -14,7 +14,7 @@ from sqlite3 import Error
from ._version import __version__
OSXPHOTOS_EXPORTDB_VERSION = "3.0"
OSXPHOTOS_EXPORTDB_VERSION = "3.1"
class ExportDB_ABC(ABC):
@@ -77,7 +77,7 @@ class ExportDB_ABC(ABC):
pass
@abstractmethod
def set_exiftool_json_sidecar_for_file(self, filename, stats):
def set_exiftool_json_sidecar_for_file(self, filename, sidecar_data, sidecar_sig):
pass
@abstractmethod
@@ -85,7 +85,7 @@ class ExportDB_ABC(ABC):
pass
@abstractmethod
def set_xmp_sidecar_for_file(self, filename, stats):
def set_xmp_sidecar_for_file(self, filename, sidecar_data, sidecar_sig):
pass
@abstractmethod
@@ -103,8 +103,6 @@ class ExportDB_ABC(ABC):
edited_stat,
info_json,
exif_json,
exiftool_json_sidecar,
xmp_sidecar,
):
pass
@@ -159,17 +157,17 @@ class ExportDBNoOp(ExportDB_ABC):
def set_exifdata_for_file(self, uuid, exifdata):
pass
def set_exiftool_json_sidecar_for_file(self, filename, stats):
def set_exiftool_json_sidecar_for_file(self, filename, sidecar_data, sidecar_sig):
pass
def get_exiftool_json_sidecar_for_file(self, filename):
pass
return None, (None, None, None)
def set_xmp_sidecar_for_file(self, filename, stats):
def set_xmp_sidecar_for_file(self, filename, sidecar_data, sidecar_sig):
pass
def get_xmp_sidecar_for_file(self, filename):
pass
return None, (None, None, None)
def set_data(
self,
@@ -181,8 +179,6 @@ class ExportDBNoOp(ExportDB_ABC):
edited_stat,
info_json,
exif_json,
exiftool_json_sidecar,
xmp_sidecar,
):
pass
@@ -412,64 +408,84 @@ class ExportDB(ExportDB_ABC):
logging.warning(e)
def get_exiftool_json_sidecar_for_file(self, filename):
""" returns the exiftool JSON sidecar data for a file """
""" returns the exiftool JSON sidecar data and signature for a file """
filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
conn = self._conn
try:
c = conn.cursor()
c.execute(
"SELECT sidecar_data FROM exiftool_json_sidecar WHERE filepath_normalized = ?",
"SELECT sidecar_data, mode, size, mtime FROM exiftool_json_sidecar WHERE filepath_normalized = ?",
(filename,),
)
results = c.fetchone()
sidecar_data = results[0] if results else None
if results:
sidecar_data = results[0]
sidecar_sig = (
results[1],
results[2],
int(results[3]) if results[3] is not None else None,
)
else:
sidecar_data = None
sidecar_sig = (None, None, None)
except Error as e:
logging.warning(e)
sidecar_data = None
sidecar_sig = (None, None, None)
return sidecar_data
return sidecar_data, sidecar_sig
def set_exiftool_json_sidecar_for_file(self, filename, sidecar_data):
""" sets the exiftool JSON sidecar data for a file """
def set_exiftool_json_sidecar_for_file(self, filename, sidecar_data, sidecar_sig):
""" sets the exiftool JSON sidecar data and signature for a file """
filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
conn = self._conn
try:
c = conn.cursor()
c.execute(
"INSERT OR REPLACE INTO exiftool_json_sidecar(filepath_normalized, sidecar_data) VALUES (?, ?);",
(filename, sidecar_data),
"INSERT OR REPLACE INTO exiftool_json_sidecar(filepath_normalized, sidecar_data, mode, size, mtime) VALUES (?, ?, ?, ?, ?);",
(filename, sidecar_data, *sidecar_sig),
)
conn.commit()
except Error as e:
logging.warning(e)
def get_xmp_sidecar_for_file(self, filename):
""" returns the XMP sidecar data for a file """
""" returns the XMP sidecar data and signature for a file """
filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
conn = self._conn
try:
c = conn.cursor()
c.execute(
"SELECT sidecar_data FROM xmp_sidecar WHERE filepath_normalized = ?",
"SELECT sidecar_data, mode, size, mtime FROM xmp_sidecar WHERE filepath_normalized = ?",
(filename,),
)
results = c.fetchone()
sidecar_data = results[0] if results else None
if results:
sidecar_data = results[0]
sidecar_sig = (
results[1],
results[2],
int(results[3]) if results[3] is not None else None,
)
else:
sidecar_data = None
sidecar_sig = (None, None, None)
except Error as e:
logging.warning(e)
sidecar_data = None
sidecar_sig = (None, None, None)
return sidecar_data
return sidecar_data, sidecar_sig
def set_xmp_sidecar_for_file(self, filename, sidecar_data):
def set_xmp_sidecar_for_file(self, filename, sidecar_data, sidecar_sig):
""" sets the XMP sidecar data for a file """
filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
conn = self._conn
try:
c = conn.cursor()
c.execute(
"INSERT OR REPLACE INTO xmp_sidecar(filepath_normalized, sidecar_data) VALUES (?, ?);",
(filename, sidecar_data),
"INSERT OR REPLACE INTO xmp_sidecar(filepath_normalized, sidecar_data, mode, size, mtime) VALUES (?, ?, ?, ?, ?);",
(filename, sidecar_data, *sidecar_sig),
)
conn.commit()
except Error as e:
@@ -485,8 +501,6 @@ class ExportDB(ExportDB_ABC):
edited_stat,
info_json,
exif_json,
exiftool_json_sidecar,
xmp_sidecar,
):
""" sets all the data for file and uuid at once
"""
@@ -527,14 +541,6 @@ class ExportDB(ExportDB_ABC):
"INSERT OR REPLACE INTO exifdata(filepath_normalized, json_exifdata) VALUES (?, ?);",
(filename_normalized, exif_json),
)
c.execute(
"INSERT OR REPLACE INTO exiftool_json_sidecar(filepath_normalized, sidecar_data) VALUES (?, ?);",
(filename_normalized, exiftool_json_sidecar),
)
c.execute(
"INSERT OR REPLACE INTO xmp_sidecar(filepath_normalized, sidecar_data) VALUES (?, ?);",
(filename_normalized, xmp_sidecar),
)
conn.commit()
except Error as e:
logging.warning(e)
@@ -676,12 +682,18 @@ class ExportDB(ExportDB_ABC):
"sql_xmp_table": """ CREATE TABLE IF NOT EXISTS xmp_sidecar (
id INTEGER PRIMARY KEY,
filepath_normalized TEXT NOT NULL,
sidecar_data TEXT
sidecar_data TEXT,
mode INTEGER,
size INTEGER,
mtime REAL
); """,
"sql_exiftool_json_table": """ CREATE TABLE IF NOT EXISTS exiftool_json_sidecar (
id INTEGER PRIMARY KEY,
filepath_normalized TEXT NOT NULL,
sidecar_data JSON
sidecar_data JSON,
mode INTEGER,
size INTEGER,
mtime REAL
); """,
"sql_files_idx": """ CREATE UNIQUE INDEX IF NOT EXISTS idx_files_filepath_normalized on files (filepath_normalized); """,
"sql_info_idx": """ CREATE UNIQUE INDEX IF NOT EXISTS idx_info_uuid on info (uuid); """,

45
osxphotos/photoinfo/_photoinfo_export.py
View File

@@ -46,7 +46,16 @@ from ..utils import dd_to_dms_str, findfiles, noop
ExportResults = namedtuple(
"ExportResults",
["exported", "new", "updated", "skipped", "exif_updated", "touched", "sidecar_json", "sidecar_xmp"],
[
"exported",
"new",
"updated",
"skipped",
"exif_updated",
"touched",
"sidecar_json",
"sidecar_xmp",
],
)
@@ -526,8 +535,6 @@ def export2(
edited_stat=(None, None, None),
info_json=self.json(),
exif_json=None,
exiftool_json_sidecar=None,
xmp_sidecar=None,
)
if dest_uuid != self.uuid:
# not the right file, find the right one
@@ -554,8 +561,6 @@ def export2(
edited_stat=(None, None, None),
info_json=self.json(),
exif_json=None,
exiftool_json_sidecar=None,
xmp_sidecar=None,
)
break
@@ -755,20 +760,26 @@ def export2(
ignore_date_modified=ignore_date_modified,
)
sidecar_digest = hexdigest(sidecar_str)
old_sidecar_digest = export_db.get_exiftool_json_sidecar_for_file(
old_sidecar_digest, sidecar_sig = export_db.get_exiftool_json_sidecar_for_file(
sidecar_filename
)
write_sidecar = (
not update
or (update and not sidecar_filename.exists())
or (update and sidecar_digest != old_sidecar_digest)
or (
update
and (sidecar_digest != old_sidecar_digest)
or not fileutil.cmp_file_sig(sidecar_filename, sidecar_sig)
)
)
if write_sidecar:
verbose(f"Writing exiftool JSON sidecar {sidecar_filename}")
if not dry_run:
self._write_sidecar(sidecar_filename, sidecar_str)
export_db.set_exiftool_json_sidecar_for_file(
sidecar_filename, sidecar_digest
sidecar_filename,
sidecar_digest,
fileutil.file_sig(sidecar_filename),
)
else:
verbose(f"Skipped up to date exiftool JSON sidecar {sidecar_filename}")
@@ -785,17 +796,27 @@ def export2(
extension=dest.suffix[1:] if dest.suffix else None,
)
sidecar_digest = hexdigest(sidecar_str)
old_sidecar_digest = export_db.get_xmp_sidecar_for_file(sidecar_filename)
old_sidecar_digest, sidecar_sig = export_db.get_xmp_sidecar_for_file(
sidecar_filename
)
write_sidecar = (
not update
or (update and not sidecar_filename.exists())
or (update and sidecar_digest != old_sidecar_digest)
or (
update
and (sidecar_digest != old_sidecar_digest)
or not fileutil.cmp_file_sig(sidecar_filename, sidecar_sig)
)
)
if write_sidecar:
verbose(f"Writing XMP sidecar {sidecar_filename}")
if not dry_run:
self._write_sidecar(sidecar_filename, sidecar_str)
export_db.set_xmp_sidecar_for_file(sidecar_filename, sidecar_digest)
export_db.set_xmp_sidecar_for_file(
sidecar_filename,
sidecar_digest,
fileutil.file_sig(sidecar_filename),
)
else:
verbose(f"Skipped up to date XMP sidecar {sidecar_filename}")
@@ -1056,8 +1077,6 @@ def _export_photo(
edited_stat=edited_stat,
info_json=self.json(),
exif_json=None,
exiftool_json_sidecar=None,
xmp_sidecar=None,
)
if touched_files: