From c64a115d29bc5586949c06940da79862e6c3d37f Mon Sep 17 00:00:00 2001 From: samwiseg00 Date: Tue, 23 Oct 2018 21:54:32 -0700 Subject: [PATCH 1/3] Add logic to determine system timezone --- Tautulli.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Tautulli.py b/Tautulli.py index 25d6eebc..3a8ed643 100755 --- a/Tautulli.py +++ b/Tautulli.py @@ -28,9 +28,12 @@ import sys sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib')) import argparse +import datetime import locale +import pytz import signal import time +import tzlocal import plexpy from plexpy import config, database, logger, webstart @@ -106,6 +109,14 @@ def main(): logger.initLogger(console=not plexpy.QUIET, log_dir=False, verbose=plexpy.VERBOSE) + try: + plexpy.SYS_TIMEZONE = str(tzlocal.get_localzone()) + plexpy.SYS_UTC_OFFSET = datetime.datetime.now(pytz.timezone(plexpy.SYS_TIMEZONE)).strftime('%z') + except (pytz.UnknownTimeZoneError, LookupError, ValueError) as e: + logger.error("Could not determine system timezone. %s" % e) + plexpy.SYS_TIMEZONE = 'Unknown' + plexpy.SYS_UTC_OFFSET = '+0000' + if os.getenv('TAUTULLI_DOCKER', False) == 'True': plexpy.DOCKER = True From 8fff79670079dd971dabc630e5762c85a050490d Mon Sep 17 00:00:00 2001 From: samwiseg00 Date: Tue, 23 Oct 2018 21:55:03 -0700 Subject: [PATCH 2/3] Log system timezone on startup --- plexpy/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plexpy/__init__.py b/plexpy/__init__.py index 7f1329b1..fd2d40b3 100644 --- a/plexpy/__init__.py +++ b/plexpy/__init__.py @@ -110,6 +110,8 @@ TRACKER = None WIN_SYS_TRAY_ICON = None +SYS_TIMEZONE = None +SYS_UTC_OFFSET = None def initialize(config_file): with INIT_LOCK: @@ -157,6 +159,9 @@ def initialize(config_file): common.PLATFORM, common.PLATFORM_RELEASE, common.PLATFORM_VERSION, ' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else '' )) + logger.info(u"{} (UTC{})".format( + plexpy.SYS_TIMEZONE, plexpy.SYS_UTC_OFFSET + )) logger.info(u"Python {}".format( sys.version )) From fdc9f165a4ea2e431a85a558b88d91f0d5278c85 Mon Sep 17 00:00:00 2001 From: samwiseg00 Date: Tue, 23 Oct 2018 21:55:32 -0700 Subject: [PATCH 3/3] Add system timezone to the web configuration table --- data/interfaces/default/configuration_table.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/interfaces/default/configuration_table.html b/data/interfaces/default/configuration_table.html index 3095dec2..f7717d1a 100644 --- a/data/interfaces/default/configuration_table.html +++ b/data/interfaces/default/configuration_table.html @@ -71,6 +71,10 @@ DOCUMENTATION :: END Platform: ${common.PLATFORM} ${common.PLATFORM_RELEASE} (${common.PLATFORM_VERSION + (' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else '')}) + + System Timezone: + ${plexpy.SYS_TIMEZONE} (${'UTC{}'.format(plexpy.SYS_UTC_OFFSET)}) + Python Version: ${sys.version}