From 48facb797ed912e4ea6b04b17d1ff190ac2daac4 Mon Sep 17 00:00:00 2001 From: stefan Date: Wed, 12 Sep 2018 19:26:21 +0200 Subject: Update to 3.5.2 and .net core 2.1 --- MediaBrowser.Controller/Library/DeleteOptions.cs | 8 - MediaBrowser.Controller/Library/IIntroProvider.cs | 32 -- MediaBrowser.Controller/Library/ILibraryManager.cs | 559 --------------------- MediaBrowser.Controller/Library/ILibraryMonitor.cs | 43 -- .../Library/ILibraryPostScanTask.cs | 20 - .../Library/IMediaSourceManager.cs | 97 ---- .../Library/IMediaSourceProvider.cs | 32 -- .../Library/IMetadataFileSaver.cs | 19 - MediaBrowser.Controller/Library/IMetadataSaver.cs | 33 -- MediaBrowser.Controller/Library/IMusicManager.cs | 25 - MediaBrowser.Controller/Library/ISearchEngine.cs | 19 - .../Library/IUserDataManager.cs | 65 --- MediaBrowser.Controller/Library/IUserManager.cs | 199 -------- .../Library/IUserViewManager.cs | 22 - MediaBrowser.Controller/Library/IntroInfo.cs | 19 - .../Library/ItemChangeEventArgs.cs | 24 - MediaBrowser.Controller/Library/ItemResolveArgs.cs | 281 ----------- MediaBrowser.Controller/Library/ItemUpdateType.cs | 14 - .../Library/LibraryManagerExtensions.cs | 13 - .../Library/MetadataConfigurationStore.cs | 29 -- MediaBrowser.Controller/Library/NameExtensions.cs | 26 - .../Library/PlaybackProgressEventArgs.cs | 32 -- .../Library/PlaybackStopEventArgs.cs | 11 - MediaBrowser.Controller/Library/Profiler.cs | 77 --- MediaBrowser.Controller/Library/SearchHintInfo.cs | 22 - MediaBrowser.Controller/Library/TVUtils.cs | 58 --- .../Library/UserDataSaveEventArgs.cs | 39 -- 27 files changed, 1818 deletions(-) delete mode 100644 MediaBrowser.Controller/Library/DeleteOptions.cs delete mode 100644 MediaBrowser.Controller/Library/IIntroProvider.cs delete mode 100644 MediaBrowser.Controller/Library/ILibraryManager.cs delete mode 100644 MediaBrowser.Controller/Library/ILibraryMonitor.cs delete mode 100644 MediaBrowser.Controller/Library/ILibraryPostScanTask.cs delete mode 100644 MediaBrowser.Controller/Library/IMediaSourceManager.cs delete mode 100644 MediaBrowser.Controller/Library/IMediaSourceProvider.cs delete mode 100644 MediaBrowser.Controller/Library/IMetadataFileSaver.cs delete mode 100644 MediaBrowser.Controller/Library/IMetadataSaver.cs delete mode 100644 MediaBrowser.Controller/Library/IMusicManager.cs delete mode 100644 MediaBrowser.Controller/Library/ISearchEngine.cs delete mode 100644 MediaBrowser.Controller/Library/IUserDataManager.cs delete mode 100644 MediaBrowser.Controller/Library/IUserManager.cs delete mode 100644 MediaBrowser.Controller/Library/IUserViewManager.cs delete mode 100644 MediaBrowser.Controller/Library/IntroInfo.cs delete mode 100644 MediaBrowser.Controller/Library/ItemChangeEventArgs.cs delete mode 100644 MediaBrowser.Controller/Library/ItemResolveArgs.cs delete mode 100644 MediaBrowser.Controller/Library/ItemUpdateType.cs delete mode 100644 MediaBrowser.Controller/Library/LibraryManagerExtensions.cs delete mode 100644 MediaBrowser.Controller/Library/MetadataConfigurationStore.cs delete mode 100644 MediaBrowser.Controller/Library/NameExtensions.cs delete mode 100644 MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs delete mode 100644 MediaBrowser.Controller/Library/PlaybackStopEventArgs.cs delete mode 100644 MediaBrowser.Controller/Library/Profiler.cs delete mode 100644 MediaBrowser.Controller/Library/SearchHintInfo.cs delete mode 100644 MediaBrowser.Controller/Library/TVUtils.cs delete mode 100644 MediaBrowser.Controller/Library/UserDataSaveEventArgs.cs (limited to 'MediaBrowser.Controller/Library') diff --git a/MediaBrowser.Controller/Library/DeleteOptions.cs b/MediaBrowser.Controller/Library/DeleteOptions.cs deleted file mode 100644 index 81ed908993..0000000000 --- a/MediaBrowser.Controller/Library/DeleteOptions.cs +++ /dev/null @@ -1,8 +0,0 @@ - -namespace MediaBrowser.Controller.Library -{ - public class DeleteOptions - { - public bool DeleteFileLocation { get; set; } - } -} diff --git a/MediaBrowser.Controller/Library/IIntroProvider.cs b/MediaBrowser.Controller/Library/IIntroProvider.cs deleted file mode 100644 index 611aab3875..0000000000 --- a/MediaBrowser.Controller/Library/IIntroProvider.cs +++ /dev/null @@ -1,32 +0,0 @@ -using MediaBrowser.Controller.Entities; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace MediaBrowser.Controller.Library -{ - /// - /// Class BaseIntroProvider - /// - public interface IIntroProvider - { - /// - /// Gets the intros. - /// - /// The item. - /// The user. - /// IEnumerable{System.String}. - Task> GetIntros(BaseItem item, User user); - - /// - /// Gets all intro files. - /// - /// IEnumerable{System.String}. - IEnumerable GetAllIntroFiles(); - - /// - /// Gets the name. - /// - /// The name. - string Name { get; } - } -} diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs deleted file mode 100644 index 9ef372eb66..0000000000 --- a/MediaBrowser.Controller/Library/ILibraryManager.cs +++ /dev/null @@ -1,559 +0,0 @@ -using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.Entities.Audio; -using MediaBrowser.Controller.Entities.TV; -using MediaBrowser.Controller.Providers; -using MediaBrowser.Controller.Resolvers; -using MediaBrowser.Controller.Sorting; -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Querying; -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; - -using MediaBrowser.Controller.Configuration; -using MediaBrowser.Controller.Dto; -using MediaBrowser.Controller.IO; -using MediaBrowser.Model.Configuration; -using MediaBrowser.Model.Dto; -using MediaBrowser.Model.IO; - -namespace MediaBrowser.Controller.Library -{ - /// - /// Interface ILibraryManager - /// - public interface ILibraryManager - { - /// - /// Resolves the path. - /// - /// The file information. - /// The parent. - /// BaseItem. - BaseItem ResolvePath(FileSystemMetadata fileInfo, - Folder parent = null); - - /// - /// Resolves a set of files into a list of BaseItem - /// - IEnumerable ResolvePaths(IEnumerable files, - IDirectoryService directoryService, - Folder parent, - LibraryOptions libraryOptions, - string collectionType = null); - - /// - /// Gets the root folder. - /// - /// The root folder. - AggregateFolder RootFolder { get; } - - /// - /// Gets a Person - /// - /// The name. - /// Task{Person}. - Person GetPerson(string name); - - /// - /// Finds the by path. - /// - /// The path. - /// BaseItem. - BaseItem FindByPath(string path, bool? isFolder); - - /// - /// Gets the artist. - /// - /// The name. - /// Task{Artist}. - MusicArtist GetArtist(string name); - MusicArtist GetArtist(string name, DtoOptions options); - /// - /// Gets a Studio - /// - /// The name. - /// Task{Studio}. - Studio GetStudio(string name); - - /// - /// Gets a Genre - /// - /// The name. - /// Task{Genre}. - Genre GetGenre(string name); - - /// - /// Gets the genre. - /// - /// The name. - /// Task{MusicGenre}. - MusicGenre GetMusicGenre(string name); - - /// - /// Gets the game genre. - /// - /// The name. - /// Task{GameGenre}. - GameGenre GetGameGenre(string name); - - /// - /// Gets a Year - /// - /// The value. - /// Task{Year}. - /// - Year GetYear(int value); - - /// - /// Validate and refresh the People sub-set of the IBN. - /// The items are stored in the db but not loaded into memory until actually requested by an operation. - /// - /// The cancellation token. - /// The progress. - /// Task. - Task ValidatePeople(CancellationToken cancellationToken, IProgress progress); - - /// - /// Reloads the root media folder - /// - /// The progress. - /// The cancellation token. - /// Task. - Task ValidateMediaLibrary(IProgress progress, CancellationToken cancellationToken); - - /// - /// Queues the library scan. - /// - void QueueLibraryScan(); - - void UpdateImages(BaseItem item); - - /// - /// Gets the default view. - /// - /// IEnumerable{VirtualFolderInfo}. - List GetVirtualFolders(); - - List GetVirtualFolders(bool includeRefreshState); - - /// - /// Gets the item by id. - /// - /// The id. - /// BaseItem. - BaseItem GetItemById(Guid id); - - /// - /// Gets the intros. - /// - /// The item. - /// The user. - /// IEnumerable{System.String}. - Task> GetIntros(BaseItem item, User user); - - /// - /// Gets all intro files. - /// - /// IEnumerable{System.String}. - IEnumerable GetAllIntroFiles(); - - /// - /// Adds the parts. - /// - /// The rules. - /// The plugin folders. - /// The resolvers. - /// The intro providers. - /// The item comparers. - /// The postscan tasks. - void AddParts(IEnumerable rules, - IEnumerable pluginFolders, - IEnumerable resolvers, - IEnumerable introProviders, - IEnumerable itemComparers, - IEnumerable postscanTasks); - - /// - /// Sorts the specified items. - /// - /// The items. - /// The user. - /// The sort by. - /// The sort order. - /// IEnumerable{BaseItem}. - IEnumerable Sort(IEnumerable items, User user, IEnumerable sortBy, SortOrder sortOrder); - IEnumerable Sort(IEnumerable items, User user, IEnumerable> orderBy); - - /// - /// Gets the user root folder. - /// - /// UserRootFolder. - Folder GetUserRootFolder(); - - /// - /// Creates the item. - /// - void CreateItem(BaseItem item, CancellationToken cancellationToken); - - /// - /// Creates the items. - /// - void CreateItems(IEnumerable items, BaseItem parent, CancellationToken cancellationToken); - - /// - /// Updates the item. - /// - void UpdateItem(BaseItem item, ItemUpdateType updateReason, CancellationToken cancellationToken); - - /// - /// Retrieves the item. - /// - /// The id. - /// BaseItem. - BaseItem RetrieveItem(Guid id); - - bool IsScanRunning { get; } - - /// - /// Occurs when [item added]. - /// - event EventHandler ItemAdded; - - /// - /// Occurs when [item updated]. - /// - event EventHandler ItemUpdated; - /// - /// Occurs when [item removed]. - /// - event EventHandler ItemRemoved; - - /// - /// Reports the item removed. - /// - void ReportItemRemoved(BaseItem item, BaseItem parent); - - /// - /// Finds the type of the collection. - /// - /// The item. - /// System.String. - string GetContentType(BaseItem item); - - /// - /// Gets the type of the inherited content. - /// - /// The item. - /// System.String. - string GetInheritedContentType(BaseItem item); - - /// - /// Gets the type of the configured content. - /// - /// The item. - /// System.String. - string GetConfiguredContentType(BaseItem item); - - /// - /// Gets the type of the configured content. - /// - /// The path. - /// System.String. - string GetConfiguredContentType(string path); - - /// - /// Normalizes the root path list. - /// - /// The paths. - /// IEnumerable{System.String}. - List NormalizeRootPathList(IEnumerable paths); - - /// - /// Registers the item. - /// - /// The item. - void RegisterItem(BaseItem item); - - /// - /// Deletes the item. - /// - /// The item. - /// The options. - /// Task. - Task DeleteItem(BaseItem item, DeleteOptions options); - - /// - /// Gets the named view. - /// - /// The user. - /// The name. - /// The parent identifier. - /// Type of the view. - /// Name of the sort. - /// The cancellation token. - /// Task<UserView>. - UserView GetNamedView(User user, - string name, - string parentId, - string viewType, - string sortName, - CancellationToken cancellationToken); - - /// - /// Gets the named view. - /// - /// The user. - /// The name. - /// Type of the view. - /// Name of the sort. - /// The cancellation token. - /// Task<UserView>. - UserView GetNamedView(User user, - string name, - string viewType, - string sortName, - CancellationToken cancellationToken); - - /// - /// Gets the named view. - /// - /// The name. - /// Type of the view. - /// Name of the sort. - /// The cancellation token. - UserView GetNamedView(string name, - string viewType, - string sortName, - CancellationToken cancellationToken); - - /// - /// Gets the named view. - /// - /// The name. - /// The parent identifier. - /// Type of the view. - /// Name of the sort. - /// The unique identifier. - /// The cancellation token. - UserView GetNamedView(string name, - string parentId, - string viewType, - string sortName, - string uniqueId, - CancellationToken cancellationToken); - - /// - /// Gets the shadow view. - /// - /// The parent. - /// Type of the view. - /// Name of the sort. - /// The cancellation token. - /// Task<UserView>. - UserView GetShadowView(BaseItem parent, - string viewType, - string sortName, - CancellationToken cancellationToken); - - /// - /// Determines whether [is video file] [the specified path]. - /// - /// The path. - /// true if [is video file] [the specified path]; otherwise, false. - bool IsVideoFile(string path); - - /// - /// Determines whether [is audio file] [the specified path]. - /// - /// The path. - /// true if [is audio file] [the specified path]; otherwise, false. - bool IsAudioFile(string path); - - bool IsAudioFile(string path, LibraryOptions libraryOptions); - bool IsVideoFile(string path, LibraryOptions libraryOptions); - - /// - /// Gets the season number from path. - /// - /// The path. - /// System.Nullable<System.Int32>. - int? GetSeasonNumberFromPath(string path); - - /// - /// Fills the missing episode numbers from path. - /// - /// The episode. - /// true if XXXX, false otherwise. - bool FillMissingEpisodeNumbersFromPath(Episode episode); - - /// - /// Parses the name. - /// - /// The name. - /// ItemInfo. - ItemLookupInfo ParseName(string name); - - /// - /// Gets the new item identifier. - /// - /// The key. - /// The type. - /// Guid. - Guid GetNewItemId(string key, Type type); - - /// - /// Finds the trailers. - /// - /// The owner. - /// The file system children. - /// The directory service. - /// IEnumerable<Trailer>. - IEnumerable