Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb75fa5a07 | ||
|
|
2664ab4d5a |
@@ -45,7 +45,9 @@
|
||||
<fieldset class="verticalSection verticalSection-extrabottompadding">
|
||||
<legend><h3 class="sectionTitle">Trailer Languages</h3></legend>
|
||||
<p class="fieldDescription">
|
||||
Only download trailers in the selected languages.
|
||||
Only download trailers in the selected languages. Both the trailer and the
|
||||
movie/show itself (its original language) must be in one of them, so a
|
||||
subtitled foreign trailer is skipped.
|
||||
Leave everything unchecked to allow all languages.
|
||||
</p>
|
||||
<div style="display:grid;grid-template-columns:1fr 1fr;gap:0 2em;">
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<RootNamespace>Jellyfin.Plugin.CinemaTrailers4Jellyfins</RootNamespace>
|
||||
<AssemblyVersion>1.0.0.14</AssemblyVersion>
|
||||
<FileVersion>1.0.0.14</FileVersion>
|
||||
<AssemblyVersion>1.0.0.15</AssemblyVersion>
|
||||
<FileVersion>1.0.0.15</FileVersion>
|
||||
<Nullable>enable</Nullable>
|
||||
<GenerateDocumentationFile>false</GenerateDocumentationFile>
|
||||
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
|
||||
|
||||
@@ -177,6 +177,14 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.ScheduledTasks
|
||||
continue;
|
||||
}
|
||||
|
||||
// A trailer's own language tag is often "en" just because it has English
|
||||
// subtitles, so also require the title itself to be in an allowed language.
|
||||
if (allowedLanguages != null && !allowedLanguages.Contains(movie.OriginalLanguage))
|
||||
{
|
||||
_logger.LogDebug("|CinemaTrailers4Jellyfins| Skipping '{Title}': original language '{Lang}' is not allowed", movie.Title, movie.OriginalLanguage);
|
||||
continue;
|
||||
}
|
||||
|
||||
var trailers = await _tmdbService.GetTrailersAsync(
|
||||
"movie", movie.Id.ToString(), config.TmdbApiKey, allowedLanguages, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
@@ -284,6 +292,14 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.ScheduledTasks
|
||||
continue;
|
||||
}
|
||||
|
||||
// A trailer's own language tag is often "en" just because it has English
|
||||
// subtitles, so also require the title itself to be in an allowed language.
|
||||
if (allowedLanguages != null && !allowedLanguages.Contains(show.OriginalLanguage))
|
||||
{
|
||||
_logger.LogDebug("|CinemaTrailers4Jellyfins| Skipping '{Title}': original language '{Lang}' is not allowed", show.Title, show.OriginalLanguage);
|
||||
continue;
|
||||
}
|
||||
|
||||
var trailers = await _tmdbService.GetTrailersAsync(
|
||||
"tv", show.Id.ToString(), config.TmdbApiKey, allowedLanguages, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
||||
{
|
||||
public record TmdbVideo(string Key, string Name, string Language, bool Official, int Size);
|
||||
|
||||
public record TmdbMediaResult(int Id, string Title, string ReleaseDate)
|
||||
public record TmdbMediaResult(int Id, string Title, string ReleaseDate, string OriginalLanguage)
|
||||
{
|
||||
public int? Year => DateTime.TryParse(ReleaseDate, out var d) ? d.Year : (int?)null;
|
||||
}
|
||||
@@ -170,6 +170,7 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
||||
var releaseDate = entry.TryGetProperty(dateField, out var rd) ? rd.GetString() ?? string.Empty : string.Empty;
|
||||
var title = entry.TryGetProperty(titleField, out var t) ? t.GetString() ?? string.Empty : string.Empty;
|
||||
var id = entry.GetProperty("id").GetInt32();
|
||||
var originalLanguage = entry.TryGetProperty("original_language", out var ol) ? ol.GetString() ?? string.Empty : string.Empty;
|
||||
|
||||
if (releasedAfter.HasValue && DateTime.TryParse(releaseDate, out var parsed))
|
||||
{
|
||||
@@ -177,7 +178,7 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
||||
}
|
||||
|
||||
anyInRange = true;
|
||||
results.Add(new TmdbMediaResult(id, title, releaseDate));
|
||||
results.Add(new TmdbMediaResult(id, title, releaseDate, originalLanguage));
|
||||
}
|
||||
|
||||
if (page >= totalPages || (releasedAfter.HasValue && !anyInRange))
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
version: 1.0.0.14
|
||||
version: 1.0.0.15
|
||||
name: CinemaTrailers4Jellyfins
|
||||
guid: b581493e-1046-40ed-b6dc-cb8027624984
|
||||
description: >
|
||||
@@ -12,9 +12,10 @@ category: General
|
||||
owner: 514mart
|
||||
targetAbi: 10.11.0.0
|
||||
changelog:
|
||||
- When yt-dlp fails part-way, its partial download files (.part, .ytdl,
|
||||
separate video/audio) are now deleted instead of being left in the
|
||||
trailer folder
|
||||
- Trailer Languages now also checks the original language of the movie or
|
||||
show. Before, only the trailer's own language tag was checked, and
|
||||
TMDB often tags subtitled foreign trailers as English, so Korean,
|
||||
Chinese or Japanese trailers got through
|
||||
|
||||
dotnetProjects:
|
||||
- name: Jellyfin.Plugin.CinemaTrailers4Jellyfins
|
||||
|
||||
@@ -8,6 +8,14 @@
|
||||
"owner": "514mart",
|
||||
"imageUrl": "https://www.git.quarantinedstudio.com/mvezina/CinemaTrailers4Jellyfins/raw/branch/main/Jellyfin.Plugin.CinemaTrailers4Jellyfins/Images/logo.svg",
|
||||
"versions": [
|
||||
{
|
||||
"checksum": "10ecbc35b84e98bade61576bbfc41864",
|
||||
"changelog": "- When yt-dlp fails part-way, its partial download files (.part, .ytdl, separate video/audio) are now deleted instead of being left in the trailer folder\n",
|
||||
"targetAbi": "10.11.0.0",
|
||||
"sourceUrl": "https://www.git.quarantinedstudio.com/mvezina/CinemaTrailers4Jellyfins/releases/download/v1.0.0.14/cinematrailers4jellyfins_1.0.0.14.zip",
|
||||
"timestamp": "2026-10-05T22:19:38Z",
|
||||
"version": "1.0.0.14"
|
||||
},
|
||||
{
|
||||
"checksum": "f1fe201e7b0238fa432ae7fb5dbb1844",
|
||||
"changelog": "- yt-dlp now prefers H.264 + AAC (plays or hardware-transcodes on every client; VP9/AV1 often needed a CPU transcode) and uses Jellyfin's own ffmpeg for the merge\n- If yt-dlp fails, the built-in downloader is tried instead\n- Fix a possible hang. yt-dlp's output is now read while it runs, so a full output buffer can no longer block it\n",
|
||||
|
||||
Reference in New Issue
Block a user