From 91732472123e7334a4f32d80705373758d218aeb Mon Sep 17 00:00:00 2001 From: lelo Date: Thu, 29 May 2025 15:08:14 +0200 Subject: [PATCH] fix toplist folder --- app.py | 13 ++++++------- helperfunctions.py | 13 +++++++------ static/app.js | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app.py b/app.py index 4ca3361..7e08fc8 100755 --- a/app.py +++ b/app.py @@ -279,17 +279,16 @@ def api_browse(subpath): foldernames = [] files = [] split_path = subpath.split('/') + if len(split_path) == 1 and split_path[0] == 'toplist': foldernames = [ - {'name': 'Predigten', 'path': 'toplist/predigt'}, - {'name': 'Chorlieder', 'path': 'toplist/chor'}, - {'name': 'Gemeinsamer Gesang', 'path': 'toplist/gemeinsamer_gesang'}, - {'name': 'Gruppengesang', 'path': 'toplist/gruppengesang'}, + {'name': 'Predigten', 'path': 'toplist/Predigt'}, + {'name': 'Chorlieder', 'path': 'toplist/Chor'}, + {'name': 'Gemeinsamer Gesang', 'path': 'toplist/Gemeinsamer Gesang'}, + {'name': 'Gruppenlieder', 'path': 'toplist/Gruppenlied'}, ] elif len(split_path) > 1 and split_path[0] == 'toplist': - files = [ - hf.generate_top_list(split_path[1]) - ] + files = hf.generate_top_list(split_path[1]) return jsonify({ 'breadcrumbs': generate_breadcrumbs(subpath), diff --git a/helperfunctions.py b/helperfunctions.py index 7323e89..3fe8e4f 100644 --- a/helperfunctions.py +++ b/helperfunctions.py @@ -104,7 +104,7 @@ def generate_top_list(category): start_str = start_dt.isoformat() # Filter for mimes that start with the given type - params_for_filter = (start_str) + params_for_filter = (start_str,) # 1. Top files by access count query = f''' @@ -123,17 +123,18 @@ def generate_top_list(category): rows = [ { 'rel_path': rel_path, + 'access_count': access_count, 'category': extract_structure_from_string(rel_path)[0] } - for rel_path in rows + for rel_path, access_count in rows ] - rows = [r for r in rows if r['category'] == category][:20] - + filelist = [ { - 'name': rel_path, - 'path': rel_path + 'name': rel_path.split('/')[-1], + 'path': rel_path, + 'file_type': 'music' } for rel_path in [r['rel_path'] for r in rows] ] diff --git a/static/app.js b/static/app.js index 95150d1..190ef90 100644 --- a/static/app.js +++ b/static/app.js @@ -117,7 +117,7 @@ function renderContent(data) { contentHTML += `
  • 📅 Gestern
  • `; } if (data.breadcrumbs.length === 1 ) { - contentHTML += `
  • 👥 oft gehört
  • `; + contentHTML += `
  • 🔥 oft angehört
  • `; } console.log(data.folder_today, data.folder_yesterday); data.directories.forEach(dir => {