Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
86d8e2a05b | ||
|
|
c013416473 | ||
|
|
e43e3f7245 | ||
|
|
4145e1f1dd | ||
|
|
6002ce7b46 |
@@ -3,8 +3,8 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net9.0</TargetFramework>
|
||||||
<RootNamespace>Jellyfin.Plugin.CinemaTrailers4Jellyfins</RootNamespace>
|
<RootNamespace>Jellyfin.Plugin.CinemaTrailers4Jellyfins</RootNamespace>
|
||||||
<AssemblyVersion>1.0.0.12</AssemblyVersion>
|
<AssemblyVersion>1.0.0.14</AssemblyVersion>
|
||||||
<FileVersion>1.0.0.12</FileVersion>
|
<FileVersion>1.0.0.14</FileVersion>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<GenerateDocumentationFile>false</GenerateDocumentationFile>
|
<GenerateDocumentationFile>false</GenerateDocumentationFile>
|
||||||
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
|
||||||
|
|||||||
@@ -63,8 +63,10 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(ytDlpPath) && File.Exists(ytDlpPath))
|
if (!string.IsNullOrWhiteSpace(ytDlpPath) && File.Exists(ytDlpPath))
|
||||||
{
|
{
|
||||||
return await DownloadWithYtDlpAsync(youtubeKey, outputPath, preferredHeight, ytDlpPath, ct)
|
if (await DownloadWithYtDlpAsync(youtubeKey, outputPath, preferredHeight, ytDlpPath, ct).ConfigureAwait(false))
|
||||||
.ConfigureAwait(false);
|
return true;
|
||||||
|
|
||||||
|
_logger.LogWarning("|CinemaTrailers4Jellyfins| yt-dlp failed for {Key}; falling back to the built-in downloader.", youtubeKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
return await DownloadWithYoutubeExplodeAsync(youtubeKey, outputPath, preferredHeight, ct)
|
return await DownloadWithYoutubeExplodeAsync(youtubeKey, outputPath, preferredHeight, ct)
|
||||||
@@ -224,13 +226,16 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Format selects the best video at or below preferredHeight merged with the best audio.
|
// Format selects the best video at or below preferredHeight merged with the best audio,
|
||||||
// --merge-output-format mp4 ensures the output is always an mp4.
|
// preferring H.264 + AAC (plays or hardware-transcodes on every client; VP9/AV1 often
|
||||||
|
// need a CPU transcode). --merge-output-format mp4 ensures the output is always an mp4.
|
||||||
var args = string.Join(" ",
|
var args = string.Join(" ",
|
||||||
$"-f \"bestvideo[height<={preferredHeight}]+bestaudio/best[height<={preferredHeight}]\"",
|
$"-f \"bestvideo[height<={preferredHeight}][vcodec^=avc1]+bestaudio[ext=m4a]/bestvideo[height<={preferredHeight}]+bestaudio/best[height<={preferredHeight}]\"",
|
||||||
"--merge-output-format mp4",
|
"--merge-output-format mp4",
|
||||||
"--no-playlist",
|
"--no-playlist",
|
||||||
"--no-warnings",
|
"--no-warnings",
|
||||||
|
"--no-progress",
|
||||||
|
$"--ffmpeg-location \"{FfmpegLocator.Path}\"",
|
||||||
$"-o \"{outputPath}\"",
|
$"-o \"{outputPath}\"",
|
||||||
$"\"https://www.youtube.com/watch?v={key}\"");
|
$"\"https://www.youtube.com/watch?v={key}\"");
|
||||||
|
|
||||||
@@ -252,11 +257,15 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
};
|
};
|
||||||
|
|
||||||
process.Start();
|
process.Start();
|
||||||
|
// Drain both pipes while yt-dlp runs so a full buffer can never block it.
|
||||||
|
var stdoutTask = process.StandardOutput.ReadToEndAsync(ct);
|
||||||
|
var stderrTask = process.StandardError.ReadToEndAsync(ct);
|
||||||
await process.WaitForExitAsync(ct).ConfigureAwait(false);
|
await process.WaitForExitAsync(ct).ConfigureAwait(false);
|
||||||
|
await stdoutTask.ConfigureAwait(false);
|
||||||
|
var stderr = await stderrTask.ConfigureAwait(false);
|
||||||
|
|
||||||
if (process.ExitCode != 0)
|
if (process.ExitCode != 0)
|
||||||
{
|
{
|
||||||
var stderr = await process.StandardError.ReadToEndAsync(ct).ConfigureAwait(false);
|
|
||||||
_logger.LogError("|CinemaTrailers4Jellyfins| yt-dlp exited with code {Code} for {Key}: {Error}",
|
_logger.LogError("|CinemaTrailers4Jellyfins| yt-dlp exited with code {Code} for {Key}: {Error}",
|
||||||
process.ExitCode, key, stderr);
|
process.ExitCode, key, stderr);
|
||||||
return false;
|
return false;
|
||||||
@@ -273,6 +282,32 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
_logger.LogError(ex, "|CinemaTrailers4Jellyfins| yt-dlp download failed for {Key}", key);
|
_logger.LogError(ex, "|CinemaTrailers4Jellyfins| yt-dlp download failed for {Key}", key);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
DeleteYtDlpLeftovers(outputPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// yt-dlp names its separate/partial downloads "<output name>.f137.mp4.part", ".f140.m4a",
|
||||||
|
// ".ytdl", ... It removes them after a successful merge, but not when it fails. Everything
|
||||||
|
// sharing the output's "<name>." prefix (other than the output itself) is one of those.
|
||||||
|
private void DeleteYtDlpLeftovers(string outputPath)
|
||||||
|
{
|
||||||
|
var folder = Path.GetDirectoryName(outputPath);
|
||||||
|
if (folder == null || !Directory.Exists(folder))
|
||||||
|
return;
|
||||||
|
|
||||||
|
var outputName = Path.GetFileName(outputPath);
|
||||||
|
var prefix = Path.GetFileNameWithoutExtension(outputPath) + ".";
|
||||||
|
foreach (var file in Directory.EnumerateFiles(folder))
|
||||||
|
{
|
||||||
|
var name = Path.GetFileName(file);
|
||||||
|
if (name.StartsWith(prefix, StringComparison.Ordinal)
|
||||||
|
&& !string.Equals(name, outputName, StringComparison.Ordinal))
|
||||||
|
{
|
||||||
|
TryDeleteFile(file);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
11
build.yaml
11
build.yaml
@@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
version: 1.0.0.12
|
version: 1.0.0.14
|
||||||
name: CinemaTrailers4Jellyfins
|
name: CinemaTrailers4Jellyfins
|
||||||
guid: b581493e-1046-40ed-b6dc-cb8027624984
|
guid: b581493e-1046-40ed-b6dc-cb8027624984
|
||||||
description: >
|
description: >
|
||||||
@@ -12,12 +12,9 @@ category: General
|
|||||||
owner: 514mart
|
owner: 514mart
|
||||||
targetAbi: 10.11.0.0
|
targetAbi: 10.11.0.0
|
||||||
changelog:
|
changelog:
|
||||||
- Anime trailers now only play before anime. Western animation (Pixar,
|
- When yt-dlp fails part-way, its partial download files (.part, .ytdl,
|
||||||
Disney, ...) is no longer blocked and follows the normal genre filter
|
separate video/audio) are now deleted instead of being left in the
|
||||||
again. A trailer counts as anime when TMDB tags it "anime" or "based on
|
trailer folder
|
||||||
manga", or it is animation in Japanese, Chinese or Korean; it is marked
|
|
||||||
with a ct4j-anime tag in its NFO at download time. Your anime is
|
|
||||||
recognised by the "Anime" genre or the same TMDB keywords
|
|
||||||
|
|
||||||
dotnetProjects:
|
dotnetProjects:
|
||||||
- name: Jellyfin.Plugin.CinemaTrailers4Jellyfins
|
- name: Jellyfin.Plugin.CinemaTrailers4Jellyfins
|
||||||
|
|||||||
@@ -8,6 +8,22 @@
|
|||||||
"owner": "514mart",
|
"owner": "514mart",
|
||||||
"imageUrl": "https://www.git.quarantinedstudio.com/mvezina/CinemaTrailers4Jellyfins/raw/branch/main/Jellyfin.Plugin.CinemaTrailers4Jellyfins/Images/logo.svg",
|
"imageUrl": "https://www.git.quarantinedstudio.com/mvezina/CinemaTrailers4Jellyfins/raw/branch/main/Jellyfin.Plugin.CinemaTrailers4Jellyfins/Images/logo.svg",
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"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",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://www.git.quarantinedstudio.com/mvezina/CinemaTrailers4Jellyfins/releases/download/v1.0.0.13/cinematrailers4jellyfins_1.0.0.13.zip",
|
||||||
|
"timestamp": "2026-10-05T22:11:03Z",
|
||||||
|
"version": "1.0.0.13"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"checksum": "d7a565b0e4d47effb9db40fb44847920",
|
||||||
|
"changelog": "- Anime trailers now only play before anime. Western animation (Pixar, Disney, ...) is no longer blocked and follows the normal genre filter again. A trailer counts as anime when TMDB tags it \"anime\" or \"based on manga\", or it is animation in Japanese, Chinese or Korean; it is marked with a ct4j-anime tag in its NFO at download time. Your anime is recognised by the \"Anime\" genre or the same TMDB keywords\n",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://www.git.quarantinedstudio.com/mvezina/CinemaTrailers4Jellyfins/releases/download/v1.0.0.12/cinematrailers4jellyfins_1.0.0.12.zip",
|
||||||
|
"timestamp": "2026-10-05T21:57:24Z",
|
||||||
|
"version": "1.0.0.12"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"checksum": "ccb45ef4bda23b245e47f6226e3c06fc",
|
"checksum": "ccb45ef4bda23b245e47f6226e3c06fc",
|
||||||
"changelog": "- Animated trailers (anime included) now only play before animated content. Before, an anime trailer could play before a live-action movie or show when they shared a genre like Drama or Action, or when no trailer matched the genre filter. A live-action feature now gets no trailer rather than an animated one\n",
|
"changelog": "- Animated trailers (anime included) now only play before animated content. Before, an anime trailer could play before a live-action movie or show when they shared a genre like Drama or Action, or when no trailer matched the genre filter. A live-action feature now gets no trailer rather than an animated one\n",
|
||||||
|
|||||||
Reference in New Issue
Block a user