GameSentenceMiner 2.16.11__py3-none-any.whl → 2.16.12__py3-none-any.whl

GameSentenceMiner/web/static/js/stats.js

@@ -152,11 +152,12 @@ document.addEventListener('DOMContentLoaded', function () {
                 tempStreak = 0;
             }
         }
-        
-        // Calculate current streak from today backwards
+
+        // Calculate current streak from today backwards, using streak requirement hours from config
         const date = new Date();
         const today = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
-        
+        const streakRequirement = window.statsConfig ? window.statsConfig.streakRequirementHours : 1.0;
+
         // Find today's index or the most recent date before today
         let todayIndex = -1;
         for (let i = dates.length - 1; i >= 0; i--) {
@@ -165,11 +166,11 @@ document.addEventListener('DOMContentLoaded', function () {
                 break;
             }
         }
-        
+
         // Count backwards from today (or most recent date)
         if (todayIndex >= 0) {
             for (let i = todayIndex; i >= 0; i--) {
-                if (dates[i].activity > 0) {
+                if (dates[i].activity >= streakRequirement) {
                     currentStreak++;
                 } else {
                     break;
@@ -196,18 +197,24 @@ document.addEventListener('DOMContentLoaded', function () {
             // Calculate reading time for each day with activity
             let totalHours = 0;
             let activeDays = 0;
-            const afkTimerSeconds = 120; // Default AFK timer - should be fetched from settings
-            
+            let afkTimerSeconds = window.statsConfig ? window.statsConfig.afkTimerSeconds : 120;
+            // Try to get AFK timer from settings modal if available and valid
+            const afkTimerInput = document.getElementById('afkTimer');
+            if (afkTimerInput && afkTimerInput.value) {
+                const parsed = parseInt(afkTimerInput.value, 10);
+                if (!isNaN(parsed) && parsed > 0) afkTimerSeconds = parsed;
+            }
+
             for (const [dateStr, timestamps] of Object.entries(dailyTimestamps)) {
                 if (timestamps.length >= 2) {
                     timestamps.sort((a, b) => a - b);
                     let dayReadingTime = 0;
-                    
+
                     for (let i = 1; i < timestamps.length; i++) {
                         const gap = timestamps[i] - timestamps[i-1];
                         dayReadingTime += Math.min(gap, afkTimerSeconds);
                     }
-                    
+
                     if (dayReadingTime > 0) {
                         totalHours += dayReadingTime / 3600;
                         activeDays++;
@@ -837,14 +844,20 @@ document.addEventListener('DOMContentLoaded', function () {
     }
 
     // Goal Progress Chart functionality
-    let goalSettings = {
-        reading_hours_target: 1500,
-        character_count_target: 25000000,
-        games_target: 100
-    };
+    let goalSettings = window.statsConfig || {};
+    if (!goalSettings.reading_hours_target) goalSettings.reading_hours_target = 1500;
+    if (!goalSettings.character_count_target) goalSettings.character_count_target = 25000000;
+    if (!goalSettings.games_target) goalSettings.games_target = 100;
 
-    // Function to load goal settings from API
+    // Function to load goal settings from API (fallback)
     async function loadGoalSettings() {
+        // Use global config if available, otherwise fetch
+        if (window.statsConfig) {
+            goalSettings.reading_hours_target = window.statsConfig.readingHoursTarget || 1500;
+            goalSettings.character_count_target = window.statsConfig.characterCountTarget || 25000000;
+            goalSettings.games_target = window.statsConfig.gamesTarget || 100;
+            return;
+        }
         try {
             const response = await fetch('/api/settings');
             if (response.ok) {
@@ -899,8 +912,14 @@ document.addEventListener('DOMContentLoaded', function () {
                 if (timestamps.length >= 2) {
                     timestamps.sort((a, b) => a - b);
                     let dayHours = 0;
-                    const afkTimerSeconds = 120; // Default AFK timer
-                    
+                    let afkTimerSeconds = window.statsConfig ? window.statsConfig.afkTimerSeconds : 120;
+                    // Try to get AFK timer from settings modal if available and valid
+                    const afkTimerInput = document.getElementById('afkTimer');
+                    if (afkTimerInput && afkTimerInput.value) {
+                        const parsed = parseInt(afkTimerInput.value, 10);
+                        if (!isNaN(parsed) && parsed > 0) afkTimerSeconds = parsed;
+                    }
+
                     for (let i = 1; i < timestamps.length; i++) {
                         const gap = timestamps[i] - timestamps[i-1];
                         dayHours += Math.min(gap, afkTimerSeconds) / 3600;
@@ -1099,9 +1118,30 @@ document.addEventListener('DOMContentLoaded', function () {
     }
 
     // Initial load with saved year preference
-    const savedYear = localStorage.getItem('selectedHeatmapYear') || 'all';
+    const savedYear = localStorage.getItem('selectedHeatmapYear') || window.statsConfig?.heatmapDisplayYear || 'all';
     loadStatsData(savedYear);
 
+    // Populate settings modal with global config values on load
+    if (window.statsConfig) {
+        const sessionGapInput = document.getElementById('sessionGap');
+        if (sessionGapInput) sessionGapInput.value = window.statsConfig.sessionGapSeconds || 3600;
+
+        const streakReqInput = document.getElementById('streakRequirement');
+        if (streakReqInput) streakReqInput.value = window.statsConfig.streakRequirementHours || 1.0;
+
+        const heatmapYearSelect = document.getElementById('heatmapYear');
+        if (heatmapYearSelect) heatmapYearSelect.value = window.statsConfig.heatmapDisplayYear || 'all';
+
+        const hoursTargetInput = document.getElementById('readingHoursTarget');
+        if (hoursTargetInput) hoursTargetInput.value = window.statsConfig.readingHoursTarget || 1500;
+
+        const charsTargetInput = document.getElementById('characterCountTarget');
+        if (charsTargetInput) charsTargetInput.value = window.statsConfig.characterCountTarget || 25000000;
+
+        const gamesTargetInput = document.getElementById('gamesTarget');
+        if (gamesTargetInput) gamesTargetInput.value = window.statsConfig.gamesTarget || 100;
+    }
+
     // Function to update goal progress using existing stats data
     async function updateGoalProgressWithData(statsData) {
         const goalProgressChart = document.getElementById('goalProgressChart');
@@ -1178,9 +1218,8 @@ document.addEventListener('DOMContentLoaded', function () {
 
             // Calculate sessions (count gaps > session threshold as new sessions)
             let sessions = 0;
-            const sessionGapDefault = 3600; // 1 hour in seconds
-            // Try to get session gap from settings modal if available
-            let sessionGap = sessionGapDefault;
+            let sessionGap = window.statsConfig ? window.statsConfig.sessionGapSeconds : 3600;
+            // Try to get session gap from settings modal if available and valid
             const sessionGapInput = document.getElementById('sessionGap');
             if (sessionGapInput && sessionGapInput.value) {
                 const parsed = parseInt(sessionGapInput.value, 10);
@@ -1214,7 +1253,7 @@ document.addEventListener('DOMContentLoaded', function () {
                 .filter(ts => !isNaN(ts))
                 .sort((a, b) => a - b);
             // Get AFK timer from settings modal if available
-            let afkTimerSeconds = 120; // default
+            let afkTimerSeconds = window.statsConfig ? window.statsConfig.afkTimerSeconds : 120;
             const afkTimerInput = document.getElementById('afkTimer');
             if (afkTimerInput && afkTimerInput.value) {
                 const parsed = parseInt(afkTimerInput.value, 10);

GameSentenceMiner/web/stats.py

@@ -345,8 +345,11 @@ def calculate_time_based_streak(lines, streak_requirement_hours=None):
         int: Current streak in days
     """
     if streak_requirement_hours is None:
-        streak_requirement_hours = getattr(get_config().advanced, 'streak_requirement_hours', 1.0)
-    
+        # Prefer stats_config if available, fallback to config.advanced, then 1.0
+        try:
+            streak_requirement_hours = get_stats_config().streak_requirement_hours
+        except AttributeError:
+            streak_requirement_hours = getattr(get_config().advanced, 'streak_requirement_hours', 1.0)
     # Add debug logging
     logger.debug(f"Calculating streak with requirement: {streak_requirement_hours} hours")
     logger.debug(f"Processing {len(lines)} lines for streak calculation")
@@ -440,9 +443,10 @@ def calculate_current_game_stats(all_lines):
     # Calculate sessions (gaps of more than session_gap_seconds = new session)
     sorted_timestamps = sorted(timestamps)
     sessions = 1
+    session_gap = get_stats_config().session_gap_seconds
     for i in range(1, len(sorted_timestamps)):
         time_gap = sorted_timestamps[i] - sorted_timestamps[i-1]
-        if time_gap > get_stats_config().session_gap_seconds:
+        if time_gap > session_gap:
             sessions += 1
     
     # Calculate daily activity for progress trend
@@ -533,9 +537,10 @@ def calculate_all_games_stats(all_lines):
     # Calculate sessions across all games (gaps of more than 1 hour = new session)
     sorted_timestamps = sorted(timestamps)
     sessions = 1
+    session_gap = get_stats_config().session_gap_seconds
     for i in range(1, len(sorted_timestamps)):
         time_gap = sorted_timestamps[i] - sorted_timestamps[i-1]
-        if time_gap > 3600:  # 1 hour gap
+        if time_gap > session_gap:
             sessions += 1
     
     # Calculate daily activity for progress trend

GameSentenceMiner/web/templates/stats.html

@@ -520,6 +520,28 @@
     </div>
 
 
+    {% set afk_timer = stats_config.afk_timer_seconds | default(120) %}
+    {% set session_gap = stats_config.session_gap_seconds | default(3600) %}
+    {% set streak_req = config.advanced.streak_requirement_hours | default(1.0) %}
+    {% set hours_target = stats_config.reading_hours_target | default(1500) %}
+    {% set chars_target = stats_config.character_count_target | default(25000000) %}
+    {% set games_target = stats_config.games_target | default(100) %}
+    {% set heatmap_year = 'all' %}
+
+    {% set stats_config = {
+        'afkTimerSeconds': afk_timer,
+        'sessionGapSeconds': session_gap,
+        'streakRequirementHours': streak_req,
+        'readingHoursTarget': hours_target,
+        'characterCountTarget': chars_target,
+        'gamesTarget': games_target,
+        'heatmapDisplayYear': heatmap_year
+    } %}
+
+    <!-- Inject stats config values for frontend -->
+    <script>
+      window.statsConfig = {{ stats_config | tojson }};
+    </script>
     <!-- Include shared JavaScript first (required dependency for stats.js) -->
     <script src="/static/js/shared.js"></script>
     <script src="/static/js/kanji-grid.js"></script>

GameSentenceMiner/web/texthooking_page.py

@@ -261,7 +261,11 @@ def datetimeformat(value, format='%Y-%m-%d %H:%M:%S'):
 @app.route('/stats')
 def stats():
     """Renders the stats page."""
-    return render_template('stats.html')
+    from GameSentenceMiner.util.configuration import get_master_config, get_stats_config
+    return render_template('stats.html',
+                         config=get_config(),
+                         master_config=get_master_config(),
+                         stats_config=get_stats_config())
 
 @app.route('/api/anki_stats')
 def api_anki_stats():

{gamesentenceminer-2.16.11.dist-info → gamesentenceminer-2.16.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.16.11
+Version: 2.16.12
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.16.11.dist-info → gamesentenceminer-2.16.12.dist-info}/RECORD

@@ -60,8 +60,8 @@ GameSentenceMiner/web/database_api.py,sha256=XkFJDVm9X15Coz6rakNLKQj-218MYziGOeo
 GameSentenceMiner/web/events.py,sha256=6Vyz5c9MdpMIa7Zqljqhap2XFQnAVYJ0CdQV64TSZsA,5119
 GameSentenceMiner/web/gsm_websocket.py,sha256=IwwQo6VtgPqeOuc-datgfJyLpX3LwB2MISDqA6EkiSA,4131
 GameSentenceMiner/web/service.py,sha256=YZchmScTn7AX_GkwV1ULEK6qjdOnJcpc3qfMwDf7cUE,5363
-GameSentenceMiner/web/stats.py,sha256=VM4PwQRVjuwDcFAz08_7yWC0T7fGAfmVUDuxYuyiswA,22078
-GameSentenceMiner/web/texthooking_page.py,sha256=gB2i3X7DQ9kEML6ak4PFSKMi6zd6nPEa_ob-XG4guBo,13231
+GameSentenceMiner/web/stats.py,sha256=h4tRA_00OdQ9uVYrQuAE5SmeSGHMLfTUHPOy6re_h5s,22366
+GameSentenceMiner/web/texthooking_page.py,sha256=zQx9c8AQ4pWN8JgxvW0MKWkvtoIyrhXBlGdT-acBupU,13484
 GameSentenceMiner/web/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/web/static/apple-touch-icon.png,sha256=OcMI8af_68DA_tweOsQ5LytTyMwm7-hPW07IfrOVgEs,46132
 GameSentenceMiner/web/static/favicon-96x96.png,sha256=lOePzjiKl1JY2J1kT_PMdyEnrlJmi5GWbmXJunM12B4,16502
@@ -80,19 +80,19 @@ GameSentenceMiner/web/static/js/database.js,sha256=-SjMmhXzU8a3QNGrwGtJCu55ZXXfk
 GameSentenceMiner/web/static/js/kanji-grid.js,sha256=rUa8_TGFm4Z8CtURoAlZjCN032PLe0YmHvN52S4_sE0,7181
 GameSentenceMiner/web/static/js/search.js,sha256=QrjsVXf90c1LzD09TPaK93RbIN9yEiXF8IKAKrDY4hw,10482
 GameSentenceMiner/web/static/js/shared.js,sha256=UL7wDJ5FsqeIspkCcC4s_jOv6a93I2gxFi57gQT8Bn0,21001
-GameSentenceMiner/web/static/js/stats.js,sha256=vuLqyrr42u44G2X01vg2tL277Gslz7cNRnpFUB22dNw,83445
+GameSentenceMiner/web/static/js/stats.js,sha256=uAh_J0JngC1QjB_Y9YxRKfWrxfPsdyy6Ypk5WFerZKU,86149
 GameSentenceMiner/web/templates/anki_stats.html,sha256=FdIMl-kY0-3as9Wn0i-wKIIkl1xXn4nWMbWPypN_1T0,10955
 GameSentenceMiner/web/templates/database.html,sha256=Gd54rgZmfcV7ufoJ69COeMncs5Q5u-rSJcsIvROVCEo,13732
 GameSentenceMiner/web/templates/index.html,sha256=7ChQ1j602MOiYU95wXAKP_Ezsh_JgdlGz2uXIzS2j0g,227894
 GameSentenceMiner/web/templates/search.html,sha256=nao3M_hAbm5ftzThi91NtQ3ZiINMPUNx4ngFmqLnLQ4,4060
-GameSentenceMiner/web/templates/stats.html,sha256=BL7HQLs62RbPbo5Hs8BgdH9CsrGLH583JSn0Uz3PK5Y,31536
+GameSentenceMiner/web/templates/stats.html,sha256=G3S2YBZ2sQ-D4wTQQBe8411cVTE9QPQq-wr4kyDPi_w,32508
 GameSentenceMiner/web/templates/utility.html,sha256=KtqnZUMAYs5XsEdC9Tlsd40NKAVic0mu6sh-ReMDJpU,16940
 GameSentenceMiner/web/templates/components/navigation.html,sha256=6y9PvM3nh8LY6JWrZb6zVOm0vqkBLDc6d3gB9X5lT_w,1055
 GameSentenceMiner/web/templates/components/theme-styles.html,sha256=hiq3zdJljpRjQO1iUA7gfFKwXebltG-IWW-gnKS4GHA,3439
 GameSentenceMiner/wip/__init___.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gamesentenceminer-2.16.11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.16.11.dist-info/METADATA,sha256=vN1yQWVBqhIYzJ4ygcNNFdok5bC_7_gvtMYn7gKmrwc,7349
-gamesentenceminer-2.16.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gamesentenceminer-2.16.11.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.16.11.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.16.11.dist-info/RECORD,,
+gamesentenceminer-2.16.12.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.16.12.dist-info/METADATA,sha256=SgT5FkcLIkIfeGJbk_hyrvw0fZCNY27li0gD42HsKrs,7349
+gamesentenceminer-2.16.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gamesentenceminer-2.16.12.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.16.12.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.16.12.dist-info/RECORD,,