fix: reset Pomodoro session data for new day and update theme loader formatting

Author: murdercode

src-tauri/Cargo.toml

@@ -43,7 +43,7 @@ tauri-plugin-oauth = { git = "https://github.com/FabianLars/tauri-plugin-oauth",
 tauri-plugin-aptabase = "1.0.0"
 serde = { version = "1", features = ["derive"], default-features = false }
 serde_json = { version = "1", default-features = false }
-chrono = { version = "0.4", features = ["serde"], default-features = false }
+chrono = { version = "0.4", features = ["serde", "clock"], default-features = false }
 dotenv = "0.15"
 base64 = "0.21"
 

src-tauri/src/lib.rs

@@ -416,10 +416,26 @@ async fn load_session_data(app: AppHandle) -> Result<Option<PomodoroSession>, St
     }
 
     let content =
-        fs::read_to_string(file_path).map_err(|e| format!("Failed to read session file: {}", e))?;
-    let session: PomodoroSession =
+        fs::read_to_string(&file_path).map_err(|e| format!("Failed to read session file: {}", e))?;
+    let mut session: PomodoroSession =
         serde_json::from_str(&content).map_err(|e| format!("Failed to parse session: {}", e))?;
 
+    // Get today's date string
+    let today = chrono::Local::now().format("%a %b %d %Y").to_string();
+    
+    // If the saved session is not from today, reset the counters but keep the date updated
+    if session.date != today {
+        session.completed_pomodoros = 0;
+        session.total_focus_time = 0;
+        session.current_session = 1;
+        session.date = today;
+        
+        // Save the reset session back to file
+        let json = serde_json::to_string_pretty(&session)
+            .map_err(|e| format!("Failed to serialize reset session: {}", e))?;
+        fs::write(file_path, json).map_err(|e| format!("Failed to write reset session file: {}", e))?;
+    }
+
     Ok(Some(session))
 }
 

src/core/pomodoro-timer.js

@@ -1933,25 +1933,48 @@ export class PomodoroTimer {
     }
 
     async loadSessionData() {
+        const today = new Date().toDateString();
+        
         try {
             const data = await invoke('load_session_data');
-            if (data && data.date === new Date().toDateString()) {
+            if (data && data.date === today) {
+                // Load today's session data
                 this.completedPomodoros = data.completed_pomodoros || 0;
                 this.totalFocusTime = data.total_focus_time || 0;
                 this.currentSession = data.current_session || 1;
                 this.updateProgressDots();
+            } else {
+                // Reset to default values for new day or no data
+                this.completedPomodoros = 0;
+                this.totalFocusTime = 0;
+                this.currentSession = 1;
+                this.updateProgressDots();
             }
         } catch (error) {
             console.error('Failed to load session data from Tauri, using localStorage:', error);
             const saved = localStorage.getItem('pomodoro-session');
+            
             if (saved) {
                 const data = JSON.parse(saved);
-                if (data.date === new Date().toDateString()) {
+                if (data.date === today) {
+                    // Load today's session data from localStorage
                     this.completedPomodoros = data.completedPomodoros || 0;
                     this.totalFocusTime = data.totalFocusTime || 0;
                     this.currentSession = data.currentSession || 1;
                     this.updateProgressDots();
+                } else {
+                    // Reset to default values for new day or no data
+                    this.completedPomodoros = 0;
+                    this.totalFocusTime = 0;
+                    this.currentSession = 1;
+                    this.updateProgressDots();
                 }
+            } else {
+                // No saved data at all, reset to defaults
+                this.completedPomodoros = 0;
+                this.totalFocusTime = 0;
+                this.currentSession = 1;
+                this.updateProgressDots();
             }
         }
     }

src/utils/theme-loader.js

@@ -39,7 +39,7 @@ class ThemeLoader {
         // that gets updated by the build process or manually maintained
 
         // This could be enhanced to use a build-time script that generates this list
-                                                                                                                                                                                                        const knownThemes = [
+                                                                                                                                                                                                                                const knownThemes = [
             'espresso.css',
             'pipboy.css',
             'pommodore64.css'