Apply review comments

pull/11680/head
Shadowghost 2 months ago
parent 287e06d6dc
commit 18e6c1ef7d

@ -14,6 +14,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Playlists; using MediaBrowser.Controller.Playlists;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using PlaylistsNET.Content; using PlaylistsNET.Content;
@ -25,14 +26,16 @@ namespace MediaBrowser.Providers.Playlists
IPreRefreshProvider, IPreRefreshProvider,
IHasItemChangeMonitor IHasItemChangeMonitor
{ {
private readonly ILogger<PlaylistItemsProvider> _logger; private readonly IFileSystem _fileSystem;
private readonly ILibraryManager _libraryManager; private readonly ILibraryManager _libraryManager;
private readonly ILogger<PlaylistItemsProvider> _logger;
private readonly CollectionType[] _ignoredCollections = [CollectionType.livetv, CollectionType.boxsets, CollectionType.playlists]; private readonly CollectionType[] _ignoredCollections = [CollectionType.livetv, CollectionType.boxsets, CollectionType.playlists];
public PlaylistItemsProvider(ILogger<PlaylistItemsProvider> logger, ILibraryManager libraryManager) public PlaylistItemsProvider(ILogger<PlaylistItemsProvider> logger, ILibraryManager libraryManager, IFileSystem fileSystem)
{ {
_logger = logger; _logger = logger;
_libraryManager = libraryManager; _libraryManager = libraryManager;
_fileSystem = fileSystem;
} }
public string Name => "Playlist Reader"; public string Name => "Playlist Reader";
@ -158,20 +161,10 @@ namespace MediaBrowser.Providers.Playlists
private bool TryGetPlaylistItemPath(string itemPath, string playlistPath, List<string> libraryPaths, out string path) private bool TryGetPlaylistItemPath(string itemPath, string playlistPath, List<string> libraryPaths, out string path)
{ {
path = null; path = null;
string pathToCheck; string pathToCheck = _fileSystem.MakeAbsolutePath(Path.GetDirectoryName(playlistPath), itemPath);
if (File.Exists(itemPath)) if (!File.Exists(pathToCheck))
{
pathToCheck = itemPath;
}
else
{ {
var baseFolder = Path.GetDirectoryName(playlistPath); return false;
var basePath = Path.Combine(baseFolder, itemPath);
pathToCheck = Path.GetFullPath(basePath);
if (!File.Exists(pathToCheck))
{
return false;
}
} }
foreach (var libraryPath in libraryPaths) foreach (var libraryPath in libraryPaths)

Loading…
Cancel
Save