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

Add secure and relayed to the database

Browse source
This commit is contained in:
JonnyWong16 2019-04-27 15:40:33 -07:00
parent d3a7229c00
commit 9b42bb240a
2 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

31
plexpy/__init__.py
View file

@ -586,7 +586,7 @@ def dbcheck():
'transcode_hw_decoding INTEGER, transcode_hw_encoding INTEGER, ' 'transcode_hw_decoding INTEGER, transcode_hw_encoding INTEGER, '
'optimized_version INTEGER, optimized_version_profile TEXT, optimized_version_title TEXT, ' 'optimized_version INTEGER, optimized_version_profile TEXT, optimized_version_title TEXT, '
'synced_version INTEGER, synced_version_profile TEXT, ' 'synced_version INTEGER, synced_version_profile TEXT, '
'live INTEGER, live_uuid TEXT, ' 'live INTEGER, live_uuid TEXT, secure INTEGER, relayed INTEGER, '
'buffer_count INTEGER DEFAULT 0, buffer_last_triggered INTEGER, last_paused INTEGER, watched INTEGER DEFAULT 0, ' 'buffer_count INTEGER DEFAULT 0, buffer_last_triggered INTEGER, last_paused INTEGER, watched INTEGER DEFAULT 0, '
'write_attempts INTEGER DEFAULT 0, raw_stream_info TEXT)' 'write_attempts INTEGER DEFAULT 0, raw_stream_info TEXT)'
) )
@ -595,8 +595,9 @@ def dbcheck():
c_db.execute( c_db.execute(
'CREATE TABLE IF NOT EXISTS session_history (id INTEGER PRIMARY KEY AUTOINCREMENT, reference_id INTEGER, ' 'CREATE TABLE IF NOT EXISTS session_history (id INTEGER PRIMARY KEY AUTOINCREMENT, reference_id INTEGER, '
'started INTEGER, stopped INTEGER, rating_key INTEGER, user_id INTEGER, user TEXT, ' 'started INTEGER, stopped INTEGER, rating_key INTEGER, user_id INTEGER, user TEXT, '
'ip_address TEXT, paused_counter INTEGER DEFAULT 0, player TEXT, product TEXT, product_version TEXT, platform TEXT, platform_version TEXT, profile TEXT, machine_id TEXT, ' 'ip_address TEXT, paused_counter INTEGER DEFAULT 0, player TEXT, product TEXT, product_version TEXT, '
'bandwidth INTEGER, location TEXT, quality_profile TEXT, ' 'platform TEXT, platform_version TEXT, profile TEXT, machine_id TEXT, '
'bandwidth INTEGER, location TEXT, quality_profile TEXT, secure INTEGER, relayed INTEGER'
'parent_rating_key INTEGER, grandparent_rating_key INTEGER, media_type TEXT, view_offset INTEGER DEFAULT 0)' 'parent_rating_key INTEGER, grandparent_rating_key INTEGER, media_type TEXT, view_offset INTEGER DEFAULT 0)'
) )
@ -1143,6 +1144,18 @@ def dbcheck():
'ALTER TABLE sessions ADD COLUMN original_title TEXT' 'ALTER TABLE sessions ADD COLUMN original_title TEXT'
) )
# Upgrade sessions table from earlier versions
try:
c_db.execute('SELECT secure FROM sessions')
except sqlite3.OperationalError:
logger.debug(u"Altering database. Updating database table sessions.")
c_db.execute(
'ALTER TABLE sessions ADD COLUMN secure INTEGER'
)
c_db.execute(
'ALTER TABLE sessions ADD COLUMN relayed INTEGER'
)
# Upgrade session_history table from earlier versions # Upgrade session_history table from earlier versions
try: try:
c_db.execute('SELECT reference_id FROM session_history') c_db.execute('SELECT reference_id FROM session_history')
@ -1193,6 +1206,18 @@ def dbcheck():
'ALTER TABLE session_history ADD COLUMN quality_profile TEXT' 'ALTER TABLE session_history ADD COLUMN quality_profile TEXT'
) )
# Upgrade session_history table from earlier versions
try:
c_db.execute('SELECT secure FROM session_history')
except sqlite3.OperationalError:
logger.debug(u"Altering database. Updating database table session_history.")
c_db.execute(
'ALTER TABLE session_history ADD COLUMN secure INTEGER'
)
c_db.execute(
'ALTER TABLE session_history ADD COLUMN relayed INTEGER'
)
# Upgrade session_history_metadata table from earlier versions # Upgrade session_history_metadata table from earlier versions
try: try:
c_db.execute('SELECT full_title FROM session_history_metadata') c_db.execute('SELECT full_title FROM session_history_metadata')

6
plexpy/activity_processor.py
View file

@ -115,6 +115,8 @@ class ActivityProcessor(object):
'subtitles': session.get('subtitles', 0), 'subtitles': session.get('subtitles', 0),
'live': session.get('live', 0), 'live': session.get('live', 0),
'live_uuid': session.get('live_uuid', ''), 'live_uuid': session.get('live_uuid', ''),
'secure': session.get('secure', None),
'relayed': session.get('relayed', 0),
'raw_stream_info': json.dumps(session), 'raw_stream_info': json.dumps(session),
'stopped': int(time.time()) 'stopped': int(time.time())
} }
@ -261,7 +263,9 @@ class ActivityProcessor(object):
'bandwidth': session['bandwidth'], 'bandwidth': session['bandwidth'],
'location': session['location'], 'location': session['location'],
'quality_profile': session['quality_profile'], 'quality_profile': session['quality_profile'],
'view_offset': session['view_offset'] 'view_offset': session['view_offset'],
'secure': session['secure'],
'relayed': session['relayed']
} }
# logger.debug(u"Tautulli ActivityProcessor :: Writing sessionKey %s session_history transaction..." # logger.debug(u"Tautulli ActivityProcessor :: Writing sessionKey %s session_history transaction..."