alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-04 06:48:35 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Eric Reed
2013-05-23 11:45:43 -04:00
parent f4a199d275 bfb377793a
commit 47be566fc6
11 changed files with 93 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -706,16 +706,10 @@ namespace MediaBrowser.Controller.Entities
}
}
var saveTasks = new List<Task>();
await LibraryManager.CreateItems(newItems, cancellationToken).ConfigureAwait(false);
foreach (var item in newItems)
{
if (saveTasks.Count > 50)
{
await Task.WhenAll(saveTasks).ConfigureAwait(false);
saveTasks.Clear();
}
if (!_children.TryAdd(item.Id, item))
{
Logger.Error("Failed to add {0}", item.Name);
@@ -724,12 +718,8 @@ namespace MediaBrowser.Controller.Entities
{
Logger.Debug("** " + item.Name + " Added to library.");
}
saveTasks.Add(LibraryManager.CreateItem(item, CancellationToken.None));
}
await Task.WhenAll(saveTasks).ConfigureAwait(false);
await LibraryManager.SaveChildren(Id, newChildren, CancellationToken.None).ConfigureAwait(false);
//force the indexes to rebuild next time

8
MediaBrowser.Controller/Library/ILibraryManager.cs
View File

@@ -184,6 +184,14 @@ namespace MediaBrowser.Controller.Library
/// <returns>Task.</returns>
Task CreateItem(BaseItem item, CancellationToken cancellationToken);
/// <summary>
/// Creates the items.
/// </summary>
/// <param name="items">The items.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
Task CreateItems(IEnumerable<BaseItem> items, CancellationToken cancellationToken);
/// <summary>
/// Updates the item.
/// </summary>

8
MediaBrowser.Controller/Persistence/IItemRepository.cs
View File

@@ -64,5 +64,13 @@ namespace MediaBrowser.Controller.Persistence
/// <param name="criticReviews">The critic reviews.</param>
/// <returns>Task.</returns>
Task SaveCriticReviews(Guid itemId, IEnumerable<ItemReview> criticReviews);
/// <summary>
/// Saves the items.
/// </summary>
/// <param name="items">The items.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
Task SaveItems(IEnumerable<BaseItem> items, CancellationToken cancellationToken);
}
}

8
MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
View File

@@ -911,12 +911,12 @@ namespace MediaBrowser.Controller.Providers.Movies
/// <summary>
/// The remove
/// </summary>
const string remove = "\"'!`?";
const string Remove = "\"'!`?";
// "Face/Off" support.
/// <summary>
/// The spacers
/// </summary>
const string spacers = "/,.:;\\(){}[]+-_=–*"; // (there are not actually two - in the they are different char codes)
const string Spacers = "/,.:;\\(){}[]+-_=–*"; // (there are not actually two - in the they are different char codes)
/// <summary>
/// The replace start numbers
/// </summary>
@@ -996,11 +996,11 @@ namespace MediaBrowser.Controller.Providers.Movies
{
// skip char modifier and diacritics
}
else if (remove.IndexOf(c) > -1)
else if (Remove.IndexOf(c) > -1)
{
// skip chars we are removing
}
else if (spacers.IndexOf(c) > -1)
else if (Spacers.IndexOf(c) > -1)
{
sb.Append(" ");
}

2
MediaBrowser.Controller/Providers/Movies/OpenMovieDatabaseProvider.cs
View File

@@ -15,7 +15,7 @@ namespace MediaBrowser.Controller.Providers.Movies
{
public class OpenMovieDatabaseProvider : BaseMetadataProvider
{
private readonly SemaphoreSlim _resourcePool = new SemaphoreSlim(1, 1);
private readonly SemaphoreSlim _resourcePool = new SemaphoreSlim(2, 2);
/// <summary>
/// Gets the json serializer.

2
MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
View File

@@ -35,7 +35,7 @@ namespace MediaBrowser.Controller.Providers.TV
/// <summary>
/// The tv db
/// </summary>
internal readonly SemaphoreSlim TvDbResourcePool = new SemaphoreSlim(1, 1);
internal readonly SemaphoreSlim TvDbResourcePool = new SemaphoreSlim(2, 2);
/// <summary>
/// Gets the current.