Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: move triggers + more tests #83

Merged
merged 2 commits into from
Oct 27, 2024
Merged

test: move triggers + more tests #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6c1922
test: move triggers + more tests
dan-online Oct 27, 2024
7f1acf7
chore: remove while and use if
dan-online Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ serde_json = "1.0.128"

# Tracing
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt", "local-time", "time"] }
tracing-subscriber = { version = "0.3.18", features = [
"env-filter",
"fmt",
"local-time",
"time",
] }
tracing-appender = "0.2.3"

# Database
Expand Down Expand Up @@ -78,3 +83,7 @@ regex = "1.10.6"
# Command-line arguments
clap = { version = "4.5.18", features = ["derive"] }
clap_derive = { version = "4.5.18" }

[dev-dependencies]
# Standardize logging output
tracing-test = "0.2.5"
3 changes: 3 additions & 0 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ use utils::cli::Args;
use utils::logs::setup_logs;
use utils::settings::Settings;

#[doc(hidden)]
mod tests;

/// Web server routes
pub mod routes;

Expand Down
2 changes: 1 addition & 1 deletion src/routes/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ struct ListQuery {

impl Default for ListQuery {
fn default() -> Self {
ListQuery {
Self {
limit: 10,
page: 1,
sort: None,
Expand Down
7 changes: 3 additions & 4 deletions src/service/targets/autopulse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::{
};
use reqwest::header;
use serde::Deserialize;
use tracing::{error, trace};
use tracing::{debug, error};

#[derive(Clone, Deserialize)]
pub struct Autopulse {
Expand Down Expand Up @@ -44,9 +44,7 @@ impl Autopulse {

let res = client.get(url.to_string()).send().await?;

if res.status().is_success() {
trace!("scanned file: {}", ev.file_path);
} else {
if !res.status().is_success() {
let body = res.text().await?;
return Err(anyhow::anyhow!("unable to scan file: {}", body));
}
Expand All @@ -63,6 +61,7 @@ impl TargetProcess for Autopulse {
match self.scan(ev).await {
Ok(_) => {
succeded.push(ev.id.clone());
debug!("file scanned: {}", ev.file_path);
}
Err(e) => {
error!("error scanning file: {}", e);
Expand Down
8 changes: 4 additions & 4 deletions src/service/targets/plex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{db::models::ScanEvent, utils::settings::TargetProcess};
use reqwest::header;
use serde::Deserialize;
use tracing::{error, trace};
use tracing::{debug, error, trace};

#[derive(Deserialize, Clone)]
pub struct Plex {
Expand Down Expand Up @@ -235,7 +235,7 @@ impl TargetProcess for Plex {
if let Some(library) = self.in_library(&libraries, ev)? {
match self.scan(ev, &library).await {
Ok(_) => {
trace!("scanned file '{}'", ev.file_path);
debug!("scanned file '{}'", ev.file_path);

if self.analyze || self.refresh {
match self.get_item(&library, &ev.file_path).await {
Expand All @@ -247,7 +247,7 @@ impl TargetProcess for Plex {
if self.analyze {
match self.analyze_item(&item.key).await {
Ok(_) => {
trace!("analyzed metadata '{}'", item.key);
debug!("analyzed metadata '{}'", item.key);
}
Err(e) => {
error!(
Expand All @@ -263,7 +263,7 @@ impl TargetProcess for Plex {
if self.refresh {
match self.refresh_item(&item.key).await {
Ok(_) => {
trace!("refreshed metadata '{}'", item.key);
debug!("refreshed metadata '{}'", item.key);
}
Err(e) => {
error!(
Expand Down
62 changes: 0 additions & 62 deletions src/service/triggers/lidarr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,65 +45,3 @@ impl TriggerRequest for LidarrRequest {
}
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_from_json_test() {
let json = serde_json::json!({
"eventType": "Test"
});

let lidarr_request = LidarrRequest::from_json(json).unwrap();

assert!(matches!(lidarr_request, LidarrRequest::Test {}));
}

#[test]
fn test_from_json_download() {
let json = serde_json::json!({
"eventType": "Download",
"trackFiles": [
{ "path": "/Music/blink‐182/California (2016)/CD 01/01 - Cynical.mp3" },
{ "path": "/Music/blink‐182/California (2016)/CD 01/02 - Bored to Death.mp3" },
{ "path": "/Music/blink‐182/California (2016)/CD 02/01 - Parking Lot.mp3" },
{ "path": "/Music/blink‐182/California (2016)/CD 02/02 - Misery.mp3" }
],
"artist": {
"name": "blink-182",
"path": "/Music/blink-182"
}
});

let lidarr_request = LidarrRequest::from_json(json).unwrap();

if let LidarrRequest::Download { .. } = lidarr_request {
assert_eq!(
lidarr_request.paths(),
vec![
(
"/Music/blink‐182/California (2016)/CD 01/01 - Cynical.mp3".to_string(),
true
),
(
"/Music/blink‐182/California (2016)/CD 01/02 - Bored to Death.mp3"
.to_string(),
true
),
(
"/Music/blink‐182/California (2016)/CD 02/01 - Parking Lot.mp3".to_string(),
true
),
(
"/Music/blink‐182/California (2016)/CD 02/02 - Misery.mp3".to_string(),
true
),
]
);
} else {
panic!("Unexpected variant");
}
}
}
2 changes: 1 addition & 1 deletion src/service/triggers/notify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ impl Notify {
tx.send(path).map_err(|e| anyhow::anyhow!(e))
}

fn async_watcher(
pub fn async_watcher(
&self,
) -> notify::Result<(RecommendedWatcher, UnboundedReceiver<notify::Result<Event>>)> {
let (tx, rx) = unbounded_channel();
Expand Down
121 changes: 2 additions & 119 deletions src/service/triggers/radarr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ pub struct Radarr {
#[serde(rename_all = "camelCase")]
#[doc(hidden)]
pub struct MovieFile {
relative_path: String,
pub relative_path: String,
}

#[derive(Deserialize, Clone)]
#[serde(rename_all = "camelCase")]
#[doc(hidden)]
pub struct Movie {
folder_path: String,
pub folder_path: String,
}

#[derive(Deserialize, Clone)]
Expand Down Expand Up @@ -78,120 +78,3 @@ impl TriggerRequest for RadarrRequest {
}
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_from_json_test() {
let json = serde_json::json!({
"eventType": "Test"
});

let radarr_request = RadarrRequest::from_json(json).unwrap();

assert!(matches!(radarr_request, RadarrRequest::Test {}));
}

#[test]
fn test_from_json_download() {
let json = serde_json::json!({
"eventType": "Download",
"movieFile": {
"relativePath": "Interstellar.2014.UHD.BluRay.2160p.REMUX.mkv"
},
"movie": {
"folderPath": "/Movies/Interstellar (2014)"
}
});

let radarr_request = RadarrRequest::from_json(json).unwrap();

if let RadarrRequest::Download { movie_file, movie } = radarr_request.clone() {
assert_eq!(
movie_file.relative_path,
"Interstellar.2014.UHD.BluRay.2160p.REMUX.mkv"
);
assert_eq!(movie.folder_path, "/Movies/Interstellar (2014)");
assert_eq!(
radarr_request.paths(),
vec![(
"/Movies/Interstellar (2014)/Interstellar.2014.UHD.BluRay.2160p.REMUX.mkv"
.to_string(),
true
)]
);
} else {
panic!("Unexpected variant");
}
}

#[test]
fn test_from_json_movie_delete() {
let json = serde_json::json!({
"eventType": "MovieDelete",
"movie": {
"folderPath": "/Movies/Wonder Woman 1984 (2020)"
}
});

let radarr_request = RadarrRequest::from_json(json).unwrap();

if let RadarrRequest::MovieDelete { movie } = radarr_request.clone() {
assert_eq!(movie.folder_path, "/Movies/Wonder Woman 1984 (2020)");
assert_eq!(radarr_request.paths(), vec![(movie.folder_path, false)]);
} else {
panic!("Unexpected variant");
}
}

#[test]
fn test_from_json_movie_file_delete() {
let json = serde_json::json!({
"eventType": "MovieFileDelete",
"movieFile": {
"relativePath": "Tenet.2020.mkv"
},
"movie": {
"folderPath": "/Movies/Tenet (2020)"
}
});

let radarr_request = RadarrRequest::from_json(json).unwrap();

if let RadarrRequest::MovieFileDelete { movie_file, movie } = radarr_request.clone() {
assert_eq!(movie_file.relative_path, "Tenet.2020.mkv");
assert_eq!(movie.folder_path, "/Movies/Tenet (2020)");

assert_eq!(
radarr_request.paths(),
vec![("/Movies/Tenet (2020)/Tenet.2020.mkv".to_string(), false)]
);
} else {
panic!("Unexpected variant");
}
}

#[test]
fn test_from_json_rename() {
let json = serde_json::json!({
"eventType": "Rename",
"movie": {
"folderPath": "/Movies/Deadpool (2016)"
}
});

let radarr_request = RadarrRequest::from_json(json).unwrap();

if let RadarrRequest::Rename { movie } = radarr_request.clone() {
assert_eq!(movie.folder_path, "/Movies/Deadpool (2016)");
assert_eq!(
radarr_request.paths(),
vec![("/Movies/Deadpool (2016)".to_string(), true)]
);
} else {
panic!("Unexpected variant");
}
}
}
Loading
Loading