Dark-Alex-17/managarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Refactored the SonarrEvent enum to not unnecessarily wrap dual series_id and season_number values in a tuple when both values can be passed directly

Browse Source
This commit is contained in:
Alex Clarke
2026-01-19 16:44:10 -07:00
parent a2e6400a38
commit f17f542e8e
19 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/sonarr_network/library/seasons/mod.rs
+12 -12
View File
@@ -14,10 +14,10 @@ mod sonarr_seasons_network_tests;
impl Network<'_, '_> {
pub(in crate::network::sonarr_network) async fn toggle_sonarr_season_monitoring(
&mut self,
series_id_season_number_tuple: (i64, i64),
series_id: i64,
season_number: i64,
) -> Result<()> {
let event = SonarrEvent::ToggleSeasonMonitoring(series_id_season_number_tuple);
let (series_id, season_number) = series_id_season_number_tuple;
let event = SonarrEvent::ToggleSeasonMonitoring(series_id, season_number);
let detail_event = SonarrEvent::GetSeriesDetails(series_id);
info!("Toggling season monitoring for season {season_number} in series with ID: {series_id}");
@@ -94,10 +94,10 @@ impl Network<'_, '_> {
pub(in crate::network::sonarr_network) async fn get_season_releases(
&mut self,
series_season_id_tuple: (i64, i64),
series_id: i64,
season_number: i64,
) -> Result<Vec<SonarrRelease>> {
let event = SonarrEvent::GetSeasonReleases(series_season_id_tuple);
let (series_id, season_number) = series_season_id_tuple;
let event = SonarrEvent::GetSeasonReleases(series_id, season_number);
info!("Fetching releases for series with ID: {series_id} and season number: {season_number}");
let request_props = self
@@ -132,10 +132,10 @@ impl Network<'_, '_> {
pub(in crate::network::sonarr_network) async fn get_sonarr_season_history(
&mut self,
series_season_id_tuple: (i64, i64),
series_id: i64,
season_number: i64,
) -> Result<Vec<SonarrHistoryItem>> {
let event = SonarrEvent::GetSeasonHistory(series_season_id_tuple);
let (series_id, season_number) = series_season_id_tuple;
let event = SonarrEvent::GetSeasonHistory(series_id, season_number);
info!("Fetching history for series with ID: {series_id} and season number: {season_number}");
let params = format!("seriesId={series_id}&seasonNumber={season_number}",);
@@ -170,10 +170,10 @@ impl Network<'_, '_> {
pub(in crate::network::sonarr_network) async fn trigger_automatic_season_search(
&mut self,
series_season_id_tuple: (i64, i64),
series_id: i64,
season_number: i64,
) -> Result<Value> {
let event = SonarrEvent::TriggerAutomaticSeasonSearch(series_season_id_tuple);
let (series_id, season_number) = series_season_id_tuple;
let event = SonarrEvent::TriggerAutomaticSeasonSearch(series_id, season_number);
info!("Searching indexers for series with ID: {series_id} and season number: {season_number}");
let body = SonarrCommandBody {
src/network/sonarr_network/library/seasons/sonarr_seasons_network_tests.rs
+14 -14
View File
@@ -37,7 +37,7 @@ mod tests {
"PUT",
format!(
"/api/v3{}/1",
SonarrEvent::ToggleSeasonMonitoring((1, 1)).resource()
SonarrEvent::ToggleSeasonMonitoring(1, 1).resource()
)
.as_str(),
)
@@ -56,7 +56,7 @@ mod tests {
assert!(
network
.handle_sonarr_event(SonarrEvent::ToggleSeasonMonitoring((1, 1)))
.handle_sonarr_event(SonarrEvent::ToggleSeasonMonitoring(1, 1))
.await
.is_ok()
);
@@ -117,7 +117,7 @@ mod tests {
let (mock, app, _server) = MockServarrApi::get()
.returns(release_json)
.query("seriesId=1&seasonNumber=1")
.build_for(SonarrEvent::GetSeasonReleases((1, 1)))
.build_for(SonarrEvent::GetSeasonReleases(1, 1))
.await;
app
.lock()
@@ -138,7 +138,7 @@ mod tests {
let mut network = test_network(&app);
let SonarrSerdeable::Releases(releases_vec) = network
.handle_sonarr_event(SonarrEvent::GetSeasonReleases((1, 1)))
.handle_sonarr_event(SonarrEvent::GetSeasonReleases(1, 1))
.await
.unwrap()
else {
@@ -203,7 +203,7 @@ mod tests {
let (mock, app, _server) = MockServarrApi::get()
.returns(release_json)
.query("seriesId=1&seasonNumber=1")
.build_for(SonarrEvent::GetSeasonReleases((1, 1)))
.build_for(SonarrEvent::GetSeasonReleases(1, 1))
.await;
app
.lock()
@@ -224,7 +224,7 @@ mod tests {
assert!(
network
.handle_sonarr_event(SonarrEvent::GetSeasonReleases((1, 1)))
.handle_sonarr_event(SonarrEvent::GetSeasonReleases(1, 1))
.await
.is_ok()
);
@@ -291,7 +291,7 @@ mod tests {
let (mock, app, _server) = MockServarrApi::get()
.returns(history_json)
.query("seriesId=1&seasonNumber=1")
.build_for(SonarrEvent::GetSeasonHistory((1, 1)))
.build_for(SonarrEvent::GetSeasonHistory(1, 1))
.await;
app.lock().await.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
app
@@ -322,7 +322,7 @@ mod tests {
let mut network = test_network(&app);
let SonarrSerdeable::SonarrHistoryItems(history) = network
.handle_sonarr_event(SonarrEvent::GetSeasonHistory((1, 1)))
.handle_sonarr_event(SonarrEvent::GetSeasonHistory(1, 1))
.await
.unwrap()
else {
@@ -403,7 +403,7 @@ mod tests {
let (mock, app, _server) = MockServarrApi::get()
.returns(history_json)
.query("seriesId=1&seasonNumber=1")
.build_for(SonarrEvent::GetSeasonHistory((1, 1)))
.build_for(SonarrEvent::GetSeasonHistory(1, 1))
.await;
app
.lock()
@@ -423,7 +423,7 @@ mod tests {
let mut network = test_network(&app);
let SonarrSerdeable::SonarrHistoryItems(history) = network
.handle_sonarr_event(SonarrEvent::GetSeasonHistory((1, 1)))
.handle_sonarr_event(SonarrEvent::GetSeasonHistory(1, 1))
.await
.unwrap()
else {
@@ -499,7 +499,7 @@ mod tests {
let (mock, app, _server) = MockServarrApi::get()
.returns(history_json)
.query("seriesId=1&seasonNumber=1")
.build_for(SonarrEvent::GetSeasonHistory((1, 1)))
.build_for(SonarrEvent::GetSeasonHistory(1, 1))
.await;
app.lock().await.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
app
@@ -520,7 +520,7 @@ mod tests {
let mut network = test_network(&app);
let SonarrSerdeable::SonarrHistoryItems(history) = network
.handle_sonarr_event(SonarrEvent::GetSeasonHistory((1, 1)))
.handle_sonarr_event(SonarrEvent::GetSeasonHistory(1, 1))
.await
.unwrap()
else {
@@ -563,14 +563,14 @@ mod tests {
"seasonNumber": 1
}))
.returns(json!({}))
.build_for(SonarrEvent::TriggerAutomaticSeasonSearch((1, 1)))
.build_for(SonarrEvent::TriggerAutomaticSeasonSearch(1, 1))
.await;
app.lock().await.server_tabs.next();
let mut network = test_network(&app);
assert!(
network
.handle_sonarr_event(SonarrEvent::TriggerAutomaticSeasonSearch((1, 1)))
.handle_sonarr_event(SonarrEvent::TriggerAutomaticSeasonSearch(1, 1))
.await
.is_ok()
);