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;
|
||||
@@ -18,7 +17,8 @@ use crate::ui::lidarr_ui::lidarr_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;
|
||||
@@ -153,18 +153,12 @@ fn draw_artist_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 artist_description = vec![
|
||||
Line::from(vec![
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years╭─────────────────────────────────────────────────────── Overview ───────────────────────────────────────────────────────╮ │
|
||||
│Disambiguat│some interesting description of the artist │ │
|
||||
│Type: Perso│ │ │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to fini╭─────────────────────────────────── Edit - Alex (American pianist) ────────────────────────────────────╮ │
|
||||
│Disambiguation: Ame│ │ │
|
||||
│Type: Person │ │ │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to fini╭─────────────────────────────────── Edit - Alex (American pianist) ────────────────────────────────────╮ │
|
||||
│Disambiguation: Ame│ │ │
|
||||
│Type: Person │ │ │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to fini╭─────────────────────────────────── Edit - Alex (American pianist) ────────────────────────────────────╮ │
|
||||
│Disambiguation: Ame│ │ │
|
||||
│Type: Person │ │ │
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ expression: output
|
||||
=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex
|
||||
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│Artist: Alex │
|
||||
│Overview: some interesting description of the artistShe was born in Madison, Wisconsin: a city she has never really left.Her first album took her │
|
||||
│Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│
|
||||
│seven years to finish. │
|
||||
│Disambiguation: American pianist │
|
||||
│Type: Person │
|
||||
|
||||
Reference in new issue
Block a user