From b7867214ef317bbf6502e53701a990ec5f13b645 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 11 Aug 2017 17:55:48 -0400 Subject: update download error handling --- .../Entities/IHasSpecialFeatures.cs | 3 +- MediaBrowser.Controller/Entities/Movies/Movie.cs | 6 +- .../Entities/UserViewBuilder.cs | 4 +- .../MediaBrowser.Controller.csproj | 1 - MediaBrowser.Controller/Sync/ISyncManager.cs | 15 +--- MediaBrowser.Controller/Sync/ISyncRepository.cs | 80 ---------------------- 6 files changed, 7 insertions(+), 102 deletions(-) delete mode 100644 MediaBrowser.Controller/Sync/ISyncRepository.cs (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Entities/IHasSpecialFeatures.cs b/MediaBrowser.Controller/Entities/IHasSpecialFeatures.cs index b3a0dc237b..f4905b7dcf 100644 --- a/MediaBrowser.Controller/Entities/IHasSpecialFeatures.cs +++ b/MediaBrowser.Controller/Entities/IHasSpecialFeatures.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; namespace MediaBrowser.Controller.Entities { @@ -9,6 +8,6 @@ namespace MediaBrowser.Controller.Entities /// Gets or sets the special feature ids. /// /// The special feature ids. - List SpecialFeatureIds { get; set; } + Guid[] SpecialFeatureIds { get; set; } } } diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs index 99d7fdecb4..3a41709fed 100644 --- a/MediaBrowser.Controller/Entities/Movies/Movie.cs +++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs @@ -19,11 +19,11 @@ namespace MediaBrowser.Controller.Entities.Movies /// public class Movie : Video, IHasSpecialFeatures, IHasTrailers, IHasLookupInfo, ISupportsBoxSetGrouping { - public List SpecialFeatureIds { get; set; } + public Guid[] SpecialFeatureIds { get; set; } public Movie() { - SpecialFeatureIds = new List(); + SpecialFeatureIds = EmptyGuidArray; RemoteTrailers = EmptyMediaUrlArray; LocalTrailerIds = EmptyGuidArray; RemoteTrailerIds = EmptyGuidArray; @@ -77,7 +77,7 @@ namespace MediaBrowser.Controller.Entities.Movies private async Task RefreshSpecialFeatures(MetadataRefreshOptions options, List fileSystemChildren, CancellationToken cancellationToken) { var newItems = LibraryManager.FindExtras(this, fileSystemChildren, options.DirectoryService).ToList(); - var newItemIds = newItems.Select(i => i.Id).ToList(); + var newItemIds = newItems.Select(i => i.Id).ToArray(); var itemsChanged = !SpecialFeatureIds.SequenceEqual(newItemIds); diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs index f0d4d544e5..a012603976 100644 --- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs +++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs @@ -1387,8 +1387,8 @@ namespace MediaBrowser.Controller.Entities if (movie != null) { var ok = filterValue - ? movie.SpecialFeatureIds.Count > 0 - : movie.SpecialFeatureIds.Count == 0; + ? movie.SpecialFeatureIds.Length > 0 + : movie.SpecialFeatureIds.Length == 0; if (!ok) { diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 38a76c06a0..5c2bae82eb 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -336,7 +336,6 @@ - diff --git a/MediaBrowser.Controller/Sync/ISyncManager.cs b/MediaBrowser.Controller/Sync/ISyncManager.cs index 291632ea5a..66f64464f1 100644 --- a/MediaBrowser.Controller/Sync/ISyncManager.cs +++ b/MediaBrowser.Controller/Sync/ISyncManager.cs @@ -16,6 +16,7 @@ namespace MediaBrowser.Controller.Sync event EventHandler> SyncJobUpdated; event EventHandler> SyncJobItemUpdated; event EventHandler> SyncJobItemCreated; + event EventHandler> SyncJobItemCancelled; /// /// Creates the job. @@ -134,20 +135,6 @@ namespace MediaBrowser.Controller.Sync /// Task<SyncDataResponse>. Task SyncData(SyncDataRequest request); - /// - /// Marks the job item for removal. - /// - /// The identifier. - /// Task. - Task MarkJobItemForRemoval(string id); - - /// - /// Unmarks the job item for removal. - /// - /// The identifier. - /// Task. - Task UnmarkJobItemForRemoval(string id); - /// /// Gets the library item ids. /// diff --git a/MediaBrowser.Controller/Sync/ISyncRepository.cs b/MediaBrowser.Controller/Sync/ISyncRepository.cs deleted file mode 100644 index 8e9b2bf774..0000000000 --- a/MediaBrowser.Controller/Sync/ISyncRepository.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System.Collections.Generic; -using MediaBrowser.Model.Querying; -using MediaBrowser.Model.Sync; -using System.Threading.Tasks; - -namespace MediaBrowser.Controller.Sync -{ - public interface ISyncRepository - { - /// - /// Gets the job. - /// - /// The identifier. - /// SyncJob. - SyncJob GetJob(string id); - - /// - /// Creates the specified job. - /// - /// The job. - /// Task. - Task Create(SyncJob job); - - /// - /// Updates the specified job. - /// - /// The job. - /// Task. - Task Update(SyncJob job); - - /// - /// Deletes the job. - /// - /// The identifier. - /// Task. - Task DeleteJob(string id); - - /// - /// Gets the jobs. - /// - /// The query. - /// QueryResult<SyncJob>. - QueryResult GetJobs(SyncJobQuery query); - - /// - /// Gets the job item. - /// - /// The identifier. - /// SyncJobItem. - SyncJobItem GetJobItem(string id); - - /// - /// Creates the specified job item. - /// - /// The job item. - /// Task. - Task Create(SyncJobItem jobItem); - - /// - /// Updates the specified job item. - /// - /// The job item. - /// Task. - Task Update(SyncJobItem jobItem); - - /// - /// Gets the job items. - /// - /// The query. - /// IEnumerable<SyncJobItem>. - QueryResult GetJobItems(SyncJobItemQuery query); - - /// - /// Gets the library item ids. - /// - /// The query. - /// QueryResult<System.String>. - Dictionary GetSyncedItemProgresses(SyncJobItemQuery query); - } -} -- cgit v1.2.3