diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-11-02 16:58:51 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-11-02 16:58:51 -0400 |
| commit | 78f9364b034d73ec80836e2c3a3b62714c8a3bdd (patch) | |
| tree | 10e567068db1bd788c58a969c1e3c889961f5a5b | |
| parent | d71d2a5d02cf31b67420b54160868247f23546bb (diff) | |
move classes to portable server project
| -rw-r--r-- | Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs (renamed from MediaBrowser.Server.Implementations/Branding/BrandingConfigurationFactory.cs) | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Emby.Server.Implementations.csproj | 6 | ||||
| -rw-r--r-- | Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs (renamed from MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs) | 13 | ||||
| -rw-r--r-- | Emby.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs (renamed from MediaBrowser.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs) | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs (renamed from MediaBrowser.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs) | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/ScheduledTasks/RefreshIntrosTask.cs (renamed from MediaBrowser.Server.Implementations/ScheduledTasks/RefreshIntrosTask.cs) | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs (renamed from MediaBrowser.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs) | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj | 8 |
8 files changed, 14 insertions, 23 deletions
diff --git a/MediaBrowser.Server.Implementations/Branding/BrandingConfigurationFactory.cs b/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 @@ <Compile Include="..\SharedVersion.cs"> <Link>Properties\SharedVersion.cs</Link> </Compile> + <Compile Include="Branding\BrandingConfigurationFactory.cs" /> <Compile Include="Channels\ChannelConfigurations.cs" /> <Compile Include="Channels\ChannelDynamicMediaSourceProvider.cs" /> <Compile Include="Channels\ChannelImageProvider.cs" /> @@ -61,6 +62,11 @@ <Compile Include="Intros\DefaultIntroProvider.cs" /> <Compile Include="News\NewsService.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="ScheduledTasks\ChapterImagesTask.cs" /> + <Compile Include="ScheduledTasks\PeopleValidationTask.cs" /> + <Compile Include="ScheduledTasks\PluginUpdateTask.cs" /> + <Compile Include="ScheduledTasks\RefreshIntrosTask.cs" /> + <Compile Include="ScheduledTasks\SystemUpdateTask.cs" /> <Compile Include="Updates\InstallationManager.cs" /> </ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs b/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 { /// <summary> /// Class ChapterImagesTask @@ -32,12 +32,6 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks /// </summary> private readonly ILibraryManager _libraryManager; - /// <summary> - /// The current new item timer - /// </summary> - /// <value>The new item timer.</value> - private Timer NewItemTimer { get; set; } - private readonly IItemRepository _itemRepo; private readonly IApplicationPaths _appPaths; @@ -48,9 +42,6 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks /// <summary> /// Initializes a new instance of the <see cref="ChapterImagesTask" /> class. /// </summary> - /// <param name="logManager">The log manager.</param> - /// <param name="libraryManager">The library manager.</param> - /// <param name="itemRepo">The item repo.</param> 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<string>(); } - catch (DirectoryNotFoundException) + catch (IOException) { previouslyFailedImages = new List<string>(); } diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs b/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 { /// <summary> /// Class PeopleValidationTask diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs b/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 { /// <summary> /// Plugin Update Task diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshIntrosTask.cs b/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 { /// <summary> /// Class RefreshIntrosTask diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs b/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 { /// <summary> /// 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 @@ <Compile Include="Activity\ActivityManager.cs" /> <Compile Include="Activity\ActivityRepository.cs" /> <Compile Include="Archiving\ZipClient.cs" /> - <Compile Include="Branding\BrandingConfigurationFactory.cs" /> <Compile Include="Collections\CollectionManager.cs" /> <Compile Include="Collections\CollectionsDynamicFolder.cs" /> <Compile Include="Collections\CollectionImageProvider.cs" /> @@ -274,6 +273,7 @@ <Compile Include="Persistence\IDbConnector.cs" /> <Compile Include="Persistence\MediaStreamColumns.cs" /> <Compile Include="Reflection\AssemblyInfo.cs" /> + <Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" /> <Compile Include="Security\MBLicenseFile.cs" /> <Compile Include="Security\PluginSecurityManager.cs" /> <Compile Include="Security\RegRecord.cs" /> @@ -302,12 +302,6 @@ <Compile Include="Playlists\PlaylistImageProvider.cs" /> <Compile Include="Playlists\PlaylistManager.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="ScheduledTasks\PeopleValidationTask.cs" /> - <Compile Include="ScheduledTasks\ChapterImagesTask.cs" /> - <Compile Include="ScheduledTasks\PluginUpdateTask.cs" /> - <Compile Include="ScheduledTasks\RefreshIntrosTask.cs" /> - <Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" /> - <Compile Include="ScheduledTasks\SystemUpdateTask.cs" /> <Compile Include="Security\AuthenticationRepository.cs" /> <Compile Include="Security\EncryptionManager.cs" /> <Compile Include="ServerApplicationPaths.cs" /> |
