Merge branch 'main' into var-interpolation

Dark-Alex-17 · Jan 26, 2025 · 8d450de · 8d450de
1 parent c4ace8c
commit 8d450de
Show file tree

Hide file tree

Showing 55 changed files with 103 additions and 58 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -54,6 +54,7 @@ derive_setters = "0.1.6"
 deunicode = "1.6.0"
 paste = "1.0.15"
 openssl = { version = "0.10.68", features = ["vendored"] }
+veil = "0.2.0"
 
 [dev-dependencies]
 assert_cmd = "2.0.16"

diff --git a/src/app/app_tests.rs b/src/app/app_tests.rs
@@ -409,4 +409,23 @@ mod tests {
       "https://dontdo:[email protected]/query?test=%20query#results"
     );
   }
+
+  fn test_servarr_config_redacted_debug() {
+    let host = "localhost".to_owned();
+    let port = 1234;
+    let uri = "http://localhost:1234".to_owned();
+    let api_token = "thisisatest".to_owned();
+    let ssl_cert_path = "/some/path".to_owned();
+    let expected_str = format!("ServarrConfig {{ host: Some(\"{}\"), port: Some({}), uri: Some(\"{}\"), api_token: \"***********\", ssl_cert_path: Some(\"{}\") }}",
+    host, port, uri, ssl_cert_path);
+    let servarr_config = ServarrConfig {
+      host: Some(host),
+      port: Some(port),
+      uri: Some(uri),
+      api_token,
+      ssl_cert_path: Some(ssl_cert_path),
+    };
+
+    assert_str_eq!(format!("{servarr_config:?}"), expected_str);
+  }
 }
diff --git a/src/app/mod.rs b/src/app/mod.rs
@@ -7,6 +7,7 @@ use regex::Regex;
 use serde::{Deserialize, Serialize};
 use tokio::sync::mpsc::Sender;
 use tokio_util::sync::CancellationToken;
+use veil::Redact;
 
 use crate::app::context_clues::{build_context_clue_string, SERVARR_CONTEXT_CLUES};
 use crate::cli::Command;
@@ -43,7 +44,7 @@ pub struct App<'a> {
   pub data: Data<'a>,
 }
 
-impl<'a> App<'a> {
+impl App<'_> {
   pub fn new(
     network_tx: Sender<NetworkEvent>,
     config: AppConfig,
@@ -166,7 +167,7 @@ impl<'a> App<'a> {
   }
 }
 
-impl<'a> Default for App<'a> {
+impl Default for App<'_> {
   fn default() -> Self {
     App {
       navigation_stack: Vec::new(),
@@ -259,7 +260,7 @@ impl AppConfig {
   }
 }
 
-#[derive(Debug, Deserialize, Serialize, Clone)]
+#[derive(Redact, Deserialize, Serialize, Clone)]
 pub struct ServarrConfig {
   #[serde(default, deserialize_with = "deserialize_optional_env_var")]
   pub host: Option<String>,
@@ -268,6 +269,7 @@ pub struct ServarrConfig {
   #[serde(default, deserialize_with = "deserialize_optional_env_var")]
   pub uri: Option<String>,
   #[serde(default, deserialize_with = "deserialize_env_var")]
+  #[redact]
   pub api_token: String,
   #[serde(default, deserialize_with = "deserialize_optional_env_var")]
   pub ssl_cert_path: Option<String>,

diff --git a/src/app/radarr/mod.rs b/src/app/radarr/mod.rs
@@ -8,7 +8,7 @@ pub mod radarr_context_clues;
 #[path = "radarr_tests.rs"]
 mod radarr_tests;
 
-impl<'a> App<'a> {
+impl App<'_> {
   pub(super) async fn dispatch_by_radarr_block(&mut self, active_radarr_block: &ActiveRadarrBlock) {
     match active_radarr_block {
       ActiveRadarrBlock::Blocklist => {

diff --git a/src/app/sonarr/mod.rs b/src/app/sonarr/mod.rs
@@ -11,7 +11,7 @@ pub mod sonarr_context_clues;
 #[path = "sonarr_tests.rs"]
 mod sonarr_tests;
 
-impl<'a> App<'a> {
+impl App<'_> {
   pub(super) async fn dispatch_by_sonarr_block(&mut self, active_sonarr_block: &ActiveSonarrBlock) {
     match active_sonarr_block {
       ActiveSonarrBlock::Series => {

diff --git a/src/handlers/radarr_handlers/blocklist/mod.rs b/src/handlers/radarr_handlers/blocklist/mod.rs
@@ -21,7 +21,7 @@ pub(super) struct BlocklistHandler<'a, 'b> {
   _context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> BlocklistHandler<'a, 'b> {
+impl BlocklistHandler<'_, '_> {
   handle_table_events!(
     self,
     blocklist,

diff --git a/src/handlers/radarr_handlers/collections/collection_details_handler.rs b/src/handlers/radarr_handlers/collections/collection_details_handler.rs
@@ -23,7 +23,7 @@ pub(super) struct CollectionDetailsHandler<'a, 'b> {
   _context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> CollectionDetailsHandler<'a, 'b> {
+impl CollectionDetailsHandler<'_, '_> {
   handle_table_events!(
     self,
     collection_movies,

diff --git a/src/handlers/radarr_handlers/collections/edit_collection_handler.rs b/src/handlers/radarr_handlers/collections/edit_collection_handler.rs
@@ -20,7 +20,7 @@ pub(super) struct EditCollectionHandler<'a, 'b> {
   context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> EditCollectionHandler<'a, 'b> {
+impl EditCollectionHandler<'_, '_> {
   fn build_edit_collection_params(&mut self) -> EditCollectionParams {
     let edit_collection_modal = self
       .app

diff --git a/src/handlers/radarr_handlers/collections/mod.rs b/src/handlers/radarr_handlers/collections/mod.rs
@@ -29,7 +29,7 @@ pub(super) struct CollectionsHandler<'a, 'b> {
   context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> CollectionsHandler<'a, 'b> {
+impl CollectionsHandler<'_, '_> {
   handle_table_events!(
     self,
     collections,

diff --git a/src/handlers/radarr_handlers/downloads/mod.rs b/src/handlers/radarr_handlers/downloads/mod.rs
@@ -20,7 +20,7 @@ pub(super) struct DownloadsHandler<'a, 'b> {
   _context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> DownloadsHandler<'a, 'b> {
+impl DownloadsHandler<'_, '_> {
   handle_table_events!(
     self,
     downloads,

diff --git a/src/handlers/radarr_handlers/indexers/edit_indexer_handler.rs b/src/handlers/radarr_handlers/indexers/edit_indexer_handler.rs
@@ -19,7 +19,7 @@ pub(super) struct EditIndexerHandler<'a, 'b> {
   _context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> EditIndexerHandler<'a, 'b> {
+impl EditIndexerHandler<'_, '_> {
   fn build_edit_indexer_params(&mut self) -> EditIndexerParams {
     let edit_indexer_modal = self
       .app

diff --git a/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs b/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs
@@ -20,7 +20,7 @@ pub(super) struct IndexerSettingsHandler<'a, 'b> {
   _context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> IndexerSettingsHandler<'a, 'b> {
+impl IndexerSettingsHandler<'_, '_> {
   fn build_edit_indexer_settings_body(&mut self) -> IndexerSettings {
     self
       .app

diff --git a/src/handlers/radarr_handlers/indexers/mod.rs b/src/handlers/radarr_handlers/indexers/mod.rs
@@ -31,7 +31,7 @@ pub(super) struct IndexersHandler<'a, 'b> {
   context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> IndexersHandler<'a, 'b> {
+impl IndexersHandler<'_, '_> {
   handle_table_events!(self, indexers, self.app.data.radarr_data.indexers, Indexer);
 
   fn extract_indexer_id(&self) -> i64 {

diff --git a/src/handlers/radarr_handlers/indexers/test_all_indexers_handler.rs b/src/handlers/radarr_handlers/indexers/test_all_indexers_handler.rs
@@ -17,7 +17,7 @@ pub(super) struct TestAllIndexersHandler<'a, 'b> {
   _context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> TestAllIndexersHandler<'a, 'b> {
+impl TestAllIndexersHandler<'_, '_> {
   handle_table_events!(
     self,
     indexer_test_all_results,

diff --git a/src/handlers/radarr_handlers/library/add_movie_handler.rs b/src/handlers/radarr_handlers/library/add_movie_handler.rs
@@ -24,7 +24,7 @@ pub(super) struct AddMovieHandler<'a, 'b> {
   context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> AddMovieHandler<'a, 'b> {
+impl AddMovieHandler<'_, '_> {
   handle_table_events!(
     self,
     add_movie_search_results,

diff --git a/src/handlers/radarr_handlers/library/delete_movie_handler.rs b/src/handlers/radarr_handlers/library/delete_movie_handler.rs
@@ -17,7 +17,7 @@ pub(super) struct DeleteMovieHandler<'a, 'b> {
   _context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> DeleteMovieHandler<'a, 'b> {
+impl DeleteMovieHandler<'_, '_> {
   fn build_delete_movie_params(&mut self) -> DeleteMovieParams {
     let id = self.app.data.radarr_data.movies.current_selection().id;
     let delete_movie_files = self.app.data.radarr_data.delete_movie_files;

diff --git a/src/handlers/radarr_handlers/library/edit_movie_handler.rs b/src/handlers/radarr_handlers/library/edit_movie_handler.rs
@@ -20,7 +20,7 @@ pub(super) struct EditMovieHandler<'a, 'b> {
   context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> EditMovieHandler<'a, 'b> {
+impl EditMovieHandler<'_, '_> {
   fn build_edit_movie_params(&mut self) -> EditMovieParams {
     let movie_id = self.app.data.radarr_data.movies.current_selection().id;
     let edit_movie_modal = self

diff --git a/src/handlers/radarr_handlers/library/mod.rs b/src/handlers/radarr_handlers/library/mod.rs
@@ -34,7 +34,7 @@ pub(super) struct LibraryHandler<'a, 'b> {
   context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> LibraryHandler<'a, 'b> {
+impl LibraryHandler<'_, '_> {
   handle_table_events!(self, movies, self.app.data.radarr_data.movies, Movie);
 }
 

diff --git a/src/handlers/radarr_handlers/library/movie_details_handler.rs b/src/handlers/radarr_handlers/library/movie_details_handler.rs
@@ -28,7 +28,7 @@ pub(super) struct MovieDetailsHandler<'a, 'b> {
   _context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> MovieDetailsHandler<'a, 'b> {
+impl MovieDetailsHandler<'_, '_> {
   handle_table_events!(
     self,
     movie_releases,

diff --git a/src/handlers/radarr_handlers/root_folders/mod.rs b/src/handlers/radarr_handlers/root_folders/mod.rs
@@ -21,7 +21,7 @@ pub(super) struct RootFoldersHandler<'a, 'b> {
   _context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> RootFoldersHandler<'a, 'b> {
+impl RootFoldersHandler<'_, '_> {
   handle_table_events!(
     self,
     root_folders,

diff --git a/src/handlers/radarr_handlers/system/system_details_handler.rs b/src/handlers/radarr_handlers/system/system_details_handler.rs
@@ -19,7 +19,7 @@ pub(super) struct SystemDetailsHandler<'a, 'b> {
   _context: Option<ActiveRadarrBlock>,
 }
 
-impl<'a, 'b> SystemDetailsHandler<'a, 'b> {
+impl SystemDetailsHandler<'_, '_> {
   fn extract_task_name(&self) -> RadarrTaskName {
     self
       .app

diff --git a/src/handlers/sonarr_handlers/blocklist/mod.rs b/src/handlers/sonarr_handlers/blocklist/mod.rs
@@ -21,7 +21,7 @@ pub(super) struct BlocklistHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> BlocklistHandler<'a, 'b> {
+impl BlocklistHandler<'_, '_> {
   handle_table_events!(
     self,
     blocklist,

diff --git a/src/handlers/sonarr_handlers/downloads/mod.rs b/src/handlers/sonarr_handlers/downloads/mod.rs
@@ -20,7 +20,7 @@ pub(super) struct DownloadsHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> DownloadsHandler<'a, 'b> {
+impl DownloadsHandler<'_, '_> {
   handle_table_events!(
     self,
     downloads,

diff --git a/src/handlers/sonarr_handlers/history/mod.rs b/src/handlers/sonarr_handlers/history/mod.rs
@@ -21,7 +21,7 @@ pub(super) struct HistoryHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> HistoryHandler<'a, 'b> {
+impl HistoryHandler<'_, '_> {
   handle_table_events!(
     self,
     history,

diff --git a/src/handlers/sonarr_handlers/indexers/edit_indexer_handler.rs b/src/handlers/sonarr_handlers/indexers/edit_indexer_handler.rs
@@ -19,7 +19,7 @@ pub(super) struct EditIndexerHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> EditIndexerHandler<'a, 'b> {
+impl EditIndexerHandler<'_, '_> {
   fn build_edit_indexer_params(&mut self) -> EditIndexerParams {
     let edit_indexer_modal = self
       .app

diff --git a/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler.rs b/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler.rs
@@ -20,7 +20,7 @@ pub(super) struct IndexerSettingsHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> IndexerSettingsHandler<'a, 'b> {
+impl IndexerSettingsHandler<'_, '_> {
   fn build_edit_indexer_settings_params(&mut self) -> IndexerSettings {
     self
       .app

diff --git a/src/handlers/sonarr_handlers/indexers/mod.rs b/src/handlers/sonarr_handlers/indexers/mod.rs
@@ -31,7 +31,7 @@ pub(super) struct IndexersHandler<'a, 'b> {
   context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> IndexersHandler<'a, 'b> {
+impl IndexersHandler<'_, '_> {
   handle_table_events!(self, indexers, self.app.data.sonarr_data.indexers, Indexer);
 
   fn extract_indexer_id(&self) -> i64 {

diff --git a/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler.rs b/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler.rs
@@ -17,7 +17,7 @@ pub(super) struct TestAllIndexersHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> TestAllIndexersHandler<'a, 'b> {
+impl TestAllIndexersHandler<'_, '_> {
   handle_table_events!(
     self,
     indexer_test_all_results,

diff --git a/src/handlers/sonarr_handlers/library/add_series_handler.rs b/src/handlers/sonarr_handlers/library/add_series_handler.rs
@@ -22,7 +22,7 @@ pub(super) struct AddSeriesHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> AddSeriesHandler<'a, 'b> {
+impl AddSeriesHandler<'_, '_> {
   handle_table_events!(
     self,
     add_searched_series,

diff --git a/src/handlers/sonarr_handlers/library/delete_series_handler.rs b/src/handlers/sonarr_handlers/library/delete_series_handler.rs
@@ -18,7 +18,7 @@ pub(super) struct DeleteSeriesHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> DeleteSeriesHandler<'a, 'b> {
+impl DeleteSeriesHandler<'_, '_> {
   fn build_delete_series_params(&mut self) -> DeleteSeriesParams {
     let id = self.app.data.sonarr_data.series.current_selection().id;
     let delete_series_files = self.app.data.sonarr_data.delete_series_files;

diff --git a/src/handlers/sonarr_handlers/library/edit_series_handler.rs b/src/handlers/sonarr_handlers/library/edit_series_handler.rs
@@ -20,7 +20,7 @@ pub(super) struct EditSeriesHandler<'a, 'b> {
   context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> EditSeriesHandler<'a, 'b> {
+impl EditSeriesHandler<'_, '_> {
   fn build_edit_series_params(&mut self) -> EditSeriesParams {
     let edit_series_modal = self
       .app

diff --git a/src/handlers/sonarr_handlers/library/episode_details_handler.rs b/src/handlers/sonarr_handlers/library/episode_details_handler.rs
@@ -20,7 +20,7 @@ pub(super) struct EpisodeDetailsHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> EpisodeDetailsHandler<'a, 'b> {
+impl EpisodeDetailsHandler<'_, '_> {
   handle_table_events!(
     self,
     episode_history,

diff --git a/src/handlers/sonarr_handlers/library/mod.rs b/src/handlers/sonarr_handlers/library/mod.rs
@@ -44,7 +44,7 @@ pub(super) struct LibraryHandler<'a, 'b> {
   context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> LibraryHandler<'a, 'b> {
+impl LibraryHandler<'_, '_> {
   handle_table_events!(self, series, self.app.data.sonarr_data.series, Series);
 }
 

diff --git a/src/handlers/sonarr_handlers/library/season_details_handler.rs b/src/handlers/sonarr_handlers/library/season_details_handler.rs
@@ -25,7 +25,7 @@ pub(super) struct SeasonDetailsHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> SeasonDetailsHandler<'a, 'b> {
+impl SeasonDetailsHandler<'_, '_> {
   handle_table_events!(
     self,
     episodes,

diff --git a/src/handlers/sonarr_handlers/library/series_details_handler.rs b/src/handlers/sonarr_handlers/library/series_details_handler.rs
@@ -23,7 +23,7 @@ pub(super) struct SeriesDetailsHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl<'a, 'b> SeriesDetailsHandler<'a, 'b> {
+impl SeriesDetailsHandler<'_, '_> {
   handle_table_events!(self, season, self.app.data.sonarr_data.seasons, Season);
   handle_table_events!(
     self,