summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2018-05-23 19:09:19 -0400
committerJesse Plamondon-Willard <github@jplamondonw.com>2018-05-23 19:09:19 -0400
commitda22446964f4dba0047a29dee3efec7c00835048 (patch)
tree288837e9d58d715bdf8496cc7950a8e3e9463043 /src
parentfda2ac74857e3bc1129667ef6ba975efd6ca33f6 (diff)
downloadSMAPI-da22446964f4dba0047a29dee3efec7c00835048.tar.gz
SMAPI-da22446964f4dba0047a29dee3efec7c00835048.tar.bz2
SMAPI-da22446964f4dba0047a29dee3efec7c00835048.zip
fix SaveBackup failing on Mac (#522)
Diffstat (limited to 'src')
-rw-r--r--src/SMAPI.Mods.SaveBackup/ModEntry.cs82
-rw-r--r--src/SMAPI.Mods.SaveBackup/StardewModdingAPI.Mods.SaveBackup.csproj2
2 files changed, 65 insertions, 19 deletions
diff --git a/src/SMAPI.Mods.SaveBackup/ModEntry.cs b/src/SMAPI.Mods.SaveBackup/ModEntry.cs
index 37793ced..78578c3c 100644
--- a/src/SMAPI.Mods.SaveBackup/ModEntry.cs
+++ b/src/SMAPI.Mods.SaveBackup/ModEntry.cs
@@ -1,7 +1,9 @@
using System;
+using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Linq;
+using System.Reflection;
using StardewModdingAPI.Mods.SaveBackup.Framework;
using StardewValley;
@@ -50,11 +52,49 @@ namespace StardewModdingAPI.Mods.SaveBackup
/// <param name="backupFolder">The folder containing save backups.</param>
private void CreateBackup(DirectoryInfo backupFolder)
{
- FileInfo file = new FileInfo(Path.Combine(backupFolder.FullName, this.FileName));
- if (!file.Exists)
+ try
+ {
+ // get target path
+ 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($"Adding {file.Name}...", LogLevel.Trace);
- ZipFile.CreateFromDirectory(Constants.SavesPath, file.FullName, CompressionLevel.Fastest, includeBaseDirectory: false);
+ 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>
private void PruneBackups(DirectoryInfo backupFolder, int backupsToKeep)
{
- var oldBackups = backupFolder
- .GetFiles()
- .OrderByDescending(p => p.CreationTimeUtc)
- .Skip(backupsToKeep);
-
- foreach (FileInfo file in oldBackups)
+ try
{
- try
- {
- this.Monitor.Log($"Deleting {file.Name}...", LogLevel.Trace);
- file.Delete();
- }
- catch (Exception ex)
+ var oldBackups = backupFolder
+ .GetFiles()
+ .OrderByDescending(p => p.CreationTimeUtc)
+ .Skip(backupsToKeep);
+
+ foreach (FileInfo file in oldBackups)
{
- this.Monitor.Log($"Error deleting old save backup '{file.Name}': {ex}");
+ try
+ {
+ this.Monitor.Log($"Deleting {file.Name}...", LogLevel.Trace);
+ file.Delete();
+ }
+ 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);
+ }
}
}
}
diff --git a/src/SMAPI.Mods.SaveBackup/StardewModdingAPI.Mods.SaveBackup.csproj b/src/SMAPI.Mods.SaveBackup/StardewModdingAPI.Mods.SaveBackup.csproj
index 89e92a8a..44fff536 100644
--- a/src/SMAPI.Mods.SaveBackup/StardewModdingAPI.Mods.SaveBackup.csproj
+++ b/src/SMAPI.Mods.SaveBackup/StardewModdingAPI.Mods.SaveBackup.csproj
@@ -31,8 +31,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="System.IO.Compression" />
- <Reference Include="System.IO.Compression.FileSystem" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\build\GlobalAssemblyInfo.cs">