code cleanup, prepare for 0.12.0

Author: B0ney

data/src/config/general.rs

@@ -14,9 +14,6 @@ pub struct GeneralConfig {
     pub non_gui_quiet_output: bool,
     pub non_gui_use_cwd: bool,
     pub hide_gif: bool,
-    pub idle_gif: Option<PathBuf>,
-    pub ripping_gif: Option<PathBuf>,
-    pub complete_gif: Option<PathBuf>,
     pub suppress_warnings: bool,
     pub show_errors_in_text_editor: bool,
     pub sample_name_params: SampleNameParams,
@@ -29,9 +26,6 @@ impl Default for GeneralConfig {
             non_gui_quiet_output: false,
             non_gui_use_cwd: false,
             hide_gif: false,
-            idle_gif: None,
-            ripping_gif: None,
-            complete_gif: None,
             suppress_warnings: false,
             theme: Themes::default(),
             sample_name_params: SampleNameParams::default(),

data/src/lib.rs

@@ -1,8 +1,4 @@
 //! Data components of XMODITS
-//!
-
-#![allow(dead_code)]
-#![allow(unused_imports)]
 
 pub mod config;
 pub mod theme;

data/src/theme.rs

@@ -1,7 +1,6 @@
 pub mod themes;
 
 use iced::Color;
-use serde::{Deserialize, Serialize};
 pub use themes::Themes;
 
 pub struct Theme {

data/src/theme/themes.rs

@@ -1,4 +1,4 @@
-use iced::{color, Color};
+use iced::color;
 use serde::{Deserialize, Serialize};
 
 use super::Palette;

src/logger.rs

@@ -1,8 +1,8 @@
-pub mod crash_handler;
 pub mod bad_modules;
+pub mod crash_handler;
 
-pub use crash_handler::set_panic_hook;
 pub use bad_modules::log_file_on_panic;
+pub use crash_handler::set_panic_hook;
 
 use anyhow::Result;
 use rand::Rng;
@@ -59,15 +59,8 @@ where
 /// This allows logs to be displayed when launched from the terminal.
 pub fn reattach_windows_terminal() {
     #[cfg(windows)]
-    unsafe {
-        use std::sync::Once;
+    {
         use windows_sys::Win32::System::Console::{AttachConsole, ATTACH_PARENT_PROCESS};
-
-        // Probably overkill to wrap in ONCE
-        static ONCE: Once = Once::new();
-
-        ONCE.call_once(|| {
-            let _ = AttachConsole(ATTACH_PARENT_PROCESS);
-        });
+        let _ = unsafe { AttachConsole(ATTACH_PARENT_PROCESS) };
     }
 }

src/logger/bad_modules.rs

@@ -11,7 +11,6 @@ type Subscriber = Box<dyn Fn(PathBuf) + Send + Sync + 'static>;
 
 #[derive(Default)]
 pub(crate) struct BadModules {
-    modules: RwLock<Vec<PathBuf>>,
     subscribers: RwLock<Vec<Subscriber>>,
 }
 
@@ -29,8 +28,6 @@ impl BadModules {
             .read()
             .iter()
             .for_each(|notify| notify(path.clone()));
-
-        self.modules.write().push(path);
     }
 }
 

src/screen/config.rs

@@ -3,4 +3,3 @@
 pub mod name_preview;
 pub mod sample_naming;
 pub mod sample_ripping;
-// pub mod custom_filters;

src/screen/config/name_preview.rs

@@ -1,37 +1,8 @@
 //! Preview how ripped samples will be named
 
-use std::path::PathBuf;
-
 use data::config::{SampleNameConfig, SampleNameParams, SampleRippingConfig};
 use xmodits_lib::interface::{name::Context, Sample};
 
-use crate::widget::Element;
-
-#[derive(Debug, Clone)]
-pub enum Message {
-    ModuleName(String),
-    FileName(Option<String>),
-    Source(PathBuf),
-    RawIndex(u16),
-    SeqIndex(u16),
-}
-
-pub fn update(name_params: &mut SampleNameParams, message: Message) {
-    tracing::info!("{:?}", &message);
-
-    match message {
-        Message::ModuleName(module_name) => name_params.module_name = module_name,
-        Message::FileName(file_name) => name_params.sample_filename = file_name,
-        Message::Source(source) => name_params.module_source = source,
-        Message::RawIndex(raw_index) => name_params.raw_index = raw_index,
-        Message::SeqIndex(seq_index) => name_params.seq_index = seq_index,
-    }
-}
-
-pub fn view<'a>() -> Element<'a, Message> {
-    todo!()
-}
-
 pub fn preview_name<'a>(
     params: &SampleNameParams,
     naming: &'a SampleNameConfig,

src/screen/settings.rs

@@ -1,30 +1,18 @@
 use data::config::{self};
 use iced::widget::{checkbox, column, pick_list, row};
 use iced::Command;
-use std::path::PathBuf;
 
-use crate::screen::config::name_preview;
-use crate::utils::folder_dialog;
 use crate::widget::helpers::control;
 use crate::widget::Element;
 
 #[derive(Debug, Clone)]
 pub enum Message {
     NonGuiQuietOutput(bool),
     NonGuiUseCwd(bool),
-    SetLogFolder(Option<PathBuf>),
-    SetLogFolderDialog,
     ShowAnimatedGIF(bool),
     SuppressWarnings(bool),
     ShowErrorsInTextEditor(bool),
-    SetGif {
-        kind: GIFKind,
-        path: Option<PathBuf>,
-    },
     SetTheme(data::theme::Themes),
-    NamePreview(name_preview::Message),
-    ImportTheme,
-    ExportTheme,
 }
 
 /*
@@ -58,7 +46,6 @@ pub fn view(general: &config::GeneralConfig) -> Element<Message> {
 
     column![control("Application Settings", settings)]
         .push(themes(general))
-        // .push(animated_gif(general))
         .push_maybe(non_gui(general))
         .spacing(8)
         .into()
@@ -71,7 +58,6 @@ pub fn themes(general: &config::GeneralConfig) -> Element<Message> {
             Some(general.theme),
             Message::SetTheme
         ),
-        // button("Load").on_press(Message::ImportTheme),
     ]
     .spacing(8)
     .align_items(iced::Alignment::Center);
@@ -103,50 +89,15 @@ pub enum GIFKind {
     Complete,
 }
 
-// pub fn animated_gif(general: &config::GeneralConfig) -> Element<Message> {
-//     let settings = column![checkbox(
-//         "Hide Animated GIFs",
-//         general.hide_gif,
-//         Message::ShowAnimatedGIF
-//     ),
-//     ]
-
-//     // .push(button(
-//     //     general
-//     //         .logging_path
-//     //         .as_deref()
-//     //         .map(filename)
-//     //         .unwrap_or_default(),
-//     // ))
-//     .spacing(8);
-//     control("Animated GIFs", settings).into()
-// }
-
 pub fn update(cfg: &mut config::GeneralConfig, message: Message) -> Command<Message> {
     tracing::info!("{:?}", &message);
 
     match message {
         Message::NonGuiQuietOutput(quiet_output) => cfg.non_gui_quiet_output = quiet_output,
         Message::NonGuiUseCwd(use_cwd) => cfg.non_gui_use_cwd = use_cwd,
-        Message::SetLogFolder(log_path) => {
-            if let Some(log_path) = log_path {
-                cfg.logging_path = Some(log_path)
-            }
-        }
-        Message::SetLogFolderDialog => {
-            return Command::perform(folder_dialog(), Message::SetLogFolder)
-        }
         Message::ShowAnimatedGIF(toggle) => cfg.hide_gif = toggle,
         Message::SuppressWarnings(toggle) => cfg.suppress_warnings = toggle,
-        Message::SetGif { kind, path } => match kind {
-            GIFKind::Idle => cfg.idle_gif = path,
-            GIFKind::Ripping => cfg.ripping_gif = path,
-            GIFKind::Complete => cfg.complete_gif = path,
-        },
         Message::SetTheme(theme) => cfg.theme = theme,
-        Message::NamePreview(msg) => name_preview::update(&mut cfg.sample_name_params, msg),
-        Message::ImportTheme => (),
-        Message::ExportTheme => (),
         Message::ShowErrorsInTextEditor(show) => cfg.show_errors_in_text_editor = show,
     }
 

src/screen/tracker_info.rs

@@ -9,7 +9,7 @@ use crate::utils::filename;
 use crate::widget::helpers::{centered_container, control_filled, text_adv};
 use crate::widget::Element;
 
-use iced::widget::{button, column, text, Space};
+use iced::widget::{column, text, Space};
 use iced::Alignment;
 use xmodits_lib::common::info::Info;
 
@@ -67,7 +67,7 @@ impl TrackerInfo {
             } => {
                 #[cfg(feature = "audio")]
                 let view_samples_button = Some(
-                    button("View Samples")
+                    iced::widget::button("View Samples")
                         .on_press(Message::PreviewSamples(path.to_owned()))
                         .padding(5),
                 );