Merge branch 'dev'

CHANGELOG.md

@@ -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.

data/interfaces/default/js/tables/logs.js

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

plexpy/datafactory.py

@@ -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']:
+                        if count >= last_count:
-                            most_concurrent = {'count': count,
+                            last_count = count
-                                               'started': last_start[:-1],
+                            most_concurrent = [{'count': count,
-                                               'stopped': d['time'][:-1]}
+                                                '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
 

plexpy/version.py

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