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

Merge branch 'dev'

Browse source
This commit is contained in:
Jonathan Wong 2015-12-22 19:36:10 -08:00
commit 9409303f24
4 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,5 +1,11 @@
# Changelog
## v1.2.16 (2015-12-22)
* Fix Most Concurrent stream stat for emtpy databases
* Change logs to 50 lines by default
## v1.2.15 (2015-12-20)
* Fix navbar covering current activity on smaller screens.

2
data/interfaces/default/js/tables/logs.js
View file

@ -4,7 +4,7 @@ var log_table_options = {
"processing": false,
"pagingType": "bootstrap",
"order": [ 0, 'desc'],
"pageLength": 10,
"pageLength": 50,
"stateSave": true,
"language": {
"search":"Search: ",

18
plexpy/datafactory.py
View file

@ -587,23 +587,25 @@ class DataFactory(object):
times = sorted(times, key=lambda k: k['time'])
count = 0
last_count = 0
last_start = 0
most_concurrent = {'count': count}
most_concurrent = []
for d in times:
if d['count'] == 1:
count += d['count']
if count >= most_concurrent['count']:
if count >= last_count:
last_start = d['time']
else:
if count >= most_concurrent['count']:
most_concurrent = {'count': count,
'started': last_start[:-1],
'stopped': d['time'][:-1]}
if count >= last_count:
last_count = count
most_concurrent = [{'count': count,
'started': last_start[:-1],
'stopped': d['time'][:-1]}]
count += d['count']
home_stats.append({'stat_id': stat,
'rows': [most_concurrent]})
'rows': most_concurrent})
return home_stats
@ -1087,4 +1089,4 @@ class DataFactory(object):
for item in result:
total_duration = item['total_duration']
return total_duration
return total_duration

2
plexpy/version.py
View file

@ -1,2 +1,2 @@
PLEXPY_VERSION = "master"
PLEXPY_RELEASE_VERSION = "1.2.15"
PLEXPY_RELEASE_VERSION = "1.2.16"