Working manual search with UTF-8 support and scrolling. Still need release details and finally, manually selecting release to download.
This commit is contained in:
@@ -297,10 +297,13 @@ impl App {
|
||||
self.check_for_prompt_action().await;
|
||||
}
|
||||
ActiveRadarrBlock::ManualSearch => {
|
||||
if self.data.radarr_data.movie_releases.items.is_empty() {
|
||||
self.is_loading = true;
|
||||
self
|
||||
.dispatch_network_event(RadarrEvent::GetReleases.into())
|
||||
.await;
|
||||
}
|
||||
|
||||
self.check_for_prompt_action().await;
|
||||
}
|
||||
_ => (),
|
||||
|
||||
+1
-7
@@ -53,13 +53,7 @@ async fn main() -> Result<()> {
|
||||
|
||||
#[tokio::main]
|
||||
async fn start_networking(mut network_rx: Receiver<NetworkEvent>, app: &Arc<Mutex<App>>) {
|
||||
let network = Network::new(
|
||||
reqwest::Client::builder()
|
||||
.timeout(Duration::from_secs(45))
|
||||
.build()
|
||||
.unwrap(),
|
||||
app,
|
||||
);
|
||||
let network = Network::new(reqwest::Client::new(), app);
|
||||
|
||||
while let Some(network_event) = network_rx.recv().await {
|
||||
network.handle_network_event(network_event).await;
|
||||
|
||||
+9
-1
@@ -252,7 +252,15 @@ impl Display for HorizontallyScrollableText {
|
||||
if *self.offset.borrow() == 0 {
|
||||
write!(f, "{}", self.text)
|
||||
} else {
|
||||
write!(f, "{}", &self.text[*self.offset.borrow()..])
|
||||
let text_vec = self.text.chars().collect::<Vec<_>>();
|
||||
write!(
|
||||
f,
|
||||
"{}",
|
||||
text_vec[*self.offset.borrow()..]
|
||||
.iter()
|
||||
.cloned()
|
||||
.collect::<String>()
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -222,7 +222,7 @@ pub struct Release {
|
||||
#[derivative(Default(value = "Number::from(0)"))]
|
||||
pub age: Number,
|
||||
pub title: HorizontallyScrollableText,
|
||||
pub indexer: HorizontallyScrollableText,
|
||||
pub indexer: String,
|
||||
#[derivative(Default(value = "Number::from(0)"))]
|
||||
pub size: Number,
|
||||
pub rejected: bool,
|
||||
|
||||
@@ -55,6 +55,7 @@ fn draw_movie_info<B: Backend>(f: &mut Frame<'_, B>, app: &mut App, area: Rect)
|
||||
ActiveRadarrBlock::MovieHistory => draw_movie_history(f, app, area),
|
||||
ActiveRadarrBlock::Cast => draw_movie_cast(f, app, area),
|
||||
ActiveRadarrBlock::Crew => draw_movie_crew(f, app, area),
|
||||
ActiveRadarrBlock::ManualSearch => draw_movie_releases(f, app, area),
|
||||
_ => (),
|
||||
}
|
||||
}
|
||||
@@ -334,12 +335,12 @@ fn draw_movie_releases<B: Backend>(f: &mut Frame<'_, B>, app: &mut App, content_
|
||||
constraints: vec![
|
||||
Constraint::Length(8),
|
||||
Constraint::Length(10),
|
||||
Constraint::Length(1),
|
||||
Constraint::Percentage(40),
|
||||
Constraint::Percentage(10),
|
||||
Constraint::Length(8),
|
||||
Constraint::Length(8),
|
||||
Constraint::Percentage(10),
|
||||
Constraint::Length(4),
|
||||
Constraint::Percentage(30),
|
||||
Constraint::Percentage(18),
|
||||
Constraint::Length(12),
|
||||
Constraint::Length(12),
|
||||
Constraint::Percentage(7),
|
||||
Constraint::Percentage(10),
|
||||
],
|
||||
table_headers: vec![
|
||||
@@ -360,14 +361,15 @@ fn draw_movie_releases<B: Backend>(f: &mut Frame<'_, B>, app: &mut App, content_
|
||||
quality,
|
||||
..
|
||||
} = release;
|
||||
let age = format!("{} days", age.as_u64().unwrap());
|
||||
let age = format!("{} days", age.as_u64().unwrap_or(0));
|
||||
title.scroll_or_reset(get_width(content_area), current_selection == *release);
|
||||
indexer.scroll_or_reset(get_width(content_area), current_selection == *release);
|
||||
let size = convert_to_gb(size.as_u64().unwrap());
|
||||
let rejected_str = if *rejected { "⛔" } else { "" };
|
||||
let seeders = seeders.as_u64().unwrap();
|
||||
let leechers = leechers.as_u64().unwrap();
|
||||
let peers = format!("{} / {}", seeders, leechers);
|
||||
let mut peers = Text::from(format!("{} / {}", seeders, leechers));
|
||||
peers.patch_style(determine_peer_style(seeders, leechers));
|
||||
|
||||
let language = if languages.is_some() {
|
||||
languages.clone().unwrap()[0].name.clone()
|
||||
} else {
|
||||
@@ -378,11 +380,11 @@ fn draw_movie_releases<B: Backend>(f: &mut Frame<'_, B>, app: &mut App, content_
|
||||
Row::new(vec![
|
||||
Cell::from(protocol.clone()),
|
||||
Cell::from(age),
|
||||
Cell::from(rejected_str).style(determine_style_from_rejection(*rejected)),
|
||||
Cell::from(rejected_str),
|
||||
Cell::from(title.to_string()),
|
||||
Cell::from(indexer.to_string()),
|
||||
Cell::from(format!("{} GB", size)),
|
||||
Cell::from(peers).style(determine_peer_style(seeders, leechers)),
|
||||
Cell::from(indexer.clone()),
|
||||
Cell::from(format!("{:.1} GB", size)),
|
||||
Cell::from(peers),
|
||||
Cell::from(language),
|
||||
Cell::from(quality),
|
||||
])
|
||||
@@ -401,14 +403,6 @@ fn determine_style_from_download_status(download_status: &str) -> Style {
|
||||
}
|
||||
}
|
||||
|
||||
fn determine_style_from_rejection(rejected: bool) -> Style {
|
||||
if rejected {
|
||||
style_failure()
|
||||
} else {
|
||||
style_primary()
|
||||
}
|
||||
}
|
||||
|
||||
fn determine_peer_style(seeders: u64, leechers: u64) -> Style {
|
||||
if seeders == 0 {
|
||||
style_failure()
|
||||
|
||||
+1
-1
@@ -165,7 +165,7 @@ pub fn style_button_highlight(is_selected: bool) -> Style {
|
||||
}
|
||||
|
||||
pub fn title_style(title: &str) -> Span<'_> {
|
||||
Span::styled(title, style_bold())
|
||||
Span::styled(format!(" {} ", title), style_bold())
|
||||
}
|
||||
|
||||
pub fn title_block(title: &str) -> Block<'_> {
|
||||
|
||||
Reference in New Issue
Block a user