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

calibredb set_metadata: When converting a string into a datetime if the string is a full ISO 8601 date with timezone do not adjust the date to make it timezone neutral. Fixes #1883433 [Can't Set timestamp field to first or last of month via CLI](https://bugs.launchpad.net/calibre/+bug/1883433)

Browse Source
This commit is contained in:
Kovid Goyal 2020-06-14 22:18:46 +05:30
parent 36dac43b93
commit 54d14349e2
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/ebooks/metadata/book/base.py
View File

@ -822,8 +822,12 @@ def field_from_string(field, raw, field_metadata):
elif dt == 'rating': elif dt == 'rating':
val = float(raw) * 2 val = float(raw) * 2
elif dt == 'datetime': elif dt == 'datetime':
from calibre.utils.date import parse_only_date from calibre.utils.iso8601 import parse_iso8601
val = parse_only_date(raw) try:
val = parse_iso8601(raw, require_aware=True)
except Exception:
from calibre.utils.date import parse_only_date
val = parse_only_date(raw)
elif dt == 'bool': elif dt == 'bool':
if raw.lower() in {'true', 'yes', 'y'}: if raw.lower() in {'true', 'yes', 'y'}:
val = True val = True

4
src/calibre/utils/iso8601.py
View File

@ -42,7 +42,7 @@ del tzutc, tzlocal
UNDEFINED_DATE = datetime(101,1,1, tzinfo=utc_tz) UNDEFINED_DATE = datetime(101,1,1, tzinfo=utc_tz)
def parse_iso8601(date_string, assume_utc=False, as_utc=True): def parse_iso8601(date_string, assume_utc=False, as_utc=True, require_aware=False):
if not date_string: if not date_string:
return UNDEFINED_DATE return UNDEFINED_DATE
dt, aware, tzseconds = speedup.parse_iso8601(date_string) dt, aware, tzseconds = speedup.parse_iso8601(date_string)
@ -54,6 +54,8 @@ def parse_iso8601(date_string, assume_utc=False, as_utc=True):
sign = '-' if tzseconds < 0 else '+' sign = '-' if tzseconds < 0 else '+'
description = "%s%02d:%02d" % (sign, abs(tzseconds) // 3600, (abs(tzseconds) % 3600) // 60) description = "%s%02d:%02d" % (sign, abs(tzseconds) // 3600, (abs(tzseconds) % 3600) // 60)
tz = tzoffset(description, tzseconds) tz = tzoffset(description, tzseconds)
elif require_aware:
raise ValueError('{} does not specify a time zone'.format(date_string))
dt = dt.replace(tzinfo=tz) dt = dt.replace(tzinfo=tz)
if as_utc and tz is utc_tz: if as_utc and tz is utc_tz:
return dt return dt