Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
feat: add dhakaflix provider and isolate caches
Samir Hossainsc0dea4e6db98
diff --git a/Cargo.lock b/Cargo.lockindex 722f9a1..5efae51 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -1553,6 +1553,7 @@ dependencies = ["md-5","mimalloc","open",+ "percent-encoding","rand 0.10.2","ratatui","ratatui-image",diff --git a/Cargo.toml b/Cargo.tomlindex 12acec5..eba8376 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -37,6 +37,7 @@ unicode-segmentation = "1.12.0"unicode-width = "0.2.0"mimalloc = "0.1.52"open = "5.4.0"+percent-encoding = "2.3.2"[lib]name = "moviebox_tui"diff --git a/src/providers/bdix/circleftp/client.rs b/src/providers/bdix/circleftp/client.rsindex c0087a6..2ee84f2 100644--- a/src/providers/bdix/circleftp/client.rs+++ b/src/providers/bdix/circleftp/client.rs@@ -2,10 +2,11 @@ use std::time::Duration;use thiserror::Error;use crate::providers::models::{- CatalogItem, Episode, MediaDetails, MediaType, ProviderKind, ProviderMediaId, Release, Season, SourceMirror,+ CatalogItem, Episode, MediaDetails, MediaType, ProviderKind, ProviderMediaId, Release, Season,+ SourceMirror,};-use super::parser::{search_to_moviebox_json, CircleFtpSearchResponse};+use super::parser::{CircleFtpSearchResponse, search_to_moviebox_json};#[derive(Debug, Error)]pub enum CircleFtpError {@@ -41,11 +42,9 @@ impl CircleFtpClient {url.query_pairs_mut().append_pair("searchTerm", query).append_pair("order", "desc");-- let resp = self.client.get(url)- .send()- .await?;-++ let resp = self.client.get(url).send().await?;+let search_resp: CircleFtpSearchResponse = resp.json().await?;Ok(search_to_moviebox_json(&search_resp))}@@ -54,10 +53,19 @@ impl CircleFtpClient {let url = format!("{}/posts/{}", self.base_url, id);let resp = self.client.get(&url).send().await?;let json: serde_json::Value = resp.json().await?;-- let title = json.get("title").or(json.get("name")).and_then(|v| v.as_str()).unwrap_or("Unknown").to_string();++ let title = json+ .get("title")+ .or(json.get("name"))+ .and_then(|v| v.as_str())+ .unwrap_or("Unknown")+ .to_string();let r#type = json.get("type").and_then(|v| v.as_str()).unwrap_or("");- let media_type = if r#type == "series" { MediaType::Series } else { MediaType::Movie };+ let media_type = if r#type == "series" {+ MediaType::Series+ } else {+ MediaType::Movie+ };let year = json.get("year").and_then(|v| {if v.is_number() {Some(v.to_string())@@ -65,11 +73,13 @@ impl CircleFtpClient {v.as_str().map(|s| s.to_string())}});-- let poster_url = json.get("image").or(json.get("imageSm"))++ let poster_url = json+ .get("image")+ .or(json.get("imageSm")).and_then(|v| v.as_str()).map(|s| format!("http://new.circleftp.net:5000/uploads/{}", s));-+let mut seasons = Vec::new();if media_type == MediaType::Series {if let Some(content) = json.get("content").and_then(|v| v.as_array()) {@@ -77,7 +87,10 @@ impl CircleFtpClient {let mut episodes = Vec::new();if let Some(ep_arr) = s_val.get("episodes").and_then(|v| v.as_array()) {for (e_idx, e_val) in ep_arr.iter().enumerate() {- let ep_title = e_val.get("title").and_then(|v| v.as_str()).map(|s| s.to_string());+ let ep_title = e_val+ .get("title")+ .and_then(|v| v.as_str())+ .map(|s| s.to_string());episodes.push(Episode {season: s_idx + 1,number: e_idx + 1,@@ -92,10 +105,16 @@ impl CircleFtpClient {}}}-- let description = json.get("metaData").and_then(|v| v.as_str()).map(|s| s.to_string());- let duration = json.get("watchTime").and_then(|v| v.as_str()).map(|s| s.to_string());-++ let description = json+ .get("metaData")+ .and_then(|v| v.as_str())+ .map(|s| s.to_string());+ let duration = json+ .get("watchTime")+ .and_then(|v| v.as_str())+ .map(|s| s.to_string());+let mut genres = Vec::new();if let Some(cats) = json.get("categories").and_then(|v| v.as_array()) {for cat in cats {@@ -104,29 +123,46 @@ impl CircleFtpClient {}}}-+let title_full = json.get("title").and_then(|v| v.as_str()).unwrap_or("");-+let mut prints = None;let mut audios = None;-+let t_lower = title_full.to_lowercase();- if t_lower.contains("hindi") { audios = Some("Hindi".to_string()); }- else if t_lower.contains("bengali") || t_lower.contains("bangla") { audios = Some("Bengali".to_string()); }- else if t_lower.contains("english") { audios = Some("English".to_string()); }- else if t_lower.contains("tamil") { audios = Some("Tamil".to_string()); }- else if t_lower.contains("telugu") { audios = Some("Telugu".to_string()); }- else if t_lower.contains("malayalam") { audios = Some("Malayalam".to_string()); }- else if t_lower.contains("korean") { audios = Some("Korean".to_string()); }- else if t_lower.contains("dual audio") { audios = Some("Dual Audio".to_string()); }- else if t_lower.contains("multi audio") { audios = Some("Multi Audio".to_string()); }-- if t_lower.contains("cam") || t_lower.contains("hdcam") { prints = Some("CAM".to_string()); }- else if t_lower.contains("hdtc") || t_lower.contains("tc") { prints = Some("HDTC".to_string()); }- else if t_lower.contains("hdrip") || t_lower.contains("hd rip") { prints = Some("HDRip".to_string()); }- else if t_lower.contains("webrip") || t_lower.contains("web-rip") { prints = Some("WEBRip".to_string()); }- else if t_lower.contains("webdl") || t_lower.contains("web-dl") { prints = Some("WEB-DL".to_string()); }- else if t_lower.contains("bluray") || t_lower.contains("brrip") { prints = Some("BluRay".to_string()); }+ if t_lower.contains("hindi") {+ audios = Some("Hindi".to_string());+ } else if t_lower.contains("bengali") || t_lower.contains("bangla") {+ audios = Some("Bengali".to_string());+ } else if t_lower.contains("english") {+ audios = Some("English".to_string());+ } else if t_lower.contains("tamil") {+ audios = Some("Tamil".to_string());+ } else if t_lower.contains("telugu") {+ audios = Some("Telugu".to_string());+ } else if t_lower.contains("malayalam") {+ audios = Some("Malayalam".to_string());+ } else if t_lower.contains("korean") {+ audios = Some("Korean".to_string());+ } else if t_lower.contains("dual audio") {+ audios = Some("Dual Audio".to_string());+ } else if t_lower.contains("multi audio") {+ audios = Some("Multi Audio".to_string());+ }++ if t_lower.contains("cam") || t_lower.contains("hdcam") {+ prints = Some("CAM".to_string());+ } else if t_lower.contains("hdtc") || t_lower.contains("tc") {+ prints = Some("HDTC".to_string());+ } else if t_lower.contains("hdrip") || t_lower.contains("hd rip") {+ prints = Some("HDRip".to_string());+ } else if t_lower.contains("webrip") || t_lower.contains("web-rip") {+ prints = Some("WEBRip".to_string());+ } else if t_lower.contains("webdl") || t_lower.contains("web-dl") {+ prints = Some("WEB-DL".to_string());+ } else if t_lower.contains("bluray") || t_lower.contains("brrip") {+ prints = Some("BluRay".to_string());+ }Ok(MediaDetails {id: ProviderMediaId {@@ -159,38 +195,51 @@ impl CircleFtpClient {let url = format!("{}/posts/{}", self.base_url, id);let resp = self.client.get(&url).send().await?;let json: serde_json::Value = resp.json().await?;-+let mut releases = Vec::new();let r#type = json.get("type").and_then(|v| v.as_str()).unwrap_or("");-+let quality_str = json.get("quality").and_then(|v| v.as_str()).unwrap_or("HD");let quality = if quality_str.to_lowercase().contains("1080p") {Some("1080p".to_string())} else if quality_str.to_lowercase().contains("720p") {Some("720p".to_string())- } else if quality_str.to_lowercase().contains("4k") || quality_str.to_lowercase().contains("2160p") {+ } else if quality_str.to_lowercase().contains("4k")+ || quality_str.to_lowercase().contains("2160p")+ {Some("4k".to_string())} else {Some(quality_str.to_string())};-+let title_str = json.get("title").and_then(|v| v.as_str()).unwrap_or("");-+let mut codec = None;let mut language = None;let t_lower = title_str.to_lowercase();-- if t_lower.contains("x264") || t_lower.contains("h264") { codec = Some("x264".to_string()); }- else if t_lower.contains("x265") || t_lower.contains("hevc") { codec = Some("HEVC".to_string()); }- else if t_lower.contains("av1") { codec = Some("AV1".to_string()); }-- if t_lower.contains("hindi") { language = Some("Hindi".to_string()); }- else if t_lower.contains("bengali") || t_lower.contains("bangla") { language = Some("Bengali".to_string()); }- else if t_lower.contains("english") { language = Some("English".to_string()); }- else if t_lower.contains("tamil") { language = Some("Tamil".to_string()); }- else if t_lower.contains("telugu") { language = Some("Telugu".to_string()); }- else if t_lower.contains("malayalam") { language = Some("Malayalam".to_string()); }-++ if t_lower.contains("x264") || t_lower.contains("h264") {+ codec = Some("x264".to_string());+ } else if t_lower.contains("x265") || t_lower.contains("hevc") {+ codec = Some("HEVC".to_string());+ } else if t_lower.contains("av1") {+ codec = Some("AV1".to_string());+ }++ if t_lower.contains("hindi") {+ language = Some("Hindi".to_string());+ } else if t_lower.contains("bengali") || t_lower.contains("bangla") {+ language = Some("Bengali".to_string());+ } else if t_lower.contains("english") {+ language = Some("English".to_string());+ } else if t_lower.contains("tamil") {+ language = Some("Tamil".to_string());+ } else if t_lower.contains("telugu") {+ language = Some("Telugu".to_string());+ } else if t_lower.contains("malayalam") {+ language = Some("Malayalam".to_string());+ }+if r#type == "series" {if let (Some(target_s), Some(target_e)) = (season, episode) {if let Some(content) = json.get("content").and_then(|v| v.as_array()) {@@ -198,44 +247,50 @@ impl CircleFtpClient {if let Some(ep_arr) = s_val.get("episodes").and_then(|v| v.as_array()) {if let Some(e_val) = ep_arr.get(target_e.saturating_sub(1)) {if let Some(link) = e_val.get("link").and_then(|v| v.as_str()) {- let filename = link.split('/').next_back().unwrap_or("Video File")+ let filename = link+ .split('/')+ .next_back()+ .unwrap_or("Video File").replace("%20", " ").replace("%28", "(").replace("%29", ")").replace("%5B", "[").replace("%5D", "]");-- releases.push(Release {- provider: ProviderKind::BdixCircleFtp,- filename,- quality: quality.clone(),- codec: codec.clone(),- language: language.clone(),- size_bytes: None,- season: Some(target_s),- episode: Some(target_e),- mirrors: vec![SourceMirror {- label: "CircleFTP".to_string(),- resolver_url: link.to_string(),- headers: Vec::new(),- direct_file: true,- }],- });++ releases.push(Release {+ provider: ProviderKind::BdixCircleFtp,+ filename,+ quality: quality.clone(),+ codec: codec.clone(),+ language: language.clone(),+ size_bytes: None,+ season: Some(target_s),+ episode: Some(target_e),+ mirrors: vec![SourceMirror {+ label: "CircleFTP".to_string(),+ resolver_url: link.to_string(),+ headers: Vec::new(),+ direct_file: true,+ }],+ });+ }}}}}}- }} else {if let Some(content) = json.get("content").and_then(|v| v.as_str()) {- let filename = content.split('/').next_back().unwrap_or("Video File")+ let filename = content+ .split('/')+ .next_back()+ .unwrap_or("Video File").replace("%20", " ").replace("%28", "(").replace("%29", ")").replace("%5B", "[").replace("%5D", "]");-+releases.push(Release {provider: ProviderKind::BdixCircleFtp,filename,@@ -258,10 +313,7 @@ impl CircleFtpClient {Ok(releases)}- pub async fn resolve_release(- &self,- resolver_url: &str,- ) -> Result<String, CircleFtpError> {+ pub async fn resolve_release(&self, resolver_url: &str) -> Result<String, CircleFtpError> {Ok(resolver_url.to_string())}}diff --git a/src/providers/bdix/circleftp/parser.rs b/src/providers/bdix/circleftp/parser.rsindex 22919b2..e626f44 100644--- a/src/providers/bdix/circleftp/parser.rs+++ b/src/providers/bdix/circleftp/parser.rs@@ -1,6 +1,4 @@-use crate::providers::models::{- CatalogItem, MediaType, ProviderKind, ProviderMediaId,-};+use crate::providers::models::{CatalogItem, MediaType, ProviderKind, ProviderMediaId};use serde::Deserialize;#[derive(Debug, Deserialize)]@@ -39,13 +37,18 @@ pub fn search_to_moviebox_json(response: &CircleFtpSearchResponse) -> Vec<Catalolet mut items = Vec::new();if let Some(posts) = &response.posts {for post in posts {- let title = post.title.as_ref().or(post.name.as_ref()).cloned().unwrap_or_else(|| "Unknown".to_string());+ let title = post+ .title+ .as_ref()+ .or(post.name.as_ref())+ .cloned()+ .unwrap_or_else(|| "Unknown".to_string());let media_type = if post.r#type.as_deref() == Some("series") {MediaType::Series} else {MediaType::Movie};-+let year = post.year.as_ref().and_then(|y| {if y.is_number() {Some(y.to_string())@@ -53,11 +56,14 @@ pub fn search_to_moviebox_json(response: &CircleFtpSearchResponse) -> Vec<Cataloy.as_str().map(|s| s.to_string())}});-+// Try to construct poster URL if an image is provided- let poster_url = post.image.as_ref().or(post.image_sm.as_ref())+ let poster_url = post+ .image+ .as_ref()+ .or(post.image_sm.as_ref()).map(|img| format!("http://new.circleftp.net:5000/uploads/{}", img));-+items.push(CatalogItem {id: ProviderMediaId {provider: ProviderKind::BdixCircleFtp,diff --git a/src/providers/bdix/dhakaflix/client.rs b/src/providers/bdix/dhakaflix/client.rsnew file mode 100644index 0000000..b353fee--- /dev/null+++ b/src/providers/bdix/dhakaflix/client.rs@@ -0,0 +1,376 @@+use reqwest::Client;+use serde_json::json;+use std::time::Duration;+use thiserror::Error;++use crate::providers::models::{+ CatalogItem, MediaDetails, MediaType, ProviderKind, ProviderMediaId, Release,+};++#[derive(Debug, Error)]+pub enum DhakaFlixError {+ #[error("network error: {0}")]+ Network(#[from] reqwest::Error),+ #[error("parse error: {0}")]+ Parse(String),+}++fn parse_title_and_year(raw_title: &str) -> (String, Option<String>) {+ let mut title = raw_title.to_string();+ let mut year = None;++ if let Some(start) = title.rfind('(') {+ if let Some(end) = title[start..].find(')') {+ let year_str = &title[start + 1..start + end];+ if year_str.len() == 4 && year_str.chars().all(|c| c.is_ascii_digit()) {+ year = Some(year_str.to_string());+ title = title[..start].trim().to_string();+ return (title, year);+ }+ }+ }++ let lower = title.to_lowercase();+ let qualities = [+ " 1080p", " 720p", " 480p", " 2160p", " 4k", " hd", " hdrip", " webrip", " hdcam",+ ];+ for q in qualities {+ if lower.ends_with(q) {+ title = title[..title.len() - q.len()].trim().to_string();+ break;+ }+ }++ (title, year)+}++#[derive(Clone)]+pub struct DhakaFlixClient {+ client: Client,+}++impl Default for DhakaFlixClient {+ fn default() -> Self {+ Self::new()+ }+}++const SERVERS: &[(&str, &str)] = &[+ ("http://172.16.50.7", "/DHAKA-FLIX-7/"),+ ("http://172.16.50.14", "/DHAKA-FLIX-14/"),+ ("http://172.16.50.12", "/DHAKA-FLIX-12/"),+ ("http://172.16.50.9", "/DHAKA-FLIX-9/"),+];++impl DhakaFlixClient {+ pub fn new() -> Self {+ Self {+ client: reqwest::Client::builder()+ .timeout(Duration::from_secs(5))+ .user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36")+ .build()+ .unwrap(),+ }+ }++ pub async fn search(&self, query: &str) -> Result<Vec<CatalogItem>, DhakaFlixError> {+ let mut all_results = Vec::new();++ let mut futures = Vec::new();+ for (base_url, href) in SERVERS {+ let url = format!("{}{}", base_url, href);+ let body = json!({+ "action": "get",+ "search": {+ "href": href,+ "pattern": query,+ "ignorecase": true+ }+ });+ let client = self.client.clone();++ futures.push(async move {+ let mut server_results = Vec::new();+ if let Ok(resp) = client.post(&url).json(&body).send().await {+ if let Ok(text) = resp.text().await {+ if let Ok(json) = serde_json::from_str::<serde_json::Value>(&text) {+ if let Some(search_arr) = json.get("search").and_then(|v| v.as_array())+ {+ for item in search_arr {+ if let Some(item_href) =+ item.get("href").and_then(|v| v.as_str())+ {+ let is_dir = item_href.ends_with('/');+ let mut parts: Vec<&str> = item_href+ .split('/')+ .filter(|p| !p.is_empty())+ .collect();++ if !is_dir && parts.len() > 1 {+ parts.pop();+ }++ let folder_path = format!("/{}/", parts.join("/"));++ if let Some(name) = parts.last() {+ let name_decoded =+ percent_encoding::percent_decode_str(name)+ .decode_utf8_lossy()+ .to_string();+ let (clean_title, year) =+ parse_title_and_year(&name_decoded);++ server_results.push(CatalogItem {+ id: ProviderMediaId {+ provider: ProviderKind::BdixDhakaFlix,+ value: format!(+ "{}:{}{}",+ base_url,+ href,+ folder_path.trim_start_matches(href)+ ),+ },+ title: clean_title,+ year,+ media_type: MediaType::Movie,+ poster_url: None,+ season_count: None,+ });+ }+ }+ }+ }+ }+ }+ }+ server_results+ });+ }++ let results_array = futures::future::join_all(futures).await;+ for mut res in results_array {+ all_results.append(&mut res);+ }++ all_results.dedup_by(|a, b| a.title == b.title);++ let mut poster_futures = Vec::new();+ for item in &all_results {+ let client = self.client.clone();+ let id = item.id.value.clone();++ poster_futures.push(async move {+ let parts: Vec<&str> = id.split(':').collect();+ if parts.len() >= 3 {+ let base_url = parts[0..2].join(":");+ let path = parts[2..].join(":");+ let path_parts: Vec<&str> = path.split('/').filter(|p| !p.is_empty()).collect();+ if !path_parts.is_empty() {+ let api_href = format!("/{}/", path_parts[0]);+ let api_url = format!("{}{}", base_url, api_href);++ let body = json!({+ "action": "get",+ "items": {+ "href": path,+ "what": 1+ }+ });++ if let Ok(resp) = client.post(&api_url).json(&body).send().await {+ if let Ok(json) = resp.json::<serde_json::Value>().await {+ if let Some(items) = json.get("items").and_then(|v| v.as_array()) {+ for file in items {+ if let Some(href) =+ file.get("href").and_then(|v| v.as_str())+ {+ let href_lower = href.to_lowercase();+ if href_lower.ends_with(".jpg")+ || href_lower.ends_with(".jpeg")+ || href_lower.ends_with(".png")+ {+ return Some(format!("{}{}", base_url, href));+ }+ }+ }+ }+ }+ }+ }+ }+ None+ });+ }++ let posters = futures::future::join_all(poster_futures).await;+ for (item, poster) in all_results.iter_mut().zip(posters) {+ item.poster_url = poster;+ }++ Ok(all_results)+ }++ pub async fn details(&self, id: &str) -> Result<MediaDetails, DhakaFlixError> {+ let parts: Vec<&str> = id.split(':').collect();+ let mut title = "Unknown".to_string();+ if parts.len() >= 3 {+ let path = parts[2..].join(":");+ let path_parts: Vec<&str> = path.split('/').filter(|p| !p.is_empty()).collect();+ if let Some(name) = path_parts.last() {+ title = percent_encoding::percent_decode_str(name)+ .decode_utf8_lossy()+ .to_string();+ }+ }++ let (clean_title, year) = parse_title_and_year(&title);++ Ok(MediaDetails {+ id: ProviderMediaId {+ provider: ProviderKind::BdixDhakaFlix,+ value: id.to_string(),+ },+ title: clean_title,+ media_type: MediaType::Movie,+ year,+ description: None,+ tagline: None,+ imdb_rating: None,+ director: None,+ stars: None,+ prints: None,+ audios: None,+ poster_url: None,+ duration: None,+ genres: vec![],+ seasons: vec![],+ })+ }++ pub async fn streams(&self, id: &str) -> Result<Vec<Release>, DhakaFlixError> {+ let mut releases = Vec::new();++ let parts: Vec<&str> = id.split(':').collect();+ if parts.len() < 3 {+ return Ok(releases);+ }++ let base_url = parts[0..2].join(":");+ let path = parts[2..].join(":");+ let path_parts: Vec<&str> = path.split('/').filter(|p| !p.is_empty()).collect();++ if path_parts.last().is_some() {+ let mut api_href = "/";+ for (s_base, s_href) in SERVERS {+ if base_url == *s_base {+ api_href = *s_href;+ break;+ }+ }++ let api_url = format!("{}{}", base_url, api_href);+ let body = json!({+ "action": "get",+ "items": {+ "href": path,+ "what": 1+ }+ });++ if let Ok(resp) = self.client.post(&api_url).json(&body).send().await {+ if let Ok(json) = resp.json::<serde_json::Value>().await {+ if let Some(items_arr) = json.get("items").and_then(|v| v.as_array()) {+ for item in items_arr {+ if let (Some(item_href), Some(size)) = (+ item.get("href").and_then(|v| v.as_str()),+ item.get("size").and_then(|v| v.as_u64()),+ ) {+ let filename = item_href+ .split('/')+ .next_back()+ .unwrap_or("Unknown")+ .to_string();+ let filename_decoded =+ percent_encoding::percent_decode_str(&filename)+ .decode_utf8_lossy()+ .to_string();++ let f_lower = filename_decoded.to_lowercase();+ if !f_lower.ends_with(".mkv")+ && !f_lower.ends_with(".mp4")+ && !f_lower.ends_with(".avi")+ && !f_lower.ends_with(".webm")+ {+ continue;+ }++ let quality = if f_lower.contains("1080p") {+ Some("1080p".to_string())+ } else if filename_decoded.to_lowercase().contains("720p") {+ Some("720p".to_string())+ } else if filename_decoded.to_lowercase().contains("2160p")+ || filename_decoded.to_lowercase().contains("4k")+ {+ Some("4K".to_string())+ } else {+ Some("HD".to_string())+ };++ let mut language = None;+ let mut codec = None;++ if f_lower.contains("hindi") {+ language = Some("Hindi".to_string());+ } else if f_lower.contains("bengali") || f_lower.contains("bangla")+ {+ language = Some("Bengali".to_string());+ } else if f_lower.contains("tamil") {+ language = Some("Tamil".to_string());+ } else if f_lower.contains("telugu") {+ language = Some("Telugu".to_string());+ } else if f_lower.contains("dual") {+ language = Some("Dual Audio".to_string());+ } else if f_lower.contains("multi") {+ language = Some("Multi Audio".to_string());+ } else if f_lower.contains("english") {+ language = Some("English".to_string());+ }++ if f_lower.contains("hevc") || f_lower.contains("x265") {+ codec = Some("HEVC".to_string());+ } else if f_lower.contains("x264") || f_lower.contains("h264") {+ codec = Some("x264".to_string());+ } else if f_lower.contains("av1") {+ codec = Some("AV1".to_string());+ }++ releases.push(Release {+ provider: ProviderKind::BdixDhakaFlix,+ filename: filename_decoded,+ quality,+ codec,+ language,+ size_bytes: Some(size),+ season: None,+ episode: None,+ mirrors: vec![crate::providers::models::SourceMirror {+ label: "DhakaFlix".to_string(),+ resolver_url: format!("{}{}", base_url, item_href),+ headers: vec![],+ direct_file: true,+ }],+ });+ }+ }+ }+ }+ }+ }++ Ok(releases)+ }++ pub async fn resolve_release(&self, resolver_url: &str) -> Result<String, DhakaFlixError> {+ Ok(resolver_url.to_string())+ }+}diff --git a/src/providers/bdix/dhakaflix/mod.rs b/src/providers/bdix/dhakaflix/mod.rsnew file mode 100644index 0000000..b9babe5--- /dev/null+++ b/src/providers/bdix/dhakaflix/mod.rs@@ -0,0 +1 @@+pub mod client;diff --git a/src/providers/bdix/mod.rs b/src/providers/bdix/mod.rsindex b7c68e9..a516823 100644--- a/src/providers/bdix/mod.rs+++ b/src/providers/bdix/mod.rs@@ -1 +1,2 @@pub mod circleftp;+pub mod dhakaflix;diff --git a/src/providers/mod.rs b/src/providers/mod.rsindex c8ae1d0..897b159 100644--- a/src/providers/mod.rs+++ b/src/providers/mod.rs@@ -1,5 +1,5 @@+pub mod bdix;pub mod fourkhdhub;pub mod iptv_org;pub mod models;pub mod moviebox;-pub mod bdix;diff --git a/src/providers/models.rs b/src/providers/models.rsindex 028d3e1..d40750b 100644--- a/src/providers/models.rs+++ b/src/providers/models.rs@@ -8,16 +8,23 @@ pub enum ProviderKind {MovieBox,FourKHdHub,BdixCircleFtp,+ BdixDhakaFlix,}impl ProviderKind {- pub const ENABLED: [Self; 3] = [Self::MovieBox, Self::FourKHdHub, Self::BdixCircleFtp];+ pub const ENABLED: [Self; 4] = [+ Self::MovieBox,+ Self::FourKHdHub,+ Self::BdixCircleFtp,+ Self::BdixDhakaFlix,+ ];pub const fn cache_key(self) -> &'static str {match self {Self::MovieBox => "moviebox",Self::FourKHdHub => "fourkhdhub",Self::BdixCircleFtp => "bdix_circleftp",+ Self::BdixDhakaFlix => "bdix_dhakaflix",}}@@ -26,11 +33,12 @@ impl ProviderKind {Self::MovieBox => "MovieBox",Self::FourKHdHub => "4KHDHub",Self::BdixCircleFtp => "CircleFTP (BDIX)",+ Self::BdixDhakaFlix => "DhakaFlix (BDIX)",}}pub const fn is_bdix(self) -> bool {- matches!(self, Self::BdixCircleFtp)+ matches!(self, Self::BdixCircleFtp | Self::BdixDhakaFlix)}}diff --git a/src/tui/app.rs b/src/tui/app.rsindex fe5ffbb..a18cf06 100644--- a/src/tui/app.rs+++ b/src/tui/app.rs@@ -49,6 +49,7 @@ pub struct App {client: MovieBoxClient,fourk_client: FourKHdHubClient,circleftp_client: crate::providers::bdix::circleftp::CircleFtpClient,+ dhakaflix_client: crate::providers::bdix::dhakaflix::client::DhakaFlixClient,action_sender: mpsc::UnboundedSender<Action>,action_receiver: mpsc::UnboundedReceiver<Action>,}@@ -89,9 +90,7 @@ impl App {{state.active_theme_kind = theme_val.to_string();}- if let Some(bdix) =- config_json.get("bdix_enabled").and_then(|v| v.as_bool())- {+ if let Some(bdix) = config_json.get("bdix_enabled").and_then(|v| v.as_bool()) {state.bdix_enabled = bdix;}}@@ -113,6 +112,7 @@ impl App {client: MovieBoxClient::new(),fourk_client: FourKHdHubClient::new(),circleftp_client: crate::providers::bdix::circleftp::CircleFtpClient::new(),+ dhakaflix_client: crate::providers::bdix::dhakaflix::client::DhakaFlixClient::new(),action_sender,action_receiver,}@@ -262,12 +262,18 @@ impl App {self.state.search_results.clear();self.state.search_suggestions.clear();self.state.search_preview = None;+ self.state.preview_loading = false;self.state.selected_details = None;self.state.selected_resources = None;self.state.active_subject_id = None;self.state.available_seasons.clear();self.state.available_episode_numbers.clear();self.state.stream_pool.clear();+ self.state.is_resolving_playback = false;+ self.state.search_posters.clear();+ self.state.search_poster_protocols.clear();+ self.state.image_cache.clear();+ self.state.preview_cache.clear();self.state.poster_image = None;self.state.poster_protocol = None;self.state.search_poster_protocols.clear();@@ -292,8 +298,10 @@ impl App {.into_iter().filter(|p| !p.is_bdix() || self.state.bdix_enabled).collect();-- if available_providers.is_empty() { return; }++ if available_providers.is_empty() {+ return;+ }let current = available_providers.iter()@@ -1610,17 +1618,15 @@ impl App {crate::cache::invalidate_provider_stream_cache(provider, &id_clone, se, ep,);- crate::cache::invalidate_provider_details_cache(- provider, &id_clone_2,- );+ crate::cache::invalidate_provider_details_cache(provider, &id_clone_2);});self.state.selected_season = se;self.state.selected_episode = ep;-+self.action_sender.send(Action::FetchDetails(id.clone(), true)).ok();-+self.action_sender.send(Action::FetchEpisodeStreams {subject_id: id,@@ -1827,7 +1833,7 @@ impl App {);return None;}-+if lower_query == "/enable-bdix" || lower_query == "/disable-bdix" {self.state.bdix_enabled = lower_query == "/enable-bdix";self.persist_config();@@ -1842,7 +1848,7 @@ impl App {"Disabled"},);-+if !self.state.bdix_enabled && self.state.active_provider.is_bdix() {let mut new_provider = crate::providers::models::ProviderKind::MovieBox;for provider in crate::providers::models::ProviderKind::ENABLED.iter() {@@ -1851,9 +1857,11 @@ impl App {break;}}- self.action_sender.send(Action::SwitchProvider(new_provider)).ok();+ self.action_sender+ .send(Action::SwitchProvider(new_provider))+ .ok();}-+return None;}@@ -1891,6 +1899,7 @@ impl App {release_year: c.group.clone(),cover_url: Some(c.logo.clone()),season: 1,+ provider: ProviderKind::MovieBox,}).collect();self.state.is_loading = false;@@ -1994,6 +2003,7 @@ impl App {self.state.search_suggestions.clear();self.state.suggest_index = None;self.state.search_preview = None;+ self.state.preview_loading = false;self.state.status_message = format!("Searching for '{}'...", query);self.state.status_timer = 150;@@ -2002,6 +2012,7 @@ impl App {let client = self.client.clone();let fourk_client = self.fourk_client.clone();let circleftp_client = self.circleftp_client.clone();+ let dhakaflix_client = self.dhakaflix_client.clone();let context = self.request_context();tokio::spawn(async move {if !force_refresh {@@ -2035,7 +2046,16 @@ impl App {ProviderKind::BdixCircleFtp => circleftp_client.search(&query_clone).await- .map(|items| crate::providers::fourkhdhub::search_to_moviebox_json(&items))+ .map(|items| {+ crate::providers::fourkhdhub::search_to_moviebox_json(&items)+ })+ .map_err(|error| error.to_string()),+ ProviderKind::BdixDhakaFlix => dhakaflix_client+ .search(&query_clone)+ .await+ .map(|items| {+ crate::providers::fourkhdhub::search_to_moviebox_json(&items)+ }).map_err(|error| error.to_string()),};match result {@@ -2248,6 +2268,7 @@ impl App {release_year,cover_url,season,+ provider: context.provider,});}}@@ -2474,6 +2495,7 @@ impl App {release_year,cover_url,season,+ provider: ProviderKind::MovieBox,});count += 1;}@@ -2678,6 +2700,7 @@ impl App {let client = self.client.clone();let fourk_client = self.fourk_client.clone();let circleftp_client = self.circleftp_client.clone();+ let dhakaflix_client = self.dhakaflix_client.clone();let sender = self.action_sender.clone();let context = self.request_context();self.state.is_loading = true;@@ -2699,6 +2722,11 @@ impl App {.await.map(|items| crate::providers::fourkhdhub::search_to_moviebox_json(&items)).map_err(|error| error.to_string()),+ ProviderKind::BdixDhakaFlix => dhakaflix_client+ .search(&query)+ .await+ .map(|items| crate::providers::fourkhdhub::search_to_moviebox_json(&items))+ .map_err(|error| error.to_string()),};match result {Ok(res) => {@@ -2913,9 +2941,16 @@ impl App {let client = self.client.clone();let fourk_client = self.fourk_client.clone();let circleftp_client = self.circleftp_client.clone();+ let dhakaflix_client = self.dhakaflix_client.clone();let sender = self.action_sender.clone();let id_clone = id.clone();- let context = self.request_context();+ let mut target_prov = self.state.active_provider;+ if let Some(res) = self.state.search_results.iter().find(|r| r.id == id) {+ target_prov = res.provider;+ }+ let mut context = self.request_context();+ context.provider = target_prov;+tokio::spawn(async move {if !force_refresh {let id_for_cache = id_clone.clone();@@ -2946,7 +2981,16 @@ impl App {ProviderKind::BdixCircleFtp => circleftp_client.details(&id_clone).await- .map(|details| crate::providers::fourkhdhub::details_to_moviebox_json(&details))+ .map(|details| {+ crate::providers::fourkhdhub::details_to_moviebox_json(&details)+ })+ .map_err(|error| error.to_string()),+ ProviderKind::BdixDhakaFlix => dhakaflix_client+ .details(&id_clone)+ .await+ .map(|details| {+ crate::providers::fourkhdhub::details_to_moviebox_json(&details)+ }).map_err(|error| error.to_string()),};match result {@@ -3045,7 +3089,15 @@ impl App {}return None;}- if self.state.active_provider == ProviderKind::FourKHdHub || self.state.active_provider == ProviderKind::BdixCircleFtp {+ let mut prov = self.state.active_provider;+ if let Some(res) = self.state.search_results.iter().find(|r| r.id == id) {+ prov = res.provider;+ }++ if prov == ProviderKind::FourKHdHub+ || prov == ProviderKind::BdixCircleFtp+ || prov == ProviderKind::BdixDhakaFlix+ {self.state.preview_loading = false;self.state.search_preview = None;return None;@@ -3118,7 +3170,7 @@ impl App {let client = self.client.clone();let sender = self.action_sender.clone();let id_clone = id.clone();- let prov = self.state.active_provider;+tokio::spawn(async move {if let Ok(Some(cached_disk)) = tokio::task::spawn_blocking({let id_clone = id_clone.clone();@@ -3167,12 +3219,12 @@ impl App {.map(|res| res.id.clone())};+ self.state.preview_loading = false;+if current_id.as_deref() != Some(id.as_str()) {return None;}- self.state.preview_loading = false;-self.state.preview_cache.put(id.clone(), json.clone());self.state.search_preview = Some(json.clone());self.state.poster_image = None;@@ -3288,15 +3340,17 @@ impl App {let source = crate::providers::models::PlaybackSource::bare(ProviderKind::BdixCircleFtp,release.mirrors[0].resolver_url.clone(),- None+ None,);if open_with {sender_clone.send(Action::ShowPlaybackPicker(source)).ok();} else {- sender_clone.send(Action::LaunchPlayback(- crate::tui::state::PlayerKind::Mpv,- source- )).ok();+ sender_clone+ .send(Action::LaunchPlayback(+ crate::tui::state::PlayerKind::Mpv,+ source,+ ))+ .ok();}return None;} else {@@ -3530,9 +3584,11 @@ impl App {let source = crate::providers::models::PlaybackSource::bare(ProviderKind::BdixCircleFtp,release.mirrors[0].resolver_url.clone(),- None+ None,);- sender_clone.send(Action::StartDownload(subtitle_url, Some(source.url))).ok();+ sender_clone+ .send(Action::StartDownload(subtitle_url, Some(source.url)))+ .ok();return None;} else {self.fourk_client.clone()@@ -3719,7 +3775,12 @@ impl App {let payload = final_payload;if self.state.poster_image.is_none() {- if let Some(cached_img) = self.state.image_cache.get(&id) {+ if let Some(cached_img) = self+ .state+ .image_cache+ .get(&id)+ .or_else(|| self.state.search_posters.get(&id))+ {self.state.poster_image = Some((**cached_img).clone());} else if let Some(cover_val) = payload.get("cover")&& let Some(url) = cover_val.get("url").and_then(|u| u.as_str())@@ -4053,16 +4114,28 @@ impl App {}}- if context.provider == ProviderKind::FourKHdHub || context.provider == ProviderKind::BdixCircleFtp {+ if context.provider == ProviderKind::FourKHdHub || context.provider.is_bdix() {let sender = self.action_sender.clone();let fourk_client = self.fourk_client.clone();let circleftp_client = self.circleftp_client.clone();+ let dhakaflix_client = self.dhakaflix_client.clone();let id = subject_id.clone();tokio::spawn(async move {let result = if context.provider == ProviderKind::FourKHdHub {- fourk_client.releases(&id, season, episode).await.map_err(|e| e.to_string())+ fourk_client+ .releases(&id, season, episode)+ .await+ .map_err(|e| e.to_string())+ } else if context.provider == ProviderKind::BdixCircleFtp {+ circleftp_client+ .releases(&id, Some(season), Some(episode))+ .await+ .map_err(|e| e.to_string())} else {- circleftp_client.releases(&id, Some(season), Some(episode)).await.map_err(|e| e.to_string())+ dhakaflix_client+ .streams(&id)+ .await+ .map_err(|e| e.to_string())};match result {Ok(releases) if !releases.is_empty() => {diff --git a/src/tui/player.rs b/src/tui/player.rsindex 053232b..440c520 100644--- a/src/tui/player.rs+++ b/src/tui/player.rs@@ -97,7 +97,9 @@ fn mpv_command(fn iina_command(url: &str, subtitle: Option<&str>, headers: &[(String, String)]) -> Command {let configured = configured_executable("MOVIEBOX_IINA_PATH");let cli_global = std::path::Path::new("/Applications/IINA.app/Contents/MacOS/iina-cli");- let cli_local = dirs::home_dir().map(|h| h.join("Applications/IINA.app/Contents/MacOS/iina-cli")).unwrap_or_default();+ let cli_local = dirs::home_dir()+ .map(|h| h.join("Applications/IINA.app/Contents/MacOS/iina-cli"))+ .unwrap_or_default();let mut command = if let Some(executable) = configured {Command::new(executable)diff --git a/src/tui/state.rs b/src/tui/state.rsindex 78245d4..0395956 100644--- a/src/tui/state.rs+++ b/src/tui/state.rs@@ -38,6 +38,7 @@ pub struct SearchResult {pub release_year: String,pub cover_url: Option<String>,pub season: usize,+ pub provider: crate::providers::models::ProviderKind,}#[derive(Debug, Default)]