From 7a8301a8dc4483b8c5e09d47fda99edb06b8631a Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sun, 10 Dec 2017 23:46:56 -0800 Subject: [PATCH] Update git repo links --- plexpy/common.py | 5 ----- plexpy/config.py | 10 ++++++++-- plexpy/versioncheck.py | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/plexpy/common.py b/plexpy/common.py index 1b248e5f..96c1126c 100644 --- a/plexpy/common.py +++ b/plexpy/common.py @@ -13,11 +13,6 @@ # You should have received a copy of the GNU General Public License # along with Tautulli. If not, see . -''' -Created on Aug 1, 2011 - -@author: Michael -''' import platform from collections import OrderedDict diff --git a/plexpy/config.py b/plexpy/config.py index 974f7613..2036251e 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -175,7 +175,8 @@ _CONFIG_DEFINITIONS = { 'GIT_PATH': (str, 'General', ''), 'GIT_REMOTE': (str, 'General', 'origin'), 'GIT_TOKEN': (str, 'General', ''), - 'GIT_USER': (str, 'General', 'JonnyWong16'), + 'GIT_USER': (str, 'General', 'tautulli'), + 'GIT_REPO': (str, 'General', 'tautulli'), 'GRAPH_TYPE': (str, 'General', 'plays'), 'GRAPH_DAYS': (int, 'General', 30), 'GRAPH_MONTHS': (int, 'General', 12), @@ -247,7 +248,7 @@ _CONFIG_DEFINITIONS = { 'INTERFACE': (str, 'General', 'default'), 'IP_LOGGING_ENABLE': (int, 'General', 0), 'IFTTT_KEY': (str, 'IFTTT', ''), - 'IFTTT_EVENT': (str, 'IFTTT', 'plexpy'), + 'IFTTT_EVENT': (str, 'IFTTT', 'tautulli'), 'IFTTT_ENABLED': (int, 'IFTTT', 0), 'IFTTT_ON_PLAY': (int, 'IFTTT', 0), 'IFTTT_ON_STOP': (int, 'IFTTT', 0), @@ -872,3 +873,8 @@ class Config(object): self.MUSIC_WATCHED_PERCENT = self.NOTIFY_WATCHED_PERCENT self.CONFIG_VERSION == 9 + + if self.CONFIG_VERSION == 9: + if self.GIT_USER.lower() == 'jonnywong16': + self.GIT_USER = 'tautulli' + self.CONFIG_VERSION = 10 \ No newline at end of file diff --git a/plexpy/versioncheck.py b/plexpy/versioncheck.py index 121cdf38..c1854c2b 100644 --- a/plexpy/versioncheck.py +++ b/plexpy/versioncheck.py @@ -211,7 +211,7 @@ def update(): logger.info('Output: ' + str(output)) else: - tar_download_url = 'https://github.com/%s/plexpy/tarball/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_BRANCH) + tar_download_url = 'https://github.com/{}/{}/tarball/{}'.format(plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CONFIG.GIT_BRANCH) update_dir = os.path.join(plexpy.PROG_DIR, 'update') version_path = os.path.join(plexpy.PROG_DIR, 'version.txt')