piwigo/PiwigoDirectorySync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes some concurrency issues on filecount and failed files
All checks were successful
PiwigoDirectorySync/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Philipp Häfelfinger 2023-09-11 16:51:46 +02:00
parent 809f892b07
commit adcf8b1504
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PiwigoDirectorySync/Services/FileIndexer.cs
View File

@ -1,4 +1,5 @@
using System.Threading.Channels; using System.Collections.Concurrent;
using System.Threading.Channels;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -9,9 +10,10 @@ namespace PiwigoDirectorySync.Services;
internal class FileIndexer : IFileIndexer internal class FileIndexer : IFileIndexer
{ {
private readonly IList<string> _failedFiles = new List<string>(); private readonly ConcurrentBag<string> _failedFiles = new();
private readonly ILogger<FileIndexer> _logger; private readonly ILogger<FileIndexer> _logger;
private readonly IServiceProvider _serviceProvider; private readonly IServiceProvider _serviceProvider;
private int _totalFilesScanned;
public FileIndexer(ILogger<FileIndexer> logger, IServiceProvider serviceProvider) public FileIndexer(ILogger<FileIndexer> logger, IServiceProvider serviceProvider)
{ {
@ -19,8 +21,9 @@ internal class FileIndexer : IFileIndexer
_serviceProvider = serviceProvider; _serviceProvider = serviceProvider;
} }
public int TotalFilesScanned { get; private set; } public int TotalFilesScanned => _totalFilesScanned;
public IReadOnlyCollection<string> FailedFiles => _failedFiles.AsReadOnly();
public IReadOnlyCollection<string> FailedFiles => _failedFiles;
public async Task StartProcessingAsync(Channel<string> fileQueue, int piwigoServerId, CancellationToken ct) public async Task StartProcessingAsync(Channel<string> fileQueue, int piwigoServerId, CancellationToken ct)
{ {
@ -74,7 +77,7 @@ internal class FileIndexer : IFileIndexer
await db.SaveChangesAsync(ct); await db.SaveChangesAsync(ct);
TotalFilesScanned++; Interlocked.Add(ref _totalFilesScanned, 1);
} }
catch (Exception ex) catch (Exception ex)
{ {