From 78f9364b034d73ec80836e2c3a3b62714c8a3bdd Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 2 Nov 2016 16:58:51 -0400 Subject: [PATCH] move classes to portable server project --- .../Branding/BrandingConfigurationFactory.cs | 2 +- .../Emby.Server.Implementations.csproj | 6 ++++++ .../ScheduledTasks/ChapterImagesTask.cs | 13 ++----------- .../ScheduledTasks/PeopleValidationTask.cs | 2 +- .../ScheduledTasks/PluginUpdateTask.cs | 2 +- .../ScheduledTasks/RefreshIntrosTask.cs | 2 +- .../ScheduledTasks/SystemUpdateTask.cs | 2 +- .../MediaBrowser.Server.Implementations.csproj | 8 +------- 8 files changed, 14 insertions(+), 23 deletions(-) rename {MediaBrowser.Server.Implementations => Emby.Server.Implementations}/Branding/BrandingConfigurationFactory.cs (90%) rename {MediaBrowser.Server.Implementations => Emby.Server.Implementations}/ScheduledTasks/ChapterImagesTask.cs (92%) rename {MediaBrowser.Server.Implementations => Emby.Server.Implementations}/ScheduledTasks/PeopleValidationTask.cs (97%) rename {MediaBrowser.Server.Implementations => Emby.Server.Implementations}/ScheduledTasks/PluginUpdateTask.cs (98%) rename {MediaBrowser.Server.Implementations => Emby.Server.Implementations}/ScheduledTasks/RefreshIntrosTask.cs (98%) rename {MediaBrowser.Server.Implementations => Emby.Server.Implementations}/ScheduledTasks/SystemUpdateTask.cs (98%) diff --git a/MediaBrowser.Server.Implementations/Branding/BrandingConfigurationFactory.cs b/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs similarity index 90% rename from MediaBrowser.Server.Implementations/Branding/BrandingConfigurationFactory.cs rename to Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs index d6cd3424b..a29f55f16 100644 --- a/MediaBrowser.Server.Implementations/Branding/BrandingConfigurationFactory.cs +++ b/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs @@ -2,7 +2,7 @@ using MediaBrowser.Model.Branding; using System.Collections.Generic; -namespace MediaBrowser.Server.Implementations.Branding +namespace Emby.Server.Implementations.Branding { public class BrandingConfigurationFactory : IConfigurationFactory { diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index 317b1b9b8..85dfda0a3 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -52,6 +52,7 @@ Properties\SharedVersion.cs + @@ -61,6 +62,11 @@ + + + + + diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs b/Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs similarity index 92% rename from MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs rename to Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs index 63941f3b6..d75815847 100644 --- a/MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs @@ -16,7 +16,7 @@ using MediaBrowser.Model.IO; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Tasks; -namespace MediaBrowser.Server.Implementations.ScheduledTasks +namespace Emby.Server.Implementations.ScheduledTasks { /// /// Class ChapterImagesTask @@ -32,12 +32,6 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks /// private readonly ILibraryManager _libraryManager; - /// - /// The current new item timer - /// - /// The new item timer. - private Timer NewItemTimer { get; set; } - private readonly IItemRepository _itemRepo; private readonly IApplicationPaths _appPaths; @@ -48,9 +42,6 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks /// /// Initializes a new instance of the class. /// - /// The log manager. - /// The library manager. - /// The item repo. public ChapterImagesTask(ILogManager logManager, ILibraryManager libraryManager, IItemRepository itemRepo, IApplicationPaths appPaths, IEncodingManager encodingManager, IFileSystem fileSystem) { _logger = logManager.GetLogger(GetType().Name); @@ -115,7 +106,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks { previouslyFailedImages = new List(); } - catch (DirectoryNotFoundException) + catch (IOException) { previouslyFailedImages = new List(); } diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs b/Emby.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs similarity index 97% rename from MediaBrowser.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs rename to Emby.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs index f90e61902..51122226b 100644 --- a/MediaBrowser.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using MediaBrowser.Controller; using MediaBrowser.Model.Tasks; -namespace MediaBrowser.Server.Implementations.ScheduledTasks +namespace Emby.Server.Implementations.ScheduledTasks { /// /// Class PeopleValidationTask diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs similarity index 98% rename from MediaBrowser.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs rename to Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs index 1d81ec043..e619b6864 100644 --- a/MediaBrowser.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs @@ -10,7 +10,7 @@ using System.Threading; using System.Threading.Tasks; using MediaBrowser.Model.Tasks; -namespace MediaBrowser.Server.Implementations.ScheduledTasks +namespace Emby.Server.Implementations.ScheduledTasks { /// /// Plugin Update Task diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshIntrosTask.cs b/Emby.Server.Implementations/ScheduledTasks/RefreshIntrosTask.cs similarity index 98% rename from MediaBrowser.Server.Implementations/ScheduledTasks/RefreshIntrosTask.cs rename to Emby.Server.Implementations/ScheduledTasks/RefreshIntrosTask.cs index f10dbcfe7..749233fa1 100644 --- a/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshIntrosTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/RefreshIntrosTask.cs @@ -8,7 +8,7 @@ using MediaBrowser.Common.IO; using MediaBrowser.Controller.IO; using MediaBrowser.Model.IO; -namespace MediaBrowser.Server.Implementations.ScheduledTasks +namespace Emby.Server.Implementations.ScheduledTasks { /// /// Class RefreshIntrosTask diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs similarity index 98% rename from MediaBrowser.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs rename to Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs index e44eacf3d..28fd8b68c 100644 --- a/MediaBrowser.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; using MediaBrowser.Model.Tasks; -namespace MediaBrowser.Server.Implementations.ScheduledTasks +namespace Emby.Server.Implementations.ScheduledTasks { /// /// Plugin Update Task diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index a2975c860..6cc3b8a47 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -111,7 +111,6 @@ - @@ -274,6 +273,7 @@ + @@ -302,12 +302,6 @@ - - - - - -