Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5176582391 | ||
|
|
e518b79c36 | ||
|
|
6bb23dc9c4 | ||
|
|
5f7a76feb5 | ||
|
|
adfa570569 | ||
|
|
99798b5174 | ||
|
|
c76ddbc352 | ||
|
|
e9d9543941 |
@@ -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.6</AssemblyVersion>
|
<AssemblyVersion>1.0.0.10</AssemblyVersion>
|
||||||
<FileVersion>1.0.0.6</FileVersion>
|
<FileVersion>1.0.0.10</FileVersion>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<GenerateDocumentationFile>false</GenerateDocumentationFile>
|
<GenerateDocumentationFile>false</GenerateDocumentationFile>
|
||||||
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Jellyfin.Controller" Version="10.11.0" />
|
<PackageReference Include="Jellyfin.Controller" Version="10.11.0" />
|
||||||
<PackageReference Include="Jellyfin.Model" Version="10.11.0" />
|
<PackageReference Include="Jellyfin.Model" Version="10.11.0" />
|
||||||
<PackageReference Include="YoutubeExplode" Version="6.*" />
|
<PackageReference Include="YoutubeExplode" Version="6.6.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -171,7 +171,7 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.ScheduledTasks
|
|||||||
|
|
||||||
var paths = BuildMediaPaths(movie.Title, movie.Year, config);
|
var paths = BuildMediaPaths(movie.Title, movie.Year, config);
|
||||||
|
|
||||||
if (config.SkipAlreadyDownloaded && Directory.Exists(paths.MediaFolder))
|
if (config.SkipAlreadyDownloaded && File.Exists(paths.TrailerPath))
|
||||||
{
|
{
|
||||||
_logger.LogDebug("|CinemaTrailers4Jellyfins| Already downloaded: {Path}", paths.MediaFolder);
|
_logger.LogDebug("|CinemaTrailers4Jellyfins| Already downloaded: {Path}", paths.MediaFolder);
|
||||||
continue;
|
continue;
|
||||||
@@ -197,7 +197,12 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.ScheduledTasks
|
|||||||
cancellationToken).ConfigureAwait(false);
|
cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
if (!success)
|
if (!success)
|
||||||
|
{
|
||||||
|
// Don't leave an empty folder behind: it would count toward MaxTotalTrailers
|
||||||
|
// (pushing out real trailers) and would never be retried.
|
||||||
|
TryDeleteFolder(paths.MediaFolder);
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
var fakeMovieReady = await _fakeMovieService.CopyFakeMovieAsync(paths.FakeMoviePath, cancellationToken).ConfigureAwait(false);
|
var fakeMovieReady = await _fakeMovieService.CopyFakeMovieAsync(paths.FakeMoviePath, cancellationToken).ConfigureAwait(false);
|
||||||
if (!fakeMovieReady)
|
if (!fakeMovieReady)
|
||||||
@@ -272,7 +277,7 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.ScheduledTasks
|
|||||||
|
|
||||||
var paths = BuildMediaPaths(show.Title, show.Year, config);
|
var paths = BuildMediaPaths(show.Title, show.Year, config);
|
||||||
|
|
||||||
if (config.SkipAlreadyDownloaded && Directory.Exists(paths.MediaFolder))
|
if (config.SkipAlreadyDownloaded && File.Exists(paths.TrailerPath))
|
||||||
{
|
{
|
||||||
_logger.LogDebug("|CinemaTrailers4Jellyfins| Already downloaded: {Path}", paths.MediaFolder);
|
_logger.LogDebug("|CinemaTrailers4Jellyfins| Already downloaded: {Path}", paths.MediaFolder);
|
||||||
continue;
|
continue;
|
||||||
@@ -298,7 +303,12 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.ScheduledTasks
|
|||||||
cancellationToken).ConfigureAwait(false);
|
cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
if (!success)
|
if (!success)
|
||||||
|
{
|
||||||
|
// Don't leave an empty folder behind: it would count toward MaxTotalTrailers
|
||||||
|
// (pushing out real trailers) and would never be retried.
|
||||||
|
TryDeleteFolder(paths.MediaFolder);
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
var fakeMovieReady = await _fakeMovieService.CopyFakeMovieAsync(paths.FakeMoviePath, cancellationToken).ConfigureAwait(false);
|
var fakeMovieReady = await _fakeMovieService.CopyFakeMovieAsync(paths.FakeMoviePath, cancellationToken).ConfigureAwait(false);
|
||||||
if (!fakeMovieReady)
|
if (!fakeMovieReady)
|
||||||
|
|||||||
@@ -109,16 +109,11 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
"-f mp4",
|
"-f mp4",
|
||||||
$"\"{tempPath}\"");
|
$"\"{tempPath}\"");
|
||||||
|
|
||||||
// Prefer Jellyfin's bundled ffmpeg; fall back to whatever is on PATH.
|
|
||||||
var ffmpegPath = File.Exists("/usr/lib/jellyfin-ffmpeg/ffmpeg")
|
|
||||||
? "/usr/lib/jellyfin-ffmpeg/ffmpeg"
|
|
||||||
: "ffmpeg";
|
|
||||||
|
|
||||||
using var process = new Process
|
using var process = new Process
|
||||||
{
|
{
|
||||||
StartInfo = new ProcessStartInfo
|
StartInfo = new ProcessStartInfo
|
||||||
{
|
{
|
||||||
FileName = ffmpegPath,
|
FileName = FfmpegLocator.Path,
|
||||||
Arguments = args,
|
Arguments = args,
|
||||||
RedirectStandardOutput = true,
|
RedirectStandardOutput = true,
|
||||||
RedirectStandardError = true,
|
RedirectStandardError = true,
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
using System.IO;
|
||||||
|
|
||||||
|
namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
||||||
|
{
|
||||||
|
internal static class FfmpegLocator
|
||||||
|
{
|
||||||
|
private const string JellyfinFfmpeg = "/usr/lib/jellyfin-ffmpeg/ffmpeg";
|
||||||
|
|
||||||
|
// Prefer Jellyfin's bundled ffmpeg; fall back to whatever is on PATH.
|
||||||
|
public static string Path => File.Exists(JellyfinFfmpeg) ? JellyfinFfmpeg : "ffmpeg";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -77,6 +77,10 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
int preferredHeight,
|
int preferredHeight,
|
||||||
CancellationToken ct)
|
CancellationToken ct)
|
||||||
{
|
{
|
||||||
|
// Separate video/audio downloads land next to the output and are always removed,
|
||||||
|
// whether the merge succeeds or not.
|
||||||
|
var videoTemp = outputPath + ".video.tmp";
|
||||||
|
var audioTemp = outputPath + ".audio.tmp";
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var youtube = new YoutubeClient(_httpClient);
|
var youtube = new YoutubeClient(_httpClient);
|
||||||
@@ -84,30 +88,42 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
.GetManifestAsync($"https://www.youtube.com/watch?v={key}", ct)
|
.GetManifestAsync($"https://www.youtube.com/watch?v={key}", ct)
|
||||||
.ConfigureAwait(false);
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
// Muxed streams include audio+video in one file. Quality is capped at 720p by YouTube.
|
// Muxed streams include audio+video in one file. YouTube rarely serves them
|
||||||
|
// anymore, but use one when it exists since it needs no merge.
|
||||||
var muxedStreams = manifest.GetMuxedStreams().ToList();
|
var muxedStreams = manifest.GetMuxedStreams().ToList();
|
||||||
if (muxedStreams.Count == 0)
|
if (muxedStreams.Count > 0)
|
||||||
{
|
{
|
||||||
_logger.LogWarning("|CinemaTrailers4Jellyfins| No muxed streams available for {Key}. Consider configuring yt-dlp for 1080p support.", key);
|
var muxed = PickByHeight(muxedStreams, preferredHeight);
|
||||||
|
_logger.LogInformation(
|
||||||
|
"|CinemaTrailers4Jellyfins| Downloading {Key} at {Quality} (muxed) to {Path}",
|
||||||
|
key, muxed.VideoQuality.Label, outputPath);
|
||||||
|
await youtube.Videos.Streams.DownloadAsync(muxed, outputPath, cancellationToken: ct).ConfigureAwait(false);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Otherwise download the best video-only and audio-only streams and merge them.
|
||||||
|
// MP4 (H.264/AAC) is preferred for client compatibility; any container is the fallback.
|
||||||
|
var videoStreams = manifest.GetVideoOnlyStreams().ToList();
|
||||||
|
var audioStreams = manifest.GetAudioOnlyStreams().ToList();
|
||||||
|
if (videoStreams.Count == 0 || audioStreams.Count == 0)
|
||||||
|
{
|
||||||
|
_logger.LogWarning("|CinemaTrailers4Jellyfins| No usable video/audio streams for {Key}.", key);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prefer the highest quality at or below the configured height limit.
|
var mp4Video = videoStreams.Where(s => s.Container == Container.Mp4).ToList();
|
||||||
var stream = muxedStreams
|
var video = PickByHeight(mp4Video.Count > 0 ? mp4Video : videoStreams, preferredHeight);
|
||||||
.Where(s => s.VideoQuality.MaxHeight <= preferredHeight)
|
var mp4Audio = audioStreams.Where(s => s.Container == Container.Mp4).ToList();
|
||||||
.OrderByDescending(s => s.VideoQuality.MaxHeight)
|
var audio = (mp4Audio.Count > 0 ? mp4Audio : audioStreams).GetWithHighestBitrate();
|
||||||
.FirstOrDefault()
|
|
||||||
?? muxedStreams.OrderByDescending(s => s.VideoQuality.MaxHeight).First();
|
|
||||||
|
|
||||||
_logger.LogInformation(
|
_logger.LogInformation(
|
||||||
"|CinemaTrailers4Jellyfins| Downloading {Key} at {Quality} to {Path}",
|
"|CinemaTrailers4Jellyfins| Downloading {Key} at {Quality} (video + audio, merged with ffmpeg) to {Path}",
|
||||||
key, stream.VideoQuality.Label, outputPath);
|
key, video.VideoQuality.Label, outputPath);
|
||||||
|
|
||||||
await youtube.Videos.Streams
|
await youtube.Videos.Streams.DownloadAsync(video, videoTemp, cancellationToken: ct).ConfigureAwait(false);
|
||||||
.DownloadAsync(stream, outputPath, cancellationToken: ct)
|
await youtube.Videos.Streams.DownloadAsync(audio, audioTemp, cancellationToken: ct).ConfigureAwait(false);
|
||||||
.ConfigureAwait(false);
|
|
||||||
|
|
||||||
return true;
|
return await MergeAsync(key, videoTemp, audioTemp, outputPath, ct).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
catch (OperationCanceledException)
|
catch (OperationCanceledException)
|
||||||
{
|
{
|
||||||
@@ -118,6 +134,85 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
_logger.LogError(ex, "|CinemaTrailers4Jellyfins| YoutubeExplode download failed for {Key}", key);
|
_logger.LogError(ex, "|CinemaTrailers4Jellyfins| YoutubeExplode download failed for {Key}", key);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
TryDeleteFile(videoTemp);
|
||||||
|
TryDeleteFile(audioTemp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Highest quality at or below the configured height limit, else the lowest available.
|
||||||
|
private static T PickByHeight<T>(System.Collections.Generic.IReadOnlyList<T> streams, int preferredHeight)
|
||||||
|
where T : IVideoStreamInfo
|
||||||
|
=> streams
|
||||||
|
.Where(s => s.VideoQuality.MaxHeight <= preferredHeight)
|
||||||
|
.OrderByDescending(s => s.VideoQuality.MaxHeight)
|
||||||
|
.FirstOrDefault()
|
||||||
|
?? streams.OrderBy(s => s.VideoQuality.MaxHeight).First();
|
||||||
|
|
||||||
|
// Stream-copies (no re-encode) the video and audio tracks into one MP4.
|
||||||
|
// Writes to a temp file first so a failed merge never leaves a broken trailer.
|
||||||
|
private async Task<bool> MergeAsync(string key, string videoPath, string audioPath, string outputPath, CancellationToken ct)
|
||||||
|
{
|
||||||
|
var mergeTemp = outputPath + ".merge.tmp";
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var args = string.Join(" ",
|
||||||
|
"-y -loglevel error",
|
||||||
|
$"-i \"{videoPath}\"",
|
||||||
|
$"-i \"{audioPath}\"",
|
||||||
|
"-map 0:v:0 -map 1:a:0 -c copy -movflags +faststart",
|
||||||
|
"-f mp4",
|
||||||
|
$"\"{mergeTemp}\"");
|
||||||
|
|
||||||
|
using var process = new Process
|
||||||
|
{
|
||||||
|
StartInfo = new ProcessStartInfo
|
||||||
|
{
|
||||||
|
FileName = FfmpegLocator.Path,
|
||||||
|
Arguments = args,
|
||||||
|
RedirectStandardOutput = true,
|
||||||
|
RedirectStandardError = true,
|
||||||
|
UseShellExecute = false,
|
||||||
|
CreateNoWindow = true,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
process.Start();
|
||||||
|
// Drain both pipes while ffmpeg 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 stdoutTask.ConfigureAwait(false);
|
||||||
|
var stderr = await stderrTask.ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (process.ExitCode != 0 || !File.Exists(mergeTemp))
|
||||||
|
{
|
||||||
|
_logger.LogError("|CinemaTrailers4Jellyfins| ffmpeg merge failed for {Key} (exit code {Code}): {Error}",
|
||||||
|
key, process.ExitCode, stderr);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
File.Move(mergeTemp, outputPath, overwrite: true);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
TryDeleteFile(mergeTemp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void TryDeleteFile(string path)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (File.Exists(path))
|
||||||
|
File.Delete(path);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(ex, "|CinemaTrailers4Jellyfins| Could not delete temporary file {Path}", path);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<bool> DownloadWithYtDlpAsync(
|
private async Task<bool> DownloadWithYtDlpAsync(
|
||||||
|
|||||||
@@ -48,6 +48,16 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
var preRollEnabled = !string.IsNullOrEmpty(config.TrailerPreRollLibraryId);
|
var preRollEnabled = !string.IsNullOrEmpty(config.TrailerPreRollLibraryId);
|
||||||
var featurePreRollEnabled = !string.IsNullOrEmpty(config.FeaturePreRollLibraryId);
|
var featurePreRollEnabled = !string.IsNullOrEmpty(config.FeaturePreRollLibraryId);
|
||||||
|
|
||||||
|
_logger.LogInformation(
|
||||||
|
"|CinemaTrailers4Jellyfins| GetIntros called for {Type} '{Name}' (Path={Path}). "
|
||||||
|
+ "trailersEnabled={Trailers} preRollEnabled={PreRoll} featurePreRollEnabled={FeaturePreRoll}",
|
||||||
|
item.GetType().Name,
|
||||||
|
item.Name,
|
||||||
|
item.Path,
|
||||||
|
trailersEnabled,
|
||||||
|
preRollEnabled,
|
||||||
|
featurePreRollEnabled);
|
||||||
|
|
||||||
if (!trailersEnabled && !preRollEnabled && !featurePreRollEnabled)
|
if (!trailersEnabled && !preRollEnabled && !featurePreRollEnabled)
|
||||||
return Task.FromResult(Enumerable.Empty<IntroInfo>());
|
return Task.FromResult(Enumerable.Empty<IntroInfo>());
|
||||||
|
|
||||||
@@ -65,16 +75,23 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
|
|
||||||
case Episode episode:
|
case Episode episode:
|
||||||
if (!config.TrailersForEpisodes)
|
if (!config.TrailersForEpisodes)
|
||||||
|
{
|
||||||
|
_logger.LogInformation("|CinemaTrailers4Jellyfins| Skipping: TrailersForEpisodes is disabled.");
|
||||||
return Task.FromResult(Enumerable.Empty<IntroInfo>());
|
return Task.FromResult(Enumerable.Empty<IntroInfo>());
|
||||||
|
}
|
||||||
|
|
||||||
if (!IsFirstEpisodeOfDay(user.Id))
|
if (!IsFirstEpisodeOfDay(user.Id))
|
||||||
|
{
|
||||||
|
_logger.LogInformation("|CinemaTrailers4Jellyfins| Skipping: not the first episode of the day for this user.");
|
||||||
return Task.FromResult(Enumerable.Empty<IntroInfo>());
|
return Task.FromResult(Enumerable.Empty<IntroInfo>());
|
||||||
|
}
|
||||||
|
|
||||||
feature = episode.Series ?? (BaseItem)episode;
|
feature = episode.Series ?? (BaseItem)episode;
|
||||||
isEpisode = true;
|
isEpisode = true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
_logger.LogInformation("|CinemaTrailers4Jellyfins| Skipping: item type {Type} is not a Movie or Episode.", item.GetType().Name);
|
||||||
return Task.FromResult(Enumerable.Empty<IntroInfo>());
|
return Task.FromResult(Enumerable.Empty<IntroInfo>());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,13 +102,16 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
// (covers both the fake-movie files and their trailer extras).
|
// (covers both the fake-movie files and their trailer extras).
|
||||||
if (!string.IsNullOrEmpty(outputFolder)
|
if (!string.IsNullOrEmpty(outputFolder)
|
||||||
&& item.Path?.StartsWith(outputFolder, StringComparison.OrdinalIgnoreCase) == true)
|
&& item.Path?.StartsWith(outputFolder, StringComparison.OrdinalIgnoreCase) == true)
|
||||||
|
{
|
||||||
|
_logger.LogInformation("|CinemaTrailers4Jellyfins| Skipping: item path is inside the output folder ({Folder}).", outputFolder);
|
||||||
return Task.FromResult(Enumerable.Empty<IntroInfo>());
|
return Task.FromResult(Enumerable.Empty<IntroInfo>());
|
||||||
|
}
|
||||||
|
|
||||||
var intros = new List<IntroInfo>();
|
var intros = new List<IntroInfo>();
|
||||||
|
|
||||||
if (preRollEnabled)
|
if (preRollEnabled)
|
||||||
{
|
{
|
||||||
var preRoll = GetRandomLibraryMovieIntro("Trailer Pre-Roll", config.TrailerPreRollLibraryId, item.Id);
|
var preRoll = GetRandomLibraryMovieIntro("Trailer Pre-Roll", config.TrailerPreRollLibraryId, item.Id, user);
|
||||||
if (preRoll != null)
|
if (preRoll != null)
|
||||||
intros.Add(preRoll);
|
intros.Add(preRoll);
|
||||||
}
|
}
|
||||||
@@ -109,6 +129,9 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
.Where(m =>
|
.Where(m =>
|
||||||
m.Path?.StartsWith(outputFolder, StringComparison.OrdinalIgnoreCase) == true
|
m.Path?.StartsWith(outputFolder, StringComparison.OrdinalIgnoreCase) == true
|
||||||
&& m.LocalTrailers.Count > 0
|
&& m.LocalTrailers.Count > 0
|
||||||
|
// Skip items the user can't actually play (e.g. library not in their access list) —
|
||||||
|
// some clients hang indefinitely trying to play an inaccessible item.
|
||||||
|
&& m.IsVisibleStandalone(user)
|
||||||
// Keep TV show trailers for episodes and movie trailers for movies separate.
|
// Keep TV show trailers for episodes and movie trailers for movies separate.
|
||||||
&& m.Tags.Contains(TrailerTags.TvShow, StringComparer.OrdinalIgnoreCase) == isEpisode)
|
&& m.Tags.Contains(TrailerTags.TvShow, StringComparer.OrdinalIgnoreCase) == isEpisode)
|
||||||
.SelectMany(m => m.LocalTrailers.Select(t => (Movie: m, Trailer: t)))
|
.SelectMany(m => m.LocalTrailers.Select(t => (Movie: m, Trailer: t)))
|
||||||
@@ -145,11 +168,16 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
|
|
||||||
if (featurePreRollEnabled)
|
if (featurePreRollEnabled)
|
||||||
{
|
{
|
||||||
var featureRoll = GetRandomLibraryMovieIntro("Feature Pre-Roll", config.FeaturePreRollLibraryId, item.Id);
|
var featureRoll = GetRandomLibraryMovieIntro("Feature Pre-Roll", config.FeaturePreRollLibraryId, item.Id, user);
|
||||||
if (featureRoll != null)
|
if (featureRoll != null)
|
||||||
intros.Add(featureRoll);
|
intros.Add(featureRoll);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_logger.LogInformation(
|
||||||
|
"|CinemaTrailers4Jellyfins| Returning {Count} intro(s): {Paths}",
|
||||||
|
intros.Count,
|
||||||
|
string.Join(", ", intros.Select(i => i.Path)));
|
||||||
|
|
||||||
return Task.FromResult<IEnumerable<IntroInfo>>(intros);
|
return Task.FromResult<IEnumerable<IntroInfo>>(intros);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -157,7 +185,7 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
/// Picks a random Movie from the given Jellyfin library (VirtualFolder ItemId) to use as a
|
/// Picks a random Movie from the given Jellyfin library (VirtualFolder ItemId) to use as a
|
||||||
/// pre-roll/post-roll bumper, excluding the item currently being played.
|
/// pre-roll/post-roll bumper, excluding the item currently being played.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private IntroInfo? GetRandomLibraryMovieIntro(string label, string libraryId, Guid excludeId)
|
private IntroInfo? GetRandomLibraryMovieIntro(string label, string libraryId, Guid excludeId, User user)
|
||||||
{
|
{
|
||||||
if (!Guid.TryParse(libraryId, out var parsedId))
|
if (!Guid.TryParse(libraryId, out var parsedId))
|
||||||
{
|
{
|
||||||
@@ -168,29 +196,32 @@ namespace Jellyfin.Plugin.CinemaTrailers4Jellyfins.Services
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
var movies = _libraryManager
|
if (_libraryManager.GetItemById(parsedId) is not Folder folder)
|
||||||
.GetItemList(new InternalItemsQuery
|
{
|
||||||
{
|
_logger.LogWarning(
|
||||||
IncludeItemTypes = new[] { BaseItemKind.Movie },
|
"|CinemaTrailers4Jellyfins| {Label} library {LibraryId} could not be found.",
|
||||||
TopParentIds = new[] { parsedId },
|
label,
|
||||||
Recursive = true,
|
parsedId);
|
||||||
})
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var movies = folder.GetRecursiveChildren()
|
||||||
.OfType<Movie>()
|
.OfType<Movie>()
|
||||||
.Where(m => m.Id != excludeId)
|
.Where(m => m.Id != excludeId && m.IsVisibleStandalone(user))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
if (movies.Count == 0)
|
if (movies.Count == 0)
|
||||||
{
|
{
|
||||||
_logger.LogDebug(
|
_logger.LogInformation(
|
||||||
"|CinemaTrailers4Jellyfins| {Label} library {LibraryId} has no eligible Movie items. "
|
"|CinemaTrailers4Jellyfins| {Label} library {LibraryId} has no eligible Movie items visible to this user. "
|
||||||
+ "Ensure the library has been scanned and contains at least one other Movie.",
|
+ "Ensure the library has been scanned, contains at least one other Movie, and is in this user's library access list.",
|
||||||
label,
|
label,
|
||||||
parsedId);
|
parsedId);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
var movie = movies[_rng.Next(movies.Count)];
|
var movie = movies[_rng.Next(movies.Count)];
|
||||||
_logger.LogDebug(
|
_logger.LogInformation(
|
||||||
"|CinemaTrailers4Jellyfins| {Label}: picked '{Title}' ({Path}).",
|
"|CinemaTrailers4Jellyfins| {Label}: picked '{Title}' ({Path}).",
|
||||||
label,
|
label,
|
||||||
movie.Name,
|
movie.Name,
|
||||||
|
|||||||
13
build.yaml
13
build.yaml
@@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
version: 1.0.0.6
|
version: 1.0.0.10
|
||||||
name: CinemaTrailers4Jellyfins
|
name: CinemaTrailers4Jellyfins
|
||||||
guid: b581493e-1046-40ed-b6dc-cb8027624984
|
guid: b581493e-1046-40ed-b6dc-cb8027624984
|
||||||
description: >
|
description: >
|
||||||
@@ -12,10 +12,13 @@ category: General
|
|||||||
owner: 514mart
|
owner: 514mart
|
||||||
targetAbi: 10.11.0.0
|
targetAbi: 10.11.0.0
|
||||||
changelog:
|
changelog:
|
||||||
- Add diagnostic logging for Trailer Pre-Roll and Feature Pre-Roll bumpers —
|
- Fix trailer downloads, broken by a YouTube change. YouTube no longer
|
||||||
logs a warning if the configured library ID is invalid, and a debug message
|
serves combined video+audio files, so the built-in downloader now fetches
|
||||||
when no eligible movie is found or which movie was picked, to help
|
the video and audio separately, merges them with ffmpeg (no re-encode)
|
||||||
troubleshoot why a bumper isn't playing
|
and deletes the separate files afterwards
|
||||||
|
- A failed download no longer leaves an empty trailer folder behind.
|
||||||
|
Empty folders counted toward "Max trailers to keep" (pushing out real
|
||||||
|
trailers) and were never retried
|
||||||
|
|
||||||
dotnetProjects:
|
dotnetProjects:
|
||||||
- name: Jellyfin.Plugin.CinemaTrailers4Jellyfins
|
- name: Jellyfin.Plugin.CinemaTrailers4Jellyfins
|
||||||
|
|||||||
@@ -8,6 +8,38 @@
|
|||||||
"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": "9594d14a5fed94ee5eea55d72c71728c",
|
||||||
|
"changelog": "- Skip trailers and pre-roll/feature pre-roll bumpers the current user can't actually access (e.g. a library not in their library access list) \u2014 some Cinema Mode clients hang indefinitely trying to play an inaccessible item, so these are now filtered out per-user instead\n",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://www.git.quarantinedstudio.com/mvezina/CinemaTrailers4Jellyfins/releases/download/v1.0.0.9/cinematrailers4jellyfins_1.0.0.9.zip",
|
||||||
|
"timestamp": "2026-06-10T17:07:24Z",
|
||||||
|
"version": "1.0.0.9"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"checksum": "89c66caa789da56ead7d60e01d3207a5",
|
||||||
|
"changelog": "- Fix Trailer Pre-Roll / Feature Pre-Roll bumpers not being found \u2014 the library lookup now walks the configured library folder's children directly instead of relying on TopParentIds matching, which could fail to match movies even when they appear correctly in the library\n",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://www.git.quarantinedstudio.com/mvezina/CinemaTrailers4Jellyfins/releases/download/v1.0.0.8/cinematrailers4jellyfins_1.0.0.8.zip",
|
||||||
|
"timestamp": "2026-06-10T15:28:02Z",
|
||||||
|
"version": "1.0.0.8"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"checksum": "a52f1354c9737cf9ec92f588bb4e750e",
|
||||||
|
"changelog": "- Add Information-level diagnostic logging to IIntroProvider.GetIntros \u2014 logs every call (item, path, and which features are enabled), why an item is skipped, and the outcome of Trailer/Feature Pre-Roll lookups, to help troubleshoot why a pre-roll bumper isn't playing\n",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://www.git.quarantinedstudio.com/mvezina/CinemaTrailers4Jellyfins/releases/download/v1.0.0.7/cinematrailers4jellyfins_1.0.0.7.zip",
|
||||||
|
"timestamp": "2026-06-10T15:10:56Z",
|
||||||
|
"version": "1.0.0.7"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"checksum": "96e0624e5173e5e6bf829d47118e1b40",
|
||||||
|
"changelog": "- Add diagnostic logging for Trailer Pre-Roll and Feature Pre-Roll bumpers \u2014 logs a warning if the configured library ID is invalid, and a debug message when no eligible movie is found or which movie was picked, to help troubleshoot why a bumper isn't playing\n",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://www.git.quarantinedstudio.com/mvezina/CinemaTrailers4Jellyfins/releases/download/v1.0.0.6/cinematrailers4jellyfins_1.0.0.6.zip",
|
||||||
|
"timestamp": "2026-06-10T14:35:52Z",
|
||||||
|
"version": "1.0.0.6"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"checksum": "6c88aaeb38023b327e9b042181dc0708",
|
"checksum": "6c88aaeb38023b327e9b042181dc0708",
|
||||||
"changelog": "- Add Trailer Pre-Roll and Feature Pre-Roll bumpers via IIntroProvider \u2014 pick existing Jellyfin Movie libraries in settings and a random movie from each is played before the trailer block (\"Now Playing\") and/or right before the feature (\"Feature Presentation\"); both are independent and disabled by default\n",
|
"changelog": "- Add Trailer Pre-Roll and Feature Pre-Roll bumpers via IIntroProvider \u2014 pick existing Jellyfin Movie libraries in settings and a random movie from each is played before the trailer block (\"Now Playing\") and/or right before the feature (\"Feature Presentation\"); both are independent and disabled by default\n",
|
||||||
|
|||||||
Reference in New Issue
Block a user