github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-07 13:41:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add setting to enable Live TV logging

Browse source
This commit is contained in:
JonnyWong16 2020-02-17 17:53:13 -08:00
parent 81ab9b006d
commit 5d1bc3cf9b
4 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/interfaces/default/settings.html
View file

@ -149,6 +149,12 @@
<h3>History Logging</h3> <h3>History Logging</h3>
</div> </div>
<div class="checkbox">
<label>
<input type="checkbox" id="logging_live_tv" name="logging_live_tv" value="1" ${config['logging_live_tv']}> Log Live TV Sessions
</label>
<p class="help-block">Enable history logging for Live TV sessions.</p>
</div>
<div class="form-group advanced-setting"> <div class="form-group advanced-setting">
<label for="logging_ignore_interval">Ignore Interval</label> <label for="logging_ignore_interval">Ignore Interval</label>
<div class="row"> <div class="row">

5
plexpy/activity_processor.py
View file

@ -227,7 +227,10 @@ class ActivityProcessor(object):
u"seconds, so we're not logging it." % u"seconds, so we're not logging it." %
(session['rating_key'], str(real_play_time), import_ignore_interval)) (session['rating_key'], str(real_play_time), import_ignore_interval))
if not is_import and not user_details['keep_history']: if not is_import and session['live'] and not plexpy.CONFIG.LOGGING_LIVE_TV:
logging_enabled = False
logger.debug(u"Tautulli ActivityProcessor :: History logging for Live TV is disabled.")
elif not is_import and not user_details['keep_history']:
logging_enabled = False logging_enabled = False
logger.debug(u"Tautulli ActivityProcessor :: History logging for user '%s' is disabled." % user_details['username']) logger.debug(u"Tautulli ActivityProcessor :: History logging for user '%s' is disabled." % user_details['username'])
elif not is_import and not library_details['keep_history']: elif not is_import and not library_details['keep_history']:

1
plexpy/config.py
View file

@ -291,6 +291,7 @@ _CONFIG_DEFINITIONS = {
'LOG_BLACKLIST': (int, 'General', 1), 'LOG_BLACKLIST': (int, 'General', 1),
'LOG_DIR': (str, 'General', ''), 'LOG_DIR': (str, 'General', ''),
'LOGGING_IGNORE_INTERVAL': (int, 'Monitoring', 120), 'LOGGING_IGNORE_INTERVAL': (int, 'Monitoring', 120),
'LOGGING_LIVE_TV': (int, 'Monitoring', 1),
'MAXMIND_LICENSE_KEY': (str, 'General', ''), 'MAXMIND_LICENSE_KEY': (str, 'General', ''),
'METADATA_CACHE_SECONDS': (int, 'Advanced', 1800), 'METADATA_CACHE_SECONDS': (int, 'Advanced', 1800),
'MOVIE_LOGGING_ENABLE': (int, 'Monitoring', 1), 'MOVIE_LOGGING_ENABLE': (int, 'Monitoring', 1),

3
plexpy/webserve.py
View file

@ -2794,6 +2794,7 @@ class WebInterface(object):
"refresh_users_interval": plexpy.CONFIG.REFRESH_USERS_INTERVAL, "refresh_users_interval": plexpy.CONFIG.REFRESH_USERS_INTERVAL,
"refresh_users_on_startup": checked(plexpy.CONFIG.REFRESH_USERS_ON_STARTUP), "refresh_users_on_startup": checked(plexpy.CONFIG.REFRESH_USERS_ON_STARTUP),
"logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL, "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL,
"logging_live_tv": checked(plexpy.CONFIG.LOGGING_LIVE_TV),
"notify_consecutive": checked(plexpy.CONFIG.NOTIFY_CONSECUTIVE), "notify_consecutive": checked(plexpy.CONFIG.NOTIFY_CONSECUTIVE),
"notify_upload_posters": plexpy.CONFIG.NOTIFY_UPLOAD_POSTERS, "notify_upload_posters": plexpy.CONFIG.NOTIFY_UPLOAD_POSTERS,
"notify_recently_added_upgrade": checked(plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_UPGRADE), "notify_recently_added_upgrade": checked(plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_UPGRADE),
@ -2863,7 +2864,7 @@ class WebInterface(object):
checked_configs = [ checked_configs = [
"launch_browser", "enable_https", "https_create_cert", "api_enabled", "freeze_db", "check_github", "launch_browser", "enable_https", "https_create_cert", "api_enabled", "freeze_db", "check_github",
"grouping_global_history", "grouping_user_history", "grouping_charts", "group_history_tables", "grouping_global_history", "grouping_user_history", "grouping_charts", "group_history_tables",
"pms_url_manual", "week_start_monday", "pms_url_manual", "week_start_monday", "logging_live_tv",
"refresh_libraries_on_startup", "refresh_users_on_startup", "refresh_libraries_on_startup", "refresh_users_on_startup",
"notify_consecutive", "notify_recently_added_upgrade", "notify_consecutive", "notify_recently_added_upgrade",
"notify_group_recently_added_grandparent", "notify_group_recently_added_parent", "notify_group_recently_added_grandparent", "notify_group_recently_added_parent",