github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-06 05:01:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use appdata folder

Browse source
This commit is contained in:
JonnyWong16 2020-04-15 01:31:49 -07:00
parent 801510c61e
commit 1394339df6
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Tautulli.py
View file

@ -25,6 +25,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib
from future.builtins import str from future.builtins import str
import appdirs
import argparse import argparse
import datetime import datetime
import locale import locale
@ -49,12 +50,14 @@ def main():
""" """
# Fixed paths to Tautulli # Fixed paths to Tautulli
if hasattr(sys, 'frozen'): if hasattr(sys, 'frozen') and hasattr(sys, '_MEIPASS'):
plexpy.FROZEN = True
plexpy.FULL_PATH = os.path.abspath(sys.executable) plexpy.FULL_PATH = os.path.abspath(sys.executable)
plexpy.PROG_DIR = sys._MEIPASS
else: else:
plexpy.FULL_PATH = os.path.abspath(__file__) plexpy.FULL_PATH = os.path.abspath(__file__)
plexpy.PROG_DIR = os.path.dirname(plexpy.FULL_PATH)
plexpy.PROG_DIR = os.path.dirname(plexpy.FULL_PATH)
plexpy.ARGS = sys.argv[1:] plexpy.ARGS = sys.argv[1:]
# From sickbeard # From sickbeard
@ -173,6 +176,8 @@ def main():
# Determine which data directory and config file to use # Determine which data directory and config file to use
if args.datadir: if args.datadir:
plexpy.DATA_DIR = args.datadir plexpy.DATA_DIR = args.datadir
elif plexpy.FROZEN:
plexpy.DATA_DIR = appdirs.user_data_dir("Tautulli", "Tautulli")
else: else:
plexpy.DATA_DIR = plexpy.PROG_DIR plexpy.DATA_DIR = plexpy.PROG_DIR

15
plexpy/__init__.py
View file

@ -99,6 +99,7 @@ CREATEPID = False
PIDFILE = None PIDFILE = None
NOFORK = False NOFORK = False
DOCKER = False DOCKER = False
FROZEN = False
SCHED = None SCHED = None
SCHED_LOCK = threading.Lock() SCHED_LOCK = threading.Lock()
@ -186,11 +187,18 @@ 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)
if DOCKER:
build = '[Docker] '
elif FROZEN:
build = '[Bundle] '
else:
build = ''
logger.info("Starting Tautulli {}".format( logger.info("Starting Tautulli {}".format(
common.RELEASE common.RELEASE
)) ))
logger.info("{}{} {} ({}{})".format( logger.info("{}{} {} ({}{})".format(
'[Docker] ' if DOCKER else '', common.PLATFORM, common.PLATFORM_RELEASE, common.PLATFORM_VERSION, build, common.PLATFORM, common.PLATFORM_RELEASE, common.PLATFORM_VERSION,
' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else '' ' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else ''
)) ))
logger.info("{} (UTC{})".format( logger.info("{} (UTC{})".format(
@ -2237,7 +2245,10 @@ def shutdown(restart=False, update=False, checkout=False, reset=False):
logger.info("Tautulli is restarting...") logger.info("Tautulli is restarting...")
exe = sys.executable exe = sys.executable
args = [exe, FULL_PATH] if FROZEN:
args = [exe]
else:
args = [exe, FULL_PATH]
args += ARGS args += ARGS
if '--nolaunch' not in args: if '--nolaunch' not in args:
args += ['--nolaunch'] args += ['--nolaunch']