nas/jellyfin-plugin-metashark
1
0
Fork 0
mirror of https://github.com/metatube-community/jellyfin-plugin-metatube.git synced 2026-05-12 19:06:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert(Api): revert lang option

Browse Source 
This reverts commit 423859a29e.
This commit is contained in:
xjasonlyu
2023-12-29 16:56:12 -05:00
parent 5866f4873f
commit b8a68d8111
2 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Jellyfin.Plugin.MetaTube/ApiClient.cs
View File

@@ -56,13 +56,12 @@ public static class ApiClient
});
}
private static string ComposeSearchApiUrl(string path, string q, string provider, string lang, bool fallback)
private static string ComposeSearchApiUrl(string path, string q, string provider, bool fallback)
{
return ComposeUrl(path, new NameValueCollection
{
{ "q", q },
{ "provider", provider },
{ "lang", lang },
{ "fallback", fallback.ToString() }
});
}
@@ -179,7 +178,7 @@ public static class ApiClient
public static async Task<List<ActorSearchResult>> SearchActorAsync(string q, string provider,
bool fallback, CancellationToken cancellationToken)
{
var apiUrl = ComposeSearchApiUrl(ActorSearchApi, q, provider, string.Empty, fallback);
var apiUrl = ComposeSearchApiUrl(ActorSearchApi, q, provider, fallback);
return await GetDataAsync<List<ActorSearchResult>>(apiUrl, true, cancellationToken);
}
@@ -192,19 +191,13 @@ public static class ApiClient
public static async Task<List<MovieSearchResult>> SearchMovieAsync(string q, string provider,
CancellationToken cancellationToken)
{
return await SearchMovieAsync(q, provider, string.Empty, true /* default */, cancellationToken);
return await SearchMovieAsync(q, provider, true /* default */, cancellationToken);
}
public static async Task<List<MovieSearchResult>> SearchMovieAsync(string q, string provider, string lang,
CancellationToken cancellationToken)
{
return await SearchMovieAsync(q, provider, lang, true /* default */, cancellationToken);
}
public static async Task<List<MovieSearchResult>> SearchMovieAsync(string q, string provider, string lang,
public static async Task<List<MovieSearchResult>> SearchMovieAsync(string q, string provider,
bool fallback, CancellationToken cancellationToken)
{
var apiUrl = ComposeSearchApiUrl(MovieSearchApi, q, provider, lang, fallback);
var apiUrl = ComposeSearchApiUrl(MovieSearchApi, q, provider, fallback);
return await GetDataAsync<List<MovieSearchResult>>(apiUrl, true, cancellationToken);
}

11
Jellyfin.Plugin.MetaTube/Providers/MovieProvider.cs
View File

@@ -69,7 +69,7 @@ public class MovieProvider : BaseProvider, IRemoteMetadataProvider<Movie, MovieI
m.Genres = Configuration.GetGenreSubstitutionTable().Substitute(m.Genres).ToArray();
// Translate movie info.
if (Configuration.TranslationMode != TranslationMode.Disabled && info.MetadataCountryCode != "CN")
if (Configuration.TranslationMode != TranslationMode.Disabled)
await TranslateMovieInfo(m, info.MetadataLanguage, cancellationToken);
// Distinct and clean blank list
@@ -177,19 +177,12 @@ public class MovieProvider : BaseProvider, IRemoteMetadataProvider<Movie, MovieI
{
var pid = info.GetPid(Name);
var lang = info.MetadataCountryCode switch
{
"CN" => "zh",
"JP" => "ja",
_ => string.Empty
};
var searchResults = new List<MovieSearchResult>();
if (string.IsNullOrWhiteSpace(pid.Id) || string.IsNullOrWhiteSpace(pid.Provider))
{
// Search movie by name.
Logger.Info("Search for movie: {0}", info.Name);
searchResults.AddRange(await ApiClient.SearchMovieAsync(info.Name, pid.Provider, lang, cancellationToken));
searchResults.AddRange(await ApiClient.SearchMovieAsync(info.Name, pid.Provider, cancellationToken));
}
else
{