Merge remote-tracking branch 'upstream/release-10.9.z' into fix-season-backdrops
This commit is contained in:
commit
afeff31dca
|
@ -107,7 +107,7 @@ namespace Emby.Naming.ExternalFiles
|
||||||
pathInfo.Language = culture.ThreeLetterISOLanguageName;
|
pathInfo.Language = culture.ThreeLetterISOLanguageName;
|
||||||
extraString = extraString.Replace(currentSlice, string.Empty, StringComparison.OrdinalIgnoreCase);
|
extraString = extraString.Replace(currentSlice, string.Empty, StringComparison.OrdinalIgnoreCase);
|
||||||
}
|
}
|
||||||
else if (_namingOptions.MediaHearingImpairedFlags.Any(s => currentSliceWithoutSeparator.Contains(s, StringComparison.OrdinalIgnoreCase)))
|
else if (_namingOptions.MediaHearingImpairedFlags.Any(s => currentSliceWithoutSeparator.Equals(s, StringComparison.OrdinalIgnoreCase)))
|
||||||
{
|
{
|
||||||
pathInfo.IsHearingImpaired = true;
|
pathInfo.IsHearingImpaired = true;
|
||||||
extraString = extraString.Replace(currentSlice, string.Empty, StringComparison.OrdinalIgnoreCase);
|
extraString = extraString.Replace(currentSlice, string.Empty, StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
|
@ -389,7 +389,7 @@ namespace Emby.Server.Implementations.IO
|
||||||
var info = new FileInfo(path);
|
var info = new FileInfo(path);
|
||||||
|
|
||||||
if (info.Exists &&
|
if (info.Exists &&
|
||||||
((info.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden) != isHidden)
|
(info.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden != isHidden)
|
||||||
{
|
{
|
||||||
if (isHidden)
|
if (isHidden)
|
||||||
{
|
{
|
||||||
|
@ -417,8 +417,8 @@ namespace Emby.Server.Implementations.IO
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (((info.Attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly) == readOnly
|
if ((info.Attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly == readOnly
|
||||||
&& ((info.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden) == isHidden)
|
&& (info.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden == isHidden)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1884,7 +1884,7 @@ namespace Emby.Server.Implementations.Library
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var index = item.GetImageIndex(img);
|
var index = item.GetImageIndex(img);
|
||||||
image = await ConvertImageToLocal(item, img, index, removeOnFailure: true).ConfigureAwait(false);
|
image = await ConvertImageToLocal(item, img, index, true).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
catch (ArgumentException)
|
catch (ArgumentException)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
Exempt,0
|
Exempt,0
|
||||||
G,0
|
G,0
|
||||||
7+,7
|
7+,7
|
||||||
|
PG,15
|
||||||
M,15
|
M,15
|
||||||
MA,15
|
MA,15
|
||||||
MA15+,15
|
MA15+,15
|
||||||
MA 15+,15
|
MA 15+,15
|
||||||
PG,16
|
|
||||||
16+,16
|
16+,16
|
||||||
R,18
|
R,18
|
||||||
R18+,18
|
R18+,18
|
||||||
|
|
|
|
@ -170,8 +170,13 @@ namespace Emby.Server.Implementations.Playlists
|
||||||
private List<Playlist> GetUserPlaylists(Guid userId)
|
private List<Playlist> GetUserPlaylists(Guid userId)
|
||||||
{
|
{
|
||||||
var user = _userManager.GetUserById(userId);
|
var user = _userManager.GetUserById(userId);
|
||||||
|
var playlistsFolder = GetPlaylistsFolder(userId);
|
||||||
|
if (playlistsFolder is null)
|
||||||
|
{
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
return GetPlaylistsFolder(userId).GetChildren(user, true).OfType<Playlist>().ToList();
|
return playlistsFolder.GetChildren(user, true).OfType<Playlist>().ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string GetTargetPath(string path)
|
private static string GetTargetPath(string path)
|
||||||
|
@ -184,11 +189,11 @@ namespace Emby.Server.Implementations.Playlists
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
private IReadOnlyList<BaseItem> GetPlaylistItems(IEnumerable<Guid> itemIds, MediaType playlistMediaType, User user, DtoOptions options)
|
private IReadOnlyList<BaseItem> GetPlaylistItems(IEnumerable<Guid> itemIds, User user, DtoOptions options)
|
||||||
{
|
{
|
||||||
var items = itemIds.Select(_libraryManager.GetItemById).Where(i => i is not null);
|
var items = itemIds.Select(_libraryManager.GetItemById).Where(i => i is not null);
|
||||||
|
|
||||||
return Playlist.GetPlaylistItems(playlistMediaType, items, user, options);
|
return Playlist.GetPlaylistItems(items, user, options);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task AddItemToPlaylistAsync(Guid playlistId, IReadOnlyCollection<Guid> itemIds, Guid userId)
|
public Task AddItemToPlaylistAsync(Guid playlistId, IReadOnlyCollection<Guid> itemIds, Guid userId)
|
||||||
|
@ -208,7 +213,7 @@ namespace Emby.Server.Implementations.Playlists
|
||||||
?? throw new ArgumentException("No Playlist exists with Id " + playlistId);
|
?? throw new ArgumentException("No Playlist exists with Id " + playlistId);
|
||||||
|
|
||||||
// Retrieve all the items to be added to the playlist
|
// Retrieve all the items to be added to the playlist
|
||||||
var newItems = GetPlaylistItems(newItemIds, playlist.MediaType, user, options)
|
var newItems = GetPlaylistItems(newItemIds, user, options)
|
||||||
.Where(i => i.SupportsAddingToPlaylist);
|
.Where(i => i.SupportsAddingToPlaylist);
|
||||||
|
|
||||||
// Filter out duplicate items, if necessary
|
// Filter out duplicate items, if necessary
|
||||||
|
|
|
@ -127,15 +127,8 @@ public class CleanupCollectionAndPlaylistPathsTask : IScheduledTask
|
||||||
{
|
{
|
||||||
_logger.LogDebug("Updating {FolderName}", folder.Name);
|
_logger.LogDebug("Updating {FolderName}", folder.Name);
|
||||||
folder.LinkedChildren = folder.LinkedChildren.Except(itemsToRemove).ToArray();
|
folder.LinkedChildren = folder.LinkedChildren.Except(itemsToRemove).ToArray();
|
||||||
|
_providerManager.SaveMetadataAsync(folder, ItemUpdateType.MetadataEdit);
|
||||||
folder.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken);
|
folder.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken);
|
||||||
|
|
||||||
_providerManager.QueueRefresh(
|
|
||||||
folder.Id,
|
|
||||||
new MetadataRefreshOptions(new DirectoryService(_fileSystem))
|
|
||||||
{
|
|
||||||
ForceSave = true
|
|
||||||
},
|
|
||||||
RefreshPriority.High);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Common.Configuration;
|
using MediaBrowser.Common.Configuration;
|
||||||
|
using MediaBrowser.Controller.IO;
|
||||||
using MediaBrowser.Model.Globalization;
|
using MediaBrowser.Model.Globalization;
|
||||||
using MediaBrowser.Model.IO;
|
using MediaBrowser.Model.IO;
|
||||||
using MediaBrowser.Model.Tasks;
|
using MediaBrowser.Model.Tasks;
|
||||||
|
@ -133,53 +134,14 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
|
||||||
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
DeleteFile(file.FullName);
|
FileSystemHelper.DeleteFile(_fileSystem, file.FullName, _logger);
|
||||||
|
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
|
||||||
DeleteEmptyFolders(directory);
|
FileSystemHelper.DeleteEmptyFolders(_fileSystem, directory, _logger);
|
||||||
|
|
||||||
progress.Report(100);
|
progress.Report(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DeleteEmptyFolders(string parent)
|
|
||||||
{
|
|
||||||
foreach (var directory in _fileSystem.GetDirectoryPaths(parent))
|
|
||||||
{
|
|
||||||
DeleteEmptyFolders(directory);
|
|
||||||
if (!_fileSystem.GetFileSystemEntryPaths(directory).Any())
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Directory.Delete(directory, false);
|
|
||||||
}
|
|
||||||
catch (UnauthorizedAccessException ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Error deleting directory {Path}", directory);
|
|
||||||
}
|
|
||||||
catch (IOException ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Error deleting directory {Path}", directory);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void DeleteFile(string path)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
_fileSystem.DeleteFile(path);
|
|
||||||
}
|
|
||||||
catch (UnauthorizedAccessException ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Error deleting file {Path}", path);
|
|
||||||
}
|
|
||||||
catch (IOException ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Error deleting file {Path}", path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Common.Configuration;
|
using MediaBrowser.Common.Configuration;
|
||||||
|
using MediaBrowser.Controller.IO;
|
||||||
using MediaBrowser.Model.Globalization;
|
using MediaBrowser.Model.Globalization;
|
||||||
using MediaBrowser.Model.IO;
|
using MediaBrowser.Model.IO;
|
||||||
using MediaBrowser.Model.Tasks;
|
using MediaBrowser.Model.Tasks;
|
||||||
|
@ -113,53 +113,14 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
|
||||||
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
DeleteFile(file.FullName);
|
FileSystemHelper.DeleteFile(_fileSystem, file.FullName, _logger);
|
||||||
|
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
|
||||||
DeleteEmptyFolders(directory);
|
FileSystemHelper.DeleteEmptyFolders(_fileSystem, directory, _logger);
|
||||||
|
|
||||||
progress.Report(100);
|
progress.Report(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DeleteEmptyFolders(string parent)
|
|
||||||
{
|
|
||||||
foreach (var directory in _fileSystem.GetDirectoryPaths(parent))
|
|
||||||
{
|
|
||||||
DeleteEmptyFolders(directory);
|
|
||||||
if (!_fileSystem.GetFileSystemEntryPaths(directory).Any())
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Directory.Delete(directory, false);
|
|
||||||
}
|
|
||||||
catch (UnauthorizedAccessException ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Error deleting directory {Path}", directory);
|
|
||||||
}
|
|
||||||
catch (IOException ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Error deleting directory {Path}", directory);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void DeleteFile(string path)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
_fileSystem.DeleteFile(path);
|
|
||||||
}
|
|
||||||
catch (UnauthorizedAccessException ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Error deleting file {Path}", path);
|
|
||||||
}
|
|
||||||
catch (IOException ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Error deleting file {Path}", path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,7 +80,8 @@ public class ItemRefreshController : BaseJellyfinApiController
|
||||||
|| imageRefreshMode == MetadataRefreshMode.FullRefresh
|
|| imageRefreshMode == MetadataRefreshMode.FullRefresh
|
||||||
|| replaceAllImages
|
|| replaceAllImages
|
||||||
|| replaceAllMetadata,
|
|| replaceAllMetadata,
|
||||||
IsAutomated = false
|
IsAutomated = false,
|
||||||
|
RemoveOldMetadata = replaceAllMetadata
|
||||||
};
|
};
|
||||||
|
|
||||||
_providerManager.QueueRefresh(item.Id, refreshOptions, RefreshPriority.High);
|
_providerManager.QueueRefresh(item.Id, refreshOptions, RefreshPriority.High);
|
||||||
|
|
|
@ -154,6 +154,11 @@ public static class StreamingHelpers
|
||||||
// Some channels from HDHomerun will experience A/V sync issues
|
// Some channels from HDHomerun will experience A/V sync issues
|
||||||
streamingRequest.SegmentContainer = "ts";
|
streamingRequest.SegmentContainer = "ts";
|
||||||
streamingRequest.VideoCodec = "h264";
|
streamingRequest.VideoCodec = "h264";
|
||||||
|
streamingRequest.AudioCodec = "aac";
|
||||||
|
state.SupportedVideoCodecs = ["h264"];
|
||||||
|
state.Request.VideoCodec = "h264";
|
||||||
|
state.SupportedAudioCodecs = ["aac"];
|
||||||
|
state.Request.AudioCodec = "aac";
|
||||||
}
|
}
|
||||||
|
|
||||||
var liveStreamInfo = await mediaSourceManager.GetLiveStreamWithDirectStreamProvider(streamingRequest.LiveStreamId, cancellationToken).ConfigureAwait(false);
|
var liveStreamInfo = await mediaSourceManager.GetLiveStreamWithDirectStreamProvider(streamingRequest.LiveStreamId, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
|
@ -1949,14 +1949,15 @@ namespace MediaBrowser.Controller.Entities
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove it from the item
|
// Remove from file system
|
||||||
RemoveImage(info);
|
|
||||||
|
|
||||||
if (info.IsLocalFile)
|
if (info.IsLocalFile)
|
||||||
{
|
{
|
||||||
FileSystem.DeleteFile(info.Path);
|
FileSystem.DeleteFile(info.Path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Remove from item
|
||||||
|
RemoveImage(info);
|
||||||
|
|
||||||
await UpdateToRepositoryAsync(ItemUpdateType.ImageUpdate, CancellationToken.None).ConfigureAwait(false);
|
await UpdateToRepositoryAsync(ItemUpdateType.ImageUpdate, CancellationToken.None).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Security;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
@ -370,9 +371,18 @@ namespace MediaBrowser.Controller.Entities
|
||||||
{
|
{
|
||||||
nonCachedChildren = GetNonCachedChildren(directoryService);
|
nonCachedChildren = GetNonCachedChildren(directoryService);
|
||||||
}
|
}
|
||||||
|
catch (IOException ex)
|
||||||
|
{
|
||||||
|
Logger.LogError(ex, "Error retrieving children from file system");
|
||||||
|
}
|
||||||
|
catch (SecurityException ex)
|
||||||
|
{
|
||||||
|
Logger.LogError(ex, "Error retrieving children from file system");
|
||||||
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Logger.LogError(ex, "Error retrieving children folder");
|
Logger.LogError(ex, "Error retrieving children");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
progress.Report(ProgressHelpers.RetrievedChildren);
|
progress.Report(ProgressHelpers.RetrievedChildren);
|
||||||
|
|
|
@ -350,17 +350,10 @@ namespace MediaBrowser.Controller.Entities.TV
|
||||||
|
|
||||||
public List<BaseItem> GetSeasonEpisodes(Season parentSeason, User user, DtoOptions options, bool shouldIncludeMissingEpisodes)
|
public List<BaseItem> GetSeasonEpisodes(Season parentSeason, User user, DtoOptions options, bool shouldIncludeMissingEpisodes)
|
||||||
{
|
{
|
||||||
var queryFromSeries = ConfigurationManager.Configuration.DisplaySpecialsWithinSeasons;
|
|
||||||
|
|
||||||
// add optimization when this setting is not enabled
|
|
||||||
var seriesKey = queryFromSeries ?
|
|
||||||
GetUniqueSeriesKey(this) :
|
|
||||||
GetUniqueSeriesKey(parentSeason);
|
|
||||||
|
|
||||||
var query = new InternalItemsQuery(user)
|
var query = new InternalItemsQuery(user)
|
||||||
{
|
{
|
||||||
AncestorWithPresentationUniqueKey = queryFromSeries ? null : seriesKey,
|
AncestorWithPresentationUniqueKey = null,
|
||||||
SeriesPresentationUniqueKey = queryFromSeries ? seriesKey : null,
|
SeriesPresentationUniqueKey = GetUniqueSeriesKey(this),
|
||||||
IncludeItemTypes = new[] { BaseItemKind.Episode },
|
IncludeItemTypes = new[] { BaseItemKind.Episode },
|
||||||
OrderBy = new[] { (ItemSortBy.SortName, SortOrder.Ascending) },
|
OrderBy = new[] { (ItemSortBy.SortName, SortOrder.Ascending) },
|
||||||
DtoOptions = options
|
DtoOptions = options
|
||||||
|
|
64
MediaBrowser.Controller/IO/FileSystemHelper.cs
Normal file
64
MediaBrowser.Controller/IO/FileSystemHelper.cs
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using MediaBrowser.Model.IO;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace MediaBrowser.Controller.IO;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Helper methods for file system management.
|
||||||
|
/// </summary>
|
||||||
|
public static class FileSystemHelper
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Deletes the file.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="fileSystem">The fileSystem.</param>
|
||||||
|
/// <param name="path">The path.</param>
|
||||||
|
/// <param name="logger">The logger.</param>
|
||||||
|
public static void DeleteFile(IFileSystem fileSystem, string path, ILogger logger)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
fileSystem.DeleteFile(path);
|
||||||
|
}
|
||||||
|
catch (UnauthorizedAccessException ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Error deleting file {Path}", path);
|
||||||
|
}
|
||||||
|
catch (IOException ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Error deleting file {Path}", path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Recursively delete empty folders.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="fileSystem">The fileSystem.</param>
|
||||||
|
/// <param name="path">The path.</param>
|
||||||
|
/// <param name="logger">The logger.</param>
|
||||||
|
public static void DeleteEmptyFolders(IFileSystem fileSystem, string path, ILogger logger)
|
||||||
|
{
|
||||||
|
foreach (var directory in fileSystem.GetDirectoryPaths(path))
|
||||||
|
{
|
||||||
|
DeleteEmptyFolders(fileSystem, directory, logger);
|
||||||
|
if (!fileSystem.GetFileSystemEntryPaths(directory).Any())
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Directory.Delete(directory, false);
|
||||||
|
}
|
||||||
|
catch (UnauthorizedAccessException ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Error deleting directory {Path}", directory);
|
||||||
|
}
|
||||||
|
catch (IOException ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Error deleting directory {Path}", directory);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1208,8 +1208,8 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
var subtitlePath = state.SubtitleStream.Path;
|
var subtitlePath = state.SubtitleStream.Path;
|
||||||
var subtitleExtension = Path.GetExtension(subtitlePath.AsSpan());
|
var subtitleExtension = Path.GetExtension(subtitlePath.AsSpan());
|
||||||
|
|
||||||
if (subtitleExtension.Equals(".sub", StringComparison.OrdinalIgnoreCase)
|
// dvdsub/vobsub graphical subtitles use .sub+.idx pairs
|
||||||
|| subtitleExtension.Equals(".sup", StringComparison.OrdinalIgnoreCase))
|
if (subtitleExtension.Equals(".sub", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
var idxFile = Path.ChangeExtension(subtitlePath, ".idx");
|
var idxFile = Path.ChangeExtension(subtitlePath, ".idx");
|
||||||
if (File.Exists(idxFile))
|
if (File.Exists(idxFile))
|
||||||
|
|
|
@ -166,7 +166,7 @@ namespace MediaBrowser.Controller.Playlists
|
||||||
return base.GetChildren(user, true, query);
|
return base.GetChildren(user, true, query);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IReadOnlyList<BaseItem> GetPlaylistItems(MediaType playlistMediaType, IEnumerable<BaseItem> inputItems, User user, DtoOptions options)
|
public static IReadOnlyList<BaseItem> GetPlaylistItems(IEnumerable<BaseItem> inputItems, User user, DtoOptions options)
|
||||||
{
|
{
|
||||||
if (user is not null)
|
if (user is not null)
|
||||||
{
|
{
|
||||||
|
@ -177,14 +177,14 @@ namespace MediaBrowser.Controller.Playlists
|
||||||
|
|
||||||
foreach (var item in inputItems)
|
foreach (var item in inputItems)
|
||||||
{
|
{
|
||||||
var playlistItems = GetPlaylistItems(item, user, playlistMediaType, options);
|
var playlistItems = GetPlaylistItems(item, user, options);
|
||||||
list.AddRange(playlistItems);
|
list.AddRange(playlistItems);
|
||||||
}
|
}
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static IEnumerable<BaseItem> GetPlaylistItems(BaseItem item, User user, MediaType mediaType, DtoOptions options)
|
private static IEnumerable<BaseItem> GetPlaylistItems(BaseItem item, User user, DtoOptions options)
|
||||||
{
|
{
|
||||||
if (item is MusicGenre musicGenre)
|
if (item is MusicGenre musicGenre)
|
||||||
{
|
{
|
||||||
|
@ -216,7 +216,7 @@ namespace MediaBrowser.Controller.Playlists
|
||||||
{
|
{
|
||||||
Recursive = true,
|
Recursive = true,
|
||||||
IsFolder = false,
|
IsFolder = false,
|
||||||
MediaTypes = [mediaType],
|
MediaTypes = [MediaType.Audio, MediaType.Video],
|
||||||
EnableTotalRecordCount = false,
|
EnableTotalRecordCount = false,
|
||||||
DtoOptions = options
|
DtoOptions = options
|
||||||
};
|
};
|
||||||
|
|
|
@ -40,13 +40,12 @@ namespace MediaBrowser.LocalMetadata.Images
|
||||||
var parentPathFiles = directoryService.GetFiles(parentPath);
|
var parentPathFiles = directoryService.GetFiles(parentPath);
|
||||||
var nameWithoutExtension = Path.GetFileNameWithoutExtension(item.Path.AsSpan()).ToString();
|
var nameWithoutExtension = Path.GetFileNameWithoutExtension(item.Path.AsSpan()).ToString();
|
||||||
|
|
||||||
var thumbName = string.Concat(nameWithoutExtension, "-thumb");
|
var images = GetImageFilesFromFolder(nameWithoutExtension, parentPathFiles);
|
||||||
var images = GetImageFilesFromFolder(thumbName, parentPathFiles);
|
|
||||||
|
|
||||||
var metadataSubPath = directoryService.GetDirectories(parentPath).Where(d => d.Name.EndsWith("metadata", StringComparison.OrdinalIgnoreCase)).ToList();
|
var metadataSubDir = directoryService.GetDirectories(parentPath).FirstOrDefault(d => d.Name.Equals("metadata", StringComparison.Ordinal));
|
||||||
foreach (var path in metadataSubPath)
|
if (metadataSubDir is not null)
|
||||||
{
|
{
|
||||||
var files = directoryService.GetFiles(path.FullName);
|
var files = directoryService.GetFiles(metadataSubDir.FullName);
|
||||||
images.AddRange(GetImageFilesFromFolder(nameWithoutExtension, files));
|
images.AddRange(GetImageFilesFromFolder(nameWithoutExtension, files));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,9 +54,8 @@ namespace MediaBrowser.LocalMetadata.Images
|
||||||
|
|
||||||
private List<LocalImageInfo> GetImageFilesFromFolder(ReadOnlySpan<char> filenameWithoutExtension, List<FileSystemMetadata> filePaths)
|
private List<LocalImageInfo> GetImageFilesFromFolder(ReadOnlySpan<char> filenameWithoutExtension, List<FileSystemMetadata> filePaths)
|
||||||
{
|
{
|
||||||
var thumbName = string.Concat(filenameWithoutExtension, "-thumb");
|
|
||||||
|
|
||||||
var list = new List<LocalImageInfo>(1);
|
var list = new List<LocalImageInfo>(1);
|
||||||
|
var thumbName = string.Concat(filenameWithoutExtension, "-thumb");
|
||||||
|
|
||||||
foreach (var i in filePaths)
|
foreach (var i in filePaths)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1155,10 +1155,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
|
|
||||||
// Get all files from the BDMV/STREAMING directory
|
// Get all files from the BDMV/STREAMING directory
|
||||||
// Only return playable local .m2ts files
|
// Only return playable local .m2ts files
|
||||||
|
var files = _fileSystem.GetFiles(Path.Join(path, "BDMV", "STREAM")).ToList();
|
||||||
return validPlaybackFiles
|
return validPlaybackFiles
|
||||||
.Select(f => _fileSystem.GetFileInfo(Path.Join(path, "BDMV", "STREAM", f)))
|
.Select(validFile => files.FirstOrDefault(f => Path.GetFileName(f.FullName.AsSpan()).Equals(validFile, StringComparison.OrdinalIgnoreCase))?.FullName)
|
||||||
.Where(f => f.Exists)
|
.Where(f => f is not null)
|
||||||
.Select(f => f.FullName)
|
|
||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -280,8 +280,8 @@ namespace MediaBrowser.MediaEncoding.Probing
|
||||||
splitFormat[i] = "mpeg";
|
splitFormat[i] = "mpeg";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle MPEG-2 container
|
// Handle MPEG-TS container
|
||||||
else if (string.Equals(splitFormat[i], "mpeg", StringComparison.OrdinalIgnoreCase))
|
else if (string.Equals(splitFormat[i], "mpegts", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
splitFormat[i] = "ts";
|
splitFormat[i] = "ts";
|
||||||
}
|
}
|
||||||
|
@ -624,15 +624,19 @@ namespace MediaBrowser.MediaEncoding.Probing
|
||||||
{
|
{
|
||||||
if (string.Equals(codec, "dvb_subtitle", StringComparison.OrdinalIgnoreCase))
|
if (string.Equals(codec, "dvb_subtitle", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
codec = "dvbsub";
|
codec = "DVBSUB";
|
||||||
}
|
}
|
||||||
else if ((codec ?? string.Empty).Contains("PGS", StringComparison.OrdinalIgnoreCase))
|
else if (string.Equals(codec, "dvb_teletext", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
codec = "PGSSUB";
|
codec = "DVBTXT";
|
||||||
}
|
}
|
||||||
else if ((codec ?? string.Empty).Contains("DVD", StringComparison.OrdinalIgnoreCase))
|
else if (string.Equals(codec, "dvd_subtitle", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
codec = "DVDSUB";
|
codec = "DVDSUB"; // .sub+.idx
|
||||||
|
}
|
||||||
|
else if (string.Equals(codec, "hdmv_pgs_subtitle", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
codec = "PGSSUB"; // .sup
|
||||||
}
|
}
|
||||||
|
|
||||||
return codec;
|
return codec;
|
||||||
|
@ -779,11 +783,10 @@ namespace MediaBrowser.MediaEncoding.Probing
|
||||||
&& !string.Equals(streamInfo.FieldOrder, "progressive", StringComparison.OrdinalIgnoreCase);
|
&& !string.Equals(streamInfo.FieldOrder, "progressive", StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
if (isAudio
|
if (isAudio
|
||||||
&& (string.Equals(stream.Codec, "bmp", StringComparison.OrdinalIgnoreCase)
|
|| string.Equals(stream.Codec, "bmp", StringComparison.OrdinalIgnoreCase)
|
||||||
|| string.Equals(stream.Codec, "gif", StringComparison.OrdinalIgnoreCase)
|
|| string.Equals(stream.Codec, "gif", StringComparison.OrdinalIgnoreCase)
|
||||||
|| string.Equals(stream.Codec, "mjpeg", StringComparison.OrdinalIgnoreCase)
|
|| string.Equals(stream.Codec, "png", StringComparison.OrdinalIgnoreCase)
|
||||||
|| string.Equals(stream.Codec, "png", StringComparison.OrdinalIgnoreCase)
|
|| string.Equals(stream.Codec, "webp", StringComparison.OrdinalIgnoreCase))
|
||||||
|| string.Equals(stream.Codec, "webp", StringComparison.OrdinalIgnoreCase)))
|
|
||||||
{
|
{
|
||||||
stream.Type = MediaStreamType.EmbeddedImage;
|
stream.Type = MediaStreamType.EmbeddedImage;
|
||||||
}
|
}
|
||||||
|
|
|
@ -656,14 +656,14 @@ namespace MediaBrowser.Model.Entities
|
||||||
{
|
{
|
||||||
string codec = format ?? string.Empty;
|
string codec = format ?? string.Empty;
|
||||||
|
|
||||||
// sub = external .sub file
|
// microdvd and dvdsub/vobsub share the ".sub" file extension, but it's text-based.
|
||||||
|
|
||||||
return !codec.Contains("pgs", StringComparison.OrdinalIgnoreCase)
|
return codec.Contains("microdvd", StringComparison.OrdinalIgnoreCase)
|
||||||
&& !codec.Contains("dvd", StringComparison.OrdinalIgnoreCase)
|
|| (!codec.Contains("pgs", StringComparison.OrdinalIgnoreCase)
|
||||||
&& !codec.Contains("dvbsub", StringComparison.OrdinalIgnoreCase)
|
&& !codec.Contains("dvdsub", StringComparison.OrdinalIgnoreCase)
|
||||||
&& !string.Equals(codec, "sub", StringComparison.OrdinalIgnoreCase)
|
&& !codec.Contains("dvbsub", StringComparison.OrdinalIgnoreCase)
|
||||||
&& !string.Equals(codec, "sup", StringComparison.OrdinalIgnoreCase)
|
&& !string.Equals(codec, "sup", StringComparison.OrdinalIgnoreCase)
|
||||||
&& !string.Equals(codec, "dvb_subtitle", StringComparison.OrdinalIgnoreCase);
|
&& !string.Equals(codec, "sub", StringComparison.OrdinalIgnoreCase));
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool SupportsSubtitleConversionTo(string toCodec)
|
public bool SupportsSubtitleConversionTo(string toCodec)
|
||||||
|
|
|
@ -14,6 +14,7 @@ using MediaBrowser.Common.Configuration;
|
||||||
using MediaBrowser.Controller.Configuration;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Entities.Audio;
|
using MediaBrowser.Controller.Entities.Audio;
|
||||||
|
using MediaBrowser.Controller.IO;
|
||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Model.Configuration;
|
using MediaBrowser.Model.Configuration;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
|
@ -188,11 +189,27 @@ namespace MediaBrowser.Providers.Manager
|
||||||
{
|
{
|
||||||
_fileSystem.DeleteFile(currentPath);
|
_fileSystem.DeleteFile(currentPath);
|
||||||
|
|
||||||
// Remove containing directory if empty
|
// Remove local episode metadata directory if it exists and is empty
|
||||||
var folder = Path.GetDirectoryName(currentPath);
|
var directory = Path.GetDirectoryName(currentPath);
|
||||||
if (!_fileSystem.GetFiles(folder).Any())
|
if (item is Episode && directory.Equals("metadata", StringComparison.Ordinal))
|
||||||
{
|
{
|
||||||
Directory.Delete(folder);
|
var parentDirectoryPath = Directory.GetParent(currentPath).FullName;
|
||||||
|
if (_fileSystem.DirectoryExists(parentDirectoryPath) && !_fileSystem.GetFiles(parentDirectoryPath).Any())
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_logger.LogInformation("Deleting empty local metadata folder {Folder}", parentDirectoryPath);
|
||||||
|
Directory.Delete(parentDirectoryPath);
|
||||||
|
}
|
||||||
|
catch (UnauthorizedAccessException ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "Error deleting directory {Path}", parentDirectoryPath);
|
||||||
|
}
|
||||||
|
catch (IOException ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "Error deleting directory {Path}", parentDirectoryPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (FileNotFoundException)
|
catch (FileNotFoundException)
|
||||||
|
|
|
@ -10,6 +10,7 @@ using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Entities.Audio;
|
using MediaBrowser.Controller.Entities.Audio;
|
||||||
|
using MediaBrowser.Controller.Entities.TV;
|
||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Controller.LiveTv;
|
using MediaBrowser.Controller.LiveTv;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
|
@ -96,7 +97,7 @@ namespace MediaBrowser.Providers.Manager
|
||||||
public bool ValidateImages(BaseItem item, IEnumerable<IImageProvider> providers, ImageRefreshOptions refreshOptions)
|
public bool ValidateImages(BaseItem item, IEnumerable<IImageProvider> providers, ImageRefreshOptions refreshOptions)
|
||||||
{
|
{
|
||||||
var hasChanges = false;
|
var hasChanges = false;
|
||||||
IDirectoryService directoryService = refreshOptions?.DirectoryService;
|
var directoryService = refreshOptions?.DirectoryService;
|
||||||
|
|
||||||
if (item is not Photo)
|
if (item is not Photo)
|
||||||
{
|
{
|
||||||
|
@ -359,10 +360,8 @@ namespace MediaBrowser.Providers.Manager
|
||||||
|
|
||||||
private void PruneImages(BaseItem item, IReadOnlyList<ItemImageInfo> images)
|
private void PruneImages(BaseItem item, IReadOnlyList<ItemImageInfo> images)
|
||||||
{
|
{
|
||||||
for (var i = 0; i < images.Count; i++)
|
foreach (var image in images)
|
||||||
{
|
{
|
||||||
var image = images[i];
|
|
||||||
|
|
||||||
if (image.IsLocalFile)
|
if (image.IsLocalFile)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -377,19 +376,20 @@ namespace MediaBrowser.Providers.Manager
|
||||||
{
|
{
|
||||||
_logger.LogWarning(ex, "Unable to delete {Image}", image.Path);
|
_logger.LogWarning(ex, "Unable to delete {Image}", image.Path);
|
||||||
}
|
}
|
||||||
finally
|
|
||||||
{
|
|
||||||
// Always remove empty parent folder
|
|
||||||
var folder = Path.GetDirectoryName(image.Path);
|
|
||||||
if (Directory.Exists(folder) && !_fileSystem.GetFiles(folder).Any())
|
|
||||||
{
|
|
||||||
Directory.Delete(folder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
item.RemoveImages(images);
|
item.RemoveImages(images);
|
||||||
|
|
||||||
|
// Cleanup old metadata directory for episodes if empty
|
||||||
|
if (item is Episode)
|
||||||
|
{
|
||||||
|
var oldLocalMetadataDirectory = Path.Combine(item.ContainingFolderPath, "metadata");
|
||||||
|
if (_fileSystem.DirectoryExists(oldLocalMetadataDirectory) && !_fileSystem.GetFiles(oldLocalMetadataDirectory).Any())
|
||||||
|
{
|
||||||
|
Directory.Delete(oldLocalMetadataDirectory);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -675,6 +675,8 @@ namespace MediaBrowser.Providers.Manager
|
||||||
};
|
};
|
||||||
temp.Item.Path = item.Path;
|
temp.Item.Path = item.Path;
|
||||||
temp.Item.Id = item.Id;
|
temp.Item.Id = item.Id;
|
||||||
|
temp.Item.PreferredMetadataCountryCode = item.PreferredMetadataCountryCode;
|
||||||
|
temp.Item.PreferredMetadataLanguage = item.PreferredMetadataLanguage;
|
||||||
|
|
||||||
var foundImageTypes = new List<ImageType>();
|
var foundImageTypes = new List<ImageType>();
|
||||||
|
|
||||||
|
@ -817,19 +819,16 @@ namespace MediaBrowser.Providers.Manager
|
||||||
{
|
{
|
||||||
var refreshResult = new RefreshResult();
|
var refreshResult = new RefreshResult();
|
||||||
|
|
||||||
var tmpDataMerged = false;
|
if (id is not null)
|
||||||
|
{
|
||||||
|
MergeNewData(temp.Item, id);
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var provider in providers)
|
foreach (var provider in providers)
|
||||||
{
|
{
|
||||||
var providerName = provider.GetType().Name;
|
var providerName = provider.GetType().Name;
|
||||||
Logger.LogDebug("Running {Provider} for {Item}", providerName, logName);
|
Logger.LogDebug("Running {Provider} for {Item}", providerName, logName);
|
||||||
|
|
||||||
if (id is not null && !tmpDataMerged)
|
|
||||||
{
|
|
||||||
MergeNewData(temp.Item, id);
|
|
||||||
tmpDataMerged = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var result = await provider.GetMetadata(id, cancellationToken).ConfigureAwait(false);
|
var result = await provider.GetMetadata(id, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
#nullable disable
|
#nullable disable
|
||||||
|
|
||||||
#pragma warning disable CS1591
|
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
@ -18,182 +16,212 @@ using MediaBrowser.Model.IO;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using PlaylistsNET.Content;
|
using PlaylistsNET.Content;
|
||||||
|
|
||||||
namespace MediaBrowser.Providers.Playlists
|
namespace MediaBrowser.Providers.Playlists;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Local playlist provider.
|
||||||
|
/// </summary>
|
||||||
|
public class PlaylistItemsProvider : ILocalMetadataProvider<Playlist>,
|
||||||
|
IHasOrder,
|
||||||
|
IForcedProvider,
|
||||||
|
IHasItemChangeMonitor
|
||||||
{
|
{
|
||||||
public class PlaylistItemsProvider : ICustomMetadataProvider<Playlist>,
|
private readonly IFileSystem _fileSystem;
|
||||||
IHasOrder,
|
private readonly ILibraryManager _libraryManager;
|
||||||
IForcedProvider,
|
private readonly ILogger<PlaylistItemsProvider> _logger;
|
||||||
IPreRefreshProvider,
|
private readonly CollectionType[] _ignoredCollections = [CollectionType.livetv, CollectionType.boxsets, CollectionType.playlists];
|
||||||
IHasItemChangeMonitor
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="PlaylistItemsProvider"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="logger">Instance of the <see cref="ILogger{PlaylistItemsProvider}"/> interface.</param>
|
||||||
|
/// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
|
||||||
|
/// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
|
||||||
|
public PlaylistItemsProvider(ILogger<PlaylistItemsProvider> logger, ILibraryManager libraryManager, IFileSystem fileSystem)
|
||||||
{
|
{
|
||||||
private readonly IFileSystem _fileSystem;
|
_logger = logger;
|
||||||
private readonly ILibraryManager _libraryManager;
|
_libraryManager = libraryManager;
|
||||||
private readonly ILogger<PlaylistItemsProvider> _logger;
|
_fileSystem = fileSystem;
|
||||||
private readonly CollectionType[] _ignoredCollections = [CollectionType.livetv, CollectionType.boxsets, CollectionType.playlists];
|
}
|
||||||
|
|
||||||
public PlaylistItemsProvider(ILogger<PlaylistItemsProvider> logger, ILibraryManager libraryManager, IFileSystem fileSystem)
|
/// <inheritdoc />
|
||||||
|
public string Name => "Playlist Item Provider";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public int Order => 100;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public Task<MetadataResult<Playlist>> GetMetadata(
|
||||||
|
ItemInfo info,
|
||||||
|
IDirectoryService directoryService,
|
||||||
|
CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var result = new MetadataResult<Playlist>()
|
||||||
{
|
{
|
||||||
_logger = logger;
|
Item = new Playlist
|
||||||
_libraryManager = libraryManager;
|
{
|
||||||
_fileSystem = fileSystem;
|
Path = info.Path
|
||||||
|
}
|
||||||
|
};
|
||||||
|
Fetch(result);
|
||||||
|
|
||||||
|
return Task.FromResult(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Fetch(MetadataResult<Playlist> result)
|
||||||
|
{
|
||||||
|
var item = result.Item;
|
||||||
|
var path = item.Path;
|
||||||
|
if (!Playlist.IsPlaylistFile(path))
|
||||||
|
{
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Name => "Playlist Reader";
|
var extension = Path.GetExtension(path);
|
||||||
|
if (!Playlist.SupportedExtensions.Contains(extension ?? string.Empty, StringComparison.OrdinalIgnoreCase))
|
||||||
// Run last
|
|
||||||
public int Order => 100;
|
|
||||||
|
|
||||||
public Task<ItemUpdateType> FetchAsync(Playlist item, MetadataRefreshOptions options, CancellationToken cancellationToken)
|
|
||||||
{
|
{
|
||||||
var path = item.Path;
|
return;
|
||||||
if (!Playlist.IsPlaylistFile(path))
|
}
|
||||||
{
|
|
||||||
return Task.FromResult(ItemUpdateType.None);
|
|
||||||
}
|
|
||||||
|
|
||||||
var extension = Path.GetExtension(path);
|
|
||||||
if (!Playlist.SupportedExtensions.Contains(extension ?? string.Empty, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return Task.FromResult(ItemUpdateType.None);
|
|
||||||
}
|
|
||||||
|
|
||||||
var items = GetItems(path, extension).ToArray();
|
|
||||||
|
|
||||||
|
var items = GetItems(path, extension).ToArray();
|
||||||
|
if (items.Length > 0)
|
||||||
|
{
|
||||||
|
result.HasMetadata = true;
|
||||||
item.LinkedChildren = items;
|
item.LinkedChildren = items;
|
||||||
|
|
||||||
return Task.FromResult(ItemUpdateType.MetadataImport);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerable<LinkedChild> GetItems(string path, string extension)
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerable<LinkedChild> GetItems(string path, string extension)
|
||||||
|
{
|
||||||
|
var libraryRoots = _libraryManager.GetUserRootFolder().Children
|
||||||
|
.OfType<CollectionFolder>()
|
||||||
|
.Where(f => f.CollectionType.HasValue && !_ignoredCollections.Contains(f.CollectionType.Value))
|
||||||
|
.SelectMany(f => f.PhysicalLocations)
|
||||||
|
.Distinct(StringComparer.OrdinalIgnoreCase)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
using (var stream = File.OpenRead(path))
|
||||||
{
|
{
|
||||||
var libraryRoots = _libraryManager.GetUserRootFolder().Children
|
if (string.Equals(".wpl", extension, StringComparison.OrdinalIgnoreCase))
|
||||||
.OfType<CollectionFolder>()
|
|
||||||
.Where(f => f.CollectionType.HasValue && !_ignoredCollections.Contains(f.CollectionType.Value))
|
|
||||||
.SelectMany(f => f.PhysicalLocations)
|
|
||||||
.Distinct(StringComparer.OrdinalIgnoreCase)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
using (var stream = File.OpenRead(path))
|
|
||||||
{
|
{
|
||||||
if (string.Equals(".wpl", extension, StringComparison.OrdinalIgnoreCase))
|
return GetWplItems(stream, path, libraryRoots);
|
||||||
{
|
|
||||||
return GetWplItems(stream, path, libraryRoots);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (string.Equals(".zpl", extension, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return GetZplItems(stream, path, libraryRoots);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (string.Equals(".m3u", extension, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return GetM3uItems(stream, path, libraryRoots);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (string.Equals(".m3u8", extension, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return GetM3uItems(stream, path, libraryRoots);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (string.Equals(".pls", extension, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return GetPlsItems(stream, path, libraryRoots);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return Enumerable.Empty<LinkedChild>();
|
if (string.Equals(".zpl", extension, StringComparison.OrdinalIgnoreCase))
|
||||||
}
|
|
||||||
|
|
||||||
private IEnumerable<LinkedChild> GetPlsItems(Stream stream, string playlistPath, List<string> libraryRoots)
|
|
||||||
{
|
|
||||||
var content = new PlsContent();
|
|
||||||
var playlist = content.GetFromStream(stream);
|
|
||||||
|
|
||||||
return playlist.PlaylistEntries
|
|
||||||
.Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
|
|
||||||
.Where(i => i is not null);
|
|
||||||
}
|
|
||||||
|
|
||||||
private IEnumerable<LinkedChild> GetM3uItems(Stream stream, string playlistPath, List<string> libraryRoots)
|
|
||||||
{
|
|
||||||
var content = new M3uContent();
|
|
||||||
var playlist = content.GetFromStream(stream);
|
|
||||||
|
|
||||||
return playlist.PlaylistEntries
|
|
||||||
.Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
|
|
||||||
.Where(i => i is not null);
|
|
||||||
}
|
|
||||||
|
|
||||||
private IEnumerable<LinkedChild> GetZplItems(Stream stream, string playlistPath, List<string> libraryRoots)
|
|
||||||
{
|
|
||||||
var content = new ZplContent();
|
|
||||||
var playlist = content.GetFromStream(stream);
|
|
||||||
|
|
||||||
return playlist.PlaylistEntries
|
|
||||||
.Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
|
|
||||||
.Where(i => i is not null);
|
|
||||||
}
|
|
||||||
|
|
||||||
private IEnumerable<LinkedChild> GetWplItems(Stream stream, string playlistPath, List<string> libraryRoots)
|
|
||||||
{
|
|
||||||
var content = new WplContent();
|
|
||||||
var playlist = content.GetFromStream(stream);
|
|
||||||
|
|
||||||
return playlist.PlaylistEntries
|
|
||||||
.Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
|
|
||||||
.Where(i => i is not null);
|
|
||||||
}
|
|
||||||
|
|
||||||
private LinkedChild GetLinkedChild(string itemPath, string playlistPath, List<string> libraryRoots)
|
|
||||||
{
|
|
||||||
if (TryGetPlaylistItemPath(itemPath, playlistPath, libraryRoots, out var parsedPath))
|
|
||||||
{
|
{
|
||||||
return new LinkedChild
|
return GetZplItems(stream, path, libraryRoots);
|
||||||
{
|
|
||||||
Path = parsedPath,
|
|
||||||
Type = LinkedChildType.Manual
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
if (string.Equals(".m3u", extension, StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return GetM3uItems(stream, path, libraryRoots);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.Equals(".m3u8", extension, StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return GetM3uItems(stream, path, libraryRoots);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.Equals(".pls", extension, StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return GetPlsItems(stream, path, libraryRoots);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool TryGetPlaylistItemPath(string itemPath, string playlistPath, List<string> libraryPaths, out string path)
|
return Enumerable.Empty<LinkedChild>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerable<LinkedChild> GetPlsItems(Stream stream, string playlistPath, List<string> libraryRoots)
|
||||||
|
{
|
||||||
|
var content = new PlsContent();
|
||||||
|
var playlist = content.GetFromStream(stream);
|
||||||
|
|
||||||
|
return playlist.PlaylistEntries
|
||||||
|
.Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
|
||||||
|
.Where(i => i is not null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerable<LinkedChild> GetM3uItems(Stream stream, string playlistPath, List<string> libraryRoots)
|
||||||
|
{
|
||||||
|
var content = new M3uContent();
|
||||||
|
var playlist = content.GetFromStream(stream);
|
||||||
|
|
||||||
|
return playlist.PlaylistEntries
|
||||||
|
.Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
|
||||||
|
.Where(i => i is not null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerable<LinkedChild> GetZplItems(Stream stream, string playlistPath, List<string> libraryRoots)
|
||||||
|
{
|
||||||
|
var content = new ZplContent();
|
||||||
|
var playlist = content.GetFromStream(stream);
|
||||||
|
|
||||||
|
return playlist.PlaylistEntries
|
||||||
|
.Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
|
||||||
|
.Where(i => i is not null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerable<LinkedChild> GetWplItems(Stream stream, string playlistPath, List<string> libraryRoots)
|
||||||
|
{
|
||||||
|
var content = new WplContent();
|
||||||
|
var playlist = content.GetFromStream(stream);
|
||||||
|
|
||||||
|
return playlist.PlaylistEntries
|
||||||
|
.Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
|
||||||
|
.Where(i => i is not null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private LinkedChild GetLinkedChild(string itemPath, string playlistPath, List<string> libraryRoots)
|
||||||
|
{
|
||||||
|
if (TryGetPlaylistItemPath(itemPath, playlistPath, libraryRoots, out var parsedPath))
|
||||||
{
|
{
|
||||||
path = null;
|
return new LinkedChild
|
||||||
string pathToCheck = _fileSystem.MakeAbsolutePath(Path.GetDirectoryName(playlistPath), itemPath);
|
|
||||||
if (!File.Exists(pathToCheck))
|
|
||||||
{
|
{
|
||||||
return false;
|
Path = parsedPath,
|
||||||
}
|
Type = LinkedChildType.Manual
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var libraryPath in libraryPaths)
|
return null;
|
||||||
{
|
}
|
||||||
if (pathToCheck.StartsWith(libraryPath, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
path = pathToCheck;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
private bool TryGetPlaylistItemPath(string itemPath, string playlistPath, List<string> libraryPaths, out string path)
|
||||||
|
{
|
||||||
|
path = null;
|
||||||
|
string pathToCheck = _fileSystem.MakeAbsolutePath(Path.GetDirectoryName(playlistPath), itemPath);
|
||||||
|
if (!File.Exists(pathToCheck))
|
||||||
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool HasChanged(BaseItem item, IDirectoryService directoryService)
|
foreach (var libraryPath in libraryPaths)
|
||||||
{
|
{
|
||||||
var path = item.Path;
|
if (pathToCheck.StartsWith(libraryPath, StringComparison.OrdinalIgnoreCase))
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(path) && item.IsFileProtocol)
|
|
||||||
{
|
{
|
||||||
var file = directoryService.GetFile(path);
|
path = pathToCheck;
|
||||||
if (file is not null && file.LastWriteTimeUtc != item.DateModified)
|
return true;
|
||||||
{
|
|
||||||
_logger.LogDebug("Refreshing {Path} due to date modified timestamp change.", path);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public bool HasChanged(BaseItem item, IDirectoryService directoryService)
|
||||||
|
{
|
||||||
|
var path = item.Path;
|
||||||
|
if (!string.IsNullOrWhiteSpace(path) && item.IsFileProtocol)
|
||||||
|
{
|
||||||
|
var file = directoryService.GetFile(path);
|
||||||
|
if (file is not null && file.LastWriteTimeUtc != item.DateModified)
|
||||||
|
{
|
||||||
|
_logger.LogDebug("Refreshing {Path} due to date modified timestamp change.", path);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -250,7 +250,7 @@ public class MusicBrainzAlbumProvider : IRemoteMetadataProvider<MusicAlbum, Albu
|
||||||
// If we have a release ID but not a release group ID, lookup the release group
|
// If we have a release ID but not a release group ID, lookup the release group
|
||||||
if (!string.IsNullOrWhiteSpace(releaseId) && string.IsNullOrWhiteSpace(releaseGroupId))
|
if (!string.IsNullOrWhiteSpace(releaseId) && string.IsNullOrWhiteSpace(releaseGroupId))
|
||||||
{
|
{
|
||||||
var release = await _musicBrainzQuery.LookupReleaseAsync(new Guid(releaseId), Include.Releases, cancellationToken).ConfigureAwait(false);
|
var release = await _musicBrainzQuery.LookupReleaseAsync(new Guid(releaseId), Include.ReleaseGroups, cancellationToken).ConfigureAwait(false);
|
||||||
releaseGroupId = release.ReleaseGroup?.Id.ToString();
|
releaseGroupId = release.ReleaseGroup?.Id.ToString();
|
||||||
result.HasMetadata = true;
|
result.HasMetadata = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,8 +61,8 @@ namespace MediaBrowser.Providers.TV
|
||||||
await base.AfterMetadataRefresh(item, refreshOptions, cancellationToken).ConfigureAwait(false);
|
await base.AfterMetadataRefresh(item, refreshOptions, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
RemoveObsoleteEpisodes(item);
|
RemoveObsoleteEpisodes(item);
|
||||||
RemoveObsoleteSeasons(item);
|
|
||||||
await CreateSeasonsAsync(item, cancellationToken).ConfigureAwait(false);
|
await CreateSeasonsAsync(item, cancellationToken).ConfigureAwait(false);
|
||||||
|
RemoveObsoleteSeasons(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
|
@ -91,7 +91,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
|
|
||||||
private void RemoveObsoleteSeasons(Series series)
|
private void RemoveObsoleteSeasons(Series series)
|
||||||
{
|
{
|
||||||
// TODO Legacy. It's not really "physical" seasons as any virtual seasons are always converted to non-virtual in UpdateAndCreateSeasonsAsync.
|
// TODO Legacy. It's not really "physical" seasons as any virtual seasons are always converted to non-virtual in CreateSeasonsAsync.
|
||||||
var physicalSeasonNumbers = new HashSet<int>();
|
var physicalSeasonNumbers = new HashSet<int>();
|
||||||
var virtualSeasons = new List<Season>();
|
var virtualSeasons = new List<Season>();
|
||||||
foreach (var existingSeason in series.Children.OfType<Season>())
|
foreach (var existingSeason in series.Children.OfType<Season>())
|
||||||
|
@ -203,11 +203,16 @@ namespace MediaBrowser.Providers.TV
|
||||||
foreach (var seasonNumber in uniqueSeasonNumbers)
|
foreach (var seasonNumber in uniqueSeasonNumbers)
|
||||||
{
|
{
|
||||||
// Null season numbers will have a 'dummy' season created because seasons are always required.
|
// Null season numbers will have a 'dummy' season created because seasons are always required.
|
||||||
if (!seasons.Any(i => i.IndexNumber == seasonNumber))
|
var existingSeason = seasons.FirstOrDefault(i => i.IndexNumber == seasonNumber);
|
||||||
|
if (existingSeason is null)
|
||||||
{
|
{
|
||||||
var seasonName = GetValidSeasonNameForSeries(series, null, seasonNumber);
|
var seasonName = GetValidSeasonNameForSeries(series, null, seasonNumber);
|
||||||
var season = await CreateSeasonAsync(series, seasonName, seasonNumber, cancellationToken).ConfigureAwait(false);
|
await CreateSeasonAsync(series, seasonName, seasonNumber, cancellationToken).ConfigureAwait(false);
|
||||||
series.AddChild(season);
|
}
|
||||||
|
else if (existingSeason.IsVirtualItem)
|
||||||
|
{
|
||||||
|
existingSeason.IsVirtualItem = false;
|
||||||
|
await existingSeason.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -220,7 +225,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
/// <param name="seasonNumber">The season number.</param>
|
/// <param name="seasonNumber">The season number.</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>The newly created season.</returns>
|
/// <returns>The newly created season.</returns>
|
||||||
private async Task<Season> CreateSeasonAsync(
|
private async Task CreateSeasonAsync(
|
||||||
Series series,
|
Series series,
|
||||||
string? seasonName,
|
string? seasonName,
|
||||||
int? seasonNumber,
|
int? seasonNumber,
|
||||||
|
@ -237,14 +242,12 @@ namespace MediaBrowser.Providers.TV
|
||||||
typeof(Season)),
|
typeof(Season)),
|
||||||
IsVirtualItem = false,
|
IsVirtualItem = false,
|
||||||
SeriesId = series.Id,
|
SeriesId = series.Id,
|
||||||
SeriesName = series.Name
|
SeriesName = series.Name,
|
||||||
|
SeriesPresentationUniqueKey = series.GetPresentationUniqueKey()
|
||||||
};
|
};
|
||||||
|
|
||||||
series.AddChild(season);
|
series.AddChild(season);
|
||||||
|
|
||||||
await season.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(FileSystem)), cancellationToken).ConfigureAwait(false);
|
await season.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(FileSystem)), cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
return season;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private string GetValidSeasonNameForSeries(Series series, string? seasonName, int? seasonNumber)
|
private string GetValidSeasonNameForSeries(Series series, string? seasonName, int? seasonNumber)
|
||||||
|
|
|
@ -519,7 +519,9 @@ namespace MediaBrowser.XbmcMetadata.Parsers
|
||||||
if (reader.TryReadDateTimeExact(nfoConfiguration.ReleaseDateFormat, out var releaseDate))
|
if (reader.TryReadDateTimeExact(nfoConfiguration.ReleaseDateFormat, out var releaseDate))
|
||||||
{
|
{
|
||||||
item.PremiereDate = releaseDate;
|
item.PremiereDate = releaseDate;
|
||||||
item.ProductionYear = releaseDate.Year;
|
|
||||||
|
// Production year can already be set by the year tag
|
||||||
|
item.ProductionYear ??= releaseDate.Year;
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -919,10 +919,14 @@ public class NetworkManager : INetworkManager, IDisposable
|
||||||
{
|
{
|
||||||
ArgumentNullException.ThrowIfNull(address);
|
ArgumentNullException.ThrowIfNull(address);
|
||||||
|
|
||||||
// See conversation at https://github.com/jellyfin/jellyfin/pull/3515.
|
// Map IPv6 mapped IPv4 back to IPv4 (happens if Kestrel runs in dual-socket mode)
|
||||||
|
if (address.IsIPv4MappedToIPv6)
|
||||||
|
{
|
||||||
|
address = address.MapToIPv4();
|
||||||
|
}
|
||||||
|
|
||||||
if ((TrustAllIPv6Interfaces && address.AddressFamily == AddressFamily.InterNetworkV6)
|
if ((TrustAllIPv6Interfaces && address.AddressFamily == AddressFamily.InterNetworkV6)
|
||||||
|| address.Equals(IPAddress.Loopback)
|
|| IPAddress.IsLoopback(address))
|
||||||
|| address.Equals(IPAddress.IPv6Loopback))
|
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -104,6 +104,7 @@ public class ExternalPathParserTests
|
||||||
[InlineData(".en.cc.title", "title", "eng", false, false, true)]
|
[InlineData(".en.cc.title", "title", "eng", false, false, true)]
|
||||||
[InlineData(".hi.en.title", "title", "eng", false, false, true)]
|
[InlineData(".hi.en.title", "title", "eng", false, false, true)]
|
||||||
[InlineData(".en.hi.title", "title", "eng", false, false, true)]
|
[InlineData(".en.hi.title", "title", "eng", false, false, true)]
|
||||||
|
[InlineData(".Subs for Chinese Audio.eng", "Subs for Chinese Audio", "eng", false, false, false)]
|
||||||
public void ParseFile_ExtraTokens_ParseToValues(string tokens, string? title, string? language, bool isDefault = false, bool isForced = false, bool isHearingImpaired = false)
|
public void ParseFile_ExtraTokens_ParseToValues(string tokens, string? title, string? language, bool isDefault = false, bool isForced = false, bool isHearingImpaired = false)
|
||||||
{
|
{
|
||||||
var path = "My.Video" + tokens + ".srt";
|
var path = "My.Video" + tokens + ".srt";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user