Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
refactor(provider): gracefully handle optional 4khdhub client and harden cache capacity initialization
Samir Hossainsbd8e931d7f81
diff --git a/src/providers/fourkhdhub/client.rs b/src/providers/fourkhdhub/client.rsindex 6ba0310..b7dec2b 100644--- a/src/providers/fourkhdhub/client.rs+++ b/src/providers/fourkhdhub/client.rs@@ -23,20 +23,11 @@ pub struct FourKHdHubClient {base_url: Url,}-impl Default for FourKHdHubClient {- fn default() -> Self {- Self::new()- }-}-impl FourKHdHubClient {- pub fn new() -> Self {+ pub fn new() -> Result<Self, FourKHdHubError> {let base = std::env::var("MOVIEBOX_FOURKHDHUB_URL").unwrap_or_else(|_| DEFAULT_BASE_URL.to_string());- Self::with_base_url(&base).unwrap_or_else(|_| Self {- client: build_client(),- base_url: Url::parse(DEFAULT_BASE_URL).expect("valid default 4KHDHub URL"),- })+ Self::with_base_url(&base)}pub fn with_base_url(base: &str) -> Result<Self, FourKHdHubError> {diff --git a/src/tui/app/download.rs b/src/tui/app/download.rsindex d40b652..ae07999 100644--- a/src/tui/app/download.rs+++ b/src/tui/app/download.rs@@ -358,7 +358,18 @@ impl App {.ok();return None;} else {- self.fourk_client.clone()+ match self.fourk_client.clone() {+ Some(client) => client,+ None => {+ self.state.is_resolving_playback = false;+ self.action_sender+ .send(Action::SetStatus(+ "Error: 4KHDHub provider is unavailable".to_string(),+ ))+ .ok();+ return None;+ }+ }};let sender = self.action_sender.clone();tokio::spawn(async move {diff --git a/src/tui/app/mod.rs b/src/tui/app/mod.rsindex 1687b6a..e59df98 100644--- a/src/tui/app/mod.rs+++ b/src/tui/app/mod.rs@@ -21,7 +21,7 @@ pub struct App {state: AppState,theme: Theme,client: MovieBoxClient,- fourk_client: FourKHdHubClient,+ fourk_client: Option<FourKHdHubClient>,circleftp_client: crate::providers::bdix::circleftp::CircleFtpClient,dhakaflix_client: crate::providers::bdix::dhakaflix::client::DhakaFlixClient,action_sender: mpsc::UnboundedSender<Action>,@@ -70,12 +70,15 @@ impl App {theme,state,client: MovieBoxClient::new(),- fourk_client: FourKHdHubClient::new(),+ fourk_client: FourKHdHubClient::new().ok(),circleftp_client: crate::providers::bdix::circleftp::CircleFtpClient::new(),dhakaflix_client: crate::providers::bdix::dhakaflix::client::DhakaFlixClient::new(),action_sender,action_receiver,};+ if app.fourk_client.is_none() {+ log::warn!("4KHDHub client unavailable; provider will be disabled");+ }if provider_was_sanitized {app.persist_config();}diff --git a/src/tui/app/network.rs b/src/tui/app/network.rsindex 24683d5..820af77 100644--- a/src/tui/app/network.rs+++ b/src/tui/app/network.rs@@ -24,7 +24,7 @@ pub(super) async fn decode_poster(bytes: Vec<u8>) -> Option<std::sync::Arc<imagepub(super) async fn provider_search(moviebox: &MovieBoxClient,- fourk: &FourKHdHubClient,+ fourk: Option<&FourKHdHubClient>,circleftp: &crate::providers::bdix::circleftp::CircleFtpClient,dhakaflix: &crate::providers::bdix::dhakaflix::client::DhakaFlixClient,provider: ProviderKind,@@ -33,7 +33,10 @@ pub(super) async fn provider_search() -> Result<serde_json::Value, String> {match provider {ProviderKind::MovieBox => Provider::search(moviebox, query, page).await,- ProviderKind::FourKHdHub => Provider::search(fourk, query, page).await,+ ProviderKind::FourKHdHub => {+ let fourk = fourk.ok_or_else(|| "4KHDHub provider is unavailable".to_string())?;+ Provider::search(fourk, query, page).await+ }ProviderKind::BdixCircleFtp => Provider::search(circleftp, query, page).await,ProviderKind::BdixDhakaFlix => Provider::search(dhakaflix, query, page).await,}@@ -41,7 +44,7 @@ pub(super) async fn provider_search(pub(super) async fn provider_details(moviebox: &MovieBoxClient,- fourk: &FourKHdHubClient,+ fourk: Option<&FourKHdHubClient>,circleftp: &crate::providers::bdix::circleftp::CircleFtpClient,dhakaflix: &crate::providers::bdix::dhakaflix::client::DhakaFlixClient,provider: ProviderKind,@@ -49,7 +52,10 @@ pub(super) async fn provider_details() -> Result<serde_json::Value, String> {match provider {ProviderKind::MovieBox => Provider::details(moviebox, subject_id).await,- ProviderKind::FourKHdHub => Provider::details(fourk, subject_id).await,+ ProviderKind::FourKHdHub => {+ let fourk = fourk.ok_or_else(|| "4KHDHub provider is unavailable".to_string())?;+ Provider::details(fourk, subject_id).await+ }ProviderKind::BdixCircleFtp => Provider::details(circleftp, subject_id).await,ProviderKind::BdixDhakaFlix => Provider::details(dhakaflix, subject_id).await,}diff --git a/src/tui/app/playback.rs b/src/tui/app/playback.rsindex f2b2813..d1c7c67 100644--- a/src/tui/app/playback.rs+++ b/src/tui/app/playback.rs@@ -278,7 +278,18 @@ impl App {}return None;} else {- self.fourk_client.clone()+ match self.fourk_client.clone() {+ Some(client) => client,+ None => {+ self.state.is_resolving_playback = false;+ self.action_sender+ .send(Action::SetStatus(+ "Error: 4KHDHub provider is unavailable".to_string(),+ ))+ .ok();+ return None;+ }+ }};let sender = self.action_sender.clone();tokio::spawn(async move {diff --git a/src/tui/app/requests.rs b/src/tui/app/requests.rsindex 7830ec3..2b021d4 100644--- a/src/tui/app/requests.rs+++ b/src/tui/app/requests.rs@@ -1305,13 +1305,14 @@ impl App {tokio::spawn(async move {let result = match context.provider {ProviderKind::FourKHdHub => {- crate::providers::ReleaseProvider::episode_streams(- &fourk_client,- &id,- season,- episode,- )- .await+ if let Some(client) = fourk_client.as_ref() {+ crate::providers::ReleaseProvider::episode_streams(+ client, &id, season, episode,+ )+ .await+ } else {+ Err("4KHDHub provider is unavailable".to_string())+ }}ProviderKind::BdixCircleFtp => {crate::providers::ReleaseProvider::episode_streams(diff --git a/src/tui/app/search.rs b/src/tui/app/search.rsindex dbbed60..12666c0 100644--- a/src/tui/app/search.rs+++ b/src/tui/app/search.rs@@ -432,7 +432,7 @@ impl App {let result = network::provider_search(&client,- &fourk_client,+ fourk_client.as_ref(),&circleftp_client,&dhakaflix_client,context.provider,@@ -545,7 +545,7 @@ impl App {let result = network::provider_details(&client,- &fourk_client,+ fourk_client.as_ref(),&circleftp_client,&dhakaflix_client,context.provider,diff --git a/src/tui/state.rs b/src/tui/state.rsindex f21aad9..590cf78 100644--- a/src/tui/state.rs+++ b/src/tui/state.rs@@ -276,13 +276,6 @@ pub struct AppState {pub history: crate::history::HistoryManager,}-const fn non_zero(n: usize) -> std::num::NonZeroUsize {- match std::num::NonZeroUsize::new(n) {- Some(v) => v,- None => panic!("non-zero constant required"),- }-}-impl Default for AppState {fn default() -> Self {Self {@@ -300,9 +293,9 @@ impl Default for AppState {is_homepage_mode: false,current_tab_id: String::new(),current_page: 1,- search_posters: lru::LruCache::new(non_zero(300)),- failed_posters: lru::LruCache::new(non_zero(300)),- search_poster_protocols: lru::LruCache::new(non_zero(300)),+ search_posters: lru::LruCache::new(cache_capacity(300)),+ failed_posters: lru::LruCache::new(cache_capacity(300)),+ search_poster_protocols: lru::LruCache::new(cache_capacity(300)),in_flight_posters: std::collections::HashSet::new(),search_list_state: TableState::default(),basic_terminal: crate::tui::terminal::uses_basic_ui(),@@ -318,7 +311,7 @@ impl Default for AppState {is_waiting_for_download_stream: false,is_fetching_streams: false,stream_error: None,- preview_cache: lru::LruCache::new(non_zero(30)),+ preview_cache: lru::LruCache::new(cache_capacity(30)),resource_list_state: ListState::default(),details_pane: DetailsPane::default(),@@ -347,7 +340,7 @@ impl Default for AppState {image_supported: crate::tui::terminal::should_query_images(),clear_terminal_before_draw: false,poster_rows: 3,- image_cache: lru::LruCache::new(non_zero(10)),+ image_cache: lru::LruCache::new(cache_capacity(10)),show_help: false,visible_items: 10,active_resource_request: 0,@@ -407,6 +400,13 @@ impl Default for AppState {}}+const fn cache_capacity(n: usize) -> std::num::NonZeroUsize {+ match std::num::NonZeroUsize::new(n) {+ Some(value) => value,+ None => std::num::NonZeroUsize::MIN,+ }+}+impl AppState {pub fn notify(&mut self,