fix(readarr): stop appending stray colons to the edition overview
Every line of the edition details popup was parsed as a label and a value, so a line carrying no colon had one appended to it. A multi-line overview therefore rendered with a spurious colon at the end of each continuation line, and Goodreads sourced descriptions, which use CRLF, turned their blank lines into a lone colon. Split each line on the first colon only, leave a line without one unlabelled, and trim the trailing carriage return so a CRLF blank line renders as a real paragraph break. Building the line is now a named function so its branches can be asserted directly. Rendered text discards the carriage return, so a snapshot alone cannot tell the trimming apart from leaving it in place. A continuation line that happens to contain a colon is still styled as a label. Telling those apart needs the details to be built as styled lines rather than flattened to text and parsed back.
This commit is contained in:
7 files changed
+103
-35
No files matched your search
@@ -448,17 +448,21 @@ impl ReadarrData<'_> {
|
|||||||
|
|
||||||
let edition_details_modal = EditionDetailsModal {
|
let edition_details_modal = EditionDetailsModal {
|
||||||
edition_details: ScrollableText::with_string(
|
edition_details: ScrollableText::with_string(
|
||||||
"Title: Test Edition
|
"Title: Test Edition\n\
|
||||||
Format: Hardcover
|
Format: Hardcover\n\
|
||||||
Language: English
|
Language: English\n\
|
||||||
Publisher: DAW Books
|
Publisher: DAW Books\n\
|
||||||
Page Count: 288
|
Page Count: 288\n\
|
||||||
Release Date: 2023-05-20 00:00:00 UTC
|
Release Date: 2023-05-20 00:00:00 UTC\n\
|
||||||
ISBN13: 9780756404079
|
ISBN13: 9780756404079\n\
|
||||||
ASIN: B0043RSJ9S
|
ASIN: B0043RSJ9S\n\
|
||||||
Ratings: 4.5 (1000 votes)
|
Ratings: 4.5 (1000 votes)\n\
|
||||||
Monitored: true
|
Monitored: true\n\
|
||||||
Overview: A test edition overview."
|
Overview: original cover of ISBN 075640407X\r\n\
|
||||||
|
\r\n\
|
||||||
|
My name is Kvothe, pronounced nearly the same as \"quothe.\"\r\n\
|
||||||
|
\r\n\
|
||||||
|
The Adem call me Maedre: which means The Flame.\r\n"
|
||||||
.to_owned(),
|
.to_owned(),
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -56,17 +56,8 @@ fn draw_edition_details(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
|
|||||||
edition_details
|
edition_details
|
||||||
.items
|
.items
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|line| !line.is_empty())
|
.map(|line| edition_detail_line(line, style))
|
||||||
.map(|line| {
|
.collect::<Vec<Line<'static>>>(),
|
||||||
let split = line.split(':').collect::<Vec<&str>>();
|
|
||||||
let title = format!("{}:", split[0]);
|
|
||||||
|
|
||||||
Line::from(vec![
|
|
||||||
title.bold().style(style),
|
|
||||||
Span::styled(split[1..].join(":"), style),
|
|
||||||
])
|
|
||||||
})
|
|
||||||
.collect::<Vec<Line<'_>>>(),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
let paragraph = Paragraph::new(text)
|
let paragraph = Paragraph::new(text)
|
||||||
@@ -100,3 +91,15 @@ fn style_from_edition(edition: &Edition) -> Style {
|
|||||||
|
|
||||||
primary_style()
|
primary_style()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn edition_detail_line(line: &str, style: Style) -> Line<'static> {
|
||||||
|
let line = line.trim_end();
|
||||||
|
|
||||||
|
match line.split_once(':') {
|
||||||
|
Some((label, value)) => Line::from(vec![
|
||||||
|
format!("{label}:").bold().style(style),
|
||||||
|
Span::styled(value.to_owned(), style),
|
||||||
|
]),
|
||||||
|
None => Line::from(Span::styled(line.to_owned(), style)),
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use pretty_assertions::assert_eq;
|
use pretty_assertions::assert_eq;
|
||||||
|
use ratatui::text::Line;
|
||||||
use strum::IntoEnumIterator;
|
use strum::IntoEnumIterator;
|
||||||
|
|
||||||
use crate::app::App;
|
use crate::app::App;
|
||||||
@@ -9,7 +10,9 @@ mod tests {
|
|||||||
ActiveReadarrBlock, EDITION_DETAILS_BLOCKS,
|
ActiveReadarrBlock, EDITION_DETAILS_BLOCKS,
|
||||||
};
|
};
|
||||||
use crate::ui::DrawUi;
|
use crate::ui::DrawUi;
|
||||||
use crate::ui::readarr_ui::library::edition_details_ui::{EditionDetailsUi, style_from_edition};
|
use crate::ui::readarr_ui::library::edition_details_ui::{
|
||||||
|
EditionDetailsUi, edition_detail_line, style_from_edition,
|
||||||
|
};
|
||||||
use crate::ui::styles::{primary_style, unmonitored_style};
|
use crate::ui::styles::{primary_style, unmonitored_style};
|
||||||
use crate::ui::ui_test_utils::test_utils::render_to_string_with_app;
|
use crate::ui::ui_test_utils::test_utils::render_to_string_with_app;
|
||||||
|
|
||||||
@@ -48,6 +51,64 @@ mod tests {
|
|||||||
assert_eq!(style, unmonitored_style());
|
assert_eq!(style, unmonitored_style());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_edition_detail_line_splits_a_label_from_its_value() {
|
||||||
|
let line = edition_detail_line("Title: Test Edition", primary_style());
|
||||||
|
|
||||||
|
assert_eq!(span_contents(&line), vec!["Title:", " Test Edition"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_edition_detail_line_keeps_colons_within_a_value() {
|
||||||
|
let line = edition_detail_line("Release Date: 2023-01-05 15:00:00 UTC", primary_style());
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
span_contents(&line),
|
||||||
|
vec!["Release Date:", " 2023-01-05 15:00:00 UTC"]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_edition_detail_line_does_not_append_a_colon_to_a_line_without_one() {
|
||||||
|
let line = edition_detail_line(
|
||||||
|
"My name is Kvothe, pronounced nearly the same as \"quothe.\"",
|
||||||
|
primary_style(),
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
span_contents(&line),
|
||||||
|
vec!["My name is Kvothe, pronounced nearly the same as \"quothe.\""]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_edition_detail_line_renders_a_carriage_return_only_line_as_blank() {
|
||||||
|
let line = edition_detail_line("\r", primary_style());
|
||||||
|
|
||||||
|
assert_eq!(span_contents(&line), vec![""]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_edition_detail_line_trims_a_trailing_carriage_return() {
|
||||||
|
let line = edition_detail_line(
|
||||||
|
"I have stolen princesses back from sleeping barrow kings.\r",
|
||||||
|
primary_style(),
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
span_contents(&line),
|
||||||
|
vec!["I have stolen princesses back from sleeping barrow kings."]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn span_contents(line: &Line<'_>) -> Vec<String> {
|
||||||
|
line
|
||||||
|
.spans
|
||||||
|
.iter()
|
||||||
|
.map(|span| span.content.to_string())
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
mod snapshot_tests {
|
mod snapshot_tests {
|
||||||
use crate::models::servarr_data::readarr::modals::EditionDetailsModal;
|
use crate::models::servarr_data::readarr::modals::EditionDetailsModal;
|
||||||
use crate::models::stateful_table::StatefulTable;
|
use crate::models::stateful_table::StatefulTable;
|
||||||
|
|||||||
+3
-3
@@ -19,11 +19,11 @@ expression: output
|
|||||||
│ │ASIN: B0043RSJ9S │ │
|
│ │ASIN: B0043RSJ9S │ │
|
||||||
│ │Ratings: 4.5 (1000 votes) │ │
|
│ │Ratings: 4.5 (1000 votes) │ │
|
||||||
│ │Monitored: true │ │
|
│ │Monitored: true │ │
|
||||||
│ │Overview: A test edition overview. │ │
|
│ │Overview: original cover of ISBN 075640407X │ │
|
||||||
│ │ │ │
|
|
||||||
│ │ │ │
|
|
||||||
│ │ │ │
|
│ │ │ │
|
||||||
|
│ │My name is Kvothe, pronounced nearly the same as "quothe." │ │
|
||||||
│ │ │ │
|
│ │ │ │
|
||||||
|
│ │The Adem call me Maedre: which means The Flame. │ │
|
||||||
│ │ │ │
|
│ │ │ │
|
||||||
│ │ │ │
|
│ │ │ │
|
||||||
│ │ │ │
|
│ │ │ │
|
||||||
|
|||||||
+3
-3
@@ -19,11 +19,11 @@ expression: output
|
|||||||
│ASIN: B0043RSJ9S │
|
│ASIN: B0043RSJ9S │
|
||||||
│Ratings: 4.5 (1000 votes) │
|
│Ratings: 4.5 (1000 votes) │
|
||||||
│Monitored: true │
|
│Monitored: true │
|
||||||
│Overview: A test edition overview. │
|
│Overview: original cover of ISBN 075640407X │
|
||||||
│ │
|
|
||||||
│ │
|
|
||||||
│ │
|
│ │
|
||||||
|
│My name is Kvothe, pronounced nearly the same as "quothe." │
|
||||||
│ │
|
│ │
|
||||||
|
│The Adem call me Maedre: which means The Flame. │
|
||||||
│ │
|
│ │
|
||||||
│ │
|
│ │
|
||||||
│ │
|
│ │
|
||||||
|
|||||||
+3
-3
@@ -17,11 +17,11 @@ expression: output
|
|||||||
│ASIN: B0043RSJ9S │
|
│ASIN: B0043RSJ9S │
|
||||||
│Ratings: 4.5 (1000 votes) │
|
│Ratings: 4.5 (1000 votes) │
|
||||||
│Monitored: true │
|
│Monitored: true │
|
||||||
│Overview: A test edition overview. │
|
│Overview: original cover of ISBN 075640407X │
|
||||||
│ │
|
|
||||||
│ │
|
|
||||||
│ │
|
│ │
|
||||||
|
│My name is Kvothe, pronounced nearly the same as "quothe." │
|
||||||
│ │
|
│ │
|
||||||
|
│The Adem call me Maedre: which means The Flame. │
|
||||||
│ │
|
│ │
|
||||||
│ │
|
│ │
|
||||||
│ │
|
│ │
|
||||||
|
|||||||
+3
-3
@@ -19,11 +19,11 @@ expression: output
|
|||||||
│ASIN: B0043RSJ9S │
|
│ASIN: B0043RSJ9S │
|
||||||
│Ratings: 4.5 (1000 votes) │
|
│Ratings: 4.5 (1000 votes) │
|
||||||
│Monitored: true │
|
│Monitored: true │
|
||||||
│Overview: A test edition overview. │
|
│Overview: original cover of ISBN 075640407X │
|
||||||
│ │
|
|
||||||
│ │
|
|
||||||
│ │
|
│ │
|
||||||
|
│My name is Kvothe, pronounced nearly the same as "quothe." │
|
||||||
│ │
|
│ │
|
||||||
|
│The Adem call me Maedre: which means The Flame. │
|
||||||
│ │
|
│ │
|
||||||
│ │
|
│ │
|
||||||
│ │
|
│ │
|
||||||
|
|||||||
Reference in new issue
Block a user