aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MediaBrowser.Api/LibraryService.cs113
-rw-r--r--MediaBrowser.Server.Implementations/Providers/ProviderManager.cs2
-rw-r--r--MediaBrowser.WebDashboard/ApiClient.js22
-rw-r--r--MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj3
-rw-r--r--MediaBrowser.WebDashboard/packages.config2
5 files changed, 100 insertions, 42 deletions
diff --git a/MediaBrowser.Api/LibraryService.cs b/MediaBrowser.Api/LibraryService.cs
index fbd0cfb1e..bcf359aa4 100644
--- a/MediaBrowser.Api/LibraryService.cs
+++ b/MediaBrowser.Api/LibraryService.cs
@@ -106,7 +106,7 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Recursive", Description = "Indicates if the refresh should occur recursively.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "POST")]
public bool Recursive { get; set; }
-
+
[ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public string Id { get; set; }
}
@@ -173,7 +173,8 @@ namespace MediaBrowser.Api
/// <param name="itemRepo">The item repo.</param>
/// <param name="libraryManager">The library manager.</param>
/// <param name="userManager">The user manager.</param>
- public LibraryService(IItemRepository itemRepo, ILibraryManager libraryManager, IUserManager userManager, IUserDataRepository userDataRepository)
+ public LibraryService(IItemRepository itemRepo, ILibraryManager libraryManager, IUserManager userManager,
+ IUserDataRepository userDataRepository)
{
_itemRepo = itemRepo;
_libraryManager = libraryManager;
@@ -203,15 +204,15 @@ namespace MediaBrowser.Api
var items = GetItems(request.UserId).ToList();
var counts = new ItemCounts
- {
- AlbumCount = items.OfType<MusicAlbum>().Count(),
- EpisodeCount = items.OfType<Episode>().Count(),
- GameCount = items.OfType<BaseGame>().Count(),
- MovieCount = items.OfType<Movie>().Count(),
- SeriesCount = items.OfType<Series>().Count(),
- SongCount = items.OfType<Audio>().Count(),
- TrailerCount = items.OfType<Trailer>().Count()
- };
+ {
+ AlbumCount = items.OfType<MusicAlbum>().Count(),
+ EpisodeCount = items.OfType<Episode>().Count(),
+ GameCount = items.OfType<BaseGame>().Count(),
+ MovieCount = items.OfType<Movie>().Count(),
+ SeriesCount = items.OfType<Series>().Count(),
+ SongCount = items.OfType<Audio>().Count(),
+ TrailerCount = items.OfType<Trailer>().Count()
+ };
return ToOptimizedResult(counts);
}
@@ -236,7 +237,9 @@ namespace MediaBrowser.Api
{
try
{
- await _libraryManager.ValidateMediaLibrary(new Progress<double>(), CancellationToken.None).ConfigureAwait(false);
+ await
+ _libraryManager.ValidateMediaLibrary(new Progress<double>(), CancellationToken.None)
+ .ConfigureAwait(false);
}
catch (Exception ex)
{
@@ -269,7 +272,9 @@ namespace MediaBrowser.Api
{
try
{
- await parent.ValidateChildren(new Progress<double>(), CancellationToken.None).ConfigureAwait(false);
+ await
+ parent.ValidateChildren(new Progress<double>(), CancellationToken.None)
+ .ConfigureAwait(false);
}
catch (Exception ex)
{
@@ -306,9 +311,9 @@ namespace MediaBrowser.Api
var reviewsArray = reviews.ToArray();
var result = new ItemReviewsResult
- {
- TotalRecordCount = reviewsArray.Length
- };
+ {
+ TotalRecordCount = reviewsArray.Length
+ };
if (request.StartIndex.HasValue)
{
@@ -333,23 +338,33 @@ namespace MediaBrowser.Api
{
var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
- var item = string.IsNullOrEmpty(request.Id) ?
- (request.UserId.HasValue ? user.RootFolder :
- (Folder)_libraryManager.RootFolder) : DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, request.UserId);
+ var item = string.IsNullOrEmpty(request.Id)
+ ? (request.UserId.HasValue
+ ? user.RootFolder
+ : (Folder)_libraryManager.RootFolder)
+ : DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, request.UserId);
// Get everything
- var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
+ var fields =
+ Enum.GetNames(typeof(ItemFields))
+ .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
+ .ToList();
var dtoBuilder = new DtoBuilder(Logger, _libraryManager, _userDataRepository);
- var items = _itemRepo.GetItems(item.ThemeSongIds).OrderBy(i => i.SortName).Select(i => dtoBuilder.GetBaseItemDto(i, fields, user)).Select(t => t.Result).ToArray();
+ var items =
+ _itemRepo.GetItems(item.ThemeSongIds)
+ .OrderBy(i => i.SortName)
+ .Select(i => dtoBuilder.GetBaseItemDto(i, fields, user))
+ .Select(t => t.Result)
+ .ToArray();
var result = new ThemeSongsResult
- {
- Items = items,
- TotalRecordCount = items.Length,
- OwnerId = DtoBuilder.GetClientItemId(item)
- };
+ {
+ Items = items,
+ TotalRecordCount = items.Length,
+ OwnerId = DtoBuilder.GetClientItemId(item)
+ };
return ToOptimizedResult(result);
}
@@ -363,23 +378,33 @@ namespace MediaBrowser.Api
{
var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
- var item = string.IsNullOrEmpty(request.Id) ?
- (request.UserId.HasValue ? user.RootFolder :
- (Folder)_libraryManager.RootFolder) : DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, request.UserId);
+ var item = string.IsNullOrEmpty(request.Id)
+ ? (request.UserId.HasValue
+ ? user.RootFolder
+ : (Folder)_libraryManager.RootFolder)
+ : DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, request.UserId);
// Get everything
- var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
+ var fields =
+ Enum.GetNames(typeof(ItemFields))
+ .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
+ .ToList();
var dtoBuilder = new DtoBuilder(Logger, _libraryManager, _userDataRepository);
- var items = _itemRepo.GetItems(item.ThemeVideoIds).OrderBy(i => i.SortName).Select(i => dtoBuilder.GetBaseItemDto(i, fields, user)).Select(t => t.Result).ToArray();
+ var items =
+ _itemRepo.GetItems(item.ThemeVideoIds)
+ .OrderBy(i => i.SortName)
+ .Select(i => dtoBuilder.GetBaseItemDto(i, fields, user))
+ .Select(t => t.Result)
+ .ToArray();
var result = new ThemeVideosResult
- {
- Items = items,
- TotalRecordCount = items.Length,
- OwnerId = DtoBuilder.GetClientItemId(item)
- };
+ {
+ Items = items,
+ TotalRecordCount = items.Length,
+ OwnerId = DtoBuilder.GetClientItemId(item)
+ };
return ToOptimizedResult(result);
}
@@ -388,7 +413,14 @@ namespace MediaBrowser.Api
/// Posts the specified request.
/// </summary>
/// <param name="request">The request.</param>
- public async void Post(RefreshItem request)
+ public void Post(RefreshItem request)
+ {
+ var task = RefreshItem(request);
+
+ Task.WaitAll(task);
+ }
+
+ private async Task RefreshItem(RefreshItem request)
{
var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager);
@@ -398,11 +430,14 @@ namespace MediaBrowser.Api
{
if (folder != null)
{
- await folder.ValidateChildren(new Progress<double>(), CancellationToken.None, request.Recursive, request.Forced).ConfigureAwait(false);
+ await
+ folder.ValidateChildren(new Progress<double>(), CancellationToken.None, request.Recursive,
+ request.Forced).ConfigureAwait(false);
}
else
{
- await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
+ await
+ item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
}
}
catch (Exception ex)
diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
index 3510ff984..2ba222ca5 100644
--- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
+++ b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
@@ -114,8 +114,6 @@ namespace MediaBrowser.Server.Implementations.Providers
cancellationToken.ThrowIfCancellationRequested();
- if (force) item.ClearMetaValues();
-
// Run the normal providers sequentially in order of priority
foreach (var provider in MetadataProviders.Where(p => p.Supports(item)))
{
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js
index a46fe3487..62204c2b1 100644
--- a/MediaBrowser.WebDashboard/ApiClient.js
+++ b/MediaBrowser.WebDashboard/ApiClient.js
@@ -378,6 +378,28 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
};
/**
+ * Refreshes metadata for an item
+ */
+ self.refreshItem = function (itemId, force, recursive) {
+
+ if (!itemId) {
+ throw new Error("null itemId");
+ }
+
+ var url = self.getUrl("Items/" + itemId + "/Refresh", {
+
+ force: force || false,
+ recursive: recursive || false
+
+ });
+
+ return self.ajax({
+ type: "POST",
+ url: url
+ });
+ };
+
+ /**
* Installs or updates a new plugin
*/
self.installPlugin = function (name, updateClass, version) {
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index f02e589f2..11745acd0 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -93,6 +93,9 @@
<Content Include="dashboard-ui\css\images\clients\mbc.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\css\images\clients\roku.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\css\images\fresh.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index 9e2e4f84d..ae67867dd 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="MediaBrowser.ApiClient.Javascript" version="3.0.115" targetFramework="net45" />
+ <package id="MediaBrowser.ApiClient.Javascript" version="3.0.117" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.46" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.45" targetFramework="net45" />
</packages> \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-09 00:00:03 +0000