Merge remote-tracking branch 'origin/main' into test-refactoring

# Conflicts:
#	Cargo.lock
#	src/cli/mod.rs
#	src/cli/radarr/add_command_handler.rs
#	src/cli/radarr/get_command_handler.rs
#	src/cli/radarr/list_command_handler.rs

src/cli/mod.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use anyhow::Result;
-use clap::{Subcommand, command};
+use clap::{command, Subcommand};
 use clap_complete::Shell;
 use radarr::{RadarrCliHandler, RadarrCommand};
 use sonarr::{SonarrCliHandler, SonarrCommand};

src/cli/radarr/add_command_handler.rs

@@ -10,7 +10,7 @@ use crate::{
   app::App,
   cli::{CliCommandHandler, Command},
   models::radarr_models::{AddMovieBody, AddMovieOptions, MinimumAvailability, MovieMonitor},
-  network::{NetworkTrait, radarr_network::RadarrEvent},
+  network::{radarr_network::RadarrEvent, NetworkTrait},
 };
 
 #[cfg(test)]

src/cli/radarr/get_command_handler.rs

@@ -1,13 +1,13 @@
 use std::sync::Arc;
 
 use anyhow::Result;
-use clap::{Subcommand, command};
+use clap::{command, Subcommand};
 use tokio::sync::Mutex;
 
 use crate::{
   app::App,
   cli::{CliCommandHandler, Command},
-  network::{NetworkTrait, radarr_network::RadarrEvent},
+  network::{radarr_network::RadarrEvent, NetworkTrait},
 };
 
 use super::RadarrCommand;

src/cli/radarr/list_command_handler.rs

@@ -1,13 +1,13 @@
 use std::sync::Arc;
 
 use anyhow::Result;
-use clap::{Subcommand, command};
+use clap::{command, Subcommand};
 use tokio::sync::Mutex;
 
 use crate::{
   app::App,
   cli::{CliCommandHandler, Command},
-  network::{NetworkTrait, radarr_network::RadarrEvent},
+  network::{radarr_network::RadarrEvent, NetworkTrait},
 };
 
 use super::RadarrCommand;