diff --git a/src/ARKServerManager/Lib/ServerApp.cs b/src/ARKServerManager/Lib/ServerApp.cs index a02dfa69..a860ac49 100644 --- a/src/ARKServerManager/Lib/ServerApp.cs +++ b/src/ARKServerManager/Lib/ServerApp.cs @@ -2040,14 +2040,14 @@ namespace ServerManagerTool.Lib var saveFolderInfo = new DirectoryInfo(saveFolder); // backup the world save file - ZipUtils.ZipFile(backupFile, worldFileName, worldFile, comment.ToString()); + ZipUtils.ZipFile(backupFile, "", worldFile, comment.ToString()); // backup the player files var playerFileFilter = $"*{Config.Default.PlayerFileExtension}"; var playerFiles = saveFolderInfo.GetFiles(playerFileFilter, SearchOption.TopDirectoryOnly); foreach (var file in playerFiles) { - ZipUtils.ZipFile(backupFile, file.Name, file.FullName); + ZipUtils.ZipFile(backupFile, "", file.FullName); } // backup the tribe files @@ -2055,7 +2055,7 @@ namespace ServerManagerTool.Lib var tribeFiles = saveFolderInfo.GetFiles(tribeFileFilter, SearchOption.TopDirectoryOnly); foreach (var file in tribeFiles) { - ZipUtils.ZipFile(backupFile, file.Name, file.FullName); + ZipUtils.ZipFile(backupFile, "", file.FullName); } // backup the tribute tribe files @@ -2063,7 +2063,7 @@ namespace ServerManagerTool.Lib var tributeTribeFiles = saveFolderInfo.GetFiles(tributeTribeFileFilter, SearchOption.TopDirectoryOnly); foreach (var file in tributeTribeFiles) { - ZipUtils.ZipFile(backupFile, file.Name, file.FullName); + ZipUtils.ZipFile(backupFile, "", file.FullName); } if (Config.Default.AutoBackup_IncludeSaveGamesFolder) @@ -2078,7 +2078,7 @@ namespace ServerManagerTool.Lib var saveGamesFiles = saveGamesFolderInfo.GetFiles(saveGamesFileFilter, SearchOption.AllDirectories); foreach (var file in saveGamesFiles) { - ZipUtils.ZipFile(backupFile, file.FullName.Replace(saveGamesFolder, Config.Default.SaveGamesRelativePath), file.FullName); + ZipUtils.ZipFile(backupFile, file.DirectoryName.Replace(saveGamesFolder, Config.Default.SaveGamesRelativePath), file.FullName); } } } diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 015f7414..cb37b53a 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -7,6 +7,29 @@ 2022-05-09T00:00:00Z + + urn:uuid:BB7749B7-31F1-46B8-848D-3F3B6E84EA5B + 1.1.427 (1.1.427.1) + 1.1.427.1 + + 2022-05-09T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • World Save Backups - have fixed the timestamps associated with the files inside the zip file.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + + urn:uuid:632DF17A-04C7-4A74-8C82-0106D0770393 1.1.426 (1.1.426.2) diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index 59cec39a..ee636ba8 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -8,9 +8,9 @@ 2022-05-09T00:00:00Z - urn:uuid:0F1FA607-8CA0-4926-8783-0B3D14B9B672 - 1.1.426 (1.1.426.2) - 1.1.426.2 + urn:uuid:BB7749B7-31F1-46B8-848D-3F3B6E84EA5B + 1.1.427 (1.1.427.1) + 1.1.427.1 2022-05-09T00:00:00Z @@ -19,30 +19,7 @@ BUGFIX
    -
  • Removed TLS13 from the list of accepted security protocols, as not all OS support TLS13.
    • -
-

- - - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:632DF17A-04C7-4A74-8C82-0106D0770393 - 1.1.426 (1.1.426.1) - 1.1.426.1 - - 2022-05-09T00:00:00Z - -
-

- BUGFIX -
-

    -
  • Rcon Player List - fixed a bug when displaying the player details for Epic Players.
    • +
  • World Save Backups - have fixed the timestamps associated with the files inside the zip file.

diff --git a/src/ConanServerManager/Lib/ServerApp.cs b/src/ConanServerManager/Lib/ServerApp.cs index 1f209456..ded17b4c 100644 --- a/src/ConanServerManager/Lib/ServerApp.cs +++ b/src/ConanServerManager/Lib/ServerApp.cs @@ -1962,7 +1962,7 @@ namespace ServerManagerTool.Lib var saveFolderInfo = new DirectoryInfo(saveFolder); // backup the world save file - ZipUtils.ZipFile(backupFile, worldFileName, worldFile, comment.ToString()); + ZipUtils.ZipFile(backupFile, "", worldFile, comment.ToString()); if (Config.Default.AutoBackup_IncludeSaveGamesFolder) { @@ -1976,7 +1976,7 @@ namespace ServerManagerTool.Lib var saveGamesFiles = saveGamesFolderInfo.GetFiles(saveGamesFileFilter, SearchOption.AllDirectories); foreach (var file in saveGamesFiles) { - ZipUtils.ZipFile(backupFile, file.FullName.Replace(saveGamesFolder, Config.Default.SaveGamesRelativePath), file.FullName); + ZipUtils.ZipFile(backupFile, file.DirectoryName.Replace(saveGamesFolder, Config.Default.SaveGamesRelativePath), file.FullName); } } } diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index 49b6001d..8a78ab28 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -7,6 +7,29 @@ 2022-05-09T00:00:00Z + + urn:uuid:CE3805D7-1CC8-4DF6-8015-8E2B9B87C1FF + 1.1.71 (1.1.71.1) + 1.1.71.1 + + 2022-05-09T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • World Save Backups - have fixed the timestamps associated with the files inside the zip file.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + + urn:uuid:86CF3CE5-C935-4C04-8D31-224B2E1DD203 1.1.70 (1.1.70.2) diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index d23fb91c..d2d18cd5 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -8,9 +8,9 @@ 2022-05-09T00:00:00Z - urn:uuid:A9EE6916-474D-44AA-B6D5-F2EEFEB889C4 - 1.1.70 (1.1.70.2) - 1.1.70.2 + urn:uuid:CE3805D7-1CC8-4DF6-8015-8E2B9B87C1FF + 1.1.71 (1.1.71.1) + 1.1.71.1 2022-05-09T00:00:00Z @@ -19,30 +19,7 @@ BUGFIX
    -
  • Removed TLS13 from the list of accepted security protocols, as not all OS support TLS13.
    • -
-

- - - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:86CF3CE5-C935-4C04-8D31-224B2E1DD203 - 1.1.70 (1.1.70.1) - 1.1.70.1 - - 2022-05-09T00:00:00Z - -
-

- BUGFIX -
-

    -
  • Rcon Player List - fixed a bug when displaying the player details for Epic Players.
    • +
  • World Save Backups - have fixed the timestamps associated with the files inside the zip file.

diff --git a/src/ServerManager.Common/Utils/ZipUtils.cs b/src/ServerManager.Common/Utils/ZipUtils.cs index 2deffa23..73b31b23 100644 --- a/src/ServerManager.Common/Utils/ZipUtils.cs +++ b/src/ServerManager.Common/Utils/ZipUtils.cs @@ -178,17 +178,15 @@ namespace ServerManagerTool.Common.Utils } } - public static void ZipFile(string zipFile, string entryName, string fileToZip) + public static void ZipFile(string zipFile, string directoryPath, string fileToZip) { - ZipFile(zipFile, entryName, fileToZip, null); + ZipFile(zipFile, directoryPath, fileToZip, null); } - public static void ZipFile(string zipFile, string entryName, string fileToZip, string comment) + public static void ZipFile(string zipFile, string directoryPath, string fileToZip, string comment) { if (string.IsNullOrWhiteSpace(zipFile)) throw new ArgumentNullException(nameof(zipFile)); - if (string.IsNullOrWhiteSpace(entryName)) - throw new ArgumentNullException(nameof(entryName)); if (string.IsNullOrWhiteSpace(fileToZip)) throw new ArgumentNullException(nameof(fileToZip)); if (!File.Exists(fileToZip)) @@ -198,7 +196,7 @@ namespace ServerManagerTool.Common.Utils { using (var zip = new ZipFile()) { - zip.AddEntry(entryName, File.ReadAllBytes(fileToZip)); + zip.AddFile(fileToZip, directoryPath); zip.CompressionLevel = Ionic.Zlib.CompressionLevel.Default; if (!string.IsNullOrWhiteSpace(comment)) @@ -211,7 +209,7 @@ namespace ServerManagerTool.Common.Utils { using (var zip = Ionic.Zip.ZipFile.Read(zipFile)) { - zip.AddEntry(entryName, File.ReadAllBytes(fileToZip)); + zip.AddFile(fileToZip, directoryPath); if (!string.IsNullOrWhiteSpace(comment)) zip.Comment = comment;