Most Active Platform
- ${a['rows'][0]['platform_type']}
+ ${top_stat['rows'][0]['platform_type']}
-
% endif
% endfor
+
% else:
No stats for selected period.
% endif
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index 9e221a9d..8a31845c 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -45,12 +45,12 @@
diff --git a/plexpy/config.py b/plexpy/config.py
index 5fe59e29..51145685 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -1,4 +1,4 @@
-import plexpy.logger
+import plexpy.logger
import itertools
import os
import re
@@ -84,6 +84,7 @@ _CONFIG_DEFINITIONS = {
'GROWL_ON_WATCHED': (int, 'Growl', 0),
'HOME_STATS_LENGTH': (int, 'General', 30),
'HOME_STATS_TYPE': (int, 'General', 0),
+ 'HOME_STATS_COUNT': (int, 'General', 5),
'HTTPS_CERT': (str, 'General', ''),
'HTTPS_KEY': (str, 'General', ''),
'HTTP_HOST': (str, 'General', '0.0.0.0'),
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index b60c654b..5257f5ae 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -129,7 +129,7 @@ class DataFactory(object):
return dict
- def get_home_stats(self, time_range='30', stat_type='0'):
+ def get_home_stats(self, time_range='30', stat_type='0', stat_count='5'):
monitor_db = database.MonitorDatabase()
if not time_range.isdigit():
@@ -137,6 +137,9 @@ class DataFactory(object):
sort_type = 'total_plays' if stat_type == '0' else 'total_duration'
+ if not time_range.isdigit():
+ stat_count = '5'
+
# This actually determines the output order in the home page
stats_queries = ["top_tv", "popular_tv", "top_movies", "popular_movies", "top_users", "top_platforms"]
home_stats = []
@@ -161,7 +164,7 @@ class DataFactory(object):
'>= datetime("now", "-%s days", "localtime") ' \
'AND session_history_metadata.media_type = "episode" ' \
'GROUP BY session_history_metadata.grandparent_title ' \
- 'ORDER BY %s DESC LIMIT 10' % (time_range, sort_type)
+ 'ORDER BY %s DESC LIMIT %s' % (time_range, sort_type, stat_count)
result = monitor_db.select(query)
except:
logger.warn("Unable to execute database query.")
@@ -207,7 +210,7 @@ class DataFactory(object):
'>= datetime("now", "-%s days", "localtime") ' \
'AND session_history_metadata.media_type = "movie" ' \
'GROUP BY session_history_metadata.full_title ' \
- 'ORDER BY %s DESC LIMIT 10' % (time_range, sort_type)
+ 'ORDER BY %s DESC LIMIT %s' % (time_range, sort_type, stat_count)
result = monitor_db.select(query)
except:
logger.warn("Unable to execute database query.")
@@ -251,7 +254,7 @@ class DataFactory(object):
'AND session_history_metadata.media_type = "episode" ' \
'GROUP BY session_history_metadata.grandparent_title ' \
'ORDER BY users_watched DESC, total_plays DESC ' \
- 'LIMIT 10' % time_range
+ 'LIMIT %s' % (time_range, stat_count)
result = monitor_db.select(query)
except:
logger.warn("Unable to execute database query.")
@@ -293,7 +296,7 @@ class DataFactory(object):
'AND session_history_metadata.media_type = "movie" ' \
'GROUP BY session_history_metadata.full_title ' \
'ORDER BY users_watched DESC, total_plays DESC ' \
- 'LIMIT 10' % time_range
+ 'LIMIT %s' % (time_range, stat_count)
result = monitor_db.select(query)
except:
logger.warn("Unable to execute database query.")
@@ -338,7 +341,7 @@ class DataFactory(object):
'WHERE datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
'datetime("now", "-%s days", "localtime") '\
'GROUP BY session_history.user_id ' \
- 'ORDER BY %s DESC LIMIT 10' % (time_range, sort_type)
+ 'ORDER BY %s DESC LIMIT %s' % (time_range, sort_type, stat_count)
result = monitor_db.select(query)
except:
logger.warn("Unable to execute database query.")
@@ -386,7 +389,7 @@ class DataFactory(object):
'WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \
'>= datetime("now", "-%s days", "localtime") ' \
'GROUP BY session_history.platform ' \
- 'ORDER BY total_plays DESC' % time_range
+ 'ORDER BY total_plays DESC LIMIT %s' % (time_range, stat_count)
result = monitor_db.select(query)
except:
logger.warn("Unable to execute database query.")
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 54fc8d9f..3c0bf770 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1,4 +1,4 @@
-# This file is part of PlexPy.
+# This file is part of PlexPy.
#
# PlexPy is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -66,7 +66,8 @@ class WebInterface(object):
def home(self):
config = {
"home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH,
- "home_stats_type": plexpy.CONFIG.HOME_STATS_TYPE
+ "home_stats_type": plexpy.CONFIG.HOME_STATS_TYPE,
+ "home_stats_count": plexpy.CONFIG.HOME_STATS_COUNT
}
return serve_template(templatename="index.html", title="Home", config=config)
@@ -119,9 +120,9 @@ class WebInterface(object):
return json.dumps(formats)
@cherrypy.expose
- def home_stats(self, time_range='30', stat_type='0', **kwargs):
+ def home_stats(self, time_range='30', stat_type='0', stat_count='5', **kwargs):
data_factory = datafactory.DataFactory()
- stats_data = data_factory.get_home_stats(time_range=time_range, stat_type=stat_type)
+ stats_data = data_factory.get_home_stats(time_range=time_range, stat_type=stat_type, stat_count=stat_count)
return serve_template(templatename="home_stats.html", title="Stats", data=stats_data)
@@ -453,6 +454,7 @@ class WebInterface(object):
"notify_on_watched_body_text": plexpy.CONFIG.NOTIFY_ON_WATCHED_BODY_TEXT,
"home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH,
"home_stats_type": checked(plexpy.CONFIG.HOME_STATS_TYPE),
+ "home_stats_count": checked(plexpy.CONFIG.HOME_STATS_COUNT),
"buffer_threshold": plexpy.CONFIG.BUFFER_THRESHOLD,
"buffer_wait": plexpy.CONFIG.BUFFER_WAIT
}