Fixed timezone handling for --parse-date

Author: RhetTbull

osxphotos/cli/export.py

@@ -1333,7 +1333,7 @@ def export_cli(
         locals_,
         ignore=["ctx", "cli_obj", "dest", "load_config", "save_config", "config_only"],
     )
-
+    print(f"{locals_=} {cfg=}")
     verbose = verbose_print(verbose=verbose_flag, timestamp=timestamp, theme=theme)
 
     if load_config:

osxphotos/cli/param_types.py

@@ -44,7 +44,7 @@
     "TimeISO8601",
     "TimeOffset",
     "TimeString",
-    "UTCOffset",
+    "TimezoneOffset",
 ]
 
 
@@ -299,20 +299,24 @@ def convert(self, value, param, ctx):
         )
 
 
-class UTCOffset(click.ParamType):
-    """A UTC offset timezone in format ±[hh]:[mm], ±[h]:[mm], or ±[hh][mm]"""
+class TimezoneOffset(click.ParamType):
+    """A UTC offset timezone in format ±[hh]:[mm], ±[h]:[mm], or ±[hh][mm] or a named timezone such as "America/Los_Angeles" """
 
-    name = "UTC_OFFSET"
+    name = "TIMEZONE_OFFSET"
 
     def convert(self, value, param, ctx):
         try:
             offset_seconds = utc_offset_string_to_seconds(value)
             return Timezone(offset_seconds)
-        except Exception:
-            self.fail(
-                f"Invalid timezone format: {value}. "
-                "Valid format for timezone offset: '±HH:MM', '±H:MM', or '±HHMM'"
-            )
+        except ValueError as e:
+            try:
+                # might be named timezone
+                return Timezone(value)
+            except ValueError as e:
+                self.fail(
+                    f"Invalid timezone format or name: {value}. "
+                    "Valid format for timezone offset: '±HH:MM', '±H:MM', or '±HHMM' or named timezone such as 'America/Los_Angeles'"
+                )
 
 
 class StrpDateTimePattern(click.ParamType):

osxphotos/cli/timewarp.py

@@ -49,7 +49,7 @@
     StrpDateTimePattern,
     TimeOffset,
     TimeString,
-    UTCOffset,
+    TimezoneOffset,
 )
 from .rich_progress import rich_progress
 from .verbose import get_verbose_console, verbose_print
@@ -75,6 +75,10 @@ def get_help(self, ctx):
 
 `osxphotos timewarp --date 2021-09-10 --time-delta "-1 hour" --timezone -0700 --verbose`
 
+A named timezone can also be specified:
+
+`osxphotos timewarp --date 2021-09-10 --time-delta "-1 hour" --timezone "America/Los_Angeles" --verbose`
+
 This example sets the date for all selected photos to `2021-09-10`, subtracts 1 hour from the time of each photo, and sets the timezone of each photo to `GMT -07:00` (Pacific Daylight Time).
 
 osxphotos timewarp has been well tested on macOS Catalina (10.15).  It should work on macOS Big Sur (11.0) and macOS Monterey (12.0) but I have not been able to test this.  It will not work on macOS Mojave (10.14) or earlier as the Photos database format is different.
@@ -213,15 +217,18 @@ def get_help(self, ctx):
     "--timezone",
     "-z",
     metavar="TIMEZONE",
-    type=UTCOffset(),
-    help="Set timezone for selected photos as offset from UTC. "
-    "Format is one of '±HH:MM', '±H:MM', or '±HHMM'. "
+    type=TimezoneOffset(),
+    help="Set timezone for selected photos as offset from UTC or to named IANA timezone. "
+    "Format is one of '±HH:MM', '±H:MM', '±HHMM', or named timezone such as 'America/Los_Angeles'. "
     "The actual time of the photo is not adjusted which means, somewhat counterintuitively, "
     "that the time in the new timezone will be different. "
     "For example, if photo has time of 12:00 and timezone of GMT+01:00 and new timezone is specified as "
     "'--timezone +02:00' (one hour ahead of current GMT+01:00 timezone), the photo's new time will be 13:00 GMT+02:00, "
     "which is equivalent to the old time of 12:00+01:00. "
     "This is the same behavior exhibited by Photos when manually adjusting timezone in the Get Info window. "
+    "Note: when a named timezone is provided, daylight savings time will be considered when adjusting the time; "
+    "it will not be considered when a UTC offset is provided. "
+    "For list of valid IANA timezone names, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones "
     "See also --match-time. ",
 )
 @click.option(

osxphotos/datetime_utils.py

@@ -2,14 +2,16 @@
 
 # source: https://github.com/RhetTbull/datetime-utils
 
-__version__ = "2022.04.30"
+__version__ = "2024.10.07"
 
 import datetime
+from zoneinfo import ZoneInfo
 
 # TODO: probably shouldn't use replace here, see this:
 # https://stackoverflow.com/questions/13994594/how-to-add-timezone-into-a-naive-datetime-instance-in-python/13994611#13994611
 
 __all__ = [
+    "datetime_add_tz",
     "datetime_has_tz",
     "datetime_naive_to_local",
     "datetime_naive_to_utc",
@@ -209,39 +211,40 @@ def utc_offset_seconds(dt: datetime.datetime) -> int:
     else:
         raise ValueError("dt does not have timezone info")
 
-def datetime_add_tz(dt: datetime.datetime,
-        tzoffset: int | None = None,
-        tzname: str | None = None,
-    ) -> datetime.datetime:
-        """Add a timezone, either as an offset or named timezone, to a naive datetime.
 
-        Args:
-            dt: naive datetime
-            tzoffset: offset from UTC for timezone in seconds
-            tzname: name of timezone, for example, "America/Los_Angeles"
+def datetime_add_tz(
+    dt: datetime.datetime,
+    tzoffset: int | None = None,
+    tzname: str | None = None,
+) -> datetime.datetime:
+    """Add a timezone, either as an offset or named timezone, to a naive datetime.
 
-        Returns: timezone-aware datetime with new timezone
+    Args:
+        dt: naive datetime
+        tzoffset: offset from UTC for timezone in seconds
+        tzname: name of timezone, for example, "America/Los_Angeles"
+
+    Returns: timezone-aware datetime with new timezone
+
+    Raises:
+        ValueError if both tzoffset and tzname are None
+        ValueError if dt is not naive
+    """
+    if datetime_has_tz(dt):
+        raise ValueError(f"dt must be naive datetime: {dt}")
 
-        Note: you may pass tzoffset, tzname or both. If both are passed, the offset will be tried
-        first
-        """
-        if timestamp is None:
-            return DEFAULT_DATETIME if default else None
+    if tzoffset is None and tzname is None:
+        raise ValueError("Both tzoffset and tzname cannot be None")
 
-        tzoffset = tzoffset or 0
+    tzoffset = tzoffset or 0
+    if tzname:
         try:
-            dt = datetime.datetime.fromtimestamp(timestamp + TIME_DELTA)
-            # Try to use tzname if provided
-            if tzname:
-                try:
-                    tz = ZoneInfo(tzname)
-                    return dt.astimezone(tz)
-                except Exception:
-                    # If tzname fails, fall back to tzoffset
-                    pass
-
-            # Use tzoffset if tzname wasn't provided or failed
-            tz = datetime.timezone(datetime.timedelta(seconds=tzoffset))
+            tz = ZoneInfo(tzname)
             return dt.astimezone(tz)
-        except (ValueError, TypeError):
-            return DEFAULT_DATETIME if default else None
+        except Exception:
+            # If tzname fails, fall back to tzoffset
+            pass
+
+    # Use tzoffset if tzname wasn't provided or failed
+    tz = datetime.timezone(datetime.timedelta(seconds=tzoffset))
+    return dt.astimezone(tz)

osxphotos/exif_datetime_updater.py

@@ -17,10 +17,15 @@
 )
 from .exiftool import ExifTool
 from .exifutils import ExifDateTime, get_exif_date_time_offset
+from .photodates import update_photo_date_time
 from .photosdb import PhotosDB
+from .platform import assert_macos
+from .utils import noop
+
+assert_macos()
+
 from .phototz import PhotoTimeZone, PhotoTimeZoneUpdater
 from .timezones import Timezone, format_offset_time
-from .utils import noop
 
 __all__ = ["ExifDateTimeUpdater"]
 
@@ -193,17 +198,28 @@ def update_photos_from_exif(
         if dtinfo.datetime:
             if datetime_has_tz(dtinfo.datetime):
                 # convert datetime to naive local time for setting in photos
-                local_datetime = datetime_remove_tz(
-                    datetime_utc_to_local(datetime_tz_to_utc(dtinfo.datetime))
-                )
+                new_datetime = datetime_remove_tz(dtinfo.datetime)
+                # local_datetime = datetime_remove_tz(
+                #     datetime_utc_to_local(datetime_tz_to_utc(dtinfo.datetime))
+                # )
             else:
-                local_datetime = dtinfo.datetime
+                new_datetime = dtinfo.datetime
+            #     local_datetime = dtinfo.datetime
             # update date/time
-            photo.date = local_datetime
-            self.verbose(
-                "Updated date/time for photo "
-                f"[filename]{photo.filename}[/filename] ([uuid]{photo.uuid}[/uuid]): [time]{local_datetime}[/time]"
+            # photo.date = local_datetime
+            update_photo_date_time(
+                self.library_path,
+                photo,
+                new_datetime.date(),
+                new_datetime.time(),
+                None,
+                None,
+                self.verbose,
             )
+            # self.verbose(
+            #     "Updated date/time for photo "
+            #     f"[filename]{photo.filename}[/filename] ([uuid]{photo.uuid}[/uuid]): [time]{local_datetime}[/time]"
+            # )
 
         return None