Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-16 08:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Closes #3060

Browse Source
This commit is contained in:
Archi
2023-11-14 20:01:29 +01:00
parent b34f18497d
commit f2ff2f4929
45 changed files with 156 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ArchiSteamFarm/Helpers/CrossProcessFileBasedSemaphore.cs
View File

@@ -173,10 +173,8 @@ internal sealed class CrossProcessFileBasedSemaphore : IAsyncDisposable, ICrossP
return;
}
// ReSharper disable once RedundantSuppressNullableWarningExpression - required for .NET Framework
if (!Directory.Exists(directoryPath!)) {
// ReSharper disable once RedundantSuppressNullableWarningExpression - required for .NET Framework
DirectoryInfo directoryInfo = Directory.CreateDirectory(directoryPath!);
if (!Directory.Exists(directoryPath)) {
DirectoryInfo directoryInfo = Directory.CreateDirectory(directoryPath);
if (OperatingSystem.IsWindows()) {
try {

19
ArchiSteamFarm/Helpers/SerializableFile.cs
View File

@@ -81,11 +81,15 @@ public abstract class SerializableFile : IDisposable {
string json = JsonConvert.SerializeObject(this, Debugging.IsUserDebugging ? Formatting.Indented : Formatting.None);
if (string.IsNullOrEmpty(json)) {
throw new InvalidOperationException(nameof(json));
}
// We always want to write entire content to temporary file first, in order to never load corrupted data, also when target file doesn't exist
string newFilePath = $"{FilePath}.new";
if (File.Exists(FilePath)) {
string currentJson = await File.ReadAllTextAsync(FilePath!).ConfigureAwait(false);
string currentJson = await File.ReadAllTextAsync(FilePath).ConfigureAwait(false);
if (json == currentJson) {
return;
@@ -93,11 +97,11 @@ public abstract class SerializableFile : IDisposable {
await File.WriteAllTextAsync(newFilePath, json).ConfigureAwait(false);
File.Replace(newFilePath, FilePath!, null);
File.Replace(newFilePath, FilePath, null);
} else {
await File.WriteAllTextAsync(newFilePath, json).ConfigureAwait(false);
File.Move(newFilePath, FilePath!);
File.Move(newFilePath, FilePath);
}
} catch (Exception e) {
ASF.ArchiLogger.LogGenericException(e);
@@ -125,8 +129,13 @@ public abstract class SerializableFile : IDisposable {
}
internal static async Task<bool> Write(string filePath, string json) {
ArgumentException.ThrowIfNullOrEmpty(filePath);
ArgumentException.ThrowIfNullOrEmpty(json);
if (string.IsNullOrEmpty(filePath)) {
throw new ArgumentNullException(nameof(filePath));
}
if (string.IsNullOrEmpty(json)) {
throw new ArgumentNullException(nameof(json));
}
string newFilePath = $"{filePath}.new";