mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
revert clean task changes
This commit is contained in:
parent
80688496e8
commit
f618650fbd
1 changed files with 33 additions and 58 deletions
|
@ -142,77 +142,52 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
|||
}
|
||||
}
|
||||
|
||||
private Task UpdateToLatestSchema(CancellationToken cancellationToken, IProgress<double> progress)
|
||||
private async Task UpdateToLatestSchema(CancellationToken cancellationToken, IProgress<double> progress)
|
||||
{
|
||||
return UpdateToLatestSchema(0, 0, null, cancellationToken, progress);
|
||||
}
|
||||
|
||||
private async Task UpdateToLatestSchema(int queryStartIndex, int progressStartIndex, int? totalRecordCount, CancellationToken cancellationToken, IProgress<double> progress)
|
||||
{
|
||||
IEnumerable<BaseItem> items;
|
||||
int numItemsToSave;
|
||||
var pageSize = 1000;
|
||||
|
||||
if (totalRecordCount.HasValue)
|
||||
var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery
|
||||
{
|
||||
var list = _libraryManager.GetItemList(new InternalItemsQuery
|
||||
{
|
||||
IsCurrentSchema = false,
|
||||
ExcludeItemTypes = new[] { typeof(LiveTvProgram).Name },
|
||||
StartIndex = queryStartIndex,
|
||||
Limit = pageSize
|
||||
IsCurrentSchema = false,
|
||||
ExcludeItemTypes = new[] { typeof(LiveTvProgram).Name }
|
||||
});
|
||||
|
||||
}).ToList();
|
||||
|
||||
items = list;
|
||||
numItemsToSave = list.Count;
|
||||
}
|
||||
else
|
||||
{
|
||||
var itemsResult = _libraryManager.GetItemsResult(new InternalItemsQuery
|
||||
{
|
||||
IsCurrentSchema = false,
|
||||
ExcludeItemTypes = new[] { typeof(LiveTvProgram).Name },
|
||||
StartIndex = queryStartIndex,
|
||||
Limit = pageSize
|
||||
});
|
||||
|
||||
totalRecordCount = itemsResult.TotalRecordCount;
|
||||
items = itemsResult.Items;
|
||||
numItemsToSave = itemsResult.Items.Length;
|
||||
}
|
||||
|
||||
var numItems = totalRecordCount.Value;
|
||||
var numComplete = 0;
|
||||
var numItems = itemIds.Count;
|
||||
|
||||
_logger.Debug("Upgrading schema for {0} items", numItems);
|
||||
|
||||
if (numItemsToSave > 0)
|
||||
foreach (var itemId in itemIds)
|
||||
{
|
||||
try
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
if (itemId != Guid.Empty)
|
||||
{
|
||||
await _itemRepo.SaveItems(items, cancellationToken).ConfigureAwait(false);
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.ErrorException("Error saving item", ex);
|
||||
// Somehow some invalid data got into the db. It probably predates the boundary checking
|
||||
var item = _libraryManager.GetItemById(itemId);
|
||||
|
||||
if (item != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
await _itemRepo.SaveItem(item, cancellationToken).ConfigureAwait(false);
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.ErrorException("Error saving item", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
progressStartIndex += pageSize;
|
||||
double percent = progressStartIndex;
|
||||
numComplete++;
|
||||
double percent = numComplete;
|
||||
percent /= numItems;
|
||||
progress.Report(percent * 100);
|
||||
}
|
||||
|
||||
var newStartIndex = queryStartIndex + (pageSize - numItemsToSave);
|
||||
await UpdateToLatestSchema(newStartIndex, progressStartIndex, totalRecordCount, cancellationToken, progress).ConfigureAwait(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
progress.Report(100);
|
||||
}
|
||||
progress.Report(100);
|
||||
}
|
||||
|
||||
private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
|
||||
|
|
Loading…
Reference in a new issue