change status && add retry for cc error

qdraw · Oct 25, 2024 · 65a3884 · 65a3884
1 parent d38eb30
commit 65a3884
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/starsky/starsky.feature.thumbnail/Services/DatabaseThumbnailGenerationService.cs b/starsky/starsky.feature.thumbnail/Services/DatabaseThumbnailGenerationService.cs
@@ -123,7 +123,7 @@ await _updateStatusGeneratedThumbnailService.AddOrUpdateStatusAsync(
 		}
 
 		var filteredData = resultData
-			.Where(p => p.Status == FileIndexItem.ExifStatus.Ok).ToList();
+			.Where(p => p.Status is FileIndexItem.ExifStatus.Ok or FileIndexItem.ExifStatus.OkAndSame).ToList();
 
 		if ( filteredData.Count == 0 )
 		{

diff --git a/starsky/starsky.foundation.database/Import/ImportQuery.cs b/starsky/starsky.foundation.database/Import/ImportQuery.cs
@@ -164,8 +164,17 @@ await RetryHelper.DoAsync(LocalRemoveDefaultQuery,
 			}
 			catch ( DbUpdateConcurrencyException exception )
 			{
-				_logger.LogInformation(exception, "[RemoveItemAsync] catch-ed " +
-										  "DbUpdateConcurrencyException (do nothing)");
+				_logger.LogInformation("[RemoveItemAsync] catch-ed " +
+										  "DbUpdateConcurrencyException (retry) {exception}", exception.Message);
+				try
+				{
+					await RetryHelper.DoAsync(LocalRemoveDefaultQuery, TimeSpan.FromSeconds(2), 2);
+				}
+				catch ( AggregateException )
+				{
+					_logger.LogInformation("[RemoveItemAsync] catch-ed " +
+					                       "AggregateException (ignored after retry) {exception}", exception.Message);
+				}
 			}
 
 			return importIndexItem;