CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 09:47:22 +13:00
Code Issues Projects Releases Packages Wiki Activity

Added temp file fallback for setting load

Browse source
This commit is contained in:
Jaex 2020-05-24 15:05:51 +03:00
parent 7a6e67a0e9
commit 0ace03d138
1 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
ShareX.HelpersLib/SettingsBase.cs
View file

@ -26,6 +26,7 @@ You should have received a copy of the GNU General Public License
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Threading.Tasks;
@ -110,23 +111,6 @@ public void SaveAsync()
SaveAsync(FilePath);
}
public static T Load(string filePath, string backupFolder = null, bool createBackup = false, bool createWeeklyBackup = false)
{
T setting = LoadInternal(filePath, backupFolder);
if (setting != null)
{
setting.FilePath = filePath;
setting.IsFirstTimeRun = string.IsNullOrEmpty(setting.ApplicationVersion);
setting.IsUpgrade = !setting.IsFirstTimeRun && Helpers.CompareApplicationVersion(setting.ApplicationVersion) < 0;
setting.BackupFolder = backupFolder;
setting.CreateBackup = createBackup;
setting.CreateWeeklyBackup = createWeeklyBackup;
}
return setting;
}
private bool SaveInternal(string filePath)
{
string typeName = GetType().Name;
@ -197,7 +181,35 @@ private bool SaveInternal(string filePath)
return isSuccess;
}
private static T LoadInternal(string filePath, string backupFolder = null)
public static T Load(string filePath, string backupFolder = null, bool createBackup = false, bool createWeeklyBackup = false)
{
List<string> fallbackFilePaths = new List<string>();
string tempFilePath = filePath + ".temp";
fallbackFilePaths.Add(tempFilePath);
if (!string.IsNullOrEmpty(backupFolder))
{
string fileName = Path.GetFileName(filePath);
string backupFilePath = Path.Combine(backupFolder, fileName);
fallbackFilePaths.Add(backupFilePath);
}
T setting = LoadInternal(filePath, fallbackFilePaths);
if (setting != null)
{
setting.FilePath = filePath;
setting.IsFirstTimeRun = string.IsNullOrEmpty(setting.ApplicationVersion);
setting.IsUpgrade = !setting.IsFirstTimeRun && Helpers.CompareApplicationVersion(setting.ApplicationVersion) < 0;
setting.BackupFolder = backupFolder;
setting.CreateBackup = createBackup;
setting.CreateWeeklyBackup = createWeeklyBackup;
}
return setting;
}
private static T LoadInternal(string filePath, List<string> fallbackFilePaths = null)
{
string typeName = typeof(T).Name;
@ -249,11 +261,11 @@ private static T LoadInternal(string filePath, string backupFolder = null)
DebugHelper.WriteLine($"{typeName} file does not exist: {filePath}");
}
if (!string.IsNullOrEmpty(backupFolder))
if (fallbackFilePaths != null && fallbackFilePaths.Count > 0)
{
string fileName = Path.GetFileName(filePath);
string backupFilePath = Path.Combine(backupFolder, fileName);
return LoadInternal(backupFilePath);
filePath = fallbackFilePaths[0];
fallbackFilePaths.RemoveAt(0);
return LoadInternal(filePath, fallbackFilePaths);
}
DebugHelper.WriteLine($"Loading new {typeName} instance.");