From fc4a72288ced1aae8e30987cbfae3ebe23bb0c8c Mon Sep 17 00:00:00 2001
From: lelo <leonid.firus@outlook.com>
Date: Tue, 1 Apr 2025 21:10:18 +0000
Subject: [PATCH] add filetype selection

---
 analytics.py             | 48 +++++++++++++++++++++++-----------------
 templates/dashboard.html | 39 +++++++++++++++++++++++++++-----
 2 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/analytics.py b/analytics.py
index c4f46ef..152d066 100644
--- a/analytics.py
+++ b/analytics.py
@@ -1,5 +1,5 @@
 import sqlite3
-from flask import render_template, request
+from flask import render_template, request, session
 from datetime import datetime, timedelta
 import geoip2.database
 from auth import require_secret
@@ -94,8 +94,13 @@ def connections():
 
 @require_secret
 def dashboard():
-    filetype_arg = request.args.get('filetype', 'audio')
-    timeframe = request.args.get('timeframe', 'last24hours')
+    if 'filetype' not in session:
+        session['filetype'] = 'audio'
+    if 'timeframe' not in session:
+        session['timeframe'] = 'last24hours'
+    session['filetype'] = request.args.get('filetype', session['filetype'])
+    session['timeframe'] = request.args.get('timeframe', session['timeframe'])
+    
     now = datetime.now()
 
     # Determine which file type we're filtering by.
@@ -106,21 +111,21 @@ def dashboard():
     image_list = ['jpg', 'jpeg', 'image', 'photo']
     video_list = ['mp4', 'mov', 'wmv', 'avi']
 
-    if filetype_arg.lower() in audio_list:
+    if session['filetype'].lower() in audio_list:
         filetype = 'audio/'
-    elif filetype_arg.lower() in image_list:
+    elif session['filetype'].lower() in image_list:
         filetype = 'image/'
-    elif filetype_arg.lower() in video_list:
+    elif session['filetype'].lower() in video_list:
         filetype = 'video/'
 
-    # Determine start time based on timeframe
-    if timeframe == 'last24hours':
+    # Determine start time based on session['timeframe']
+    if session['timeframe'] == 'last24hours':
         start_dt = now - timedelta(hours=24)
-    elif timeframe == '7days':
+    elif session['timeframe'] == '7days':
         start_dt = now - timedelta(days=7)
-    elif timeframe == '30days':
+    elif session['timeframe'] == '30days':
         start_dt = now - timedelta(days=30)
-    elif timeframe == '365days':
+    elif session['timeframe'] == '365days':
         start_dt = now - timedelta(days=365)
     else:
         start_dt = now - timedelta(hours=24)
@@ -157,7 +162,7 @@ def dashboard():
 
     # 2. Distinct device trend
     #    We'll group by hour if "today", by day if "7days"/"30days", by month if "365days"
-    if timeframe == 'last24hours':
+    if session['timeframe'] == 'last24hours':
         # Group by hour: substr(timestamp, 12, 2) -> HH
         query = f'''
             SELECT substr(timestamp, 12, 2) AS bucket, COUNT(DISTINCT device_id) AS count
@@ -166,7 +171,7 @@ def dashboard():
             GROUP BY bucket
             ORDER BY bucket
         '''
-    elif timeframe in ('7days', '30days'):
+    elif session['timeframe'] in ('7days', '30days'):
         # Group by day: substr(timestamp, 1, 10) -> YYYY-MM-DD
         query = f'''
             SELECT substr(timestamp, 1, 10) AS bucket, COUNT(DISTINCT device_id) AS count
@@ -175,7 +180,7 @@ def dashboard():
             GROUP BY bucket
             ORDER BY bucket
         '''
-    elif timeframe == '365days':
+    elif session['timeframe'] == '365days':
         # Group by month: substr(timestamp, 1, 7) -> YYYY-MM
         query = f'''
             SELECT substr(timestamp, 1, 7) AS bucket, COUNT(DISTINCT device_id) AS count
@@ -200,9 +205,9 @@ def dashboard():
         dict(bucket=r[0], count=r[1]) for r in distinct_device_data_rows
     ]
 
-    # 3. Timeframe-based aggregation
+    # 3. session['timeframe']-based aggregation
     #    We'll group by hour if "today", by day if "7days"/"30days", by month if "365days".
-    if timeframe == 'last24hours':
+    if session['timeframe'] == 'last24hours':
         # Hour: substr(timestamp, 12, 2) -> HH
         query = f'''
             SELECT substr(timestamp, 12, 2) AS bucket, COUNT(*) AS count
@@ -211,7 +216,7 @@ def dashboard():
             GROUP BY bucket
             ORDER BY bucket
         '''
-    elif timeframe in ('7days', '30days'):
+    elif session['timeframe'] in ('7days', '30days'):
         # Day: substr(timestamp, 1, 10) -> YYYY-MM-DD
         query = f'''
             SELECT substr(timestamp, 1, 10) AS bucket, COUNT(*) AS count
@@ -220,7 +225,7 @@ def dashboard():
             GROUP BY bucket
             ORDER BY bucket
         '''
-    elif timeframe == '365days':
+    elif session['timeframe'] == '365days':
         # Month: substr(timestamp, 1, 7) -> YYYY-MM
         query = f'''
             SELECT substr(timestamp, 1, 7) AS bucket, COUNT(*) AS count
@@ -337,6 +342,9 @@ def dashboard():
     with log_db:
         cursor = log_db.execute(query, params_for_filter)
         cached_percentage = cursor.fetchone()[0]
+        
+    if cached_percentage is not None:
+        cached_percentage = f"{cached_percentage:.2f}"
 
     # 8. Process location data with GeoIP2
     reader = geoip2.database.Reader('GeoLite2-City.mmdb')
@@ -359,7 +367,7 @@ def dashboard():
 
     return render_template(
         "dashboard.html",
-        timeframe=timeframe,
+        timeframe=session['timeframe'],
         rows=rows,
         distinct_device_data=distinct_device_data,
         user_agent_data=user_agent_data,
@@ -368,6 +376,6 @@ def dashboard():
         total_accesses=total_accesses,
         unique_files=unique_files,
         unique_user=unique_user,
-        cached_percentage=f"{cached_percentage:.2f}",
+        cached_percentage=cached_percentage,
         timeframe_data=timeframe_data
     )
diff --git a/templates/dashboard.html b/templates/dashboard.html
index 2eac753..965e512 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -30,12 +30,41 @@
       <a href="{{ url_for('dashboard') }}" class="btn btn-primary mt-1">Auswertung</a>
     </div>
     <div class="mb-3">
-      <a href="{{ url_for('dashboard', timeframe='last24hours') }}" class="btn btn-secondary btn-sm mt-1">Last 24 Hours</a>
-      <a href="{{ url_for('dashboard', timeframe='7days') }}" class="btn btn-secondary btn-sm mt-1">Last 7 Days</a>
-      <a href="{{ url_for('dashboard', timeframe='30days') }}" class="btn btn-secondary btn-sm mt-1">Last 30 Days</a>
-      <a href="{{ url_for('dashboard', timeframe='365days') }}" class="btn btn-secondary btn-sm mt-1">Last 365 Days</a>
+      <a href="{{ url_for('dashboard', timeframe='last24hours') }}" 
+          class="btn btn-sm mt-1 {% if session['timeframe'] == 'last24hours' %}btn-warning{% else %}btn-secondary{% endif %}">
+        Last 24 Hours
+      </a>
+      <a href="{{ url_for('dashboard', timeframe='7days') }}" 
+          class="btn btn-sm mt-1 {% if session['timeframe'] == '7days' %}btn-warning{% else %}btn-secondary{% endif %}">
+        Last 7 Days
+      </a>
+      <a href="{{ url_for('dashboard', timeframe='30days') }}" 
+          class="btn btn-sm mt-1 {% if session['timeframe'] == '30days' %}btn-warning{% else %}btn-secondary{% endif %}">
+        Last 30 Days
+      </a>
+      <a href="{{ url_for('dashboard', timeframe='365days') }}" 
+          class="btn btn-sm mt-1 {% if session['timeframe'] == '365days' %}btn-warning{% else %}btn-secondary{% endif %}">
+        Last 365 Days
+      </a>
+    </div>
+    <div class="mb-3">
+      <a href="{{ url_for('dashboard', filetype='audio') }}" 
+          class="btn btn-sm mt-1 {% if session['filetype'] == 'audio' %}btn-warning{% else %}btn-secondary{% endif %}">
+        Audio
+      </a>
+      <a href="{{ url_for('dashboard', filetype='video') }}" 
+          class="btn btn-sm mt-1 {% if session['filetype'] == 'video' %}btn-warning{% else %}btn-secondary{% endif %}">
+        Video
+      </a>
+      <a href="{{ url_for('dashboard', filetype='photo') }}" 
+          class="btn btn-sm mt-1 {% if session['filetype'] == 'photo' %}btn-warning{% else %}btn-secondary{% endif %}">
+        Photo
+      </a>
+      <a href="{{ url_for('dashboard', filetype='other') }}" 
+          class="btn btn-sm mt-1 {% if session['filetype'] == 'other' %}btn-warning{% else %}btn-secondary{% endif %}">
+        Other
+      </a>   
     </div>
-
     <!-- Summary Cards -->
     <div class="row mb-4">
       <div class="col-md-3">