aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MediaBrowser.Api/ItemRefreshService.cs74
-rw-r--r--MediaBrowser.Api/ItemUpdateService.cs10
-rw-r--r--MediaBrowser.Api/LibraryService.cs51
-rw-r--r--MediaBrowser.Api/MediaBrowser.Api.csproj1
-rw-r--r--MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs2
-rw-r--r--MediaBrowser.Controller/Entities/Audio/Artist.cs2
-rw-r--r--MediaBrowser.Controller/Entities/Audio/MusicGenre.cs2
-rw-r--r--MediaBrowser.Controller/Entities/Genre.cs2
-rw-r--r--MediaBrowser.Controller/Entities/IItemByName.cs10
-rw-r--r--MediaBrowser.Controller/Entities/Person.cs2
-rw-r--r--MediaBrowser.Controller/Entities/Studio.cs2
-rw-r--r--MediaBrowser.Controller/Entities/Year.cs2
-rw-r--r--MediaBrowser.Controller/MediaBrowser.Controller.csproj1
-rw-r--r--MediaBrowser.Server.Implementations/Library/LibraryManager.cs5
14 files changed, 102 insertions, 64 deletions
diff --git a/MediaBrowser.Api/ItemRefreshService.cs b/MediaBrowser.Api/ItemRefreshService.cs
new file mode 100644
index 000000000..cad88ece9
--- /dev/null
+++ b/MediaBrowser.Api/ItemRefreshService.cs
@@ -0,0 +1,74 @@
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using ServiceStack.ServiceHost;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api
+{
+ [Route("/Items/{Id}/Refresh", "POST")]
+ [Api(Description = "Refreshes metadata for an item")]
+ public class RefreshItem : IReturnVoid
+ {
+ [ApiMember(Name = "Forced", Description = "Indicates if a normal or forced refresh should occur.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "POST")]
+ public bool Forced { get; set; }
+
+ [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; }
+ }
+
+ public class ItemRefreshService : BaseApiService
+ {
+ private readonly ILibraryManager _libraryManager;
+ private readonly IUserManager _userManager;
+
+ public ItemRefreshService(ILibraryManager libraryManager, IUserManager userManager)
+ {
+ _libraryManager = libraryManager;
+ _userManager = userManager;
+ }
+
+ /// <summary>
+ /// Posts the specified request.
+ /// </summary>
+ /// <param name="request">The request.</param>
+ public void Post(RefreshItem request)
+ {
+ var task = RefreshItem(request);
+
+ Task.WaitAll(task);
+ }
+
+ /// <summary>
+ /// Refreshes the item.
+ /// </summary>
+ /// <param name="request">The request.</param>
+ /// <returns>Task.</returns>
+ private async Task RefreshItem(RefreshItem request)
+ {
+ var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager);
+
+ var folder = item as Folder;
+
+ try
+ {
+ await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
+
+ if (folder != null)
+ {
+ await folder.ValidateChildren(new Progress<double>(), CancellationToken.None, request.Recursive,
+ request.Forced).ConfigureAwait(false);
+ }
+ }
+ catch (Exception ex)
+ {
+ Logger.ErrorException("Error refreshing library", ex);
+ }
+ }
+ }
+}
diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs
index 08c46d3e0..5c3e84cc3 100644
--- a/MediaBrowser.Api/ItemUpdateService.cs
+++ b/MediaBrowser.Api/ItemUpdateService.cs
@@ -1,14 +1,14 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Dto;
using ServiceStack.ServiceHost;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
namespace MediaBrowser.Api
{
diff --git a/MediaBrowser.Api/LibraryService.cs b/MediaBrowser.Api/LibraryService.cs
index 0f76203da..4042c7c24 100644
--- a/MediaBrowser.Api/LibraryService.cs
+++ b/MediaBrowser.Api/LibraryService.cs
@@ -97,20 +97,6 @@ namespace MediaBrowser.Api
{
}
- [Route("/Items/{Id}/Refresh", "POST")]
- [Api(Description = "Refreshes metadata for an item")]
- public class RefreshItem : IReturnVoid
- {
- [ApiMember(Name = "Forced", Description = "Indicates if a normal or forced refresh should occur.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "POST")]
- public bool Forced { get; set; }
-
- [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; }
- }
-
[Route("/Items/{Id}", "DELETE")]
[Api(Description = "Deletes an item from the library and file system")]
public class DeleteItem : IReturnVoid
@@ -390,42 +376,5 @@ namespace MediaBrowser.Api
return ToOptimizedResult(result);
}
- /// <summary>
- /// Posts the specified request.
- /// </summary>
- /// <param name="request">The request.</param>
- public void Post(RefreshItem request)
- {
- var task = RefreshItem(request);
-
- Task.WaitAll(task);
- }
-
- /// <summary>
- /// Refreshes the item.
- /// </summary>
- /// <param name="request">The request.</param>
- /// <returns>Task.</returns>
- private async Task RefreshItem(RefreshItem request)
- {
- var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager);
-
- var folder = item as Folder;
-
- try
- {
- await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
-
- if (folder != null)
- {
- await folder.ValidateChildren(new Progress<double>(), CancellationToken.None, request.Recursive,
- request.Forced).ConfigureAwait(false);
- }
- }
- catch (Exception ex)
- {
- Logger.ErrorException("Error refreshing library", ex);
- }
- }
}
}
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 8e2c85f46..60583f446 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -73,6 +73,7 @@
<Compile Include="Images\ImageRequest.cs" />
<Compile Include="Images\ImageService.cs" />
<Compile Include="Images\ImageWriter.cs" />
+ <Compile Include="ItemRefreshService.cs" />
<Compile Include="ItemUpdateService.cs" />
<Compile Include="LibraryService.cs" />
<Compile Include="Library\LibraryHelpers.cs" />
diff --git a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
index d10f98766..f776cf675 100644
--- a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
@@ -87,7 +87,7 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
{
var handler = new WebRequestHandler
{
- CachePolicy = new RequestCachePolicy(RequestCacheLevel.BypassCache),
+ CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate),
AutomaticDecompression = enableHttpCompression ? DecompressionMethods.Deflate : DecompressionMethods.None
};
diff --git a/MediaBrowser.Controller/Entities/Audio/Artist.cs b/MediaBrowser.Controller/Entities/Audio/Artist.cs
index 0fe8cb671..7730c90d3 100644
--- a/MediaBrowser.Controller/Entities/Audio/Artist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Artist.cs
@@ -4,7 +4,7 @@ namespace MediaBrowser.Controller.Entities.Audio
/// <summary>
/// Class Artist
/// </summary>
- public class Artist : BaseItem
+ public class Artist : BaseItem, IItemByName
{
/// <summary>
/// Gets the user data key.
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
index 8d34cf7da..452aaec58 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
@@ -4,7 +4,7 @@ namespace MediaBrowser.Controller.Entities.Audio
/// <summary>
/// Class MusicGenre
/// </summary>
- public class MusicGenre : BaseItem
+ public class MusicGenre : BaseItem, IItemByName
{
/// <summary>
/// Gets the user data key.
diff --git a/MediaBrowser.Controller/Entities/Genre.cs b/MediaBrowser.Controller/Entities/Genre.cs
index b2b465353..e02a427e0 100644
--- a/MediaBrowser.Controller/Entities/Genre.cs
+++ b/MediaBrowser.Controller/Entities/Genre.cs
@@ -4,7 +4,7 @@ namespace MediaBrowser.Controller.Entities
/// <summary>
/// Class Genre
/// </summary>
- public class Genre : BaseItem
+ public class Genre : BaseItem, IItemByName
{
/// <summary>
/// Gets the user data key.
diff --git a/MediaBrowser.Controller/Entities/IItemByName.cs b/MediaBrowser.Controller/Entities/IItemByName.cs
new file mode 100644
index 000000000..6d66acb70
--- /dev/null
+++ b/MediaBrowser.Controller/Entities/IItemByName.cs
@@ -0,0 +1,10 @@
+
+namespace MediaBrowser.Controller.Entities
+{
+ /// <summary>
+ /// Marker interface
+ /// </summary>
+ public interface IItemByName
+ {
+ }
+}
diff --git a/MediaBrowser.Controller/Entities/Person.cs b/MediaBrowser.Controller/Entities/Person.cs
index 0f2803744..273a10acc 100644
--- a/MediaBrowser.Controller/Entities/Person.cs
+++ b/MediaBrowser.Controller/Entities/Person.cs
@@ -4,7 +4,7 @@ namespace MediaBrowser.Controller.Entities
/// <summary>
/// This is the full Person object that can be retrieved with all of it's data.
/// </summary>
- public class Person : BaseItem
+ public class Person : BaseItem, IItemByName
{
/// <summary>
/// Gets the user data key.
diff --git a/MediaBrowser.Controller/Entities/Studio.cs b/MediaBrowser.Controller/Entities/Studio.cs
index 0dec024f8..57e560348 100644
--- a/MediaBrowser.Controller/Entities/Studio.cs
+++ b/MediaBrowser.Controller/Entities/Studio.cs
@@ -4,7 +4,7 @@ namespace MediaBrowser.Controller.Entities
/// <summary>
/// Class Studio
/// </summary>
- public class Studio : BaseItem
+ public class Studio : BaseItem, IItemByName
{
/// <summary>
/// Gets the user data key.
diff --git a/MediaBrowser.Controller/Entities/Year.cs b/MediaBrowser.Controller/Entities/Year.cs
index 307ce306b..c5235a07a 100644
--- a/MediaBrowser.Controller/Entities/Year.cs
+++ b/MediaBrowser.Controller/Entities/Year.cs
@@ -4,7 +4,7 @@ namespace MediaBrowser.Controller.Entities
/// <summary>
/// Class Year
/// </summary>
- public class Year : BaseItem
+ public class Year : BaseItem, IItemByName
{
/// <summary>
/// Gets the user data key.
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index e1cfce38b..77879ed75 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -76,6 +76,7 @@
<Compile Include="Entities\Audio\MusicGenre.cs" />
<Compile Include="Entities\Game.cs" />
<Compile Include="Entities\IByReferenceItem.cs" />
+ <Compile Include="Entities\IItemByName.cs" />
<Compile Include="Entities\MusicVideo.cs" />
<Compile Include="Library\ILibraryPostScanTask.cs" />
<Compile Include="Library\ILibraryPrescanTask.cs" />
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index f1dd24058..53d25af41 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -392,7 +392,10 @@ namespace MediaBrowser.Server.Implementations.Library
/// <param name="item">The item.</param>
private void UpdateItemInLibraryCache(BaseItem item)
{
- LibraryItemsCache.AddOrUpdate(item.Id, item, delegate { return item; });
+ if (!(item is IItemByName))
+ {
+ LibraryItemsCache.AddOrUpdate(item.Id, item, delegate { return item; });
+ }
}
/// <summary>
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-07 04:27:57 +0000