diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations')
7 files changed, 26 insertions, 9 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs b/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs index 8772176a0..20728a30c 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs @@ -18,10 +18,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer public string ResourceName { get; set; } } - public class SwaggerService : IRequiresRequestContext, IRestfulService + public class SwaggerService : IHasResultFactory, IRestfulService { - public IHttpResultFactory HttpResultFactory { get; set; } - /// <summary> /// Gets the specified request. /// </summary> @@ -35,10 +33,16 @@ namespace MediaBrowser.Server.Implementations.HttpServer var requestedFile = Path.Combine(swaggerDirectory, request.ResourceName.Replace('/', '\\')); - return HttpResultFactory.GetStaticFileResult(RequestContext, requestedFile); + return ResultFactory.GetStaticFileResult(RequestContext, requestedFile); } /// <summary> + /// Gets or sets the result factory. + /// </summary> + /// <value>The result factory.</value> + public IHttpResultFactory ResultFactory { get; set; } + + /// <summary> /// Gets or sets the request context. /// </summary> /// <value>The request context.</value> diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index ca261a393..3ec881499 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -758,7 +758,19 @@ namespace MediaBrowser.Server.Implementations.Library /// <param name="progress">The progress.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task.</returns> - public async Task ValidateMediaLibrary(IProgress<double> progress, CancellationToken cancellationToken) + public Task ValidateMediaLibrary(IProgress<double> progress, CancellationToken cancellationToken) + { + // Just run the scheduled task so that the user can see it + return Task.Run(() => _taskManager.CancelIfRunningAndQueue<RefreshMediaLibraryTask>()); + } + + /// <summary> + /// Validates the media library internal. + /// </summary> + /// <param name="progress">The progress.</param> + /// <param name="cancellationToken">The cancellation token.</param> + /// <returns>Task.</returns> + public async Task ValidateMediaLibraryInternal(IProgress<double> progress, CancellationToken cancellationToken) { _logger.Info("Validating media library"); diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index ba79ff5d5..66ec69f08 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -256,7 +256,7 @@ <ItemGroup> <EmbeddedResource Include="MediaEncoder\fonts\ARIALUNI.TTF" /> <EmbeddedResource Include="MediaEncoder\fonts\fonts.conf" /> - <EmbeddedResource Include="MediaEncoder\ffmpeg20130408.zip" /> + <EmbeddedResource Include="MediaEncoder\ffmpeg20130412.zip" /> <None Include="packages.config" /> </ItemGroup> <ItemGroup /> diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id deleted file mode 100644 index c1a4c08b1..000000000 --- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -13efb0e506699c6d90c23a7600b3556d91dd31a1
\ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id new file mode 100644 index 000000000..71f2b701c --- /dev/null +++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id @@ -0,0 +1 @@ +1b75cc4abcfd185b6db07bbe433d010f947d50ae
\ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs index ff7222e7c..58bb232a2 100644 --- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs +++ b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs @@ -237,7 +237,7 @@ namespace MediaBrowser.Server.Implementations.Providers } catch (OperationCanceledException ex) { - _logger.Debug("{0} cancelled for {1}", provider.GetType().Name, item.Name); + _logger.Debug("{0} canceled for {1}", provider.GetType().Name, item.Name); // If the outer cancellation token is the one that caused the cancellation, throw it if (cancellationToken.IsCancellationRequested && ex.CancellationToken == cancellationToken) diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs index 8170e90a6..6082b629e 100644 --- a/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs +++ b/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using MediaBrowser.Server.Implementations.Library; namespace MediaBrowser.Server.Implementations.ScheduledTasks { @@ -55,7 +56,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks progress.Report(0); - return _libraryManager.ValidateMediaLibrary(progress, cancellationToken); + return ((LibraryManager)_libraryManager).ValidateMediaLibraryInternal(progress, cancellationToken); } /// <summary> |