fix SaveBackup failing on Mac (#522)
This commit is contained in:
parent
fda2ac7485
commit
da22446964
|
@ -1,7 +1,9 @@
|
||||||
using System;
|
using System;
|
||||||
|
using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.IO.Compression;
|
using System.IO.Compression;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Reflection;
|
||||||
using StardewModdingAPI.Mods.SaveBackup.Framework;
|
using StardewModdingAPI.Mods.SaveBackup.Framework;
|
||||||
using StardewValley;
|
using StardewValley;
|
||||||
|
|
||||||
|
@ -50,11 +52,49 @@ namespace StardewModdingAPI.Mods.SaveBackup
|
||||||
/// <param name="backupFolder">The folder containing save backups.</param>
|
/// <param name="backupFolder">The folder containing save backups.</param>
|
||||||
private void CreateBackup(DirectoryInfo backupFolder)
|
private void CreateBackup(DirectoryInfo backupFolder)
|
||||||
{
|
{
|
||||||
FileInfo file = new FileInfo(Path.Combine(backupFolder.FullName, this.FileName));
|
try
|
||||||
if (!file.Exists)
|
|
||||||
{
|
{
|
||||||
this.Monitor.Log($"Adding {file.Name}...", LogLevel.Trace);
|
// get target path
|
||||||
ZipFile.CreateFromDirectory(Constants.SavesPath, file.FullName, CompressionLevel.Fastest, includeBaseDirectory: false);
|
FileInfo targetFile = new FileInfo(Path.Combine(backupFolder.FullName, this.FileName));
|
||||||
|
if (targetFile.Exists)
|
||||||
|
targetFile.Delete(); //return;
|
||||||
|
|
||||||
|
// create zip
|
||||||
|
// due to limitations with the bundled Mono on Mac, we can't reference System.IO.Compression.
|
||||||
|
this.Monitor.Log($"Adding {targetFile.Name}...", LogLevel.Trace);
|
||||||
|
switch (Constants.TargetPlatform)
|
||||||
|
{
|
||||||
|
case GamePlatform.Linux:
|
||||||
|
case GamePlatform.Windows:
|
||||||
|
{
|
||||||
|
Assembly coreAssembly = Assembly.Load("System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089") ?? throw new InvalidOperationException("Can't load System.IO.Compression assembly.");
|
||||||
|
Assembly fsAssembly = Assembly.Load("System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089") ?? throw new InvalidOperationException("Can't load System.IO.Compression assembly.");
|
||||||
|
Type compressionLevelType = coreAssembly.GetType("System.IO.Compression.CompressionLevel") ?? throw new InvalidOperationException("Can't load CompressionLevel type.");
|
||||||
|
Type zipFileType = fsAssembly.GetType("System.IO.Compression.ZipFile") ?? throw new InvalidOperationException("Can't load ZipFile type.");
|
||||||
|
MethodInfo createMethod = zipFileType.GetMethod("CreateFromDirectory", new[] { typeof(string), typeof(string), compressionLevelType, typeof(bool) }) ?? throw new InvalidOperationException("Can't load ZipFile.CreateFromDirectory method.");
|
||||||
|
createMethod.Invoke(null, new object[] { Constants.SavesPath, targetFile.FullName, CompressionLevel.Fastest, false });
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case GamePlatform.Mac:
|
||||||
|
{
|
||||||
|
DirectoryInfo saveFolder = new DirectoryInfo(Constants.SavesPath);
|
||||||
|
ProcessStartInfo startInfo = new ProcessStartInfo
|
||||||
|
{
|
||||||
|
FileName = "zip",
|
||||||
|
Arguments = $"-rq \"{targetFile.FullName}\" \"{saveFolder.Name}\" -x \"*.DS_Store\" -x \"__MACOSX\"",
|
||||||
|
WorkingDirectory = $"{Constants.SavesPath}/../",
|
||||||
|
CreateNoWindow = true
|
||||||
|
};
|
||||||
|
new Process { StartInfo = startInfo }.Start();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
this.Monitor.Log("Couldn't back up save files (see log file for details).", LogLevel.Warn);
|
||||||
|
this.Monitor.Log(ex.ToString(), LogLevel.Trace);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,23 +103,31 @@ namespace StardewModdingAPI.Mods.SaveBackup
|
||||||
/// <param name="backupsToKeep">The number of backups to keep.</param>
|
/// <param name="backupsToKeep">The number of backups to keep.</param>
|
||||||
private void PruneBackups(DirectoryInfo backupFolder, int backupsToKeep)
|
private void PruneBackups(DirectoryInfo backupFolder, int backupsToKeep)
|
||||||
{
|
{
|
||||||
var oldBackups = backupFolder
|
try
|
||||||
.GetFiles()
|
|
||||||
.OrderByDescending(p => p.CreationTimeUtc)
|
|
||||||
.Skip(backupsToKeep);
|
|
||||||
|
|
||||||
foreach (FileInfo file in oldBackups)
|
|
||||||
{
|
{
|
||||||
try
|
var oldBackups = backupFolder
|
||||||
|
.GetFiles()
|
||||||
|
.OrderByDescending(p => p.CreationTimeUtc)
|
||||||
|
.Skip(backupsToKeep);
|
||||||
|
|
||||||
|
foreach (FileInfo file in oldBackups)
|
||||||
{
|
{
|
||||||
this.Monitor.Log($"Deleting {file.Name}...", LogLevel.Trace);
|
try
|
||||||
file.Delete();
|
{
|
||||||
}
|
this.Monitor.Log($"Deleting {file.Name}...", LogLevel.Trace);
|
||||||
catch (Exception ex)
|
file.Delete();
|
||||||
{
|
}
|
||||||
this.Monitor.Log($"Error deleting old save backup '{file.Name}': {ex}");
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
this.Monitor.Log($"Error deleting old save backup '{file.Name}': {ex}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
this.Monitor.Log("Couldn't remove old backups (see log file for details).", LogLevel.Warn);
|
||||||
|
this.Monitor.Log(ex.ToString(), LogLevel.Trace);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,8 +31,6 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.IO.Compression" />
|
|
||||||
<Reference Include="System.IO.Compression.FileSystem" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="..\..\build\GlobalAssemblyInfo.cs">
|
<Compile Include="..\..\build\GlobalAssemblyInfo.cs">
|
||||||
|
|
Loading…
Reference in New Issue