mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-09 07:10:34 +02:00
update ScheduleDirect
This commit is contained in:
parent
64a683e84d
commit
e1ea92890d
|
@ -198,50 +198,6 @@ namespace MediaBrowser.Api
|
||||||
return libraryManager.GetPerson(DeSlugPersonName(name, libraryManager));
|
return libraryManager.GetPerson(DeSlugPersonName(name, libraryManager));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected IList<BaseItem> GetAllLibraryItems(string userId, IUserManager userManager, ILibraryManager libraryManager, string parentId, Func<BaseItem,bool> filter)
|
|
||||||
{
|
|
||||||
if (!string.IsNullOrEmpty(parentId))
|
|
||||||
{
|
|
||||||
var folder = (Folder)libraryManager.GetItemById(new Guid(parentId));
|
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(userId))
|
|
||||||
{
|
|
||||||
var user = userManager.GetUserById(userId);
|
|
||||||
|
|
||||||
if (user == null)
|
|
||||||
{
|
|
||||||
throw new ArgumentException("User not found");
|
|
||||||
}
|
|
||||||
|
|
||||||
return folder
|
|
||||||
.GetRecursiveChildren(user, filter)
|
|
||||||
.ToList();
|
|
||||||
}
|
|
||||||
|
|
||||||
return folder
|
|
||||||
.GetRecursiveChildren(filter);
|
|
||||||
}
|
|
||||||
if (!string.IsNullOrWhiteSpace(userId))
|
|
||||||
{
|
|
||||||
var user = userManager.GetUserById(userId);
|
|
||||||
|
|
||||||
if (user == null)
|
|
||||||
{
|
|
||||||
throw new ArgumentException("User not found");
|
|
||||||
}
|
|
||||||
|
|
||||||
return userManager
|
|
||||||
.GetUserById(userId)
|
|
||||||
.RootFolder
|
|
||||||
.GetRecursiveChildren(user, filter)
|
|
||||||
.ToList();
|
|
||||||
}
|
|
||||||
|
|
||||||
return libraryManager
|
|
||||||
.RootFolder
|
|
||||||
.GetRecursiveChildren(filter);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deslugs an artist name by finding the correct entry in the library
|
/// Deslugs an artist name by finding the correct entry in the library
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -102,12 +102,16 @@ namespace MediaBrowser.Api
|
||||||
/// <returns>System.Object.</returns>
|
/// <returns>System.Object.</returns>
|
||||||
public object Get(GetGameSystemSummaries request)
|
public object Get(GetGameSystemSummaries request)
|
||||||
{
|
{
|
||||||
var gameSystems = GetAllLibraryItems(request.UserId, _userManager, _libraryManager, null, i => i is GameSystem)
|
var user = request.UserId == null ? null : _userManager.GetUserById(request.UserId);
|
||||||
|
var query = new InternalItemsQuery(user)
|
||||||
|
{
|
||||||
|
IncludeItemTypes = new[] { typeof(GameSystem).Name }
|
||||||
|
};
|
||||||
|
var parentIds = new string[] { } ;
|
||||||
|
var gameSystems = _libraryManager.GetItems(query, user, parentIds)
|
||||||
.Cast<GameSystem>()
|
.Cast<GameSystem>()
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
var user = request.UserId == null ? null : _userManager.GetUserById(request.UserId);
|
|
||||||
|
|
||||||
var result = gameSystems
|
var result = gameSystems
|
||||||
.Select(i => GetSummary(i, user))
|
.Select(i => GetSummary(i, user))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
@ -119,8 +123,15 @@ namespace MediaBrowser.Api
|
||||||
|
|
||||||
public object Get(GetPlayerIndex request)
|
public object Get(GetPlayerIndex request)
|
||||||
{
|
{
|
||||||
var games = GetAllLibraryItems(request.UserId, _userManager, _libraryManager, null, i => i is Game)
|
var user = request.UserId == null ? null : _userManager.GetUserById(request.UserId);
|
||||||
.Cast<Game>();
|
var query = new InternalItemsQuery(user)
|
||||||
|
{
|
||||||
|
IncludeItemTypes = new[] { typeof(Game).Name }
|
||||||
|
};
|
||||||
|
var parentIds = new string[] { };
|
||||||
|
var games = _libraryManager.GetItems(query, user, parentIds)
|
||||||
|
.Cast<Game>()
|
||||||
|
.ToList();
|
||||||
|
|
||||||
var lookup = games
|
var lookup = games
|
||||||
.ToLookup(i => i.PlayersSupported ?? -1)
|
.ToLookup(i => i.PlayersSupported ?? -1)
|
||||||
|
|
|
@ -677,6 +677,50 @@ namespace MediaBrowser.Api.Library
|
||||||
return ToOptimizedSerializedResultUsingCache(counts);
|
return ToOptimizedSerializedResultUsingCache(counts);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private IList<BaseItem> GetAllLibraryItems(string userId, IUserManager userManager, ILibraryManager libraryManager, string parentId, Func<BaseItem, bool> filter)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(parentId))
|
||||||
|
{
|
||||||
|
var folder = (Folder)libraryManager.GetItemById(new Guid(parentId));
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(userId))
|
||||||
|
{
|
||||||
|
var user = userManager.GetUserById(userId);
|
||||||
|
|
||||||
|
if (user == null)
|
||||||
|
{
|
||||||
|
throw new ArgumentException("User not found");
|
||||||
|
}
|
||||||
|
|
||||||
|
return folder
|
||||||
|
.GetRecursiveChildren(user, filter)
|
||||||
|
.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
return folder
|
||||||
|
.GetRecursiveChildren(filter);
|
||||||
|
}
|
||||||
|
if (!string.IsNullOrWhiteSpace(userId))
|
||||||
|
{
|
||||||
|
var user = userManager.GetUserById(userId);
|
||||||
|
|
||||||
|
if (user == null)
|
||||||
|
{
|
||||||
|
throw new ArgumentException("User not found");
|
||||||
|
}
|
||||||
|
|
||||||
|
return userManager
|
||||||
|
.GetUserById(userId)
|
||||||
|
.RootFolder
|
||||||
|
.GetRecursiveChildren(user, filter)
|
||||||
|
.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
return libraryManager
|
||||||
|
.RootFolder
|
||||||
|
.GetRecursiveChildren(filter);
|
||||||
|
}
|
||||||
|
|
||||||
private bool FilterItem(BaseItem item, GetItemCounts request, string userId)
|
private bool FilterItem(BaseItem item, GetItemCounts request, string userId)
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrWhiteSpace(userId))
|
if (!string.IsNullOrWhiteSpace(userId))
|
||||||
|
|
|
@ -117,10 +117,7 @@ namespace MediaBrowser.Api.Movies
|
||||||
public async Task<object> Get(GetSimilarMovies request)
|
public async Task<object> Get(GetSimilarMovies request)
|
||||||
{
|
{
|
||||||
var result = await GetSimilarItemsResult(
|
var result = await GetSimilarItemsResult(
|
||||||
// Strip out secondary versions
|
request, SimilarItemsHelper.GetSimiliarityScore).ConfigureAwait(false);
|
||||||
request, item => (item is Movie) && !((Video)item).PrimaryVersionId.HasValue,
|
|
||||||
|
|
||||||
SimilarItemsHelper.GetSimiliarityScore).ConfigureAwait(false);
|
|
||||||
|
|
||||||
return ToOptimizedSerializedResultUsingCache(result);
|
return ToOptimizedSerializedResultUsingCache(result);
|
||||||
}
|
}
|
||||||
|
@ -128,10 +125,7 @@ namespace MediaBrowser.Api.Movies
|
||||||
public async Task<object> Get(GetSimilarTrailers request)
|
public async Task<object> Get(GetSimilarTrailers request)
|
||||||
{
|
{
|
||||||
var result = await GetSimilarItemsResult(
|
var result = await GetSimilarItemsResult(
|
||||||
// Strip out secondary versions
|
request, SimilarItemsHelper.GetSimiliarityScore).ConfigureAwait(false);
|
||||||
request, item => (item is Movie) && !((Video)item).PrimaryVersionId.HasValue,
|
|
||||||
|
|
||||||
SimilarItemsHelper.GetSimiliarityScore).ConfigureAwait(false);
|
|
||||||
|
|
||||||
return ToOptimizedSerializedResultUsingCache(result);
|
return ToOptimizedSerializedResultUsingCache(result);
|
||||||
}
|
}
|
||||||
|
@ -140,8 +134,12 @@ namespace MediaBrowser.Api.Movies
|
||||||
{
|
{
|
||||||
var user = _userManager.GetUserById(request.UserId);
|
var user = _userManager.GetUserById(request.UserId);
|
||||||
|
|
||||||
IEnumerable<BaseItem> movies = GetAllLibraryItems(request.UserId, _userManager, _libraryManager, request.ParentId, i => i is Movie);
|
var query = new InternalItemsQuery(user)
|
||||||
|
{
|
||||||
|
IncludeItemTypes = new[] { typeof(Movie).Name }
|
||||||
|
};
|
||||||
|
var parentIds = string.IsNullOrWhiteSpace(request.ParentId) ? new string[] { } : new[] { request.ParentId };
|
||||||
|
var movies = _libraryManager.GetItems(query, user, parentIds);
|
||||||
movies = _libraryManager.ReplaceVideosWithPrimaryVersions(movies);
|
movies = _libraryManager.ReplaceVideosWithPrimaryVersions(movies);
|
||||||
|
|
||||||
var listEligibleForCategories = new List<BaseItem>();
|
var listEligibleForCategories = new List<BaseItem>();
|
||||||
|
@ -184,21 +182,27 @@ namespace MediaBrowser.Api.Movies
|
||||||
return ToOptimizedResult(result);
|
return ToOptimizedResult(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<ItemsResult> GetSimilarItemsResult(BaseGetSimilarItemsFromItem request, Func<BaseItem, bool> includeInSearch, Func<BaseItem, List<PersonInfo>, List<PersonInfo>, BaseItem, int> getSimilarityScore)
|
private async Task<ItemsResult> GetSimilarItemsResult(BaseGetSimilarItemsFromItem request, Func<BaseItem, List<PersonInfo>, List<PersonInfo>, BaseItem, int> getSimilarityScore)
|
||||||
{
|
{
|
||||||
var user = !string.IsNullOrWhiteSpace(request.UserId) ? _userManager.GetUserById(request.UserId) : null;
|
var user = !string.IsNullOrWhiteSpace(request.UserId) ? _userManager.GetUserById(request.UserId) : null;
|
||||||
|
|
||||||
var item = string.IsNullOrEmpty(request.Id) ?
|
var item = string.IsNullOrEmpty(request.Id) ?
|
||||||
(!string.IsNullOrWhiteSpace(request.UserId) ? user.RootFolder :
|
(!string.IsNullOrWhiteSpace(request.UserId) ? user.RootFolder :
|
||||||
_libraryManager.RootFolder) : _libraryManager.GetItemById(request.Id);
|
_libraryManager.RootFolder) : _libraryManager.GetItemById(request.Id);
|
||||||
|
|
||||||
Func<BaseItem, bool> filter = i => i.Id != item.Id && includeInSearch(i);
|
var query = new InternalItemsQuery(user)
|
||||||
|
{
|
||||||
var inputItems = user == null
|
IncludeItemTypes = new[] { typeof(Movie).Name }
|
||||||
? _libraryManager.RootFolder.GetRecursiveChildren(filter)
|
};
|
||||||
: user.RootFolder.GetRecursiveChildren(user, filter);
|
var parentIds = new string[] { };
|
||||||
|
var list = _libraryManager.GetItems(query, user, parentIds)
|
||||||
var list = inputItems.ToList();
|
.Where(i =>
|
||||||
|
{
|
||||||
|
// Strip out secondary versions
|
||||||
|
var v = i as Video;
|
||||||
|
return v != null && !v.PrimaryVersionId.HasValue;
|
||||||
|
})
|
||||||
|
.ToList();
|
||||||
|
|
||||||
if (user != null && user.Configuration.IncludeTrailersInSuggestions)
|
if (user != null && user.Configuration.IncludeTrailersInSuggestions)
|
||||||
{
|
{
|
||||||
|
|
|
@ -114,7 +114,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
|
||||||
var requestString = _jsonSerializer.SerializeToString(requestList);
|
var requestString = _jsonSerializer.SerializeToString(requestList);
|
||||||
_logger.Debug("Request string for schedules is: " + requestString);
|
_logger.Debug("Request string for schedules is: " + requestString);
|
||||||
httpOptions.RequestContent = requestString;
|
httpOptions.RequestContent = requestString;
|
||||||
using (var response = await _httpClient.Post(httpOptions))
|
using (var response = await Post(httpOptions).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
StreamReader reader = new StreamReader(response.Content);
|
StreamReader reader = new StreamReader(response.Content);
|
||||||
string responseString = reader.ReadToEnd();
|
string responseString = reader.ReadToEnd();
|
||||||
|
@ -136,7 +136,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
|
||||||
var requestBody = "[\"" + string.Join("\", \"", programsID) + "\"]";
|
var requestBody = "[\"" + string.Join("\", \"", programsID) + "\"]";
|
||||||
httpOptions.RequestContent = requestBody;
|
httpOptions.RequestContent = requestBody;
|
||||||
|
|
||||||
using (var innerResponse = await _httpClient.Post(httpOptions))
|
using (var innerResponse = await Post(httpOptions).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
StreamReader innerReader = new StreamReader(innerResponse.Content);
|
StreamReader innerReader = new StreamReader(innerResponse.Content);
|
||||||
responseString = innerReader.ReadToEnd();
|
responseString = innerReader.ReadToEnd();
|
||||||
|
@ -225,7 +225,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
|
||||||
|
|
||||||
httpOptions.RequestHeaders["token"] = token;
|
httpOptions.RequestHeaders["token"] = token;
|
||||||
|
|
||||||
using (var response = await _httpClient.Get(httpOptions))
|
using (var response = await Get(httpOptions).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Channel>(response);
|
var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Channel>(response);
|
||||||
_logger.Info("Found " + root.map.Count() + " channels on the lineup on ScheduleDirect");
|
_logger.Info("Found " + root.map.Count() + " channels on the lineup on ScheduleDirect");
|
||||||
|
@ -466,7 +466,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
|
||||||
LogErrorResponseBody = true
|
LogErrorResponseBody = true
|
||||||
};
|
};
|
||||||
List<ScheduleDirect.ShowImages> images;
|
List<ScheduleDirect.ShowImages> images;
|
||||||
using (var innerResponse2 = await _httpClient.Post(httpOptions))
|
using (var innerResponse2 = await Post(httpOptions).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
images = _jsonSerializer.DeserializeFromStream<List<ScheduleDirect.ShowImages>>(
|
images = _jsonSerializer.DeserializeFromStream<List<ScheduleDirect.ShowImages>>(
|
||||||
innerResponse2.Content);
|
innerResponse2.Content);
|
||||||
|
@ -498,7 +498,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (Stream responce = await _httpClient.Get(options).ConfigureAwait(false))
|
using (Stream responce = await Get(options).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
var root = _jsonSerializer.DeserializeFromStream<List<ScheduleDirect.Headends>>(responce);
|
var root = _jsonSerializer.DeserializeFromStream<List<ScheduleDirect.Headends>>(responce);
|
||||||
|
|
||||||
|
@ -567,7 +567,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
|
||||||
if (long.TryParse(savedToken.Value, NumberStyles.Any, CultureInfo.InvariantCulture, out ticks))
|
if (long.TryParse(savedToken.Value, NumberStyles.Any, CultureInfo.InvariantCulture, out ticks))
|
||||||
{
|
{
|
||||||
// If it's under 24 hours old we can still use it
|
// If it's under 24 hours old we can still use it
|
||||||
if ((DateTime.UtcNow.Ticks - ticks) < TimeSpan.FromHours(24).Ticks)
|
if ((DateTime.UtcNow.Ticks - ticks) < TimeSpan.FromHours(20).Ticks)
|
||||||
{
|
{
|
||||||
return savedToken.Name;
|
return savedToken.Name;
|
||||||
}
|
}
|
||||||
|
@ -600,6 +600,32 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task<HttpResponseInfo> Post(HttpRequestOptions options)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return await _httpClient.Post(options).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
_tokens.Clear();
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<Stream> Get(HttpRequestOptions options)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return await _httpClient.Get(options).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
_tokens.Clear();
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private async Task<string> GetTokenInternal(string username, string password,
|
private async Task<string> GetTokenInternal(string username, string password,
|
||||||
CancellationToken cancellationToken)
|
CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
|
@ -614,7 +640,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
|
||||||
//_logger.Info("Obtaining token from Schedules Direct from addres: " + httpOptions.Url + " with body " +
|
//_logger.Info("Obtaining token from Schedules Direct from addres: " + httpOptions.Url + " with body " +
|
||||||
// httpOptions.RequestContent);
|
// httpOptions.RequestContent);
|
||||||
|
|
||||||
using (var responce = await _httpClient.Post(httpOptions))
|
using (var responce = await Post(httpOptions).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Token>(responce.Content);
|
var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Token>(responce.Content);
|
||||||
if (root.message == "OK")
|
if (root.message == "OK")
|
||||||
|
@ -696,7 +722,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (var response = await _httpClient.Get(options).ConfigureAwait(false))
|
using (var response = await Get(options).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Lineups>(response);
|
var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Lineups>(response);
|
||||||
|
|
||||||
|
|
|
@ -80,6 +80,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
private IDbCommand _deleteAncestorsCommand;
|
private IDbCommand _deleteAncestorsCommand;
|
||||||
private IDbCommand _saveAncestorCommand;
|
private IDbCommand _saveAncestorCommand;
|
||||||
|
|
||||||
|
private IDbCommand _updateInheritedRatingCommand;
|
||||||
|
|
||||||
private const int LatestSchemaVersion = 29;
|
private const int LatestSchemaVersion = 29;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -532,6 +534,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
{
|
{
|
||||||
_saveStreamCommand.Parameters.Add(_saveStreamCommand, "@" + col);
|
_saveStreamCommand.Parameters.Add(_saveStreamCommand, "@" + col);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_updateInheritedRatingCommand = _connection.CreateCommand();
|
||||||
|
_updateInheritedRatingCommand.CommandText = "Update TypedBaseItems set InheritedParentalRatingValue=@InheritedParentalRatingValue where Guid=@Guid";
|
||||||
|
_updateInheritedRatingCommand.Parameters.Add(_updateInheritedRatingCommand, "@InheritedParentalRatingValue");
|
||||||
|
_updateInheritedRatingCommand.Parameters.Add(_updateInheritedRatingCommand, "@Guid");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -2011,55 +2018,79 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
|
|
||||||
public async Task UpdateInheritedValues(CancellationToken cancellationToken)
|
public async Task UpdateInheritedValues(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
//await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false);
|
var newValues = new List<Tuple<Guid, int>>();
|
||||||
|
|
||||||
//IDbTransaction transaction = null;
|
using (var cmd = _connection.CreateCommand())
|
||||||
|
{
|
||||||
|
cmd.CommandText = "select Guid,InheritedParentalRatingValue,(select Max(ParentalRatingValue, (select COALESCE(MAX(ParentalRatingValue),0) from TypedBaseItems where guid in (Select AncestorId from AncestorIds where ItemId=Outer.guid)))) as NewInheritedParentalRatingValue from typedbaseitems as Outer where InheritedParentalRatingValue <> NewInheritedParentalRatingValue";
|
||||||
|
|
||||||
//try
|
using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
|
||||||
//{
|
{
|
||||||
// transaction = _connection.BeginTransaction();
|
while (reader.Read())
|
||||||
|
{
|
||||||
|
var id = reader.GetGuid(0);
|
||||||
|
var newValue = reader.GetInt32(2);
|
||||||
|
|
||||||
// using (var cmd = _connection.CreateCommand())
|
newValues.Add(new Tuple<Guid, int>(id, newValue));
|
||||||
// {
|
}
|
||||||
// cmd.CommandText = "update TypedBaseItems set InheritedParentalRatingValue = (select Max(ParentalRatingValue, (select COALESCE(MAX(ParentalRatingValue),0) from TypedBaseItems as T where guid in (Select AncestorId from AncestorIds where ItemId=T.guid))))";
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// cmd.Transaction = transaction;
|
if (newValues.Count == 0)
|
||||||
// cmd.ExecuteNonQuery();
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
// cmd.ExecuteNonQuery();
|
IDbTransaction transaction = null;
|
||||||
// }
|
|
||||||
|
|
||||||
// transaction.Commit();
|
try
|
||||||
//}
|
{
|
||||||
//catch (OperationCanceledException)
|
transaction = _connection.BeginTransaction();
|
||||||
//{
|
|
||||||
// if (transaction != null)
|
|
||||||
// {
|
|
||||||
// transaction.Rollback();
|
|
||||||
// }
|
|
||||||
|
|
||||||
// throw;
|
foreach (var item in newValues)
|
||||||
//}
|
{
|
||||||
//catch (Exception e)
|
_updateInheritedRatingCommand.GetParameter(0).Value = item.Item1;
|
||||||
//{
|
_updateInheritedRatingCommand.GetParameter(1).Value = item.Item2;
|
||||||
// _logger.ErrorException("Error running query:", e);
|
|
||||||
|
|
||||||
// if (transaction != null)
|
_updateInheritedRatingCommand.Transaction = transaction;
|
||||||
// {
|
_updateInheritedRatingCommand.ExecuteNonQuery();
|
||||||
// transaction.Rollback();
|
|
||||||
// }
|
|
||||||
|
|
||||||
// throw;
|
_updateInheritedRatingCommand.ExecuteNonQuery();
|
||||||
//}
|
}
|
||||||
//finally
|
|
||||||
//{
|
|
||||||
// if (transaction != null)
|
|
||||||
// {
|
|
||||||
// transaction.Dispose();
|
|
||||||
// }
|
|
||||||
|
|
||||||
// _writeLock.Release();
|
transaction.Commit();
|
||||||
//}
|
}
|
||||||
|
catch (OperationCanceledException)
|
||||||
|
{
|
||||||
|
if (transaction != null)
|
||||||
|
{
|
||||||
|
transaction.Rollback();
|
||||||
|
}
|
||||||
|
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
_logger.ErrorException("Error running query:", e);
|
||||||
|
|
||||||
|
if (transaction != null)
|
||||||
|
{
|
||||||
|
transaction.Rollback();
|
||||||
|
}
|
||||||
|
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
if (transaction != null)
|
||||||
|
{
|
||||||
|
transaction.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
_writeLock.Release();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Dictionary<string, string[]> GetTypeMapDictionary()
|
private static Dictionary<string, string[]> GetTypeMapDictionary()
|
||||||
|
|
Loading…
Reference in a new issue