mirror of
https://github.com/lampame/lampac-ukraine.git
synced 2026-04-16 17:32:20 +00:00
refactor(makhno): rename season template variable and update html content generation
This commit is contained in:
parent
bc4016b7c3
commit
f62ed52434
@ -280,7 +280,7 @@ namespace Makhno
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Build season template for selected voice (if valid) to keep season list in sync when switching voices.
|
// Build season template for selected voice (if valid) to keep season list in sync when switching voices.
|
||||||
var season_tpl = new SeasonTpl();
|
var seasonTplForVoice = new SeasonTpl();
|
||||||
List<int> seasonNumbersForTpl = seasonNumbers;
|
List<int> seasonNumbersForTpl = seasonNumbers;
|
||||||
if (seasonVoiceIndexForTpl.HasValue)
|
if (seasonVoiceIndexForTpl.HasValue)
|
||||||
{
|
{
|
||||||
@ -314,7 +314,7 @@ namespace Makhno
|
|||||||
string voiceParam = seasonVoiceIndexForTpl.HasValue ? $"&t={seasonVoiceIndexForTpl.Value}" : string.Empty;
|
string voiceParam = seasonVoiceIndexForTpl.HasValue ? $"&t={seasonVoiceIndexForTpl.Value}" : string.Empty;
|
||||||
string seasonName = seasonItem.HasValue ? seasonItem.Value.Season?.Title ?? $"Сезон {seasonNumber}" : $"Сезон {seasonNumber}";
|
string seasonName = seasonItem.HasValue ? seasonItem.Value.Season?.Title ?? $"Сезон {seasonNumber}" : $"Сезон {seasonNumber}";
|
||||||
string link = $"{host}/makhno?imdb_id={imdb_id}&title={HttpUtility.UrlEncode(title)}&original_title={HttpUtility.UrlEncode(original_title)}&year={year}&serial=1&season={seasonNumber}{voiceParam}";
|
string link = $"{host}/makhno?imdb_id={imdb_id}&title={HttpUtility.UrlEncode(title)}&original_title={HttpUtility.UrlEncode(original_title)}&year={year}&serial=1&season={seasonNumber}{voiceParam}";
|
||||||
season_tpl.Append(seasonName, link, seasonNumber.ToString());
|
seasonTplForVoice.Append(seasonName, link, seasonNumber.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = 0; i < playerData.Voices.Count; i++)
|
for (int i = 0; i < playerData.Voices.Count; i++)
|
||||||
@ -374,12 +374,11 @@ namespace Makhno
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
episode_tpl.Append(season_tpl);
|
|
||||||
episode_tpl.Append(voice_tpl);
|
episode_tpl.Append(voice_tpl);
|
||||||
if (rjson)
|
if (rjson)
|
||||||
return Content(episode_tpl.ToJson(), "application/json; charset=utf-8");
|
return Content(episode_tpl.ToJson(), "application/json; charset=utf-8");
|
||||||
|
|
||||||
return Content(episode_tpl.ToHtml(), "text/html; charset=utf-8");
|
return Content(seasonTplForVoice.ToHtml() + episode_tpl.ToHtml(), "text/html; charset=utf-8");
|
||||||
}
|
}
|
||||||
|
|
||||||
private int ExtractEpisodeNumber(string title)
|
private int ExtractEpisodeNumber(string title)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user