fix: keep a space between overview words that span a line break
The collapsed one-line overview on the Lidarr artist, Sonarr series, and Readarr author details views replaced every line break and tab with an empty string. Words on either side of a paragraph break fused together, rendering as "20th century.She was born in Ohio". Collapse each run of whitespace to a single space instead, and trim the result. Handling a whole run at a time keeps a Windows line ending, an indented paragraph, or a space that already precedes a line break from producing two spaces. The overview popups are unaffected: they receive the raw text and keep their paragraph breaks.
This commit is contained in:
109 files changed
+206
-158
No files matched your search
@@ -5,7 +5,6 @@ use ratatui::layout::{Constraint, Layout, Rect};
|
||||
use ratatui::style::Stylize;
|
||||
use ratatui::text::Line;
|
||||
use ratatui::widgets::{Cell, Paragraph, Row, Wrap};
|
||||
use regex::Regex;
|
||||
|
||||
use crate::app::App;
|
||||
use crate::models::Route;
|
||||
@@ -20,7 +19,8 @@ use crate::ui::readarr_ui::readarr_ui_utils::create_history_event_details;
|
||||
use crate::ui::styles::{ManagarrStyle, secondary_style};
|
||||
use crate::ui::utils::decorate_peer_style;
|
||||
use crate::ui::utils::{
|
||||
borderless_block, get_width_from_percentage, layout_block_top_border, title_block,
|
||||
borderless_block, collapse_whitespace, get_width_from_percentage, layout_block_top_border,
|
||||
title_block,
|
||||
};
|
||||
use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
|
||||
use crate::ui::widgets::loading_block::LoadingBlock;
|
||||
@@ -165,18 +165,12 @@ fn draw_author_description(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
|
||||
.get_by_left(¤t_selection.metadata_profile_id)
|
||||
.cloned()
|
||||
.unwrap_or_default();
|
||||
let overview = Regex::new(r"[\r\n\t]")
|
||||
.unwrap()
|
||||
.replace_all(
|
||||
&deunicode(
|
||||
current_selection
|
||||
.overview
|
||||
.as_ref()
|
||||
.unwrap_or(&String::new()),
|
||||
),
|
||||
"",
|
||||
)
|
||||
.to_string();
|
||||
let overview = collapse_whitespace(&deunicode(
|
||||
current_selection
|
||||
.overview
|
||||
.as_ref()
|
||||
.unwrap_or(&String::new()),
|
||||
));
|
||||
|
||||
let mut author_description = vec![
|
||||
Line::from(vec![
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ ╭───────────────── Download Rejected Release ──────────────────╮ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Pro│He was born in Madison, Wisconsin: a city he has never really left. │ │
|
||||
│Metadata Pr│ │ │
|
||||
│Monitored: │His first novel took him seven years to finish. │ │
|
||||
│Overview: s│ │took him │
|
||||
│Overview: s│ │l took him │
|
||||
│seven years│ │ │
|
||||
│ │ │ │
|
||||
│ │ │ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Qual│ │ │
|
||||
│Meta│ │ │
|
||||
│Moni│ │ │
|
||||
│Over│ │im │
|
||||
│Over│ │ him │
|
||||
│seve│ │ │
|
||||
│ │ │ │
|
||||
│ │ │ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ expression: output
|
||||
│Books: 3 │
|
||||
│Files: 2/3 │
|
||||
│Size on Disk: 3.30 GB │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│╭ Author Details ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│
|
||||
││ Books │ History │ Author Search ││
|
||||
││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: St│ │ │
|
||||
│Metadata Profile: C│ │ │
|
||||
│Monitored: Yes │ │ │
|
||||
│Overview: some inte│ │st novel took him │
|
||||
│Overview: some inte│ │irst novel took him │
|
||||
│seven years to fini│ │ │
|
||||
│ │ │ │
|
||||
│ │ ╭───╮ │ │
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ expression: output
|
||||
│Quality Profile: Standard │
|
||||
│Metadata Profile: Comprehensive │
|
||||
│Monitored: Yes │
|
||||
│Overview: some interesting description of the authorHe was born in Madison, Wisconsin: a city he has never really left.His first novel took him │
|
||||
│Overview: some interesting description of the author He was born in Madison, Wisconsin: a city he has never really left. His first novel took him │
|
||||
│seven years to finish. │
|
||||
│ │
|
||||
│ │
|
||||
|
||||
Reference in new issue
Block a user