jarno
/
hemppa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #169 from aspacca/tautulli-bump 

fix for new version of tautulli
This commit is contained in:
Ville Ranki 2021-08-31 12:16:30 +03:00 committed by GitHub
parent 58b1fc96f6 1ef7344b4f
commit 56586708d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/tautulli.py
View File

@ -1,7 +1,7 @@
import urllib.request import urllib.request
import urllib.parse import urllib.parse
import urllib.error import urllib.error
import tzlocal import datetime
import pytz import pytz
import os import os
import sys import sys
@ -21,12 +21,24 @@ from modules.common.module import BotModule
tautulli_path = os.getenv("TAUTULLI_PATH") tautulli_path = os.getenv("TAUTULLI_PATH")
def load_tzlocal():
try:
global tautulli_path
sys.path.insert(0, tautulli_path)
sys.path.insert(0, "{}/lib".format(tautulli_path))
module = importlib.import_module("tzlocal")
module = reload(module)
return module
except ModuleNotFoundError:
return None
def load_tautulli(): def load_tautulli():
try: try:
global tautulli_path global tautulli_path
sys.path.append(tautulli_path) sys.path.insert(0, tautulli_path)
sys.path.append("{}/lib".format(tautulli_path)) sys.path.insert(0, "{}/lib".format(tautulli_path))
module = importlib.import_module("plexpy") module = importlib.import_module("plexpy")
module = reload(module) module = reload(module)
return module return module
@ -34,6 +46,8 @@ def load_tautulli():
return None return None
plexpy = load_tautulli() plexpy = load_tautulli()
tzlocal = load_tzlocal()
send_entry_lock = asyncio.Lock() send_entry_lock = asyncio.Lock()
async def send_entry(bot, room, entry): async def send_entry(bot, room, entry):
@ -142,6 +156,7 @@ class MatrixModule(BotModule):
except (pytz.UnknownTimeZoneError, LookupError, ValueError) as e: except (pytz.UnknownTimeZoneError, LookupError, ValueError) as e:
plexpy.SYS_TIMEZONE = pytz.UTC plexpy.SYS_TIMEZONE = pytz.UTC
plexpy.SYS_UTC_OFFSET = datetime.datetime.now(plexpy.SYS_TIMEZONE).strftime('%z')
plexpy.initialize("{}/config.ini".format(tautulli_path)) plexpy.initialize("{}/config.ini".format(tautulli_path))
self.httpd = WebServer(os.getenv("TAUTULLI_NOTIFIER_ADDR"), os.getenv("TAUTULLI_NOTIFIER_PORT")) self.httpd = WebServer(os.getenv("TAUTULLI_NOTIFIER_ADDR"), os.getenv("TAUTULLI_NOTIFIER_PORT"))