mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-05 20:51:15 -07:00
parent
a96fd23d72
commit
2ed603f288
10 changed files with 16 additions and 16 deletions
|
@ -129,7 +129,7 @@ This is free software under the GPL v3 open source license. Feel free to do with
|
||||||
but any modification must be open sourced. A copy of the license is included.
|
but any modification must be open sourced. A copy of the license is included.
|
||||||
|
|
||||||
This software includes Highsoft software libraries which you may freely distribute for
|
This software includes Highsoft software libraries which you may freely distribute for
|
||||||
non-commercial use. Commerical users must licence this software, for more information visit
|
non-commercial use. Commercial users must licence this software, for more information visit
|
||||||
https://shop.highsoft.com/faq/non-commercial#non-commercial-redistribution.
|
https://shop.highsoft.com/faq/non-commercial#non-commercial-redistribution.
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,7 @@ def main():
|
||||||
if args.quiet:
|
if args.quiet:
|
||||||
plexpy.QUIET = True
|
plexpy.QUIET = True
|
||||||
|
|
||||||
# Do an intial setup of the logger.
|
# Do an initial setup of the logger.
|
||||||
# Require verbose for pre-initilization to see critical errors
|
# Require verbose for pre-initilization to see critical errors
|
||||||
logger.initLogger(console=not plexpy.QUIET, log_dir=False, verbose=True)
|
logger.initLogger(console=not plexpy.QUIET, log_dir=False, verbose=True)
|
||||||
|
|
||||||
|
|
|
@ -173,7 +173,7 @@ def check_active_sessions(ws_request=False):
|
||||||
row_id = monitor_process.write_session_history(session=stream)
|
row_id = monitor_process.write_session_history(session=stream)
|
||||||
|
|
||||||
if row_id:
|
if row_id:
|
||||||
# If session is written to the databaase successfully, remove the session from the session table
|
# If session is written to the database successfully, remove the session from the session table
|
||||||
logger.debug("Tautulli Monitor :: Removing sessionKey %s ratingKey %s from session queue"
|
logger.debug("Tautulli Monitor :: Removing sessionKey %s ratingKey %s from session queue"
|
||||||
% (stream['session_key'], stream['rating_key']))
|
% (stream['session_key'], stream['rating_key']))
|
||||||
monitor_process.delete_session(row_id=row_id)
|
monitor_process.delete_session(row_id=row_id)
|
||||||
|
|
|
@ -568,7 +568,7 @@ class Config(object):
|
||||||
|
|
||||||
def _upgrade(self):
|
def _upgrade(self):
|
||||||
"""
|
"""
|
||||||
Upgrades config file from previous verisions and bumps up config version
|
Upgrades config file from previous versions and bumps up config version
|
||||||
"""
|
"""
|
||||||
if self.CONFIG_VERSION == 0:
|
if self.CONFIG_VERSION == 0:
|
||||||
self.CONFIG_VERSION = 1
|
self.CONFIG_VERSION = 1
|
||||||
|
|
|
@ -283,7 +283,7 @@ def extract_columns(columns=None, match_columns=None):
|
||||||
columns_string = columns_string.rstrip(', ')
|
columns_string = columns_string.rstrip(', ')
|
||||||
|
|
||||||
# We return a dict of the column params
|
# We return a dict of the column params
|
||||||
# column_string is a comma seperated list of the exact column variables received.
|
# column_string is a comma separated list of the exact column variables received.
|
||||||
# column_literal is the text before the "as" if we have an "as". Usually a function.
|
# column_literal is the text before the "as" if we have an "as". Usually a function.
|
||||||
# column_named is the text after the "as", if we have an "as". Any table prefix is also stripped off.
|
# column_named is the text after the "as", if we have an "as". Any table prefix is also stripped off.
|
||||||
# We use this to match with columns received from the Datatables request.
|
# We use this to match with columns received from the Datatables request.
|
||||||
|
|
|
@ -132,7 +132,7 @@ def set_mobile_device_config(mobile_device_id=None, **kwargs):
|
||||||
if str(mobile_device_id).isdigit():
|
if str(mobile_device_id).isdigit():
|
||||||
mobile_device_id = int(mobile_device_id)
|
mobile_device_id = int(mobile_device_id)
|
||||||
else:
|
else:
|
||||||
logger.error("Tautulli MobileApp :: Unable to set exisiting mobile device: invalid mobile_device_id %s." % mobile_device_id)
|
logger.error("Tautulli MobileApp :: Unable to set existing mobile device: invalid mobile_device_id %s." % mobile_device_id)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
keys = {'id': mobile_device_id}
|
keys = {'id': mobile_device_id}
|
||||||
|
|
|
@ -955,7 +955,7 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m
|
||||||
now_iso = now.isocalendar()
|
now_iso = now.isocalendar()
|
||||||
|
|
||||||
available_params = {
|
available_params = {
|
||||||
# Global paramaters
|
# Global parameters
|
||||||
'tautulli_version': common.RELEASE,
|
'tautulli_version': common.RELEASE,
|
||||||
'tautulli_remote': plexpy.CONFIG.GIT_REMOTE,
|
'tautulli_remote': plexpy.CONFIG.GIT_REMOTE,
|
||||||
'tautulli_branch': plexpy.CONFIG.GIT_BRANCH,
|
'tautulli_branch': plexpy.CONFIG.GIT_BRANCH,
|
||||||
|
@ -1267,7 +1267,7 @@ def build_server_notify_params(notify_action=None, **kwargs):
|
||||||
now_iso = now.isocalendar()
|
now_iso = now.isocalendar()
|
||||||
|
|
||||||
available_params = {
|
available_params = {
|
||||||
# Global paramaters
|
# Global parameters
|
||||||
'tautulli_version': common.RELEASE,
|
'tautulli_version': common.RELEASE,
|
||||||
'tautulli_remote': plexpy.CONFIG.GIT_REMOTE,
|
'tautulli_remote': plexpy.CONFIG.GIT_REMOTE,
|
||||||
'tautulli_branch': plexpy.CONFIG.GIT_BRANCH,
|
'tautulli_branch': plexpy.CONFIG.GIT_BRANCH,
|
||||||
|
|
|
@ -4055,7 +4055,7 @@ class TAUTULLIREMOTEAPP(Notifier):
|
||||||
}
|
}
|
||||||
else:
|
else:
|
||||||
logger.warn("Tautulli Notifiers :: Cryptography library is missing. "
|
logger.warn("Tautulli Notifiers :: Cryptography library is missing. "
|
||||||
"Tautulli Remote app notifications will be sent unecrypted. "
|
"Tautulli Remote app notifications will be sent unencrypted. "
|
||||||
"Install the library to encrypt the notifications.")
|
"Install the library to encrypt the notifications.")
|
||||||
|
|
||||||
payload = {'app_id': mobile_app._ONESIGNAL_APP_ID,
|
payload = {'app_id': mobile_app._ONESIGNAL_APP_ID,
|
||||||
|
|
|
@ -50,7 +50,7 @@ def plex_user_login(token=None, headers=None):
|
||||||
user_token = None
|
user_token = None
|
||||||
user_id = None
|
user_id = None
|
||||||
|
|
||||||
# Try to login to Plex.tv to check if the user has a vaild account
|
# Try to login to Plex.tv to check if the user has a valid account
|
||||||
if token:
|
if token:
|
||||||
plex_tv = PlexTV(token=token, headers=headers)
|
plex_tv = PlexTV(token=token, headers=headers)
|
||||||
plex_user = plex_tv.get_plex_account_details()
|
plex_user = plex_tv.get_plex_account_details()
|
||||||
|
|
|
@ -608,7 +608,7 @@ class WebInterface(object):
|
||||||
status_message = ''
|
status_message = ''
|
||||||
else:
|
else:
|
||||||
result = None
|
result = None
|
||||||
status_message = 'An error occured.'
|
status_message = 'An error occurred.'
|
||||||
|
|
||||||
return serve_template(template_name="edit_library.html", title="Edit Library",
|
return serve_template(template_name="edit_library.html", title="Edit Library",
|
||||||
data=result, server_id=plexpy.CONFIG.PMS_IDENTIFIER, status_message=status_message)
|
data=result, server_id=plexpy.CONFIG.PMS_IDENTIFIER, status_message=status_message)
|
||||||
|
@ -1347,7 +1347,7 @@ class WebInterface(object):
|
||||||
status_message = ''
|
status_message = ''
|
||||||
else:
|
else:
|
||||||
result = None
|
result = None
|
||||||
status_message = 'An error occured.'
|
status_message = 'An error occurred.'
|
||||||
|
|
||||||
return serve_template(template_name="edit_user.html", title="Edit User", data=result, status_message=status_message)
|
return serve_template(template_name="edit_user.html", title="Edit User", data=result, status_message=status_message)
|
||||||
|
|
||||||
|
@ -1365,7 +1365,7 @@ class WebInterface(object):
|
||||||
keep_history (int): 0 or 1
|
keep_history (int): 0 or 1
|
||||||
allow_guest (int): 0 or 1
|
allow_guest (int): 0 or 1
|
||||||
|
|
||||||
Optional paramters:
|
Optional parameters:
|
||||||
None
|
None
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
|
@ -3031,7 +3031,7 @@ class WebInterface(object):
|
||||||
""" Delete the Tautulli notification logs.
|
""" Delete the Tautulli notification logs.
|
||||||
|
|
||||||
```
|
```
|
||||||
Required paramters:
|
Required parameters:
|
||||||
None
|
None
|
||||||
|
|
||||||
Optional parameters:
|
Optional parameters:
|
||||||
|
@ -3056,7 +3056,7 @@ class WebInterface(object):
|
||||||
""" Delete the Tautulli newsletter logs.
|
""" Delete the Tautulli newsletter logs.
|
||||||
|
|
||||||
```
|
```
|
||||||
Required paramters:
|
Required parameters:
|
||||||
None
|
None
|
||||||
|
|
||||||
Optional parameters:
|
Optional parameters:
|
||||||
|
@ -3081,7 +3081,7 @@ class WebInterface(object):
|
||||||
""" Delete the Tautulli login logs.
|
""" Delete the Tautulli login logs.
|
||||||
|
|
||||||
```
|
```
|
||||||
Required paramters:
|
Required parameters:
|
||||||
None
|
None
|
||||||
|
|
||||||
Optional parameters:
|
Optional parameters:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue