analytics.py

@@ -378,7 +378,36 @@ def dashboard():
         params_for_filter = (start_str, filetype + '%')
 
     # 1. Top files by access count
-    # removed and moved to file_access() function
+    query = f'''
+        SELECT rel_path, COUNT(*) as access_count
+        FROM file_access_log
+        WHERE timestamp >= ? {filetype_filter_sql}
+        GROUP BY rel_path
+        ORDER BY access_count DESC
+        LIMIT 1000
+    '''
+    with log_db:
+        cursor = log_db.execute(query, params_for_filter)
+        rows = cursor.fetchall()
+
+    # Convert rows to a list of dictionaries and add category
+    rows = [
+        {
+            'rel_path': rel_path,
+            'access_count': access_count,
+            'category': hf.extract_structure_from_string(rel_path)[0]
+        }
+        for rel_path, access_count in rows
+    ]
+
+    categories = set(r['category'] for r in rows) # distinct categories
+    top20 = [
+        {
+            'category': categorie,
+            'files': [r for r in rows if r['category'] == categorie][:20]
+        }
+        for categorie in categories
+    ]
 
     # 2. Distinct device trend
     #    We'll group by hour if "today", by day if "7days"/"30days", by month if "365days"
@@ -585,6 +614,7 @@ def dashboard():
     return render_template(
         "dashboard.html",
         timeframe=session['timeframe'],
+        top20 = top20,
         distinct_device_data=distinct_device_data,
         user_agent_data=user_agent_data,
         folder_data=folder_data,
@@ -599,84 +629,6 @@ def dashboard():
         title_long=title_long
     )
 
-
-@require_secret
-def file_access():
-    if 'timeframe' not in session:
-        session['timeframe'] = 'last24hours'
-    session['timeframe'] = request.args.get('timeframe', session['timeframe'])
-    
-    now = datetime.now()
-
-    filetype = 'audio/'
-
-    # Determine start time based on session['timeframe']
-    if session['timeframe'] == 'last24hours':
-        start_dt = now - timedelta(hours=24)
-    elif session['timeframe'] == '7days':
-        start_dt = now - timedelta(days=7)
-    elif session['timeframe'] == '30days':
-        start_dt = now - timedelta(days=30)
-    elif session['timeframe'] == '365days':
-        start_dt = now - timedelta(days=365)
-    else:
-        start_dt = now - timedelta(hours=24)
-
-    # We'll compare the textual timestamp (ISO 8601).
-    start_str = start_dt.isoformat()
-
-    # Filter for mimes that start with the given type
-    filetype_filter_sql = "AND mime LIKE ?"
-    params_for_filter = (start_str, filetype + '%')
-
-    # 1. Top files by access count
-    query = f'''
-        SELECT rel_path, COUNT(*) as access_count
-        FROM file_access_log
-        WHERE timestamp >= ? {filetype_filter_sql}
-        GROUP BY rel_path
-        ORDER BY access_count DESC
-        LIMIT 1000
-    '''
-    with log_db:
-        cursor = log_db.execute(query, params_for_filter)
-        rows = cursor.fetchall()
-
-    # Convert rows to a list of dictionaries and add category
-    rows = [
-        {
-            'rel_path': rel_path,
-            'access_count': access_count,
-            'category': hf.extract_structure_from_string(rel_path)[0]
-        }
-        for rel_path, access_count in rows
-    ]
-
-    # Get possible categories from the rows
-    categories = sorted({r['category'] for r in rows if r['category'] is not None})
-    all_categories = [None] + categories
-    top20 = []
-    for category in all_categories:
-        label = category if category is not None else 'Keine Kategorie gefunden !'
-        files = [r for r in rows if r['category'] == category][:20]
-        top20.append({
-            'category': label,
-            'files': files
-        })
-
-    title_short = app_config.get('TITLE_SHORT', 'Default Title')
-    title_long  = app_config.get('TITLE_LONG' , 'Default Title')
-
-    return render_template(
-        "file_access.html",
-        timeframe=session['timeframe'],
-        top20 = top20,
-        admin_enabled=auth.is_admin(),
-        title_short=title_short,
-        title_long=title_long
-    )
-
-
 def export_to_excel():
     """Export search_db to an Excel file and store it locally."""
 

app.py

@@ -43,7 +43,6 @@ if os.environ.get('FLASK_ENV') == 'production':
     app.config['SESSION_COOKIE_SECURE'] = True
 
 app.add_url_rule('/dashboard', view_func=a.dashboard)
-app.add_url_rule('/file_access', view_func=a.file_access)
 app.add_url_rule('/connections', view_func=a.connections)
 app.add_url_rule('/mylinks', view_func=auth.mylinks)
 app.add_url_rule('/remove_secret', view_func=auth.remove_secret, methods=['POST'])
@@ -207,8 +206,6 @@ def generate_breadcrumbs(subpath=None):
         path_accum = ""
         for part in parts:
             path_accum = f"{path_accum}/{part}" if path_accum else part
-            if 'toplist' in part:
-                part = part.replace('toplist', 'oft angehört')
             breadcrumbs.append({'name': part, 'path': path_accum})
     return breadcrumbs
 

static/app.js

@@ -124,12 +124,9 @@ function renderContent(data) {
           if (admin_enabled && data.breadcrumbs.length != 1 && dir.share) {
             share_link = `<a href="#" class="create-share" data-url="${dir.path}">⚙️</a>`;
           }
-          if (dir.path.includes('toplist')) {
-            link_symbol = '⭐';
-          } else {
-            link_symbol = '📁';
-          }
-          contentHTML += `<li class="directory-item"><a href="#" class="directory-link" data-path="${dir.path}">${link_symbol} ${dir.name}</a>${share_link}</li>`;
+          contentHTML += `<li class="directory-item"><a href="#" class="directory-link" data-path="${dir.path}">📁 ${dir.name}</a>
+          ${share_link}
+          </li>`;
         });
         if (data.breadcrumbs.length === 1) {
           contentHTML += `<li class="link-item" onclick="viewSearch()"><a onclick="viewSearch() class="link-link">🔎 Suche</a></li>`;
@@ -456,6 +453,42 @@ function reloadDirectory() {
 }
 
 
+
+if ('mediaSession' in navigator) {
+
+  // Handler for the play action
+  navigator.mediaSession.setActionHandler('play', () => {
+    document.getElementById('globalAudio').play();
+  });
+
+  // Handler for the pause action
+  navigator.mediaSession.setActionHandler('pause', () => {
+    document.getElementById('globalAudio').pause();
+  });
+
+  // Handler for the previous track action
+  navigator.mediaSession.setActionHandler('previoustrack', () => {
+    if (currentMusicIndex > 0) {
+      const prevFile = currentMusicFiles[currentMusicIndex - 1];
+      const prevLink = document.querySelector(`.play-file[data-url="${prevFile.path}"]`);
+      if (prevLink) {
+        prevLink.click();
+      }
+    }
+  });
+
+  // Handler for the next track action
+  navigator.mediaSession.setActionHandler('nexttrack', () => {
+    if (currentMusicIndex >= 0 && currentMusicIndex < currentMusicFiles.length - 1) {
+      const nextFile = currentMusicFiles[currentMusicIndex + 1];
+      const nextLink = document.querySelector(`.play-file[data-url="${nextFile.path}"]`);
+      if (nextLink) {
+        nextLink.click();
+      }
+    }
+  });
+}
+
 document.getElementById('globalAudio').addEventListener('ended', () => {
   
   reloadDirectory().then(() => {

static/audioplayer.js

@@ -3,10 +3,11 @@ const cssVar = getComputedStyle(document.documentElement).getPropertyValue('--da
 
 // player DOM elements
 const nowPlayingInfo = document.getElementById('nowPlayingInfo');
-const audio = document.getElementById('globalAudio');
+const audioPlayer = document.getElementById('globalAudio');
 const audioPlayerContainer = document.getElementById('audioPlayerContainer');
 
 const playerButton = document.querySelector('.player-button'),
+      audio = document.querySelector('audio'),
       timeline = document.querySelector('.timeline'),
       timeInfo = document.getElementById('timeInfo'),
       playIcon = `
@@ -56,24 +57,10 @@ timeline.addEventListener('touchcancel', () => { isSeeking = false; });
 audio.addEventListener('loadedmetadata', () => {
   timeline.min = 0;
   timeline.max = audio.duration;
-  timeline.value = 0;
-  timeline.style.backgroundSize = '0% 100%';
 });
 
 
 
-audio.addEventListener('play', () => {
-  if ('mediaSession' in navigator)
-    navigator.mediaSession.playbackState = 'playing';
-});
-audio.addEventListener('pause', () => {
-  if ('mediaSession' in navigator)
-    navigator.mediaSession.playbackState = 'paused';
-});
-
-
-
-
 // --- Seek function: directly set audio.currentTime using slider's value (in seconds) ---
 function changeSeek() {
   audio.currentTime = timeline.value;
@@ -88,20 +75,30 @@ function formatTime(seconds) {
 
 
 // --- Update timeline, time info, and media session on each time update ---
-function updateTimeline() {
-  if (!isSeeking && audio.duration) {
+audio.ontimeupdate = function() {
+  
+  // --- Update the slider thumb position (in seconds) while playing ---
+  if (!isSeeking) {
     timeline.value = audio.currentTime;
-    timeline.style.backgroundSize = `${(audio.currentTime / audio.duration) * 100}% 100%`;
-    timeInfo.textContent = `${formatTime(audio.currentTime)} / ${formatTime(audio.duration)}`;
+    const percentagePosition = (audio.currentTime / audio.duration) * 100;
+    timeline.style.backgroundSize = `${percentagePosition}% 100%`;
   }
-}
 
-audio.ontimeupdate = updateTimeline;
+  // --- Update the time display ---
+  const currentTimeFormatted = formatTime(audio.currentTime);
+  const durationFormatted = isNaN(audio.duration) ? "00:00" : formatTime(audio.duration);
+  timeInfo.innerHTML = `${currentTimeFormatted} / ${durationFormatted}`;
 
-// Fallback for mobile throttling
-setInterval(() => {
-  if (!audio.paused && !isSeeking) updateTimeline();
-}, 500);
+  if ('mediaSession' in navigator &&
+    'setPositionState' in navigator.mediaSession &&
+    !isNaN(audio.duration)) {
+    navigator.mediaSession.setPositionState({
+      duration: audio.duration,
+      playbackRate: audio.playbackRate,
+      position: audio.currentTime
+    });
+  }
+};
 
 
 // --- When audio ends ---
@@ -110,6 +107,7 @@ audio.onended = function() {
 };
 
 async function downloadAudio() {
+  const audio = document.getElementById('globalAudio');
   const src   = audio.currentSrc || audio.src;
   if (!src) return;
 
@@ -134,8 +132,8 @@ let currentFetchController = null;
 
 async function startPlaying(relUrl) {
       // Pause the audio and clear its source.
-      audio.pause();
-      audio.src = '';
+      audioPlayer.pause();
+      audioPlayer.src = '';
 
       // Display the audio player container.
       audioPlayerContainer.style.display = "block";
@@ -173,9 +171,9 @@ async function startPlaying(relUrl) {
         }
         
         // Set the media URL, load, and play the audio.
-        audio.src = mediaUrl;
-        audio.load();
-        await audio.play();
+        audioPlayer.src = mediaUrl;
+        audioPlayer.load();
+        await audioPlayer.play();
         clearTimeout(spinnerTimer);
         hideSpinner();
         currentTrackPath = relUrl;
@@ -196,12 +194,6 @@ async function startPlaying(relUrl) {
               { src: '/icons/logo-192x192.png', sizes: '192x192', type: 'image/png' }
             ]
             });
-            navigator.mediaSession.playbackState = 'playing';
-            navigator.mediaSession.setPositionState({
-              duration:     audio.duration,
-              playbackRate: audio.playbackRate,
-              position:     0
-            });
         }
         
         nowPlayingInfo.innerHTML = pathStr.replace(/\//g, ' > ') +
@@ -215,58 +207,4 @@ async function startPlaying(relUrl) {
           nowPlayingInfo.textContent = "Fehler: Netzwerkproblem oder ungültige URL.";
         }
       };
-}
-
-
-if ('mediaSession' in navigator) {
-
-  // Handler for the play action
-  navigator.mediaSession.setActionHandler('play', () => {
-    navigator.mediaSession.playbackState = 'playing'
-    document.getElementById('globalAudio').play();
-  });
-
-  // Handler for the pause action
-  navigator.mediaSession.setActionHandler('pause', () => {
-    navigator.mediaSession.playbackState = 'paused'
-    document.getElementById('globalAudio').pause();
-  });
-
-  // Handler for the previous track action
-  navigator.mediaSession.setActionHandler('previoustrack', () => {
-    if (currentMusicIndex > 0) {
-      const prevFile = currentMusicFiles[currentMusicIndex - 1];
-      const prevLink = document.querySelector(`.play-file[data-url="${prevFile.path}"]`);
-      if (prevLink) {
-        prevLink.click();
-      }
-    }
-  });
-
-  // Handler for the next track action
-  navigator.mediaSession.setActionHandler('nexttrack', () => {
-    if (currentMusicIndex >= 0 && currentMusicIndex < currentMusicFiles.length - 1) {
-      const nextFile = currentMusicFiles[currentMusicIndex + 1];
-      const nextLink = document.querySelector(`.play-file[data-url="${nextFile.path}"]`);
-      if (nextLink) {
-        nextLink.click();
-      }
-    }
-  });
-
-  // Handler for the seek backward action
-  navigator.mediaSession.setActionHandler('seekto', ({seekTime, fastSeek}) => {
-    if (fastSeek && 'fastSeek' in audio) {
-      audio.fastSeek(seekTime);
-    } else {
-      audio.currentTime = seekTime;
-    }
-    // immediately update the remote clock
-    navigator.mediaSession.setPositionState({
-      duration:     audio.duration,
-      playbackRate: audio.playbackRate,
-      position:     audio.currentTime
-    });
-  });
-
 }

templates/base.html

@@ -45,8 +45,6 @@
         <span> | </span>
         <a href="{{ url_for('dashboard') }}">Dashbord</a>
         <span> | </span>
-        <a href="{{ url_for('file_access') }}">Dateizugriffe</a>
-        <span> | </span>
         <a href="{{ url_for('songs_dashboard') }}">Wiederholungen</a>
         <span> | </span>
         <a href="{{ url_for('folder_secret_config_editor') }}" id="edit-folder-config">Ordnerkonfiguration</a>

templates/dashboard.html

@@ -210,7 +210,38 @@
         </div>
       </div>
 
-
+      <!-- Detailed Table of Top File Accesses -->
+      {% for top20_item in top20 %}
+      <div class="card mb-4">
+        <div class="card-header">
+          Top 20 Dateizugriffe ({{ top20_item['category'] }})
+        </div>
+        <div class="card-body">
+          <div class="table-responsive">
+            <table class="table table-striped">
+              <thead>
+                <tr>
+                  <th>Access Count</th>
+                  <th>File Path</th>
+                </tr>
+              </thead>
+              <tbody>
+                {% for row in top20_item['files'] %}
+                <tr>
+                  <td>{{ row.access_count }}</td>
+                  <td>{{ row.rel_path }}</td>
+                </tr>
+                {% else %}
+                <tr>
+                  <td colspan="2">No data available for the selected timeframe.</td>
+                </tr>
+                {% endfor %}
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+      {% endfor %}
     </div>
     {% endblock %}
 

templates/file_access.html

@@ -1,99 +0,0 @@
-{# templates/file_access.html #}
-{% extends 'base.html' %}
-
-{# page title #}
-{% block title %}Dateizugriffe{% endblock %}
-
-{# page content #}
-{% block content %}
-
-    <!-- Main Container -->
-    <div class="container">
-      <h2>Auswertung-Dateizugriffe</h2>
-
-      <!-- Dropdown Controls -->
-      <div class="mb-4 d-flex flex-wrap gap-2">
-        <!-- Timeframe Dropdown -->
-        <div class="dropdown">
-          <button class="btn btn-secondary dropdown-toggle" 
-                  type="button" id="timeframeDropdown" data-bs-toggle="dropdown" aria-expanded="false">
-            {% if session['timeframe'] == 'last24hours' %}
-              Last 24 Hours
-            {% elif session['timeframe'] == '7days' %}
-              Last 7 Days
-            {% elif session['timeframe'] == '30days' %}
-              Last 30 Days
-            {% elif session['timeframe'] == '365days' %}
-              Last 365 Days
-            {% else %}
-              Select Timeframe
-            {% endif %}
-          </button>
-          <ul class="dropdown-menu" aria-labelledby="timeframeDropdown">
-            <li>
-              <a class="dropdown-item {% if session['timeframe'] == 'last24hours' %}active{% endif %}" 
-                href="{{ url_for('file_access', timeframe='last24hours') }}">
-                Last 24 Hours
-              </a>
-            </li>
-            <li>
-              <a class="dropdown-item {% if session['timeframe'] == '7days' %}active{% endif %}" 
-                href="{{ url_for('file_access', timeframe='7days') }}">
-                Last 7 Days
-              </a>
-            </li>
-            <li>
-              <a class="dropdown-item {% if session['timeframe'] == '30days' %}active{% endif %}" 
-                href="{{ url_for('file_access', timeframe='30days') }}">
-                Last 30 Days
-              </a>
-            </li>
-            <li>
-              <a class="dropdown-item {% if session['timeframe'] == '365days' %}active{% endif %}" 
-                href="{{ url_for('file_access', timeframe='365days') }}">
-                Last 365 Days
-              </a>
-            </li>
-          </ul>
-        </div>
-      </div>
-
-
-      <!-- Detailed Table of Top File Accesses -->
-      {% for top20_item in top20 %}
-      <div class="card mb-4">
-        <div class="card-header">
-          Top 20 Dateizugriffe ({{ top20_item['category'] }})
-        </div>
-        <div class="card-body">
-          <div class="table-responsive">
-            <table class="table table-striped">
-              <thead>
-                <tr>
-                  <th>Access Count</th>
-                  <th>File Path</th>
-                </tr>
-              </thead>
-              <tbody>
-                {% for row in top20_item['files'] %}
-                <tr>
-                  <td>{{ row.access_count }}</td>
-                  <td>{{ row.rel_path }}</td>
-                </tr>
-                {% else %}
-                <tr>
-                  <td colspan="2">No data available for the selected timeframe.</td>
-                </tr>
-                {% endfor %}
-              </tbody>
-            </table>
-          </div>
-        </div>
-      </div>
-      {% endfor %}
-    </div>
-    {% endblock %}
-
-    {% block scripts %}
-
-{% endblock %}

templates/songs_dashboard.html

@@ -8,7 +8,7 @@
 {% block content %}
 
 <!-- Main Container -->
-<div class="container">
+<div class="container-fluid px-4">
   <h2>Analyse Wiederholungen</h2>
   <!-- Dropdown Controls -->
   <div class="mb-4 d-flex flex-wrap gap-2">