Add function to initialize plexapi

This commit is contained in:
JonnyWong16 2021-02-27 19:17:33 -08:00
parent af8a5342fb
commit 3b5801a2cd
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 13 additions and 14 deletions

View file

@ -53,6 +53,7 @@ if PYTHON2:
import newsletter_handler import newsletter_handler
import notification_handler import notification_handler
import notifiers import notifiers
import plex
import plextv import plextv
import users import users
import versioncheck import versioncheck
@ -73,6 +74,7 @@ else:
from plexpy import newsletter_handler from plexpy import newsletter_handler
from plexpy import notification_handler from plexpy import notification_handler
from plexpy import notifiers from plexpy import notifiers
from plexpy import plex
from plexpy import plextv from plexpy import plextv
from plexpy import users from plexpy import users
from plexpy import versioncheck from plexpy import versioncheck
@ -206,14 +208,10 @@ def initialize(config_file):
logger.initLogger(console=not QUIET, log_dir=CONFIG.LOG_DIR if log_writable else None, logger.initLogger(console=not QUIET, log_dir=CONFIG.LOG_DIR if log_writable else None,
verbose=VERBOSE) verbose=VERBOSE)
os.environ['PLEXAPI_CONFIG_PATH'] = os.path.join(DATA_DIR, 'plexapi.config.ini') if not PYTHON2:
os.environ['PLEXAPI_LOG_PATH'] = os.path.join(CONFIG.LOG_DIR, 'plexapi.log') os.environ['PLEXAPI_CONFIG_PATH'] = os.path.join(DATA_DIR, 'plexapi.config.ini')
try: os.environ['PLEXAPI_LOG_PATH'] = os.path.join(CONFIG.LOG_DIR, 'plexapi.log')
import plexapi plex.initialize_plexapi()
import importlib
importlib.reload(plexapi)
except:
pass
if DOCKER: if DOCKER:
build = '[Docker] ' build = '[Docker] '

View file

@ -19,8 +19,6 @@ from __future__ import unicode_literals
from future.builtins import object from future.builtins import object
from future.builtins import str from future.builtins import str
import sys
import plexpy import plexpy
if plexpy.PYTHON2: if plexpy.PYTHON2:
import logger import logger
@ -45,17 +43,20 @@ class DummyObject(object):
raise StopIteration raise StopIteration
if sys.version_info >= (3, 6): PlexObject = DummyObject
def initialize_plexapi():
from plexapi.server import PlexServer from plexapi.server import PlexServer
else: global PlexObject
PlexServer = DummyObject PlexObject = PlexServer
class Plex(object): class Plex(object):
def __init__(self, url=None, token=None): def __init__(self, url=None, token=None):
url = url or plexpy.CONFIG.PMS_URL url = url or plexpy.CONFIG.PMS_URL
token = token or plexpy.CONFIG.PMS_TOKEN token = token or plexpy.CONFIG.PMS_TOKEN
self.plex = PlexServer(url, token) self.plex = PlexObject(url, token)
def get_library(self, section_id): def get_library(self, section_id):
return self.plex.library.sectionByID(str(section_id)) return self.plex.library.sectionByID(str(section_id))