Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-12-25 10:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Back out ISO time

Browse source
This commit is contained in:
Odd Stråbø 2024-12-21 02:59:03 +01:00
parent 3c394bc02c
commit 8d1ae2ea78
2 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
jellyfin_kodi/jellyfin/http.py
View file

@ -179,12 +179,7 @@ class HTTP(object):
else: else:
try: try:
# Prefer custom Server-Time header in ISO 8601 format self.config.data["server-time"] = r.headers.get("Date")
# TODO: Clean up once the probability of most users having
# the updated server-side plugin is high.
self.config.data["server-time"] = r.headers.get(
"Server-Time", r.headers.get("Date")
)
elapsed = int(r.elapsed.total_seconds() * 1000) elapsed = int(r.elapsed.total_seconds() * 1000)
response = r.json() response = r.json()
LOG.debug("---<[ http ][%s ms]", elapsed) LOG.debug("---<[ http ][%s ms]", elapsed)

24
jellyfin_kodi/library.py
View file

@ -526,24 +526,16 @@ class Library(threading.Thread):
def save_last_sync(self): def save_last_sync(self):
_raw_time = self.server.config.data["server-time"] _raw_time = self.server.config.data["server-time"]
# The ISO 8601 header always end with Z
if _raw_time and _raw_time[-1] == "Z":
time_now = datetime.strptime(_raw_time, "%Y-%m-%dT%H:%M:%SZ")
else:
try:
# TODO: Clean up once the probability of most users having
# the updated server-side plugin is high.
LOG.warning(
"Server time not in ISO 8601 format, using fallback (update KodiSyncQueue)."
)
import email.utils
time_now = email.utils.parsedate_to_datetime(_raw_time) try:
import email.utils
except Exception as error: time_now = email.utils.parsedate_to_datetime(_raw_time)
LOG.warning(error)
LOG.warning("Failed to parse server time, falling back to client time.") except Exception as error:
time_now = datetime.utcnow() LOG.warning(error)
LOG.warning("Failed to parse server time, falling back to client time.")
time_now = datetime.utcnow()
# Add some tolerance in case time is out of sync with server # Add some tolerance in case time is out of sync with server
time_now -= timedelta(minutes=2) time_now -= timedelta(minutes=2)