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

fix https://github.com/drzoidberg33/plexpy/issues/705#issuecomment-219927893

Browse source 
Can you test and verify
This commit is contained in:
Hellowlol 2016-05-18 20:55:20 +02:00
parent 33458c1bdb
commit a660a1c44b
1 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

52
plexpy/webserve.py
View file

@ -1170,7 +1170,7 @@ class WebInterface(object):
@requireAuth() @requireAuth()
@addtoapi() @addtoapi()
def get_user_logins(self, user_id=None, **kwargs): def get_user_logins(self, user_id=None, **kwargs):
""" Get the data on PlexPy user login table. """ Get the data on PlexPy user login table.
``` ```
Required parameters: Required parameters:
@ -1189,15 +1189,15 @@ class WebInterface(object):
"recordsTotal": 2344, "recordsTotal": 2344,
"recordsFiltered": 10, "recordsFiltered": 10,
"data": "data":
[{"browser": "Safari 7.0.3", [{"browser": "Safari 7.0.3",
"friendly_name": "Jon Snow", "friendly_name": "Jon Snow",
"host": "http://plexpy.castleblack.com", "host": "http://plexpy.castleblack.com",
"ip_address": "xxx.xxx.xxx.xxx", "ip_address": "xxx.xxx.xxx.xxx",
"os": "Mac OS X", "os": "Mac OS X",
"timestamp": 1462591869, "timestamp": 1462591869,
"user": "LordCommanderSnow", "user": "LordCommanderSnow",
"user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/7046A194A", "user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/7046A194A",
"user_group": "guest", "user_group": "guest",
"user_id": 133788 "user_id": 133788
}, },
{...}, {...},
@ -1987,24 +1987,14 @@ class WebInterface(object):
def getLog(self, start=0, length=100, **kwargs): def getLog(self, start=0, length=100, **kwargs):
start = int(start) start = int(start)
length = int(length) length = int(length)
search_value = "" order_dir = kwargs.get('order[0][dir]', "desc")
search_regex = "" order_column = kwargs.get('order[0][column]', "0")
order_column = 0 search_value = kwargs.get('search[value]', "")
order_dir = "desc" search_regex = kwargs.get('search[regex]', "") # Remove?
sortcolumn = 0
if 'order[0][dir]' in kwargs:
order_dir = kwargs.get('order[0][dir]', "desc")
if 'order[0][column]' in kwargs:
order_column = kwargs.get('order[0][column]', "0")
if 'search[value]' in kwargs:
search_value = kwargs.get('search[value]', "")
if 'search[regex]' in kwargs:
search_regex = kwargs.get('search[regex]', "")
filt = [] filt = []
filtered = []
fa = filt.append fa = filt.append
with open(os.path.join(plexpy.CONFIG.LOG_DIR, logger.FILENAME)) as f: with open(os.path.join(plexpy.CONFIG.LOG_DIR, logger.FILENAME)) as f:
for l in f.readlines(): for l in f.readlines():
@ -2017,22 +2007,24 @@ class WebInterface(object):
# Add traceback message to previous msg. # Add traceback message to previous msg.
tl = (len(filt) - 1) tl = (len(filt) - 1)
n = len(l) - len(l.lstrip(' ')) n = len(l) - len(l.lstrip(' '))
l = ' ' * (2*n) + l[n:] l = ' ' * (2 * n) + l[n:]
filt[tl][2] += '<br>' + l filt[tl][2] += '<br>' + l
continue continue
filtered = []
if search_value == '': if search_value == '':
filtered = filt filtered = filt
else: else:
filtered = [row for row in filt for column in row if search_value.lower() in column.lower()] filtered = [row for row in filt for column in row if search_value.lower() in column.lower()]
sortcolumn = 0
if order_column == '1': if order_column == '1':
sortcolumn = 2 sortcolumn = 2
elif order_column == '2': elif order_column == '2':
sortcolumn = 1 sortcolumn = 1
filtered.sort(key=lambda x: x[sortcolumn], reverse=order_dir == "desc")
filtered.sort(key=lambda x: x[sortcolumn])
if order_dir == 'desc':
filtered = filtered[::-1]
rows = filtered[start:(start + length)] rows = filtered[start:(start + length)]