initial config generation to main file

src/config.rs

@@ -4,7 +4,7 @@ use core::fmt;
 use crate::enums::*;
 use untildify;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Monitors {
     pub monitors: Vec<MonitorType>,
 }
@@ -29,7 +29,7 @@ impl fmt::Display for Monitors {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct WallpaperDir {
     ultrawide: String,
     horizontal: String,
@@ -68,7 +68,7 @@ impl fmt::Display for WallpaperDir {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Config {
     pub x_server: String,
     pub wallpaper_engine: WallpaperHandler,

src/enums.rs

@@ -1,6 +1,6 @@
 use core::fmt;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum WallpaperHandler {
     Feh,
     Plasma,

src/files.rs

@@ -6,7 +6,7 @@ use std::fmt::Write as _;
 use crate::config::*;
 use crate::enums::*;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Wallpaper {
     path: String,
 }
@@ -23,7 +23,7 @@ impl fmt::Display for Wallpaper {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Wallpapers {
     ultrawide: Vec<Wallpaper>,
     horizontal: Vec<Wallpaper>,
@@ -32,14 +32,12 @@ pub struct Wallpapers {
 }
 
 impl Wallpapers {
-    pub fn new() -> Wallpapers {
+    pub fn new(config: Config) -> Wallpapers {
         Wallpapers {
             ultrawide: vec![],
             horizontal: vec![],
             vertical: vec![],
-            config: Config::from_config(
+            config,
-                "/home/ben/.config/wallpaperctl/wallpaperctl.ini".to_owned(),
-            ),
         }
     }
 

src/handlers/plasma.rs

@@ -1,4 +1,3 @@
-use crate::config::Monitors;
 use crate::handlers::dbus_plasma_interface;
 use crate::Wallpapers;
 
@@ -23,7 +22,7 @@ pub fn change_wallpapers(wallpapers: &Wallpapers) {
     let javascript = generate_js(wallpapers);
     let resp = proxy.evaluate_script(javascript.as_ref());
     match resp {
-        Ok(str) => {}
+        Ok(_str) => {}
         Err(e) => println!("{}", e),
     }
 }

src/main.rs

@@ -1,11 +1,13 @@
 mod config;
+use config::*;
 mod enums;
 mod files;
 use files::*;
 mod handlers;
 
 fn main() {
-    let mut wallpapers = Wallpapers::new();
+    let config = Config::from_config("/home/ben/.config/wallpaperctl/wallpaperctl.ini".to_owned());
+    let mut wallpapers = Wallpapers::new(config.clone());
 
     wallpapers.load_all();
     handlers::plasma::change_wallpapers(&wallpapers);