diff --git a/tubearchivist/api/src/aggs.py b/tubearchivist/api/src/aggs.py index ac6c2e6..8921d86 100644 --- a/tubearchivist/api/src/aggs.py +++ b/tubearchivist/api/src/aggs.py @@ -2,6 +2,7 @@ from home.src.es.connect import ElasticWrap from home.src.ta.helper import get_duration_str +from home.src.ta.settings import EnvironmentSettings class AggBase: @@ -168,13 +169,22 @@ class DownloadHist(AggBase): "calendar_interval": "day", "format": "yyyy-MM-dd", "order": {"_key": "desc"}, + "time_zone": EnvironmentSettings.TZ, }, "aggs": { - "total_videos": {"value_count": {"field": "youtube_id"}} + "total_videos": {"value_count": {"field": "youtube_id"}}, + "media_size": {"sum": {"field": "media_size"}}, }, } }, - "query": {"range": {"date_downloaded": {"gte": "now-7d/d"}}}, + "query": { + "range": { + "date_downloaded": { + "gte": "now-7d/d", + "time_zone": EnvironmentSettings.TZ, + } + } + }, } def process(self): @@ -186,6 +196,7 @@ class DownloadHist(AggBase): { "date": i.get("key_as_string"), "count": i.get("doc_count"), + "media_size": i["media_size"].get("value"), } for i in buckets ] diff --git a/tubearchivist/static/stats.js b/tubearchivist/static/stats.js index 3336753..762d245 100644 --- a/tubearchivist/static/stats.js +++ b/tubearchivist/static/stats.js @@ -241,7 +241,9 @@ function buildDailyStat(dailyStat) { text = 'Video'; } - message.innerText = `+${dailyStat.count} ${text}`; + message.innerText = + `+${dailyStat.count} ${text} + ${humanFileSize(dailyStat.media_size)}`; tile.appendChild(message); return tile;