Timezone 849 1661 (#1797)

* Working on #1661

* Fix for #1661

* Renamed --timezone --set-timezone

* Fix for Timezone test

* Added --timezone

Author: RhetTbull

Diff for: osxphotos/cli/import_cli.py

@@ -610,10 +610,10 @@ def export_db_get_photoinfo_for_filepath(
     """Return photoinfo object for a given filepath
 
     Args:
-        exportdb: path to the export database
-        exportdir: path to the export directory or None
+        exportdb_path: path to the export database
         filepath: absolute path to the file to retrieve info for from the database
         exiftool: optional path to exiftool to be passed to the PhotoInfoFromDict object
+        exportdir_path: path to the export directory or None
 
     Returns: PhotoInfoFromDict | None
     """

Diff for: osxphotos/export_db_utils.py

@@ -1072,6 +1072,11 @@ def date(self) -> datetime.datetime:
             default=True,
         )
 
+    @property
+    def date_original(self) -> datetime.datetime:
+        """Date photo was taken"""
+        return self.date
+
     @property
     def date_modified(self) -> datetime.datetime:
         """Date modified in library"""
@@ -1099,6 +1104,11 @@ def tzoffset(self) -> int:
         tz = ZoneInfo(tzname)
         return int(tz.utcoffset(self.date).total_seconds())
 
+    @property
+    def tzname(self) -> str | None:
+        """Timezone name for the asset creation date"""
+        return self._db._db_photos[self._uuid]["timezone"] or None
+
     @property
     def path(self) -> str | None:
         """Path to original photo asset in library"""
@@ -1678,6 +1688,9 @@ def asdict(self, shallow: bool = True) -> dict[str, Any]:
             dict_data["shared_moment"] = self.shared_moment
             dict_data["shared_library"] = self.shared_library
             dict_data["rating"] = self.rating
+            dict_data["screen_recording"] = self.screen_recording
+            dict_data["date_original"] = self.date_original
+            dict_data["tzname"] = self.tzname
 
         return dict_data
 

Diff for: osxphotos/iphoto.py

@@ -43,6 +43,7 @@ class MetaData:
         tz_offset_sec: int or None if not set, offset from UTC in seconds
         height: int or None if not set, height of photo in pixels
         width: int or None if not set, width of photo in pixels
+        tzname: str or None if not set, timezone name for timezone
     """
 
     title: str = ""
@@ -57,6 +58,7 @@ class MetaData:
     tz_offset_sec: float | None = None
     height: int | None = None
     width: int | None = None
+    tzname: str | None = None
 
     def __ior__(self, other):
         if isinstance(other, MetaData):
@@ -399,6 +401,7 @@ def metadata_from_metadata_dict(metadata: dict) -> MetaData:
         tz_offset_sec=tz_offset,
         height=height,
         width=width,
+        tzname=None,  # the sidecar doesn't store the timezone name
     )
 
 
@@ -537,4 +540,5 @@ def metadata_from_photoinfo(photoinfo: PhotoInfoProtocol) -> MetaData:
         tz_offset_sec=tz_offset,
         height=photoinfo.height,
         width=photoinfo.width,
+        tzname=photoinfo.tzname,
     )

Diff for: osxphotos/metadata_reader.py

@@ -209,8 +209,8 @@ def update_photo_time_for_new_timezone(
     old_timezone_offset = PhotoTimeZone(library_path=library_path).get_timezone(photo)[
         0
     ]
-    delta = old_timezone_offset - new_timezone.offset
     photo_date = photo.date
+    delta = old_timezone_offset - new_timezone.offset_for_date(photo_date)
     new_photo_date = update_datetime(
         dt=photo_date, time_delta=datetime.timedelta(seconds=delta)
     )

Diff for: osxphotos/photodates.py

@@ -20,6 +20,7 @@
 from .export_db import ExportDBTemp
 from .exportoptions import ExportOptions, ExportResults
 from .fileutil import FileUtil
+from .photoinfo_common import photoinfo_minify_dict
 from .phototemplate import RenderOptions
 from .platform import is_macos
 from .rich_utils import add_rich_markup_tag
@@ -1045,7 +1046,7 @@ def _export_photo(
         # set data in the database
         with export_db.create_or_get_file_record(dest_str, self.photo.uuid) as rec:
             if rec.photoinfo:
-                last_data = json.loads(rec.photoinfo)
+                last_data = photoinfo_minify_dict(json.loads(rec.photoinfo))
                 # to avoid issues with datetime comparisons, list order
                 # need to deserialize from photo.json() instead of using photo.asdict()
                 current_data = json.loads(self.photo.json(shallow=True))
@@ -1067,7 +1068,7 @@ def _json_default(o):
                 diff = json.dumps(diff, default=_json_default) if diff else None
             else:
                 diff = None
-            rec.photoinfo = self.photo.json(shallow=True)
+            rec.photoinfo = self.photo.json(shallow=False)
             rec.export_options = options.bit_flags
             # don't set src_sig as that is set above before any modifications by convert_to_jpeg or exiftool
             if not options.ignore_signature:

Diff for: osxphotos/photoexporter.py

@@ -173,7 +173,7 @@ def tzoffset(self) -> int:
 
     @property
     def tzname(self) -> str | None:
-        """Timezone name for the Photos creation date; on Photos version < 5, returns None"""
+        """Timezone name for the asset creation date; on Photos version < 5, returns None"""
         return self._info["imageTimeZoneName"]
 
     @property
@@ -2131,6 +2131,7 @@ def asdict(self, shallow: bool = True) -> dict[str, Any]:
             dict_data["rating"] = self.rating
             dict_data["screen_recording"] = self.screen_recording
             dict_data["date_original"] = self.date_original
+            dict_data["tzname"] = self.tzname
 
         return dict_data
 

Diff for: osxphotos/photoinfo.py

@@ -0,0 +1,38 @@
+""" Common utilities for PhotoInfo variations """
+
+from typing import Any
+
+# These are PhotoInfo.asdict() keys that that are removed from the output
+# by the PhotoExporter for comparing PhotoInfo objects.
+
+FULL_KEYS = [
+    "album_info",
+    "path_derivatives",
+    "adjustments",
+    "burst_album_info",
+    "burst_albums",
+    "burst_default_pick",
+    "burst_key",
+    "burst_photos",
+    "burst_selected",
+    "cloud_metadata",
+    "import_info",
+    "labels_normalized",
+    "person_info",
+    "project_info",
+    "search_info",
+    "search_info_normalized",
+    "syndicated",
+    "saved_to_library",
+    "shared_moment",
+    "shared_library",
+    "rating",
+    "screen_recording",
+    "date_original",
+    "tzname",
+]
+
+
+def photoinfo_minify_dict(info: dict[str, Any]) -> dict[str, Any]:
+    """Convert a full PhotoInfo dict to a minimum PhotoInfo dict"""
+    return {k: v for k, v in info.items() if k not in FULL_KEYS}

Diff for: osxphotos/photoinfo_common.py

@@ -56,14 +56,23 @@ class PhotoInfoFromDict(PhotoInfoMixin):
     @property
     def album_info(self) -> AlbumInfoFromDict:
         """Return AlbumInfo objects for photo"""
+        if getattr(self, "_album_info"):
+            return self._album_info
         # this is a little hacky but it works for `osxphotos import` use case
         if not getattr(self, "folders"):
-            return []
-        # self.folders is a rehydrated object so need access it's __dict__ to get the actual data
-        return [
-            AlbumInfoFromDict(title, folders)
-            for title, folders in self.folders.__dict__.items()
-        ]
+            self._album_info = []
+        else:
+            # self.folders is a rehydrated object so need access it's __dict__ to get the actual data
+            self._album_info = [
+                AlbumInfoFromDict(title, folders)
+                for title, folders in self.folders.__dict__.items()
+            ]
+        return self._album_info
+
+    @album_info.setter
+    def album_info(self, value):
+        """If rehydrating class has album_info, then set it"""
+        self._album_info = value
 
     def asdict(self) -> dict[str, Any]:
         """Return the PhotoInfo dictionary"""

Diff for: osxphotos/photoinfo_dict.py

@@ -41,6 +41,9 @@ def date_modified(self) -> datetime.datetime | None: ...
     @property
     def tzoffset(self) -> int: ...
 
+    @property
+    def tzname(self) -> str: ...
+
     @property
     def path(self) -> str | None: ...
 
@@ -346,6 +349,7 @@ def __getattr__(self, name):
             "fingerprint",
             "syndicated",
             "shared_moment_info",
+            "tzname",
         ]:
             return None
         elif name in [

Diff for: osxphotos/photoinfo_protocol.py

@@ -38,7 +38,7 @@ def known_timezone_names() -> list[str]:
     class Timezone:
         """Create Timezone object from either name (str) or offset from GMT (int)"""
 
-        def __init__(self, tz: Union[str, int]):
+        def __init__(self, tz: Union[str, int, float]):
             with objc.autorelease_pool():
                 self._from_offset = False
                 if isinstance(tz, str):
@@ -48,8 +48,10 @@ def __init__(self, tz: Union[str, int]):
                     ) or Foundation.NSTimeZone.timeZoneWithName_(tz)
                     if not self.timezone:
                         raise ValueError(f"Invalid timezone: {tz}")
-                elif isinstance(tz, int):
-                    self.timezone = Foundation.NSTimeZone.timeZoneForSecondsFromGMT_(tz)
+                elif isinstance(tz, (int, float)):
+                    self.timezone = Foundation.NSTimeZone.timeZoneForSecondsFromGMT_(
+                        int(tz)
+                    )
                     self._from_offset = True
                 else:
                     raise TypeError("Timezone must be a string or an int")
@@ -71,6 +73,12 @@ def offset_str(self) -> str:
         def abbreviation(self) -> str:
             return self.timezone.abbreviation()
 
+        def offset_for_date(self, dt: datetime.datetime) -> int:
+            return self.timezone.secondsFromGMTForDate_(dt)
+
+        def offset_str_for_date(self, dt: datetime.datetime) -> str:
+            return format_offset_time(self.offset_for_date(dt))
+
         def tzinfo(self, dt: datetime.datetime) -> zoneinfo.ZoneInfo:
             """Return zoneinfo.ZoneInfo object for the timezone at the given datetime"""
             if not self._from_offset:

Diff for: osxphotos/timezones.py

@@ -298,7 +298,9 @@ def is_dst() -> bool:
                 f"{TEST_LIBRARY_TIMEWARP}/originals/7/7E9DF2EE-A5B0-4077-80EC-30565221A3B9.jpeg"
             ),
             "",
-            get_local_utc_offset_str("2023-08-21 09:18:13"),
+            get_local_utc_offset_str(get_file_timestamp(
+                f"{TEST_LIBRARY_TIMEWARP}/originals/7/7E9DF2EE-A5B0-4077-80EC-30565221A3B9.jpeg"
+            )),
             "",
         ),
     },