refactor and arg for stdout

Author: daniel-sc

src/get_state.rs

@@ -1,23 +1,39 @@
 use active_win_pos_rs::get_active_window;
+use chrono::Local;
 use device_query::{DeviceQuery, DeviceState};
 
+// TODO react to keyboard input (e.g. typing)
+
 #[derive(Debug, PartialEq)]
 pub struct State {
+    pub app_name: String,
     pub window_title: String,
     pub cursor: (i32, i32),
 }
 
+const SEPARATOR: &str = ",";
+
+impl State {
+    pub fn to_csv(&self, time: &chrono::DateTime<Local>,) -> String {
+        format!("{}{}{}{}{}{}{}{}{}", time.format("%+"), SEPARATOR,self.app_name.replace(SEPARATOR, ""), SEPARATOR, self.window_title.replace(SEPARATOR, ""), SEPARATOR, self.cursor.0,SEPARATOR, self.cursor.1)
+    }
+}
+
 pub(crate) fn get_state() -> State {
     let mouse = DeviceState::new().get_mouse();
-    let window_title = match get_active_window() {
-        Ok(window) => format!("{}: {}", window.app_name, window.title),
+    match get_active_window() {
+        Ok(window) => State {
+            app_name: window.app_name,
+            window_title: window.title,
+            cursor: mouse.coords,
+        },
         Err(e) => {
             eprintln!("Error getting active window: {:?}", e);
-            String::new()
+            State {
+                app_name: String::from(""),
+                window_title: String::from(""),
+                cursor: mouse.coords,
+            }
         }
-    };
-    State {
-        window_title,
-        cursor: mouse.coords,
     }
 }

src/main.rs

@@ -1,21 +1,27 @@
 mod get_state;
 mod write_csv;
 
+use std::env;
 use chrono::Local;
 use std::thread::sleep;
 use std::time::Duration;
 
-const FREQUENCY: f64 = 10.0; // seconds
+const FREQUENCY: f64 = 2.0; // seconds
+const ARG_STDOUT: &str = "--stdout";
 
 fn main() {
+    let args: Vec<String> = env::args().collect();
     let mut prev_state = get_state::get_state();
     loop {
         let current_time = Local::now();
         let state = get_state::get_state();
         if state != prev_state {
-            let cursor = format!("{},{}", state.cursor.0, state.cursor.1);
-            let csv_filename = format!("logs/activity_log_{}.csv", current_time.format("%Y_%m_%d"));
-            write_csv::add_to_csv(&csv_filename, &current_time, &state.window_title, &cursor);
+            if args.iter().any(|arg| arg == ARG_STDOUT) {
+                println!("{}", state.to_csv(&current_time));
+            } else {
+                let csv_filename = format!("logs/activity_log_{}.csv", current_time.format("%Y_%m_%d"));
+                write_csv::add_to_csv(&csv_filename, &current_time, &state);
+            }
             prev_state = state;
         }
 

src/write_csv.rs

@@ -2,6 +2,8 @@ use chrono::Local;
 use std::fs::{create_dir_all, OpenOptions};
 use std::path::Path;
 use std::io::Write;
+use crate::get_state;
+
 
 /// Appends a log line to the CSV file.
 ///
@@ -10,19 +12,8 @@ use std::io::Write;
 pub(crate) fn add_to_csv(
     csv_filename: &str,
     current_time: &chrono::DateTime<Local>,
-    window_title: &str,
-    cursor: &str,
+    state: &get_state::State,
 ) {
-    // Format the time to include milliseconds (as in the Python code)
-    let ms = current_time.timestamp_subsec_millis();
-    let time_str = format!("{}.{:03}", current_time.format("%Y-%m-%d %H:%M:%S"), ms);
-
-    // Remove any semicolons from the window title
-    let title_adapted = window_title.replace(";", "");
-    let line = format!("{};{};{}", time_str, title_adapted, cursor);
-
-    println!("{}", line);
-
     // Ensure that the parent directory exists
     if let Some(parent) = Path::new(csv_filename).parent() {
         if !parent.exists() {
@@ -40,7 +31,7 @@ pub(crate) fn add_to_csv(
         .open(csv_filename);
     match file_result {
         Ok(mut file) => {
-            if let Err(e) = writeln!(file, "{}", line) {
+            if let Err(e) = writeln!(file, "{}", state.to_csv(&current_time)) {
                 eprintln!("Error writing to file {}: {}", csv_filename, e);
             }
         }