ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: synchronize all writes to ReliableFileStorage

Browse source
This commit is contained in:
goat 2023-10-04 00:10:04 +02:00
parent 4487ef85f4
commit 38e4fd2673
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
1 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Dalamud/Storage/ReliableFileStorage.cs
View file

@ -1,10 +1,8 @@
using System.IO;
using System.Runtime.InteropServices;
using System.Text;
using Dalamud.Logging.Internal;
using Dalamud.Utility;
using PInvoke;
using SQLite;
namespace Dalamud.Storage;
@ -28,6 +26,7 @@ public class ReliableFileStorage : IServiceType, IDisposable
{
private static readonly ModuleLog Log = new("VFS");
private readonly object syncRoot = new();
private SQLiteConnection? db;
/// <summary>
@ -118,34 +117,37 @@ public class ReliableFileStorage : IServiceType, IDisposable
{
ArgumentException.ThrowIfNullOrEmpty(path);
if (this.db == null)
lock (this.syncRoot)
{
Util.WriteAllBytesSafe(path, bytes);
return;
}
this.db.RunInTransaction(() =>
{
var normalizedPath = NormalizePath(path);
var file = this.db.Table<DbFile>().FirstOrDefault(f => f.Path == normalizedPath && f.ContainerId == containerId);
if (file == null)
if (this.db == null)
{
file = new DbFile
Util.WriteAllBytesSafe(path, bytes);
return;
}
this.db.RunInTransaction(() =>
{
var normalizedPath = NormalizePath(path);
var file = this.db.Table<DbFile>().FirstOrDefault(f => f.Path == normalizedPath && f.ContainerId == containerId);
if (file == null)
{
ContainerId = containerId,
Path = normalizedPath,
Data = bytes,
};
this.db.Insert(file);
}
else
{
file.Data = bytes;
this.db.Update(file);
}
file = new DbFile
{
ContainerId = containerId,
Path = normalizedPath,
Data = bytes,
};
this.db.Insert(file);
}
else
{
file.Data = bytes;
this.db.Update(file);
}
Util.WriteAllBytesSafe(path, bytes);
});
Util.WriteAllBytesSafe(path, bytes);
});
}
}
/// <summary>