Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

We never want QDateTime in anything but local time

Browse Source
This commit is contained in:
Kovid Goyal 2023-11-20 21:13:40 +05:30
parent 105d468b0f
commit 402b2a589e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/utils/date.py
View File

@ -187,21 +187,17 @@ def qt_to_dt(qdate_or_qdatetime, as_utc=True):
return dt.astimezone(_utc_tz if as_utc else _local_tz) return dt.astimezone(_utc_tz if as_utc else _local_tz)
def qt_from_dt(d: datetime, as_utc=False, assume_utc=False): def qt_from_dt(d: datetime, assume_utc=False):
from qt.core import QDate, QDateTime, QTime, QTimeZone from qt.core import QDate, QDateTime, QTime
if is_date_undefined(d): if is_date_undefined(d):
from calibre.gui2 import UNDEFINED_QDATETIME from calibre.gui2 import UNDEFINED_QDATETIME
return UNDEFINED_QDATETIME return UNDEFINED_QDATETIME
if d.tzinfo is None: if d.tzinfo is None:
d = d.replace(tzinfo=utc_tz if assume_utc else local_tz) d = d.replace(tzinfo=utc_tz if assume_utc else local_tz)
if as_utc: d = d.astimezone(local_tz)
d = d.astimezone(utc_tz) # not setting a time zone means this QDateTime has timeSpec() ==
ans = QDateTime.fromMSecsSinceEpoch(int(d.timestamp() * 1000), QTimeZone.utc()) # LocalTime which is what we want for display/editing.
else: ans = QDateTime(QDate(d.year, d.month, d.day), QTime(d.hour, d.minute, d.second, int(d.microsecond / 1000)))
d = d.astimezone(local_tz)
# not setting a time zone means this QDateTime has timeSpec() ==
# LocalTime which is what we want for display/editing.
ans = QDateTime(QDate(d.year, d.month, d.day), QTime(d.hour, d.minute, d.second, int(d.microsecond / 1000)))
return ans return ans