mirror of
https://github.com/narrrl/proton-stream.git
synced 2026-11-03 16:41:26 +01:00
feat(core,meta,app,android,ios,cli): TVmaze for the shows AniList does not have
With AniList chosen, a title AniList has no match for is now searched on TVmaze, keyless, before it is given up on. One provider for the whole library left live-action shows in a share of anime unmatched, and switching to TMDB would have dropped every AniList match, chain and shelf. The service holds a chain of providers. A match is stored under the provider that gave it, and enrichment and refreshes go to that provider; a miss is stored under the last provider asked, and is_fresh only trusts a miss from the end of the chain, so AniList misses stored before this are asked again at once. A provider failure still ends the lookup instead of falling through. The hand matcher searches every provider in the chain and labels each result with its source. TVmaze is never offered in the settings and is not asked about titles known to be films.
This commit is contained in:
1 parent
bb5a6638c4
commit
3ca431feca
18 files changed
+892
-195
No files matched your search
@@ -304,6 +304,9 @@ pub enum TitleType {
|
||||
pub enum MetadataProvider {
|
||||
AniList,
|
||||
Tmdb,
|
||||
/// Never chosen in the settings: what AniList hands a show it does not
|
||||
/// have. Seen on a [`MatchRecord`] from a hand search.
|
||||
TvMaze,
|
||||
}
|
||||
|
||||
/// A palette family. The shared `pstr_core::appearance::Flavor`.
|
||||
@@ -1746,7 +1749,7 @@ impl AndroidEngine {
|
||||
spawned(&runtime, async move {
|
||||
let service = self.metadata_service()?;
|
||||
let metadata = title_metadata(found);
|
||||
if metadata.provider != service.provider() {
|
||||
if !service.chain().contains(&metadata.provider) {
|
||||
return Err(BridgeError::Failure {
|
||||
reason: "match came from a different metadata provider".to_owned(),
|
||||
});
|
||||
@@ -1762,7 +1765,7 @@ impl AndroidEngine {
|
||||
if let Some(enrichment) = &outcome.enrichment {
|
||||
let stored = self.catalog.lock().set_enrichment(
|
||||
&title_key,
|
||||
service.provider(),
|
||||
outcome.provider,
|
||||
now(),
|
||||
enrichment,
|
||||
);
|
||||
@@ -2363,21 +2366,13 @@ impl AndroidEngine {
|
||||
/// behaviour.
|
||||
async fn match_titles_inner(&self, force: bool) -> Result<MatchSummary, BridgeError> {
|
||||
let service = Arc::new(self.metadata_service()?);
|
||||
let provider = service.provider();
|
||||
let (titles, stored) = self.titles_and_metadata()?;
|
||||
let enriched = self
|
||||
.catalog
|
||||
.lock()
|
||||
.enrichment_ages()
|
||||
.map_err(BridgeError::from_display)?;
|
||||
let pending = pstr_meta::service::plan(
|
||||
titles,
|
||||
&stored,
|
||||
&enriched,
|
||||
provider,
|
||||
service.has_details(),
|
||||
force,
|
||||
);
|
||||
let pending = pstr_meta::service::plan(titles, &stored, &enriched, &service.chain(), force);
|
||||
|
||||
let permits = Arc::new(tokio::sync::Semaphore::new(LOOKUP_CONCURRENCY));
|
||||
let mut lookups = tokio::task::JoinSet::new();
|
||||
@@ -2409,7 +2404,7 @@ impl AndroidEngine {
|
||||
summary.episodes += enrichment.episodes.len() as u32;
|
||||
let stored = self.catalog.lock().set_enrichment(
|
||||
&outcome.title_key,
|
||||
provider,
|
||||
outcome.provider,
|
||||
now(),
|
||||
enrichment,
|
||||
);
|
||||
@@ -3685,6 +3680,7 @@ fn metadata_provider(provider: ProviderId) -> MetadataProvider {
|
||||
match provider {
|
||||
ProviderId::AniList => MetadataProvider::AniList,
|
||||
ProviderId::Tmdb => MetadataProvider::Tmdb,
|
||||
ProviderId::TvMaze => MetadataProvider::TvMaze,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3692,6 +3688,7 @@ fn provider_id(provider: MetadataProvider) -> ProviderId {
|
||||
match provider {
|
||||
MetadataProvider::AniList => ProviderId::AniList,
|
||||
MetadataProvider::Tmdb => ProviderId::Tmdb,
|
||||
MetadataProvider::TvMaze => ProviderId::TvMaze,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user