diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs index 07bbaff749..1f69183cc8 100644 --- a/MediaBrowser.Api/Images/ImageService.cs +++ b/MediaBrowser.Api/Images/ImageService.cs @@ -293,7 +293,7 @@ namespace MediaBrowser.Api.Images if (string.IsNullOrEmpty(imagePath)) { - throw new ResourceNotFoundException(); + throw new ResourceNotFoundException(string.Format("{0} does not have an image of type {1}", item.Name, request.Type)); } // See if we can avoid a file system lookup by looking for the file in ResolveArgs diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs index 0c47013bf8..84f9f8827e 100644 --- a/MediaBrowser.Controller/Dto/DtoBuilder.cs +++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs @@ -566,29 +566,33 @@ namespace MediaBrowser.Controller.Dto return; } - // Attach People by transforming them into BaseItemPerson (DTO) - dto.People = new BaseItemPerson[item.People.Count]; - // Ordering by person type to ensure actors and artists are at the front. // This is taking advantage of the fact that they both begin with A // This should be improved in the future - var entities = await Task.WhenAll(item.People.OrderBy(i => i.Type).Select(c => + var people = item.People.OrderBy(i => i.Type).ToList(); + + // Attach People by transforming them into BaseItemPerson (DTO) + dto.People = new BaseItemPerson[people.Count]; + + var entities = await Task.WhenAll(people.Select(p => p.Name).Distinct(StringComparer.OrdinalIgnoreCase).Select(c => Task.Run(async () => { try { - return await _libraryManager.GetPerson(c.Name).ConfigureAwait(false); + return await _libraryManager.GetPerson(c).ConfigureAwait(false); } catch (IOException ex) { - _logger.ErrorException("Error getting person {0}", ex, c.Name); + _logger.ErrorException("Error getting person {0}", ex, c); return null; } }) )).ConfigureAwait(false); + var dictionary = entities.ToDictionary(i => i.Name, StringComparer.OrdinalIgnoreCase); + for (var i = 0; i < item.People.Count; i++) { var person = item.People[i]; @@ -600,15 +604,15 @@ namespace MediaBrowser.Controller.Dto Type = person.Type }; - var ibnObject = entities[i]; + Person entity; - if (ibnObject != null) + if (dictionary.TryGetValue(person.Name, out entity)) { - var primaryImagePath = ibnObject.PrimaryImagePath; + var primaryImagePath = entity.PrimaryImagePath; if (!string.IsNullOrEmpty(primaryImagePath)) { - baseItemPerson.PrimaryImageTag = Kernel.Instance.ImageManager.GetImageCacheTag(ibnObject, ImageType.Primary, primaryImagePath); + baseItemPerson.PrimaryImageTag = Kernel.Instance.ImageManager.GetImageCacheTag(entity, ImageType.Primary, primaryImagePath); } } diff --git a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs index 4cd9b20a1a..465cfec92b 100644 --- a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs +++ b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs @@ -160,6 +160,7 @@ namespace MediaBrowser.Controller.Providers private void PopulateBaseItemImages(BaseItem item) { var backdropFiles = new List(); + var screenshotFiles = new List(); // Primary Image var image = GetImage(item, "folder"); @@ -201,6 +202,22 @@ namespace MediaBrowser.Controller.Providers item.SetImage(ImageType.Thumb, image.Value.Path); } + // Thumbnail Image + image = GetImage(item, "box"); + + if (image.HasValue) + { + item.SetImage(ImageType.Box, image.Value.Path); + } + + // Thumbnail Image + image = GetImage(item, "menu"); + + if (image.HasValue) + { + item.SetImage(ImageType.Menu, image.Value.Path); + } + // Backdrop Image image = GetImage(item, "backdrop"); @@ -234,7 +251,40 @@ namespace MediaBrowser.Controller.Providers { item.BackdropImagePaths = backdropFiles; } - } + // Screenshot Image + image = GetImage(item, "screenshot"); + + if (image.HasValue) + { + screenshotFiles.Add(image.Value.Path); + } + + unfound = 0; + for (var i = 1; i <= 20; i++) + { + // Screenshot Image + image = GetImage(item, "screenshot" + i); + + if (image.HasValue) + { + screenshotFiles.Add(image.Value.Path); + } + else + { + unfound++; + + if (unfound >= 3) + { + break; + } + } + } + + if (screenshotFiles.Count > 0) + { + item.ScreenshotImagePaths = screenshotFiles; + } + } } } diff --git a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs b/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs index 8772176a0b..20728a30ca 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; } - /// /// Gets the specified request. /// @@ -35,9 +33,15 @@ namespace MediaBrowser.Server.Implementations.HttpServer var requestedFile = Path.Combine(swaggerDirectory, request.ResourceName.Replace('/', '\\')); - return HttpResultFactory.GetStaticFileResult(RequestContext, requestedFile); + return ResultFactory.GetStaticFileResult(RequestContext, requestedFile); } + /// + /// Gets or sets the result factory. + /// + /// The result factory. + public IHttpResultFactory ResultFactory { get; set; } + /// /// Gets or sets the request context. /// diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index ca261a393b..3ec881499f 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -758,7 +758,19 @@ namespace MediaBrowser.Server.Implementations.Library /// The progress. /// The cancellation token. /// Task. - public async Task ValidateMediaLibrary(IProgress progress, CancellationToken cancellationToken) + public Task ValidateMediaLibrary(IProgress progress, CancellationToken cancellationToken) + { + // Just run the scheduled task so that the user can see it + return Task.Run(() => _taskManager.CancelIfRunningAndQueue()); + } + + /// + /// Validates the media library internal. + /// + /// The progress. + /// The cancellation token. + /// Task. + public async Task ValidateMediaLibraryInternal(IProgress 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 ba79ff5d59..66ec69f08f 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -256,7 +256,7 @@ - + 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 c1a4c08b1b..0000000000 --- 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 0000000000..71f2b701c6 --- /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 ff7222e7c1..58bb232a25 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 8170e90a62..6082b629e1 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); } /// diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js index 4c88b35c3f..fe361a8685 100644 --- a/MediaBrowser.WebDashboard/ApiClient.js +++ b/MediaBrowser.WebDashboard/ApiClient.js @@ -95,6 +95,10 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { return name; }()); + function encodeName(name) { + return encodeURIComponent(name).replace("'", '%27'); + } + /** * Wraps around jQuery ajax methods to add additional info to the request. */ @@ -867,7 +871,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { throw new Error("null name"); } - var url = self.getUrl("Studios/" + name); + var url = self.getUrl("Studios/" + encodeName(name)); return self.ajax({ type: "GET", @@ -885,7 +889,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { throw new Error("null name"); } - var url = self.getUrl("Genres/" + name); + var url = self.getUrl("Genres/" + encodeName(name)); return self.ajax({ type: "GET", @@ -921,7 +925,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { throw new Error("null name"); } - var url = self.getUrl("Persons/" + name); + var url = self.getUrl("Persons/" + encodeName(name)); return self.ajax({ type: "GET", @@ -1047,7 +1051,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { }; - var url = "Persons/" + name + "/Images/" + options.type; + var url = "Persons/" + encodeName(name) + "/Images/" + options.type; if (options.index != null) { url += "/" + options.index; @@ -1117,7 +1121,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { }; - var url = "Genres/" + name + "/Images/" + options.type; + var url = "Genres/" + encodeName(name) + "/Images/" + options.type; if (options.index != null) { url += "/" + options.index; @@ -1131,7 +1135,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { }; /** - * Constructs a url for a genre image + * Constructs a url for a studio image * @param {String} name * @param {Object} options * Options supports the following properties: @@ -1152,7 +1156,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { }; - var url = "Studios/" + name + "/Images/" + options.type; + var url = "Studios/" + encodeName(name) + "/Images/" + options.type; if (options.index != null) { url += "/" + options.index; @@ -1739,7 +1743,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { throw new Error("null name"); } - var url = self.getUrl("Users/" + userId + "/ItemsByName/Favorites/" + name); + var url = self.getUrl("Users/" + userId + "/ItemsByName/Favorites/" + encodeName(name)); var method = isFavorite ? "POST" : "DELETE"; @@ -1766,7 +1770,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { throw new Error("null name"); } - var url = self.getUrl("Users/" + userId + "/ItemsByName/" + name + "/Rating", { + var url = self.getUrl("Users/" + userId + "/ItemsByName/" + encodeName(name) + "/Rating", { likes: likes }); @@ -1791,7 +1795,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { throw new Error("null name"); } - var url = self.getUrl("Users/" + userId + "/ItemsByName/" + name + "/Rating"); + var url = self.getUrl("Users/" + userId + "/ItemsByName/" + encodeName(name) + "/Rating"); return self.ajax({ type: "DELETE", @@ -1815,7 +1819,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { throw new Error("null name"); } - var url = self.getUrl("Users/" + userId + "/ItemsByName/" + name + "/UserData"); + var url = self.getUrl("Users/" + userId + "/ItemsByName/" + encodeName(name) + "/UserData"); return self.ajax({ type: "GET", diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config index 01740f591a..edc26a2383 100644 --- a/MediaBrowser.WebDashboard/packages.config +++ b/MediaBrowser.WebDashboard/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file