style: format code and improve consistency across files

kWAYTV · kWAYTV · commit 71f1ebdca14c · 2025-05-28T02:14:59.000+02:00
- Adjusted whitespace and formatting in various files for better readability.
- Ensured consistent use of newlines and indentation in Rust source files.
- Updated GitHub Actions workflow file for cleaner branch specification.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -2,21 +2,20 @@ name: Rust
 
 on:
   push:
-    branches: [ "master" ]
+    branches: ["master"]
   pull_request:
-    branches: [ "master" ]
+    branches: ["master"]
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
+      - uses: actions/checkout@v4
+      - name: Build
+        run: cargo build --verbose
+      - name: Run tests
+        run: cargo test --verbose
diff --git a/src/core/config.rs b/src/core/config.rs
@@ -1,8 +1,8 @@
 use serde::{Deserialize, Serialize};
-use std::fs;
-use std::path::Path;
 use std::error::Error;
+use std::fs;
 use std::io::{self, Write};
+use std::path::Path;
 
 const CONFIG_FILE: &str = "config.toml";
 
@@ -50,34 +50,36 @@ impl Config {
 
     fn load_from_file() -> Result<Self, Box<dyn Error>> {
         let content = fs::read_to_string(CONFIG_FILE)?;
-        
+
         // Try to parse the config, but handle missing fields gracefully
         match toml::from_str::<Config>(&content) {
             Ok(config) => Ok(config),
             Err(e) => {
                 // If parsing fails due to missing fields, merge with defaults
                 if e.to_string().contains("missing field") {
                     println!("⚠️  Config file is missing new fields, updating...");
-                    
+
                     // Parse as a generic value first
                     let mut existing: toml::Value = toml::from_str(&content)?;
                     let default_config = Self::default();
                     let default_value = toml::Value::try_from(&default_config)?;
-                    
+
                     // Merge missing fields from defaults
-                    if let (toml::Value::Table(existing_table), toml::Value::Table(default_table)) = (&mut existing, default_value) {
+                    if let (toml::Value::Table(existing_table), toml::Value::Table(default_table)) =
+                        (&mut existing, default_value)
+                    {
                         for (key, value) in default_table {
                             if !existing_table.contains_key(&key) {
                                 existing_table.insert(key, value);
                             }
                         }
                     }
-                    
+
                     // Convert back to Config and save the updated version
                     let updated_config: Config = existing.try_into()?;
                     let updated_content = toml::to_string_pretty(&updated_config)?;
                     fs::write(CONFIG_FILE, &updated_content)?;
-                    
+
                     println!("✅ Config file updated with new fields");
                     Ok(updated_config)
                 } else {
@@ -89,12 +91,12 @@ impl Config {
 
     fn create_default_and_prompt() -> Result<Self, Box<dyn Error>> {
         println!("🔧 First time setup - Creating configuration file...");
-        
+
         let default_config = Self::default();
         let toml_content = toml::to_string_pretty(&default_config)?;
-        
+
         fs::write(CONFIG_FILE, &toml_content)?;
-        
+
         println!("✅ Created '{}'", CONFIG_FILE);
         println!();
         println!("📝 Please edit the configuration file with your settings:");
@@ -105,22 +107,20 @@ impl Config {
         println!();
         print!("Press Enter when you've finished editing the config file...");
         io::stdout().flush()?;
-        
+
         let mut input = String::new();
         io::stdin().read_line(&mut input)?;
-        
+
         // Reload the config after user edits
         Self::load_from_file()
     }
 
     pub fn rust_color(&self) -> u32 {
         // Parse hex color string to u32
         if self.appearance.embed_color.starts_with('#') {
-            u32::from_str_radix(&self.appearance.embed_color[1..], 16)
-                .unwrap_or(0xCD412B)
+            u32::from_str_radix(&self.appearance.embed_color[1..], 16).unwrap_or(0xCD412B)
         } else {
-            u32::from_str_radix(&self.appearance.embed_color, 16)
-                .unwrap_or(0xCD412B)
+            u32::from_str_radix(&self.appearance.embed_color, 16).unwrap_or(0xCD412B)
         }
     }
 }
@@ -147,4 +147,4 @@ impl Default for Config {
             },
         }
     }
-} 
+}
diff --git a/src/core/mod.rs b/src/core/mod.rs
@@ -2,4 +2,4 @@ pub mod config;
 pub mod tracker;
 
 pub use config::*;
-pub use tracker::*; 
+pub use tracker::*;
diff --git a/src/core/tracker.rs b/src/core/tracker.rs
@@ -1,6 +1,6 @@
 use crate::core::Config;
-use crate::services::{CommitScraper, DiscordNotifier, Database};
-use log::{info, error, debug};
+use crate::services::{CommitScraper, Database, DiscordNotifier};
+use log::{debug, error, info};
 use std::error::Error;
 use std::time::Duration;
 use tokio::time::sleep;
@@ -28,11 +28,17 @@ impl CommitTracker {
     }
 
     pub async fn start(&mut self) -> Result<(), Box<dyn Error>> {
-        info!("🚀 {} started - monitoring Facepunch commits", self.config.discord.bot_name);
+        info!(
+            "🚀 {} started - monitoring Facepunch commits",
+            self.config.discord.bot_name
+        );
 
         // Get the last sent commit info from database
         if let Some((last_id, changeset)) = self.database.get_last_sent_commit_info().await? {
-            info!("📊 Resuming from last sent commit ID: {} ({})", last_id, changeset);
+            info!(
+                "📊 Resuming from last sent commit ID: {} ({})",
+                last_id, changeset
+            );
         } else {
             info!("📊 No previous commits found in database - starting fresh");
         }
@@ -42,12 +48,18 @@ impl CommitTracker {
                 error!("❌ {}", e);
             }
 
-            sleep(Duration::from_secs(self.config.monitoring.check_interval_secs)).await;
+            sleep(Duration::from_secs(
+                self.config.monitoring.check_interval_secs,
+            ))
+            .await;
         }
     }
 
     async fn check_for_new_commits(&mut self) -> Result<(), Box<dyn Error>> {
-        let result = self.scraper.fetch_latest_commit(&self.config.monitoring.commits_url).await?;
+        let result = self
+            .scraper
+            .fetch_latest_commit(&self.config.monitoring.commits_url)
+            .await?;
         let commit = &result.commit;
 
         // Check if we've already sent this commit
@@ -56,28 +68,37 @@ impl CommitTracker {
             return Ok(());
         }
 
-        info!("🆕 New commit #{} by {} - {}", commit.id, commit.author(), commit.message);
-        
+        info!(
+            "🆕 New commit #{} by {} - {}",
+            commit.id,
+            commit.author(),
+            commit.message
+        );
+
         // Send notification
         self.notifier.send_commit_notification(&result).await?;
-        
+
         // Mark as sent in database
-        self.database.mark_commit_sent(
-            commit.id,
-            &commit.author(),
-            &commit.message,
-            &commit.branch,
-            &commit.changeset,
-        ).await?;
-        
+        self.database
+            .mark_commit_sent(
+                commit.id,
+                &commit.author(),
+                &commit.message,
+                &commit.branch,
+                &commit.changeset,
+            )
+            .await?;
+
         info!("✅ Sent to Discord and marked as sent");
 
         // Periodic cleanup to prevent database from growing too large
         let sent_count = self.database.get_sent_commits_count().await?;
         if sent_count > self.config.database.cleanup_keep_last + 100 {
-            self.database.cleanup_old_commits(self.config.database.cleanup_keep_last).await?;
+            self.database
+                .cleanup_old_commits(self.config.database.cleanup_keep_last)
+                .await?;
         }
 
         Ok(())
     }
-} 
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -4,4 +4,4 @@ pub mod services;
 
 pub use core::*;
 pub use models::*;
-pub use services::{CommitScraper, DiscordNotifier}; 
+pub use services::{CommitScraper, DiscordNotifier};
diff --git a/src/main.rs b/src/main.rs
@@ -1,5 +1,5 @@
-use rust_commit_tracker::CommitTracker;
 use log::error;
+use rust_commit_tracker::CommitTracker;
 
 #[tokio::main]
 async fn main() {
@@ -16,7 +16,7 @@ async fn main() {
             return;
         }
     };
-    
+
     if let Err(e) = tracker.start().await {
         error!("❌ Fatal error: {}", e);
     }
diff --git a/src/models/commit.rs b/src/models/commit.rs
@@ -31,12 +31,12 @@ impl CommitInfo {
     pub fn link(&self) -> String {
         format!("https://commits.facepunch.com/{}", self.id)
     }
-    
+
     pub fn avatar_url(&self) -> &str {
         &self.user.avatar
     }
-    
+
     pub fn author(&self) -> &str {
         &self.user.name
     }
-} 
+}
diff --git a/src/models/discord.rs b/src/models/discord.rs
@@ -34,4 +34,4 @@ pub struct EmbedField {
 pub struct EmbedFooter {
     pub text: String,
     pub icon_url: String,
-} 
+}
diff --git a/src/models/mod.rs b/src/models/mod.rs
@@ -2,4 +2,4 @@ pub mod commit;
 pub mod discord;
 
 pub use commit::*;
-pub use discord::*; 
+pub use discord::*;
diff --git a/src/services/database.rs b/src/services/database.rs
@@ -1,6 +1,6 @@
-use sqlx::{SqlitePool, Row};
+use log::{debug, info};
+use sqlx::{Row, SqlitePool};
 use std::error::Error;
-use log::{info, debug};
 
 pub struct Database {
     pool: SqlitePool,
@@ -16,12 +16,12 @@ impl Database {
                 std::fs::File::create(file_path)?;
             }
         }
-        
+
         let pool = SqlitePool::connect(database_url).await?;
-        
+
         let db = Self { pool };
         db.initialize().await?;
-        
+
         Ok(db)
     }
 
@@ -93,9 +93,11 @@ impl Database {
     }
 
     pub async fn get_last_sent_commit_info(&self) -> Result<Option<(i32, String)>, Box<dyn Error>> {
-        let row = sqlx::query("SELECT commit_id, changeset FROM sent_commits ORDER BY commit_id DESC LIMIT 1")
-            .fetch_optional(&self.pool)
-            .await?;
+        let row = sqlx::query(
+            "SELECT commit_id, changeset FROM sent_commits ORDER BY commit_id DESC LIMIT 1",
+        )
+        .fetch_optional(&self.pool)
+        .await?;
 
         if let Some(row) = row {
             let commit_id: i32 = row.get("commit_id");
@@ -134,4 +136,4 @@ impl Database {
         info!("Cleaned up old commits, keeping last {}", keep_last);
         Ok(())
     }
-} 
+}
diff --git a/src/services/discord.rs b/src/services/discord.rs
diff --git a/src/services/mod.rs b/src/services/mod.rs
diff --git a/src/services/scraper.rs b/src/services/scraper.rs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-use rust_commit_tracker::CommitTracker;`
`2`	`1`	`use log::error;`
	`2`	`+use rust_commit_tracker::CommitTracker;`
`3`	`3`
`4`	`4`	`#[tokio::main]`
`5`	`5`	`async fn main() {`
`@@ -16,7 +16,7 @@ async fn main() {`
`16`	`16`	`return;`
`17`	`17`	`}`
`18`	`18`	`};`
`19`		`-`
	`19`	`+`
`20`	`20`	`if let Err(e) = tracker.start().await {`
`21`	`21`	`error!("❌ Fatal error: {}", e);`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,12 @@ impl CommitInfo {`
`31`	`31`	`pub fn link(&self) -> String {`
`32`	`32`	`format!("https://commits.facepunch.com/{}", self.id)`
`33`	`33`	`}`
`34`		`-`
	`34`	`+`
`35`	`35`	`pub fn avatar_url(&self) -> &str {`
`36`	`36`	`&self.user.avatar`
`37`	`37`	`}`
`38`		`-`
	`38`	`+`
`39`	`39`	`pub fn author(&self) -> &str {`
`40`	`40`	`&self.user.name`
`41`	`41`	`}`
`42`		`-}`
	`42`	`+}`