mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-08-19 21:03:21 -07:00
Template the stream modal
Template the history table Add history history to metadata info screens Fix some more datatables stuff More webserve housekeeping
This commit is contained in:
Tim
parent
58a1442fe9
commit
c4504d8be0
8 changed files with 564 additions and 301 deletions
|
|
@ -28,6 +28,7 @@ class DataTables(object):
|
|||
def __init__(self):
|
||||
self.ssp_db = db.DBConnection()
|
||||
|
||||
# TODO: Pass all parameters via kwargs
|
||||
def ssp_query(self, table_name,
|
||||
columns=[],
|
||||
start=0,
|
||||
|
|
@ -53,16 +54,26 @@ class DataTables(object):
|
|||
|
||||
# TODO: custom_where is ugly and causes issues with reported total results
|
||||
if custom_where != '':
|
||||
where += 'AND (' + custom_where + ')'
|
||||
custom_where = 'WHERE (' + custom_where + ')'
|
||||
|
||||
if grouping:
|
||||
query = 'SELECT * FROM (SELECT %s FROM %s GROUP BY %s) %s %s' \
|
||||
% (column_data['column_string'], table_name, group_by,
|
||||
where, order)
|
||||
if custom_where == '':
|
||||
query = 'SELECT * FROM (SELECT %s FROM %s GROUP BY %s) %s %s' \
|
||||
% (column_data['column_string'], table_name, group_by,
|
||||
where, order)
|
||||
else:
|
||||
query = 'SELECT * FROM (SELECT * FROM (SELECT %s FROM %s GROUP BY %s) %s %s) %s' \
|
||||
% (column_data['column_string'], table_name, group_by,
|
||||
where, order, custom_where)
|
||||
else:
|
||||
query = 'SELECT %s FROM %s %s %s' \
|
||||
% (column_data['column_string'], table_name, where,
|
||||
order)
|
||||
if custom_where == '':
|
||||
query = 'SELECT %s FROM %s %s %s' \
|
||||
% (column_data['column_string'], table_name, where,
|
||||
order)
|
||||
else:
|
||||
query = 'SELECT * FROM (SELECT %s FROM %s %s %s) %s' \
|
||||
% (column_data['column_string'], table_name, where,
|
||||
order, custom_where)
|
||||
|
||||
filtered = self.ssp_db.select(query)
|
||||
if search_value == '':
|
||||
|
|
@ -122,7 +133,9 @@ class DataTables(object):
|
|||
|
||||
return where
|
||||
else:
|
||||
return ''
|
||||
where = ''
|
||||
|
||||
return where
|
||||
|
||||
@staticmethod
|
||||
def extract_columns(columns=[]):
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with PlexPy. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from plexpy import logger, helpers, request, datatables, config
|
||||
from plexpy import logger, helpers, request, datatables, config, db
|
||||
|
||||
from xml.dom import minidom
|
||||
import plexpy
|
||||
|
|
@ -104,7 +104,7 @@ class PlexWatch(object):
|
|||
|
||||
return dict
|
||||
|
||||
def get_history(self, start='', length='', kwargs=None):
|
||||
def get_history(self, start='', length='', kwargs=None, custom_where=''):
|
||||
data_tables = datatables.DataTables()
|
||||
|
||||
start = int(start)
|
||||
|
|
@ -152,7 +152,7 @@ class PlexWatch(object):
|
|||
order_dir=order_dir,
|
||||
search_value=search_value,
|
||||
search_regex=search_regex,
|
||||
custom_where='',
|
||||
custom_where=custom_where,
|
||||
group_by='',
|
||||
kwargs=kwargs)
|
||||
|
||||
|
|
@ -216,3 +216,112 @@ class PlexWatch(object):
|
|||
}
|
||||
|
||||
return dict
|
||||
|
||||
def get_stream_details(self, id=0):
|
||||
|
||||
myDB = db.DBConnection()
|
||||
|
||||
query = 'SELECT xml from %s where id = %s' % (self.get_history_table_name(), id)
|
||||
xml = myDB.select_single(query)
|
||||
|
||||
try:
|
||||
dict_data = helpers.convert_xml_to_dict(helpers.latinToAscii(xml))
|
||||
except IOError, e:
|
||||
logger.warn("Error parsing XML in PlexWatch db: %s" % e)
|
||||
|
||||
dict = {'id': id,
|
||||
'data': dict_data}
|
||||
|
||||
return dict
|
||||
|
||||
"""
|
||||
Validate xml keys to make sure they exist and return their attribute value, return blank value is none found
|
||||
"""
|
||||
@staticmethod
|
||||
def get_xml_attr(xml_key, attribute, return_bool=False, default_return=''):
|
||||
if xml_key.getAttribute(attribute):
|
||||
if return_bool:
|
||||
return True
|
||||
else:
|
||||
return xml_key.getAttribute(attribute)
|
||||
else:
|
||||
if return_bool:
|
||||
return False
|
||||
else:
|
||||
return default_return
|
||||
|
||||
def get_stream_details(self, row_id=None):
|
||||
myDB = db.DBConnection()
|
||||
|
||||
if row_id:
|
||||
query = 'SELECT xml from %s where id = %s' % (self.get_history_table_name(), row_id)
|
||||
xml = myDB.select_single(query)
|
||||
xml_data = helpers.latinToAscii(xml)
|
||||
else:
|
||||
return None
|
||||
|
||||
try:
|
||||
xml_parse = minidom.parseString(xml_data)
|
||||
except:
|
||||
logger.warn("Error parsing XML for Plex stream data.")
|
||||
return None
|
||||
|
||||
xml_head = xml_parse.getElementsByTagName('opt')
|
||||
if not xml_head:
|
||||
logger.warn("Error parsing XML for Plex stream data.")
|
||||
return None
|
||||
|
||||
stream_output = {}
|
||||
|
||||
for a in xml_head:
|
||||
media_type = self.get_xml_attr(a, 'type')
|
||||
title = self.get_xml_attr(a, 'title')
|
||||
grandparent_title = self.get_xml_attr(a, 'grandparentTitle')
|
||||
|
||||
if a.getElementsByTagName('TranscodeSession'):
|
||||
transcode_data = a.getElementsByTagName('TranscodeSession')
|
||||
for transcode_session in transcode_data:
|
||||
transcode_video_dec = self.get_xml_attr(transcode_session, 'videoDecision')
|
||||
transcode_video_codec = self.get_xml_attr(transcode_session, 'videoCodec')
|
||||
transcode_height = self.get_xml_attr(transcode_session, 'height')
|
||||
transcode_width = self.get_xml_attr(transcode_session, 'width')
|
||||
transcode_audio_dec = self.get_xml_attr(transcode_session, 'audioDecision')
|
||||
transcode_audio_codec = self.get_xml_attr(transcode_session, 'audioCodec')
|
||||
transcode_audio_channels = self.get_xml_attr(transcode_session, 'audioChannels')
|
||||
else:
|
||||
transcode_data = a.getElementsByTagName('Media')
|
||||
for transcode_session in transcode_data:
|
||||
transcode_video_dec = 'direct play'
|
||||
transcode_video_codec = self.get_xml_attr(transcode_session, 'videoCodec')
|
||||
transcode_height = self.get_xml_attr(transcode_session, 'height')
|
||||
transcode_width = self.get_xml_attr(transcode_session, 'width')
|
||||
transcode_audio_dec = 'direct play'
|
||||
transcode_audio_codec = self.get_xml_attr(transcode_session, 'audioCodec')
|
||||
transcode_audio_channels = self.get_xml_attr(transcode_session, 'audioChannels')
|
||||
|
||||
if a.getElementsByTagName('Media'):
|
||||
stream_data = a.getElementsByTagName('Media')
|
||||
for stream_item in stream_data:
|
||||
stream_output = {'container': self.get_xml_attr(stream_item, 'container'),
|
||||
'bitrate': self.get_xml_attr(stream_item, 'bitrate'),
|
||||
'video_resolution': self.get_xml_attr(stream_item, 'videoResolution'),
|
||||
'width': self.get_xml_attr(stream_item, 'width'),
|
||||
'height': self.get_xml_attr(stream_item, 'height'),
|
||||
'aspect_ratio': self.get_xml_attr(stream_item, 'aspectRatio'),
|
||||
'video_framerate': self.get_xml_attr(stream_item, 'videoFrameRate'),
|
||||
'video_codec': self.get_xml_attr(stream_item, 'videoCodec'),
|
||||
'audio_codec': self.get_xml_attr(stream_item, 'audioCodec'),
|
||||
'audio_channels': self.get_xml_attr(stream_item, 'audioChannels'),
|
||||
'transcode_video_dec': transcode_video_dec,
|
||||
'transcode_video_codec': transcode_video_codec,
|
||||
'transcode_height': transcode_height,
|
||||
'transcode_width': transcode_width,
|
||||
'transcode_audio_dec': transcode_audio_dec,
|
||||
'transcode_audio_codec': transcode_audio_codec,
|
||||
'transcode_audio_channels': transcode_audio_channels,
|
||||
'media_type': media_type,
|
||||
'title': title,
|
||||
'grandparent_title': grandparent_title
|
||||
}
|
||||
|
||||
return stream_output
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with PlexPy. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from plexpy import logger, db, helpers, notifiers, plextv, pmsconnect, plexwatch
|
||||
from plexpy import logger, helpers, notifiers, plextv, pmsconnect, plexwatch
|
||||
from plexpy.helpers import checked, radio, today, cleanName
|
||||
from xml.dom import minidom
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ class WebInterface(object):
|
|||
return serve_template(templatename="index.html", title="Home")
|
||||
|
||||
@cherrypy.expose
|
||||
def history(self):
|
||||
def get_date_formats(self):
|
||||
if plexpy.CONFIG.DATE_FORMAT:
|
||||
date_format = plexpy.CONFIG.DATE_FORMAT
|
||||
else:
|
||||
|
|
@ -77,8 +77,15 @@ class WebInterface(object):
|
|||
else:
|
||||
time_format = 'HH:mm'
|
||||
|
||||
return serve_template(templatename="history.html", title="History", date_format=date_format,
|
||||
time_format=time_format)
|
||||
formats = {'date_format': date_format,
|
||||
'time_format': time_format}
|
||||
|
||||
cherrypy.response.headers['Content-type'] = 'application/json'
|
||||
return json.dumps(formats)
|
||||
|
||||
@cherrypy.expose
|
||||
def history(self):
|
||||
return serve_template(templatename="history.html", title="History")
|
||||
|
||||
@cherrypy.expose
|
||||
def users(self):
|
||||
|
|
@ -88,6 +95,14 @@ class WebInterface(object):
|
|||
def user(self):
|
||||
return serve_template(templatename="user.html", title="User")
|
||||
|
||||
@cherrypy.expose
|
||||
def get_stream_data(self, row_id=None, user='', **kwargs):
|
||||
|
||||
plex_watch = plexwatch.PlexWatch()
|
||||
stream_data = plex_watch.get_stream_details(row_id)
|
||||
|
||||
return serve_template(templatename="stream_data.html", title="Stream Data", data=stream_data, user=user)
|
||||
|
||||
@cherrypy.expose
|
||||
def get_user_list(self, start=0, length=100, **kwargs):
|
||||
|
||||
|
|
@ -332,34 +347,29 @@ class WebInterface(object):
|
|||
message=message, timer=timer)
|
||||
|
||||
@cherrypy.expose
|
||||
def getHistory_json(self, start=0, length=100, **kwargs):
|
||||
def get_history(self, start=0, length=100, custom_where='', **kwargs):
|
||||
|
||||
if 'user' in kwargs:
|
||||
user = kwargs.get('user', "")
|
||||
custom_where = 'user = "%s"' % user
|
||||
if 'rating_key' in kwargs:
|
||||
rating_key = kwargs.get('rating_key', "")
|
||||
custom_where = 'rating_key = %s' % rating_key
|
||||
|
||||
plex_watch = plexwatch.PlexWatch()
|
||||
history = plex_watch.get_history(start, length, kwargs)
|
||||
history = plex_watch.get_history(start, length, kwargs, custom_where)
|
||||
|
||||
cherrypy.response.headers['Content-type'] = 'application/json'
|
||||
return json.dumps(history)
|
||||
|
||||
@cherrypy.expose
|
||||
def getStreamDetails(self, id=0, **kwargs):
|
||||
def get_stream_details(self, rating_key=0, **kwargs):
|
||||
|
||||
myDB = db.DBConnection()
|
||||
db_table = db.DBConnection().get_history_table_name()
|
||||
plex_watch = plexwatch.PlexWatch()
|
||||
stream_details = plex_watch.get_stream_details(rating_key)
|
||||
|
||||
query = 'SELECT xml from %s where id = %s' % (db_table, id)
|
||||
xml = myDB.select_single(query)
|
||||
|
||||
try:
|
||||
dict_data = helpers.convert_xml_to_dict(helpers.latinToAscii(xml))
|
||||
except IOError, e:
|
||||
logger.warn("Error parsing XML in PlexWatch db: %s" % e)
|
||||
|
||||
dict = {'id': id,
|
||||
'data': dict_data}
|
||||
|
||||
s = json.dumps(dict)
|
||||
cherrypy.response.headers['Content-type'] = 'application/json'
|
||||
return s
|
||||
return json.dumps(stream_details)
|
||||
|
||||
|
||||
@cherrypy.expose
|
||||
|
|
@ -554,6 +564,18 @@ class WebInterface(object):
|
|||
pms_connect = pmsconnect.PmsConnect()
|
||||
result = pms_connect.get_recently_added(count, 'json')
|
||||
|
||||
if result:
|
||||
cherrypy.response.headers['Content-type'] = 'application/json'
|
||||
return result
|
||||
else:
|
||||
logger.warn('Unable to retrieve data.')
|
||||
|
||||
@cherrypy.expose
|
||||
def get_stream(self, row_id='', **kwargs):
|
||||
|
||||
plex_watch = plexwatch.PlexWatch()
|
||||
result = plex_watch.get_stream_details('122')
|
||||
|
||||
if result:
|
||||
cherrypy.response.headers['Content-type'] = 'application/json'
|
||||
return result
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue