anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only notify Tautulli updates when checked as a scheduled task (Fixes Tautulli/Tautulli-Issues#46)

Browse Source
This commit is contained in:
JonnyWong16
2018-04-28 17:59:53 -07:00
parent 5e000162c6
commit 5f7991665c
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plexpy/__init__.py
View File

@@ -243,7 +243,7 @@ def initialize(config_file):
# Check for new versions # Check for new versions
if CONFIG.CHECK_GITHUB_ON_STARTUP and CONFIG.CHECK_GITHUB: if CONFIG.CHECK_GITHUB_ON_STARTUP and CONFIG.CHECK_GITHUB:
try: try:
LATEST_VERSION = versioncheck.checkGithub() LATEST_VERSION = versioncheck.check_github()
except: except:
logger.exception(u"Unhandled exception") logger.exception(u"Unhandled exception")
LATEST_VERSION = CURRENT_VERSION LATEST_VERSION = CURRENT_VERSION
@@ -378,8 +378,8 @@ def initialize_scheduler():
# Update check # Update check
github_minutes = CONFIG.CHECK_GITHUB_INTERVAL if CONFIG.CHECK_GITHUB_INTERVAL and CONFIG.CHECK_GITHUB else 0 github_minutes = CONFIG.CHECK_GITHUB_INTERVAL if CONFIG.CHECK_GITHUB_INTERVAL and CONFIG.CHECK_GITHUB else 0
schedule_job(versioncheck.checkGithub, 'Check GitHub for updates', schedule_job(versioncheck.check_github, 'Check GitHub for updates',
hours=0, minutes=github_minutes, seconds=0, args=(bool(CONFIG.PLEXPY_AUTO_UPDATE),)) hours=0, minutes=github_minutes, seconds=0, args=(bool(CONFIG.PLEXPY_AUTO_UPDATE), True))
backup_hours = CONFIG.BACKUP_INTERVAL if 1 <= CONFIG.BACKUP_INTERVAL <= 24 else 6 backup_hours = CONFIG.BACKUP_INTERVAL if 1 <= CONFIG.BACKUP_INTERVAL <= 24 else 6

9
plexpy/versioncheck.py
View File

@@ -131,7 +131,7 @@ def getVersion():
return None, 'origin', common.BRANCH return None, 'origin', common.BRANCH
def checkGithub(auto_update=False): def check_github(auto_update=False, notify=False):
plexpy.COMMITS_BEHIND = 0 plexpy.COMMITS_BEHIND = 0
# Get the latest version available from github # Get the latest version available from github
@@ -198,8 +198,11 @@ def checkGithub(auto_update=False):
plexpy.LATEST_RELEASE = release['tag_name'] plexpy.LATEST_RELEASE = release['tag_name']
plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_plexpyupdate', 'plexpy_download_info': release, if notify:
'plexpy_update_commit': plexpy.LATEST_VERSION, 'plexpy_update_behind': plexpy.COMMITS_BEHIND}) plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_plexpyupdate',
'plexpy_download_info': release,
'plexpy_update_commit': plexpy.LATEST_VERSION,
'plexpy_update_behind': plexpy.COMMITS_BEHIND})
if auto_update: if auto_update:
logger.info('Running automatic update.') logger.info('Running automatic update.')

2
plexpy/webserve.py
View File

@@ -3699,7 +3699,7 @@ class WebInterface(object):
} }
``` ```
""" """
versioncheck.checkGithub() versioncheck.check_github()
if not plexpy.CURRENT_VERSION: if not plexpy.CURRENT_VERSION:
return {'result': 'error', return {'result': 'error',