Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions apps/rustnzb/tests/sab_compliance_e2e.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,11 @@ async fn addfile_applies_category_and_priority_and_reports_them_in_queue() {
.json()
.await
.unwrap();
assert_eq!(add_response["status"], serde_json::json!(true), "resp={add_response:?}");
assert_eq!(
add_response["status"],
serde_json::json!(true),
"resp={add_response:?}"
);
let nzo_id = add_response["nzo_ids"][0].as_str().unwrap().to_string();

let queue: serde_json::Value = client
Expand Down Expand Up @@ -138,7 +142,11 @@ async fn addurl_over_get_fetches_and_applies_category() {
.json()
.await
.unwrap();
assert_eq!(add_response["status"], serde_json::json!(true), "resp={add_response:?}");
assert_eq!(
add_response["status"],
serde_json::json!(true),
"resp={add_response:?}"
);
let nzo_id = add_response["nzo_ids"][0].as_str().unwrap().to_string();

let queue: serde_json::Value = client
Expand Down
10 changes: 6 additions & 4 deletions crates/nzb-web/src/sabnzbd_compat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,11 @@ fn handle_change_cat(state: &AppState, req: &SabApiRequest) -> Json<serde_json::
let qm = &state.queue_manager;
let resolved_cat = sab_resolve_category(new_cat);
let mut changed = false;
for raw_id in job_ids.split(',').map(str::trim).filter(|id| !id.is_empty()) {
for raw_id in job_ids
.split(',')
.map(str::trim)
.filter(|id| !id.is_empty())
{
let search_id = raw_id.strip_prefix("SABnzbd_nzo_").unwrap_or(raw_id);
if qm.change_job_category(search_id, resolved_cat).is_ok() {
changed = true;
Expand Down Expand Up @@ -2476,9 +2480,7 @@ mod tests {
async fn get_cats_reports_default_category_as_sabnzbd_sentinel() {
let test_state = test_state();
let response = handle_get_cats(&test_state.state).0;
let cats = response["categories"]
.as_array()
.expect("categories array");
let cats = response["categories"].as_array().expect("categories array");
assert_eq!(cats, &vec![serde_json::json!("*")]);
}

Expand Down