michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added refresh metadata button to the edit page

Browse Source
This commit is contained in:
Luke Pulverenti 2013-05-22 15:49:12 -04:00
parent ec392c270f
commit 458126a922
4 changed files with 97 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
MediaBrowser.Api/LibraryService.cs
View File

@ -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")] [ApiMember(Name = "Recursive", Description = "Indicates if the refresh should occur recursively.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "POST")]
public bool Recursive { get; set; } public bool Recursive { get; set; }
[ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public string Id { get; set; } public string Id { get; set; }
} }
@ -173,7 +173,8 @@ namespace MediaBrowser.Api
/// <param name="itemRepo">The item repo.</param> /// <param name="itemRepo">The item repo.</param>
/// <param name="libraryManager">The library manager.</param> /// <param name="libraryManager">The library manager.</param>
/// <param name="userManager">The user 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; _itemRepo = itemRepo;
_libraryManager = libraryManager; _libraryManager = libraryManager;
@ -203,15 +204,15 @@ namespace MediaBrowser.Api
var items = GetItems(request.UserId).ToList(); var items = GetItems(request.UserId).ToList();
var counts = new ItemCounts var counts = new ItemCounts
{ {
AlbumCount = items.OfType<MusicAlbum>().Count(), AlbumCount = items.OfType<MusicAlbum>().Count(),
EpisodeCount = items.OfType<Episode>().Count(), EpisodeCount = items.OfType<Episode>().Count(),
GameCount = items.OfType<BaseGame>().Count(), GameCount = items.OfType<BaseGame>().Count(),
MovieCount = items.OfType<Movie>().Count(), MovieCount = items.OfType<Movie>().Count(),
SeriesCount = items.OfType<Series>().Count(), SeriesCount = items.OfType<Series>().Count(),
SongCount = items.OfType<Audio>().Count(), SongCount = items.OfType<Audio>().Count(),
TrailerCount = items.OfType<Trailer>().Count() TrailerCount = items.OfType<Trailer>().Count()
}; };
return ToOptimizedResult(counts); return ToOptimizedResult(counts);
} }
@ -236,7 +237,9 @@ namespace MediaBrowser.Api
{ {
try try
{ {
await _libraryManager.ValidateMediaLibrary(new Progress<double>(), CancellationToken.None).ConfigureAwait(false); await
_libraryManager.ValidateMediaLibrary(new Progress<double>(), CancellationToken.None)
.ConfigureAwait(false);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -269,7 +272,9 @@ namespace MediaBrowser.Api
{ {
try try
{ {
await parent.ValidateChildren(new Progress<double>(), CancellationToken.None).ConfigureAwait(false); await
parent.ValidateChildren(new Progress<double>(), CancellationToken.None)
.ConfigureAwait(false);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -306,9 +311,9 @@ namespace MediaBrowser.Api
var reviewsArray = reviews.ToArray(); var reviewsArray = reviews.ToArray();
var result = new ItemReviewsResult var result = new ItemReviewsResult
{ {
TotalRecordCount = reviewsArray.Length TotalRecordCount = reviewsArray.Length
}; };
if (request.StartIndex.HasValue) if (request.StartIndex.HasValue)
{ {
@ -333,23 +338,33 @@ namespace MediaBrowser.Api
{ {
var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null; var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
var item = string.IsNullOrEmpty(request.Id) ? var item = string.IsNullOrEmpty(request.Id)
(request.UserId.HasValue ? user.RootFolder : ? (request.UserId.HasValue
(Folder)_libraryManager.RootFolder) : DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, request.UserId); ? user.RootFolder
: (Folder)_libraryManager.RootFolder)
: DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, request.UserId);
// Get everything // 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 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 var result = new ThemeSongsResult
{ {
Items = items, Items = items,
TotalRecordCount = items.Length, TotalRecordCount = items.Length,
OwnerId = DtoBuilder.GetClientItemId(item) OwnerId = DtoBuilder.GetClientItemId(item)
}; };
return ToOptimizedResult(result); return ToOptimizedResult(result);
} }
@ -363,23 +378,33 @@ namespace MediaBrowser.Api
{ {
var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null; var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
var item = string.IsNullOrEmpty(request.Id) ? var item = string.IsNullOrEmpty(request.Id)
(request.UserId.HasValue ? user.RootFolder : ? (request.UserId.HasValue
(Folder)_libraryManager.RootFolder) : DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, request.UserId); ? user.RootFolder
: (Folder)_libraryManager.RootFolder)
: DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, request.UserId);
// Get everything // 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 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 var result = new ThemeVideosResult
{ {
Items = items, Items = items,
TotalRecordCount = items.Length, TotalRecordCount = items.Length,
OwnerId = DtoBuilder.GetClientItemId(item) OwnerId = DtoBuilder.GetClientItemId(item)
}; };
return ToOptimizedResult(result); return ToOptimizedResult(result);
} }
@ -388,7 +413,14 @@ namespace MediaBrowser.Api
/// Posts the specified request. /// Posts the specified request.
/// </summary> /// </summary>
/// <param name="request">The request.</param> /// <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); var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager);
@ -398,11 +430,14 @@ namespace MediaBrowser.Api
{ {
if (folder != null) 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 else
{ {
await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false); await
item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
} }
} }
catch (Exception ex) catch (Exception ex)

2
MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
View File

@ -114,8 +114,6 @@ namespace MediaBrowser.Server.Implementations.Providers
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
if (force) item.ClearMetaValues();
// Run the normal providers sequentially in order of priority // Run the normal providers sequentially in order of priority
foreach (var provider in MetadataProviders.Where(p => p.Supports(item))) foreach (var provider in MetadataProviders.Where(p => p.Supports(item)))
{ {

22
MediaBrowser.WebDashboard/ApiClient.js
View File

@ -377,6 +377,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 * Installs or updates a new plugin
*/ */

2
MediaBrowser.WebDashboard/packages.config
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <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.Common" version="3.9.46" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.45" targetFramework="net45" /> <package id="ServiceStack.Text" version="3.9.45" targetFramework="net45" />
</packages> </packages>