diff options
Diffstat (limited to 'MediaBrowser.LocalMetadata/Providers')
12 files changed, 32 insertions, 25 deletions
diff --git a/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs index fc22e75c5..01eaf33d2 100644 --- a/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs +++ b/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs @@ -5,6 +5,7 @@ using MediaBrowser.LocalMetadata.Parsers; using MediaBrowser.Model.Logging; using System.IO; using System.Threading; +using CommonIO; namespace MediaBrowser.LocalMetadata.Providers { @@ -26,7 +27,7 @@ namespace MediaBrowser.LocalMetadata.Providers new BoxSetXmlParser(_logger).Fetch(result, path, cancellationToken); } - protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService) + protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) { return directoryService.GetFile(Path.Combine(info.Path, "collection.xml")); } diff --git a/MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs index bf2730032..17ef5fd2e 100644 --- a/MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs +++ b/MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs @@ -7,6 +7,7 @@ using MediaBrowser.Model.Logging; using System.Collections.Generic; using System.IO; using System.Threading; +using CommonIO; namespace MediaBrowser.LocalMetadata.Providers { @@ -25,12 +26,12 @@ namespace MediaBrowser.LocalMetadata.Providers var images = new List<LocalImageInfo>(); var chapters = new List<ChapterInfo>(); - new EpisodeXmlParser(_logger).Fetch(result, images, path, cancellationToken); + new EpisodeXmlParser(_logger, FileSystem).Fetch(result, images, path, cancellationToken); result.Images = images; } - protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService) + protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) { var metadataPath = Path.GetDirectoryName(info.Path); metadataPath = Path.Combine(metadataPath, "metadata"); diff --git a/MediaBrowser.LocalMetadata/Providers/FolderXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/FolderXmlProvider.cs index bf059c553..20fa889cc 100644 --- a/MediaBrowser.LocalMetadata/Providers/FolderXmlProvider.cs +++ b/MediaBrowser.LocalMetadata/Providers/FolderXmlProvider.cs @@ -1,5 +1,6 @@ using System.IO; using System.Threading; +using CommonIO; using MediaBrowser.Common.IO; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Providers; @@ -25,9 +26,9 @@ namespace MediaBrowser.LocalMetadata.Providers new BaseItemXmlParser<Folder>(_logger).Fetch(result, path, cancellationToken); } - protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService) + protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) { - return new FileInfo(Path.Combine(info.Path, "folder.xml")); + return directoryService.GetFile(Path.Combine(info.Path, "folder.xml")); } } } diff --git a/MediaBrowser.LocalMetadata/Providers/GameSystemXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/GameSystemXmlProvider.cs index f51605f06..6abb019b4 100644 --- a/MediaBrowser.LocalMetadata/Providers/GameSystemXmlProvider.cs +++ b/MediaBrowser.LocalMetadata/Providers/GameSystemXmlProvider.cs @@ -1,5 +1,6 @@ using System.IO; using System.Threading; +using CommonIO; using MediaBrowser.Common.IO; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Providers; @@ -23,7 +24,7 @@ namespace MediaBrowser.LocalMetadata.Providers new GameSystemXmlParser(_logger).Fetch(result, path, cancellationToken); } - protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService) + protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) { return directoryService.GetFile(Path.Combine(info.Path, "gamesystem.xml")); } diff --git a/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs index 7ee2c768b..8d1a4d690 100644 --- a/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs +++ b/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs @@ -5,6 +5,7 @@ using MediaBrowser.LocalMetadata.Parsers; using MediaBrowser.Model.Logging; using System.IO; using System.Threading; +using CommonIO; namespace MediaBrowser.LocalMetadata.Providers { @@ -23,12 +24,12 @@ namespace MediaBrowser.LocalMetadata.Providers new GameXmlParser(_logger).Fetch(result, path, cancellationToken); } - protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService) + protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) { var specificFile = Path.ChangeExtension(info.Path, ".xml"); - var file = new FileInfo(specificFile); + var file = FileSystem.GetFileInfo(specificFile); - return info.IsInMixedFolder || file.Exists ? file : new FileInfo(Path.Combine(Path.GetDirectoryName(info.Path), "game.xml")); + return info.IsInMixedFolder || file.Exists ? file : FileSystem.GetFileInfo(Path.Combine(Path.GetDirectoryName(info.Path), "game.xml")); } } } diff --git a/MediaBrowser.LocalMetadata/Providers/MovieXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/MovieXmlProvider.cs index 82c7dbd67..0930e9198 100644 --- a/MediaBrowser.LocalMetadata/Providers/MovieXmlProvider.cs +++ b/MediaBrowser.LocalMetadata/Providers/MovieXmlProvider.cs @@ -5,6 +5,7 @@ using MediaBrowser.LocalMetadata.Parsers; using MediaBrowser.Model.Logging; using System.IO; using System.Threading; +using CommonIO; namespace MediaBrowser.LocalMetadata.Providers { @@ -23,27 +24,22 @@ namespace MediaBrowser.LocalMetadata.Providers new MovieXmlParser(_logger).Fetch(result, path, cancellationToken); } - protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService) + protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) { return GetXmlFileInfo(info, FileSystem); } - public static FileInfo GetXmlFileInfo(ItemInfo info, IFileSystem fileSystem) + public static FileSystemMetadata GetXmlFileInfo(ItemInfo info, IFileSystem fileSystem) { var fileInfo = fileSystem.GetFileSystemInfo(info.Path); - var directoryInfo = fileInfo as DirectoryInfo; - - if (directoryInfo == null) - { - directoryInfo = new DirectoryInfo(Path.GetDirectoryName(info.Path)); - } + var directoryInfo = fileInfo.IsDirectory ? fileInfo : fileSystem.GetDirectoryInfo(Path.GetDirectoryName(info.Path)); var directoryPath = directoryInfo.FullName; var specificFile = Path.Combine(directoryPath, fileSystem.GetFileNameWithoutExtension(info.Path) + ".xml"); - var file = new FileInfo(specificFile); + var file = fileSystem.GetFileInfo(specificFile); // In a mixed folder, only {moviename}.xml is supported if (info.IsInMixedFolder) @@ -52,7 +48,7 @@ namespace MediaBrowser.LocalMetadata.Providers } // If in it's own folder, prefer movie.xml, but allow the specific file as well - var movieFile = new FileInfo(Path.Combine(directoryPath, "movie.xml")); + var movieFile = fileSystem.GetFileInfo(Path.Combine(directoryPath, "movie.xml")); return movieFile.Exists ? movieFile : file; } diff --git a/MediaBrowser.LocalMetadata/Providers/MusicVideoXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/MusicVideoXmlProvider.cs index 3171dd9a7..e24e46310 100644 --- a/MediaBrowser.LocalMetadata/Providers/MusicVideoXmlProvider.cs +++ b/MediaBrowser.LocalMetadata/Providers/MusicVideoXmlProvider.cs @@ -1,5 +1,6 @@ using System.IO; using System.Threading; +using CommonIO; using MediaBrowser.Common.IO; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Providers; @@ -23,7 +24,7 @@ namespace MediaBrowser.LocalMetadata.Providers new MusicVideoXmlParser(_logger).Fetch(result, path, cancellationToken); } - protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService) + protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) { return MovieXmlProvider.GetXmlFileInfo(info, FileSystem); } diff --git a/MediaBrowser.LocalMetadata/Providers/PersonXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/PersonXmlProvider.cs index 115d5b041..dd3541d56 100644 --- a/MediaBrowser.LocalMetadata/Providers/PersonXmlProvider.cs +++ b/MediaBrowser.LocalMetadata/Providers/PersonXmlProvider.cs @@ -1,5 +1,6 @@ using System.IO; using System.Threading; +using CommonIO; using MediaBrowser.Common.IO; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Providers; @@ -22,7 +23,7 @@ namespace MediaBrowser.LocalMetadata.Providers new BaseItemXmlParser<Person>(_logger).Fetch(result, path, cancellationToken); } - protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService) + protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) { return directoryService.GetFile(Path.Combine(info.Path, "person.xml")); } diff --git a/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs index 3de311e2b..81c87ee4d 100644 --- a/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs +++ b/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs @@ -5,6 +5,7 @@ using MediaBrowser.LocalMetadata.Parsers; using MediaBrowser.Model.Logging; using System.IO; using System.Threading; +using CommonIO; namespace MediaBrowser.LocalMetadata.Providers { @@ -23,7 +24,7 @@ namespace MediaBrowser.LocalMetadata.Providers new PlaylistXmlParser(_logger).Fetch(result, path, cancellationToken); } - protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService) + protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) { return directoryService.GetFile(Path.Combine(info.Path, "playlist.xml")); } diff --git a/MediaBrowser.LocalMetadata/Providers/SeasonXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/SeasonXmlProvider.cs index f0c8f0fa1..bea0de88e 100644 --- a/MediaBrowser.LocalMetadata/Providers/SeasonXmlProvider.cs +++ b/MediaBrowser.LocalMetadata/Providers/SeasonXmlProvider.cs @@ -1,5 +1,6 @@ using System.IO; using System.Threading; +using CommonIO; using MediaBrowser.Common.IO; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Providers; @@ -26,7 +27,7 @@ namespace MediaBrowser.LocalMetadata.Providers new SeasonXmlParser(_logger).Fetch(result, path, cancellationToken); } - protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService) + protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) { return directoryService.GetFile(Path.Combine(info.Path, "season.xml")); } diff --git a/MediaBrowser.LocalMetadata/Providers/SeriesXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/SeriesXmlProvider.cs index 80fdad483..85bbcbc02 100644 --- a/MediaBrowser.LocalMetadata/Providers/SeriesXmlProvider.cs +++ b/MediaBrowser.LocalMetadata/Providers/SeriesXmlProvider.cs @@ -1,5 +1,6 @@ using System.IO; using System.Threading; +using CommonIO; using MediaBrowser.Common.IO; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Providers; @@ -26,7 +27,7 @@ namespace MediaBrowser.LocalMetadata.Providers new SeriesXmlParser(_logger).Fetch(result, path, cancellationToken); } - protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService) + protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) { return directoryService.GetFile(Path.Combine(info.Path, "series.xml")); } diff --git a/MediaBrowser.LocalMetadata/Providers/VideoXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/VideoXmlProvider.cs index 56d289f97..0600161b3 100644 --- a/MediaBrowser.LocalMetadata/Providers/VideoXmlProvider.cs +++ b/MediaBrowser.LocalMetadata/Providers/VideoXmlProvider.cs @@ -5,6 +5,7 @@ using MediaBrowser.LocalMetadata.Parsers; using MediaBrowser.Model.Logging; using System.IO; using System.Threading; +using CommonIO; namespace MediaBrowser.LocalMetadata.Providers { @@ -23,7 +24,7 @@ namespace MediaBrowser.LocalMetadata.Providers new VideoXmlParser(_logger).Fetch(result, path, cancellationToken); } - protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService) + protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService) { return MovieXmlProvider.GetXmlFileInfo(info, FileSystem); } |