Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions src/Fluxzy.Core/Archiving/Writers/DirectoryArchiveWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ namespace Fluxzy.Writers
public class DirectoryArchiveWriter : RealtimeArchiveWriter
{
private readonly ArchiveMetaInformation _archiveMetaInformation = CreateNewCaptureArchiveMetaInformation();
private readonly object _metaLock = new object();

private static ArchiveMetaInformation CreateNewCaptureArchiveMetaInformation()
{
Expand Down Expand Up @@ -78,7 +79,7 @@ private void UpdateMeta(bool force)
if (!force && File.Exists(_archiveMetaInformationPath))
return;

lock (_archiveMetaInformationPath)
lock (_metaLock)
{
using var fileStream = File.Create(_archiveMetaInformationPath);
JsonSerializer.Serialize(fileStream, _archiveMetaInformation, GlobalArchiveOption.DefaultSerializerOptions);
Expand All @@ -87,15 +88,15 @@ private void UpdateMeta(bool force)

public override void UpdateTags(IEnumerable<Tag> tags)
{
lock (_archiveMetaInformationPath)
lock (_metaLock)
{
foreach (var tag in tags)
{
_archiveMetaInformation.Tags.Add(tag);
}
}

UpdateMeta(true);
UpdateMeta(true);
}
}

protected override bool ExchangeUpdateRequired(Exchange exchange)
Expand Down Expand Up @@ -130,18 +131,18 @@ public override bool Update(ExchangeInfo exchangeInfo, CancellationToken cancell

if (exchangeInfo.Tags?.Any() ?? false)
{
var modified = false;

lock (_archiveMetaInformation) {
lock (_metaLock)
{
var modified = false;

foreach (var tag in exchangeInfo.Tags)
{
modified = _archiveMetaInformation.Tags.Add(tag) || modified;
}
}

if (modified)
UpdateMeta(true);
if (modified)
UpdateMeta(true);
}
}

return true;
Expand Down
Loading