zik/lampac-ukraine
1
0
Fork 0
mirror of https://github.com/lampame/lampac-ukraine.git synced 2026-04-16 09:22:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(nmoonanime): simplify search method by removing original_title parameter

Browse Source 
- Add ResolveMalId helper to resolve effective MAL ID from mal_id or kinopoisk_id
- Remove original_title from Search method signature and cache keys
- Simplify BuildSearchUrl to prioritize query parameters (mal_id > imdb_id > title)
This commit is contained in:
Felix 2026-03-08 08:28:05 +02:00
parent dbb24205d7
commit 4532c621c7
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
NMoonAnime/Controller.cs
View File

@ -35,22 +35,23 @@ namespace NMoonAnime.Controllers
return Forbid();
var invoke = new NMoonAnimeInvoke(init, hybridCache, OnLog, proxyManager);
string effectiveMalId = ResolveMalId(mal_id, kinopoisk_id);
if (checksearch)
{
if (AppInit.conf?.online?.checkOnlineSearch != true)
return OnError("nmoonanime", proxyManager);
var checkResults = await invoke.Search(imdb_id, mal_id, title, original_title, year);
var checkResults = await invoke.Search(imdb_id, effectiveMalId, title, year);
if (checkResults != null && checkResults.Count > 0)
return Content("data-json=", "text/plain; charset=utf-8");
return OnError("nmoonanime", proxyManager);
}
OnLog($"NMoonAnime: назва={title}, оригінальна_назва={original_title}, imdb={imdb_id}, mal_id={mal_id}, серіал={serial}, сезон={s}, озвучка={t}");
OnLog($"NMoonAnime: назва={title}, imdb={imdb_id}, kinopoisk_id(як mal_id)={kinopoisk_id}, mal_id_ефективний={effectiveMalId}, рік={year}, серіал={serial}, сезон={s}, озвучка={t}");
var seasons = await invoke.Search(imdb_id, mal_id, title, original_title, year);
var seasons = await invoke.Search(imdb_id, effectiveMalId, title, year);
if (seasons == null || seasons.Count == 0)
return OnError("nmoonanime", proxyManager);
@ -68,7 +69,7 @@ namespace NMoonAnime.Controllers
if (isSeries)
{
return await RenderSerial(invoke, seasons, imdb_id, kinopoisk_id, title, original_title, year, mal_id, s, t, rjson);
return await RenderSerial(invoke, seasons, imdb_id, kinopoisk_id, title, original_title, year, effectiveMalId, s, t, rjson);
}
return await RenderMovie(invoke, seasons, title, original_title, firstSeasonData, rjson);
@ -297,6 +298,14 @@ namespace NMoonAnime.Controllers
return index;
}
private static string ResolveMalId(string malId, long kinopoiskId)
{
if (!string.IsNullOrWhiteSpace(malId))
return malId.Trim();
return kinopoiskId > 0 ? kinopoiskId.ToString() : null;
}
private string BuildStreamUrl(OnlinesSettings init, string streamLink)
{
string link = StripLampacArgs(streamLink?.Trim());

21
NMoonAnime/NMoonAnimeInvoke.cs
View File

@ -33,9 +33,9 @@ namespace NMoonAnime
_proxyManager = proxyManager;
}
public async Task<List<NMoonAnimeSeasonRef>> Search(string imdbId, string malId, string title, string originalTitle, int year)
public async Task<List<NMoonAnimeSeasonRef>> Search(string imdbId, string malId, string title, int year)
{
string memKey = $"NMoonAnime:search:{imdbId}:{malId}:{title}:{originalTitle}:{year}";
string memKey = $"NMoonAnime:search:{imdbId}:{malId}:{title}:{year}";
if (_hybridCache.TryGetValue(memKey, out List<NMoonAnimeSeasonRef> cached))
return cached;
@ -49,7 +49,7 @@ namespace NMoonAnime
foreach (var endpoint in endpoints)
{
string searchUrl = BuildSearchUrl(endpoint, imdbId, malId, title, originalTitle, year);
string searchUrl = BuildSearchUrl(endpoint, imdbId, malId, title, year);
if (string.IsNullOrWhiteSpace(searchUrl))
continue;
@ -198,21 +198,18 @@ namespace NMoonAnime
.ToList();
}
private string BuildSearchUrl(string endpoint, string imdbId, string malId, string title, string originalTitle, int year)
private string BuildSearchUrl(string endpoint, string imdbId, string malId, string title, int year)
{
var query = HttpUtility.ParseQueryString(string.Empty);
if (!string.IsNullOrWhiteSpace(imdbId))
query["imdb_id"] = imdbId;
if (!string.IsNullOrWhiteSpace(malId))
query["mal_id"] = malId;
if (!string.IsNullOrWhiteSpace(title))
else if (!string.IsNullOrWhiteSpace(imdbId))
query["imdb_id"] = imdbId;
else if (!string.IsNullOrWhiteSpace(title))
query["title"] = title;
if (!string.IsNullOrWhiteSpace(originalTitle))
query["original_title"] = originalTitle;
else
return null;
if (year > 0)
query["year"] = year.ToString();