Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-24 02:02:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Bond_009 2021-05-07 00:52:06 +02:00
parent fb090df0b5
commit 4367b97a54
12 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Server.Implementations/Library/ResolverHelper.cs
View File

@ -44,6 +44,11 @@ namespace Emby.Server.Implementations.Library
// Make sure DateCreated and DateModified have values // Make sure DateCreated and DateModified have values
var fileInfo = directoryService.GetFile(item.Path); var fileInfo = directoryService.GetFile(item.Path);
if (fileInfo == null)
{
throw new FileNotFoundException("Can't find item path.", item.Path);
}
SetDateCreated(item, fileInfo); SetDateCreated(item, fileInfo);
EnsureName(item, fileInfo); EnsureName(item, fileInfo);

2
MediaBrowser.Controller/Library/TVUtils.cs
View File

@ -14,7 +14,7 @@ namespace MediaBrowser.Controller.Library
/// <param name="day">The day.</param> /// <param name="day">The day.</param>
/// <returns>List{DayOfWeek}.</returns> /// <returns>List{DayOfWeek}.</returns>
[return: NotNullIfNotNull("day")] [return: NotNullIfNotNull("day")]
public static DayOfWeek[] GetAirDays(string? day) public static DayOfWeek[]? GetAirDays(string? day)
{ {
if (!string.IsNullOrEmpty(day)) if (!string.IsNullOrEmpty(day))
{ {

19
MediaBrowser.Controller/Providers/DirectoryService.cs
View File

@ -43,18 +43,17 @@ namespace MediaBrowser.Controller.Providers
return list; return list;
} }
public FileSystemMetadata GetFile(string path) public FileSystemMetadata? GetFile(string path)
{ {
var result = _fileCache.GetOrAdd(path, p => if (!_fileCache.TryGetValue(path, out var result))
{ {
var file = _fileSystem.GetFileInfo(p); var file = _fileSystem.GetFileInfo(path);
return file != null && file.Exists ? file : null; var res = file != null && file.Exists ? file : null;
}); if (res != null)
{
if (result == null) result = res;
{ _fileCache.TryAdd(path, result);
// lets not store null results in the cache }
_fileCache.TryRemove(path, out _);
} }
return result; return result;

2
MediaBrowser.Controller/Providers/IDirectoryService.cs
View File

@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.Providers
List<FileSystemMetadata> GetFiles(string path); List<FileSystemMetadata> GetFiles(string path);
FileSystemMetadata GetFile(string path); FileSystemMetadata? GetFile(string path);
IReadOnlyList<string> GetFilePaths(string path); IReadOnlyList<string> GetFilePaths(string path);

2
MediaBrowser.LocalMetadata/BaseXmlProvider.cs
View File

@ -91,7 +91,7 @@ namespace MediaBrowser.LocalMetadata
/// <param name="info">Item inf.</param> /// <param name="info">Item inf.</param>
/// <param name="directoryService">Instance of the <see cref="IDirectoryService"/> interface.</param> /// <param name="directoryService">Instance of the <see cref="IDirectoryService"/> interface.</param>
/// <returns>The file system metadata.</returns> /// <returns>The file system metadata.</returns>
protected abstract FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService); protected abstract FileSystemMetadata? GetXmlFile(ItemInfo info, IDirectoryService directoryService);
/// <inheritdoc /> /// <inheritdoc />
public bool HasChanged(BaseItem item, IDirectoryService directoryService) public bool HasChanged(BaseItem item, IDirectoryService directoryService)

2
MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs
View File

@ -36,7 +36,7 @@ namespace MediaBrowser.LocalMetadata.Providers
} }
/// <inheritdoc /> /// <inheritdoc />
protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) protected override FileSystemMetadata? GetXmlFile(ItemInfo info, IDirectoryService directoryService)
{ {
return directoryService.GetFile(Path.Combine(info.Path, "collection.xml")); return directoryService.GetFile(Path.Combine(info.Path, "collection.xml"));
} }

2
MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs
View File

@ -39,7 +39,7 @@ namespace MediaBrowser.LocalMetadata.Providers
} }
/// <inheritdoc /> /// <inheritdoc />
protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) protected override FileSystemMetadata? GetXmlFile(ItemInfo info, IDirectoryService directoryService)
{ {
return directoryService.GetFile(PlaylistXmlSaver.GetSavePath(info.Path)); return directoryService.GetFile(PlaylistXmlSaver.GetSavePath(info.Path));
} }

2
MediaBrowser.XbmcMetadata/Providers/AlbumNfoProvider.cs
View File

@ -57,7 +57,7 @@ namespace MediaBrowser.XbmcMetadata.Providers
} }
/// <inheritdoc /> /// <inheritdoc />
protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) protected override FileSystemMetadata? GetXmlFile(ItemInfo info, IDirectoryService directoryService)
=> directoryService.GetFile(Path.Combine(info.Path, "album.nfo")); => directoryService.GetFile(Path.Combine(info.Path, "album.nfo"));
} }
} }

2
MediaBrowser.XbmcMetadata/Providers/ArtistNfoProvider.cs
View File

@ -57,7 +57,7 @@ namespace MediaBrowser.XbmcMetadata.Providers
} }
/// <inheritdoc /> /// <inheritdoc />
protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) protected override FileSystemMetadata? GetXmlFile(ItemInfo info, IDirectoryService directoryService)
=> directoryService.GetFile(Path.Combine(info.Path, "artist.nfo")); => directoryService.GetFile(Path.Combine(info.Path, "artist.nfo"));
} }
} }

2
MediaBrowser.XbmcMetadata/Providers/EpisodeNfoProvider.cs
View File

@ -57,7 +57,7 @@ namespace MediaBrowser.XbmcMetadata.Providers
} }
/// <inheritdoc /> /// <inheritdoc />
protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) protected override FileSystemMetadata? GetXmlFile(ItemInfo info, IDirectoryService directoryService)
{ {
var path = Path.ChangeExtension(info.Path, ".nfo"); var path = Path.ChangeExtension(info.Path, ".nfo");

2
MediaBrowser.XbmcMetadata/Providers/SeasonNfoProvider.cs
View File

@ -57,7 +57,7 @@ namespace MediaBrowser.XbmcMetadata.Providers
} }
/// <inheritdoc /> /// <inheritdoc />
protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) protected override FileSystemMetadata? GetXmlFile(ItemInfo info, IDirectoryService directoryService)
=> directoryService.GetFile(Path.Combine(info.Path, "season.nfo")); => directoryService.GetFile(Path.Combine(info.Path, "season.nfo"));
} }
} }

2
MediaBrowser.XbmcMetadata/Providers/SeriesNfoProvider.cs
View File

@ -57,7 +57,7 @@ namespace MediaBrowser.XbmcMetadata.Providers
} }
/// <inheritdoc /> /// <inheritdoc />
protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) protected override FileSystemMetadata? GetXmlFile(ItemInfo info, IDirectoryService directoryService)
=> directoryService.GetFile(Path.Combine(info.Path, "tvshow.nfo")); => directoryService.GetFile(Path.Combine(info.Path, "tvshow.nfo"));
} }
} }