Commit: 42bea37764f1ce9e875fe81362abeea72ee21e09 - admintoolkit (git)

Administrator's Toolkit VS plugin

Commit MetaInfo

• Revisión: 42bea37764f1ce9e875fe81362abeea72ee21e09 (tree)
• Tiempo: 2022-01-31 13:30:53
• Autor: melchior <melchior@user...>
• Commiter: melchior

Log Message

Update for VS, Plus backup announcer

Updated references for VS1.16.0, Global backup announcer

Cambiar Resumen

• modified: AdminToolkit/AdminToolkit.csproj
• modified: AdminToolkit/Commands/BackupCycleCommand.cs
• modified: AdminToolkit/modinfo.json

Diferencia incremental

--- a/AdminToolkit/AdminToolkit.csproj
+++ b/AdminToolkit/AdminToolkit.csproj
@@ -20,7 +20,7 @@
     <ConsolePause>false</ConsolePause>
     <CustomCommands>
       <CustomCommands>
-        <Command type="AfterBuild" command="7z -tzip a AdminMod_${ProjectConfig}.zip" workingdir="${TargetDir}" />
+        <Command type="AfterBuild" command="7z a -tzip -x!*.zip -aoa ${ProjectName}_${ProjectConfig}.zip" workingdir="${TargetDir}" />
         <Command type="BeforeClean" command="rm -f *.zip" workingdir="${TargetDir}" />
       </CustomCommands>
     </CustomCommands>
@@ -33,7 +33,7 @@
     <ConsolePause>false</ConsolePause>
     <CustomCommands>
       <CustomCommands>
-        <Command type="AfterBuild" command="7z -tzip a AdminMod_${ProjectConfig}.zip" workingdir="${TargetDir}" />
+        <Command type="AfterBuild" command="7z a -tzip -x!*.zip -aoa ${ProjectName}_${ProjectConfig}.zip" workingdir="${TargetDir}" />
         <Command type="BeforeClean" command="rm -f *.zip" workingdir="${TargetDir}" />
       </CustomCommands>
     </CustomCommands>

--- a/AdminToolkit/Commands/BackupCycleCommand.cs
+++ b/AdminToolkit/Commands/BackupCycleCommand.cs
@@ -17,10 +17,9 @@ namespace AdminToolkit
 		private long backupTickerID;
 		private const string _timeFormat = @"d\D\ hh\H\ mm\M\ ss\S";
 
-
 		private DateTimeOffset _lastBackupTime = DateTimeOffset.MinValue;
-
 		private string fileFilter;
+		private FileSystemWatcher backupDirMonitor;
 
 		public BackupCycleCommand(ICoreServerAPI _serverAPI) : base(_serverAPI)
 		{
@@ -31,7 +30,6 @@ namespace AdminToolkit
 			this.Syntax = "enable / disable /  delay [hours] / stats";
 
 
-
 			ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.RunGame, ServerStarts);
 		}
 
@@ -148,7 +146,7 @@ namespace AdminToolkit
 
 
 		private void BackupCycleHandler(float elapsed)
-		{			
+		{
 			Logger.Event("Backup cycle triggered, elasped {0} @{1} Uptime", elapsed, ServerAPI.Server.ServerUptimeSeconds);
 			//Peek at backup DIR, count files of the backup type
 			var backupDir = new DirectoryInfo(GamePaths.Backups);
@@ -177,12 +175,6 @@ namespace AdminToolkit
 
 			this.backupTickerID = ServerAPI.Event.RegisterCallback(BackupCycleHandler, ( int )this.CachedConfiguration.BackupDelay.TotalMilliseconds);
 			Logger.Notification("BackupCycle re-engaged, delay: {0} next time: {1}", this.CachedConfiguration.BackupDelay.ToString(_timeFormat), DateTimeOffset.UtcNow.Add(this.CachedConfiguration.BackupDelay).ToString("u"));
-
-			//GlobalConstants.ConsoleGroup
-			/*
-			backupFileName = Path.GetFileName(server.Config.WorldConfig.SaveFileLocation).Replace(GlobalConstants.WorldSaveExtension, "") + "-" + string.Format("{0:yyyy-MM-dd_HH-mm-ss}", DateTime.Now) + GlobalConstants.WorldSaveExtension;
-			 */
-
 		}
 
 		private void AlterTimeDelay(int delay)
@@ -281,10 +273,21 @@ namespace AdminToolkit
 
 			fileFilter = $"{worldNameTrimmed}-*{GlobalConstants.WorldSaveExtension}";
 			Logger.VerboseDebug("File Filter: {0}", fileFilter);
+			backupDirMonitor = new FileSystemWatcher(GamePaths.Backups, fileFilter);
+			backupDirMonitor.Created += BackupFileCreation;
+			backupDirMonitor.IncludeSubdirectories = false;
+			backupDirMonitor.EnableRaisingEvents = true;
 
 			if (CachedConfiguration.Autobackup) { ToggleBackupCycle(true); }
 		}
-	}
+
+		private void BackupFileCreation(object sender, FileSystemEventArgs e)
+		{
+			if (ServerAPI.Server.CurrentRunPhase == EnumServerRunPhase.RunGame) {
+			ServerAPI.BroadcastMessageToAllGroups($"Backup procceeds concurrently... '{e.Name}'", EnumChatType.Notification);
+			}                   
+		}
+}
 
 
 }

--- a/AdminToolkit/modinfo.json
+++ b/AdminToolkit/modinfo.json
@@ -2,11 +2,11 @@
   "type": "code",
   "name": "Administrator's Toolkit mod",
   "ModID":"atk",
-  "description" : "Provides misc. Admin functions;\n admin listing, rules display (multi-lingual), auto-backup & much more.",
+  "description" : "Provides Admin functions;\n admin listing, rules display (multi-lingual), auto-backup & more.",
   "authors": ["Melchior", ],
-  "version": "0.3.7",
+  "version": "0.3.8",
   "dependencies": { 
-	"game": "1.15.0-rc.3"	
+	"game": "1.16.0"	
   },
   "requiredonclient":false,
   "website": "https://osdn.net/users/melchior/pf/admintoolkit/"