Skip to content

Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.

fix(moviebox): filter deprecation notice streams and streamline resolution

Samir Hossainsb9df7c52a617
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5400ff4..dca3b18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## [Unreleased]
+
+### Fixed
+- **MovieBox Deprecation Notice Stream Filtering**:
+ - Filtered deprecation notice video URLs (`macdn.aoneroom.com/other/`, notice video hash `b164fbfb4347792950bdfbfb563d39d9`) from community resource releases in `src/providers/moviebox/adapt.rs`.
+ - Prevented 21-second upgrade announcement video placeholders from leaking into stream selection as playable releases when episodes lack official DASH streams.
+
+### Refactored
+- **Streamlined MovieBox Episode Stream Resolution**:
+ - Replaced speculative parallel `get_resources` and secondary `fetch_resource_page` fallbacks in `providers/moviebox/mod.rs` with direct `play-info/v2` resolution.
+ - Eliminated sprawling 60-page background resource pagination loop in `src/tui/app/requests.rs`, cutting redundant network requests and preventing dead community upload parsing.
+
## [0.1.21] - 2026-09-19
### Added
diff --git a/docs/providers.md b/docs/providers.md
index e5e7668..c1cfa5a 100644
--- a/docs/providers.md
+++ b/docs/providers.md
@@ -65,6 +65,9 @@ Adding a new streaming or BDIX provider to MovieBox TUI takes 3 simple steps:
- Hosts are retried; a shared runtime token is re-initialized when all hosts fail.
- Mobile `User-Agent` generated by the crypto module is forwarded through playback and download
pipelines to satisfy CDN anti-bot checks.
+- Stream resolution in `providers/moviebox/mod.rs` resolves directly through `play-info/v2` with
+ automatic deprecation notice URL filtering (`is_deprecation_notice_url`), preventing obsolete
+ CDN placeholder videos from leaking into the stream selector when episodes lack valid streams.
- Multi-resolution discovery (`fetch_collection_resolutions`) dynamically discovers available
stream resolutions with descending quality sorting.
- Multi-resolution DASH manifests (`index.mpd`) and adaptive streams are labeled with a distinct
diff --git a/src/providers/moviebox/adapt.rs b/src/providers/moviebox/adapt.rs
index 8d0d330..c1ea971 100644
--- a/src/providers/moviebox/adapt.rs
+++ b/src/providers/moviebox/adapt.rs
@@ -529,8 +529,8 @@ pub fn moviebox_resource_item_to_release(item: &serde_json::Value) -> Release {
.get("resourceLink")
.or_else(|| item.get("url"))
.and_then(|l| l.as_str())
- .filter(|s| !s.is_empty());
-
+ .filter(|s| !s.is_empty())
+ .filter(|s| !is_deprecation_notice_url(s));
if let Some(link) = resource_link {
let label = item
.get("uploadBy")
@@ -565,6 +565,7 @@ pub fn is_deprecation_notice_url(url: &str) -> bool {
let lower = url.to_ascii_lowercase();
lower.contains("1c7de0bd3393702d9191801f15f88f8d")
|| lower.contains("9a0461bc39da389663bf3dbb17091d3f")
+ || lower.contains("b164fbfb4347792950bdfbfb563d39d9")
|| lower.contains("/notice.mp4")
|| lower.contains("notice")
|| (lower.contains("macdn.aoneroom.com") && lower.contains("/other/"))
@@ -773,10 +774,10 @@ pub fn moviebox_resource_json_to_releases(payload: &serde_json::Value) -> Vec<Re
} else {
&[]
};
-
items
.iter()
.map(moviebox_resource_item_to_release)
+ .filter(|r| !r.mirrors.is_empty())
.collect()
}
@@ -1282,4 +1283,28 @@ mod tests {
let release_str = moviebox_resource_item_to_release(&item_str);
assert_eq!(release_str.resource_id.as_deref(), Some("1234567890"));
}
+ #[test]
+ fn test_moviebox_resource_item_filters_deprecation_notice_url() {
+ let notice_item = json!({
+ "resourceId": 4087841675127701904_i64,
+ "title": "Steins;Gate S01E07",
+ "url": "https://macdn.aoneroom.com/other/2026/09/04/b164fbfb4347792950bdfbfb563d39d9.mp4"
+ });
+ let release = moviebox_resource_item_to_release(&notice_item);
+ assert!(release.mirrors.is_empty());
+
+ let payload = json!({
+ "list": [
+ notice_item,
+ {
+ "resourceId": 123,
+ "title": "Valid Stream",
+ "url": "https://example.com/stream.mp4"
+ }
+ ]
+ });
+ let releases = moviebox_resource_json_to_releases(&payload);
+ assert_eq!(releases.len(), 1);
+ assert_eq!(releases[0].filename, "Valid Stream");
+ }
}
diff --git a/src/providers/moviebox/mod.rs b/src/providers/moviebox/mod.rs
index 61abd7a..e21d369 100644
--- a/src/providers/moviebox/mod.rs
+++ b/src/providers/moviebox/mod.rs
@@ -62,88 +62,16 @@ impl crate::providers::ReleaseProvider for client::MovieBoxClient {
season: usize,
episode: usize,
) -> Result<Vec<crate::providers::models::Release>, ProviderError> {
- let (play_info_res, resources_res) = tokio::join!(
- self.get_play_info(id, season, episode),
- self.get_resources(
- id,
- season,
- episode,
- if episode > 0 {
- (episode - 1) / 20 + 1
- } else {
- 1
- },
- None,
- 20,
- )
- );
- let upload_resource_id = resources_res.ok().and_then(|val| {
- val.get("list")
- .or_else(|| val.get("data").and_then(|d| d.get("list")))
- .and_then(|l| l.as_array())
- .and_then(|arr| {
- arr.iter().find(|item| {
- let parse_num = |k: &str| -> Option<usize> {
- item.get(k).and_then(|v| {
- v.as_u64()
- .map(|n| n as usize)
- .or_else(|| v.as_i64().map(|n| n as usize))
- .or_else(|| v.as_str().and_then(|s| s.parse().ok()))
- })
- };
- let se = parse_num("se");
- let ep_num = parse_num("ep");
- (season == 0 && episode == 0)
- || (se == Some(season) && ep_num == Some(episode))
- })
- })
- .and_then(|item| {
- item.get("resourceId")
- .or_else(|| item.get("id"))
- .and_then(|v| {
- if let Some(n) = v.as_i64() {
- Some(n.to_string())
- } else if let Some(n) = v.as_u64() {
- Some(n.to_string())
- } else {
- v.as_str().map(|s| s.to_string())
- }
- })
- })
- });
-
- let json = play_info_res.map_err(ProviderError::from)?;
- let mut releases =
- adapt::moviebox_play_info_json_to_releases(&json, season, episode, self.user_agent());
-
- if !releases.is_empty() {
- if let Some(upload_id) = upload_resource_id {
- for rel in &mut releases {
- rel.resource_id = Some(upload_id.clone());
- }
- }
- return Ok(releases);
- }
-
- let page = if episode > 0 {
- (episode - 1) / 20 + 1
- } else {
- 1
- };
- let (items, _) = self
- .fetch_resource_page(id, season, episode, 0, page)
+ let json = self
+ .get_play_info(id, season, episode)
.await
.map_err(ProviderError::from)?;
- let mut legacy_releases = Vec::new();
- for item in items {
- let rel = adapt::moviebox_resource_item_to_release(&item);
- if (season == 0 && episode == 0)
- || (rel.season == Some(season) && rel.episode == Some(episode))
- {
- legacy_releases.push(rel);
- }
- }
- Ok(legacy_releases)
+ Ok(adapt::moviebox_play_info_json_to_releases(
+ &json,
+ season,
+ episode,
+ self.user_agent(),
+ ))
}
}
diff --git a/src/tui/app/requests.rs b/src/tui/app/requests.rs
index ed05bfa..0f4158c 100644
--- a/src/tui/app/requests.rs
+++ b/src/tui/app/requests.rs
@@ -1,5 +1,5 @@
use super::{App, network};
-use crate::models::{Episode, MediaType, ProviderKind, Release, Season};
+use crate::models::{Episode, MediaType, ProviderKind, Season};
use crate::tui::{
action::Action,
state::{InputMode, Screen, SearchResult},
@@ -1523,21 +1523,9 @@ impl App {
}
}
- let mut absolute_episode = 0;
- for s_val in &self.state.available_seasons {
- if s_val.number < season {
- absolute_episode += s_val.episodes.len().max(1);
- }
- }
- absolute_episode += episode.saturating_sub(1);
- let estimated_page = (absolute_episode / 20) + 1;
-
let client = self.service.client.clone();
let sender = self.action_sender.clone();
- let cancel_token = self.state.fetch_cancel.clone();
let id_clone = subject_id.clone();
- let resolutions = pool.available_resolutions.clone();
- let is_movie = season == 0 && episode == 0;
self.request_tasks.cancel_streams();
self.request_tasks.streams = Some(tokio::spawn(async move {
@@ -1545,171 +1533,31 @@ impl App {
.send(Action::SetStatus("Fetching streams...".to_string()))
.ok();
- if let Ok(streams) = crate::providers::ReleaseProvider::episode_streams(
+ match crate::providers::ReleaseProvider::episode_streams(
&client, &id_clone, season, episode,
)
.await
{
- if !streams.is_empty() {
+ Ok(streams) => {
sender
.send(Action::EpisodeStreamsReady(
context, request_id, id_clone, season, episode, streams,
))
.ok();
- return;
- }
- }
-
- let mut all_items: Vec<Release> = Vec::new();
- let mut found_target = false;
- let mut any_fetch_failed = false;
-
- if is_movie {
- let mut page = 1usize;
- loop {
- if cancel_token.load(std::sync::atomic::Ordering::Relaxed) {
- break;
- }
- match tokio::time::timeout(
- std::time::Duration::from_secs(15),
- client.fetch_resource_page(&id_clone, 0, 0, 0, page),
- )
- .await
- {
- Ok(Ok((items, pager))) => {
- let has_more = pager
- .get("hasMore")
- .and_then(|v| v.as_bool())
- .unwrap_or(false);
- for item in items {
- all_items.push(
- crate::providers::moviebox::adapt::moviebox_resource_item_to_release(
- &item,
- ),
- );
- }
- if !has_more {
- break;
- }
- page += 1;
- if page > 10 {
- break;
- }
- }
- _ => {
- any_fetch_failed = true;
- break;
- }
- }
}
- } else {
- let concurrency_limit = std::sync::Arc::new(tokio::sync::Semaphore::new(2));
- let mut page = estimated_page;
- 'outer: loop {
- if cancel_token.load(std::sync::atomic::Ordering::Relaxed) {
- break 'outer;
- }
- let mut page_handles = Vec::new();
-
- let res_to_fetch = if resolutions.is_empty() {
- vec![0]
- } else {
- resolutions.clone()
- };
-
- for &res in &res_to_fetch {
- let c = client.clone();
- let id = id_clone.clone();
- let ct = cancel_token.clone();
- let permit = concurrency_limit.clone();
- page_handles.push(tokio::spawn(async move {
- let _permit = permit.acquire_owned().await.ok();
- if ct.load(std::sync::atomic::Ordering::Relaxed) {
- return (Vec::new(), serde_json::json!({}), false);
- }
- match tokio::time::timeout(
- std::time::Duration::from_secs(15),
- c.fetch_resource_page(&id, 0, 0, res, page),
- )
- .await
- {
- Ok(Ok((items, pager))) => (items, pager, true),
- _ => (Vec::new(), serde_json::json!({}), false),
- }
- }));
- }
-
- let mut page_empty = true;
- let mut has_more = false;
- for handle in page_handles {
- if let Ok((items, pager, ok)) = handle.await {
- if !ok {
- any_fetch_failed = true;
- }
- if !items.is_empty() {
- page_empty = false;
- }
- if pager
- .get("hasMore")
- .and_then(|v| v.as_bool())
- .unwrap_or(false)
- {
- has_more = true;
- }
- for item in items {
- let release =
- crate::providers::moviebox::adapt::moviebox_resource_item_to_release(
- &item,
- );
- if release.season == Some(season)
- && release.episode == Some(episode)
- {
- found_target = true;
- }
- all_items.push(release);
- }
- }
- }
-
- if found_target || page_empty || !has_more {
- break 'outer;
- }
- page += 1;
- if page > 60 {
- break;
- }
+ Err(err) => {
+ sender
+ .send(Action::EpisodeStreamsFailed(
+ context,
+ request_id,
+ id_clone,
+ season,
+ episode,
+ err.to_string(),
+ ))
+ .ok();
}
}
-
- let target_ok = if is_movie {
- !all_items.is_empty()
- } else {
- found_target
- };
-
- if !target_ok || all_items.is_empty() {
- let provider_name = context.provider.label();
- let err_msg = if any_fetch_failed && all_items.is_empty() {
- format!("Network connection failed to {provider_name}")
- } else if any_fetch_failed {
- format!("Rate limited by {provider_name}")
- } else if all_items.is_empty() {
- format!("No stream sources available on {provider_name}")
- } else {
- format!("Episode S{season}E{episode} is not listed on {provider_name}")
- };
- sender
- .send(Action::EpisodeStreamsFailed(
- context, request_id, id_clone, season, episode, err_msg,
- ))
- .ok();
- } else {
- sender
- .send(Action::EpisodeStreamsReady(
- context, request_id, id_clone, season, episode, all_items,
- ))
- .ok();
- }
}));
}