Fixes to config (TorchAPI#178)

Updated codes for autocommands
OnStart Command now only runs immediately on session ready ONCE.
Removed ScheduledTime in autocommands
Add method to convert ScheduleTime to Interval for commands with Scheduled Trigger (new method)

Co-authored-by: Olatide F <tide1988@live.com>

Author: N1Ran

Essentials/AutoCommand.cs

@@ -2,6 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Xml.Serialization;
 using NLog;
 using Torch;
 using Torch.API;
@@ -26,45 +27,44 @@ public class AutoCommand : ViewModel
         private float _triggerRatio;
         private double _triggerCount;
 
+        [XmlIgnore]
+        public bool Completed { get; set; }
 
-        [Display(Name = "Trigger", Description ="Choose a trigger for the command")]
+        [Display(Order = 3, Name = "Trigger", Description ="Choose a trigger for the command")]
         public Trigger CommandTrigger
         {
             get => _trigger;
             set => SetValue(ref _trigger, value);
         }
 
-        [Display(Name = "Trigger Operator", Description ="Choose a Ratio Comparer for the command")]
+        [Display(Order = 6, Name = "Trigger Operator", Description ="Choose a comparer for the command")]
         public Gtl Compare
         {
             get => _comparer;
             set => SetValue(ref _comparer, value);
         }
 
 
-        [Display(Description = "Sets the name of this command. Use this name in conjunction with !admin runauto to trigger the command from ingame or from other auto commands.")]
+        [Display(Order = 1, Description = "Sets the name of this command. Use this name in conjunction with !admin runauto to trigger the command from ingame or from other auto commands.")]
         public string Name
         {
             get => _name;
             set => SetValue(ref _name, value);
         }
 
-        [Display(Name = "Scheduled Time", GroupName = "Schedule", Description = "Sets a time of day for this command to be run. Format is HH:MM:SS. MUST use 24 hour format! Will be reset to zero if Interval is set.")]
+        //[Display(Name = "Scheduled Time", GroupName = "Schedule", Description = "Sets a time of day for this command to be run. Format is HH:MM:SS. MUST use 24 hour format! Will be reset to zero if Interval is set.")]
+        [Display(Visible = false)]
         public string ScheduledTime
         {
             get => _scheduledTime.ToString();
             set
             {
                 _scheduledTime = TimeSpan.Parse(value);
                 OnPropertyChanged();
-                if (CommandTrigger != Trigger.Scheduled) return;
-                _nextRun = DateTime.Now.Date + _scheduledTime;
-                if (_nextRun < DateTime.Now)
-                    _nextRun += TimeSpan.FromDays(1);
             }
         }
 
-        [Display(Description = "Sets an interval for this command to be repeated. Format is HH:MM:SS. Will be reset to zero if Scheduled Time is set!")]
+        [Display(Order = 2, Description = "Sets an interval/Time for this command to be repeated. Format is HH:MM:SS.")]
         public string Interval
         {
             get => _interval.ToString();
@@ -78,18 +78,19 @@ public string Interval
                     _nextRun = DateTime.Now + _interval;
                 }
 
+
             }
         }
 
-        [Display(Name = "Trigger Ratio", Description = "Ratio for Sim Speed or Vote Trigger. 0.5 is equivalent to 50%")]
+        [Display(Order = 5, Name = "Trigger Ratio", Description = "Ratio for Sim Speed or Vote Trigger. 0.5 is equivalent to 50%")]
         public float TriggerRatio
         {
             get => _triggerRatio;
             set => SetValue(ref _triggerRatio, Math.Min(Math.Max(value, 0), 1));
 
         }
 
-        [Display(Name = "Trigger Count", Description = "Only use with GridCount or PlayerCount Trigger")]
+        [Display(Order = 4, Name = "Trigger Count", Description = "Only use with GridCount or PlayerCount Trigger")]
         public double TriggerCount
         {
             get => _triggerCount;
@@ -104,7 +105,7 @@ public DayOfWeek DayOfWeek
             set => SetValue(ref _day, value);
         }
 
-        [Display(Description = "Sub-command steps that will be iterated through once the Interval or Scheduled time is reached.")]
+        [Display(Order = 7, Description = "Sub-command steps that will be iterated through once the Interval or Scheduled time is reached.")]
         public ObservableCollection<CommandStep> Steps { get; } = new ObservableCollection<CommandStep>();
 
         public AutoCommand()
@@ -125,7 +126,7 @@ public void Update()
                     RunNow();
                     _nextRun = DateTime.Now + _interval;
                     return;
-                case Trigger.Scheduled when Interval == TimeSpan.Zero.ToString() && DayOfWeek != DayOfWeek.All && DateTime.Now.DayOfWeek != (System.DayOfWeek)(int)DayOfWeek:
+                case Trigger.Scheduled when  DayOfWeek != DayOfWeek.All && DateTime.Now.DayOfWeek != (System.DayOfWeek)(int)DayOfWeek:
                     //adding one day because I can't be bothered to calculate exact interval
                     _nextRun += TimeSpan.FromDays(1);
                     return;
@@ -143,8 +144,8 @@ public void Update()
 
             if (_currentStep < Steps.Count) return;
             _currentStep = 0;
-            _nextRun = _scheduledTime != TimeSpan.Zero
-                    ? DateTime.Now.Date + _scheduledTime + TimeSpan.FromDays(1)
+            _nextRun = _trigger == Trigger.Scheduled
+                    ? DateTime.Now.Date + _interval + TimeSpan.FromDays(1)
                     : _nextRun = DateTime.Now + _interval;
         }
 
@@ -219,6 +220,7 @@ public enum Gtl
         Equal
     }
 
+    //TODO Remove Scheduled
     public enum Trigger
     {
         Disabled,

Essentials/AutoCommands.cs

@@ -9,6 +9,9 @@
 using Sandbox.Game.World;
 using Sandbox.Game.Multiplayer;
 using Sandbox.Game.Entities;
+using Sandbox.ModAPI;
+using Torch.Session;
+using Torch.Managers;
 using VRage.Game.ModAPI;
 using static Essentials.Gtl;
 
@@ -42,10 +45,10 @@ private bool CanRun(AutoCommand command)
                 case Trigger.Disabled:
                     return  false;
                 case Trigger.OnStart:
-		                    var a = Math.Max(TimeSpan.Parse(command.Interval).TotalSeconds, 60);
-		                    var b = ((ITorchServer)TorchBase.Instance).ElapsedPlayTime;
-		                    if  ((a - b.TotalSeconds) <= 1 && (a - b.TotalSeconds > 0))
-		                        command.RunNow();
+                    if (command.Completed || MySession.Static?.Ready == false)break;
+                    command.Completed = true;
+                    command.RunNow();
+
                     break;
                 case Trigger.Vote:
                     break;
@@ -67,15 +70,16 @@ private bool CanRun(AutoCommand command)
                             throw new Exception("meh");
                     }
                 case Trigger.PlayerCount:
-                    switch (command.Compare)
+
+                    if (command.Compare == GreaterThan)
                     {
-                        case GreaterThan:
-                            return MySession.Static.Players.GetOnlinePlayerCount() >= command.TriggerCount;
-                        case LessThan:
-                            return MySession.Static.Players.GetOnlinePlayerCount() <= command.TriggerCount;
-                        default:
-                            throw new Exception("meh");
+                        return MySession.Static.Players.GetOnlinePlayerCount() > command.TriggerCount;
                     }
+                    else if (command.Compare == LessThan)
+                    {
+                        return MySession.Static.Players.GetOnlinePlayerCount() < command.TriggerCount;
+                    }
+                    break;
 
                 case Trigger.SimSpeed:
                     var commandActive = _simSpeedCheck.TryGetValue(command, out var time);

Essentials/EssentialsConfig.cs

@@ -34,6 +34,7 @@ public EssentialsConfig()
         public ObservableCollection<InfoCommand> InfoCommands { get; } = new ObservableCollection<InfoCommand>();
 
         private string _motd;
+        [Display(Name = "Motd", Description = "Message displayed to players upon connection")]
         public string Motd { get => _motd; set => SetValue(ref _motd, value); }
 
         public bool _enableRanks = false;

Essentials/EssentialsPlugin.cs

@@ -65,6 +65,7 @@ public override void Init(ITorchBase torch)
             string path = Path.Combine(StoragePath, "Essentials.cfg");
             Log.Info($"Attempting to load config from {path}");
             _config = Persistent<EssentialsConfig>.Load(path);
+            ConvertScheduleTime();
             _sessionManager = Torch.Managers.GetManager<TorchSessionManager>();
             if (_sessionManager != null)
                 _sessionManager.SessionStateChanged += SessionChanged;
@@ -299,5 +300,18 @@ public override void Dispose()
                 _sessionManager.SessionStateChanged -= SessionChanged;
             _sessionManager = null;
         }
+
+        //Todo Remove This method next update
+        public void ConvertScheduleTime()
+        {
+            foreach (var command in _config.Data.AutoCommands)
+            {
+                if (command.ScheduledTime == TimeSpan.Zero.ToString() || command.CommandTrigger != Trigger.Scheduled) continue;
+                command.Interval = command.ScheduledTime;
+                command.ScheduledTime = TimeSpan.Zero.ToString();
+            }
+            _config.Save();
+
+        }
     }
 }

Essentials/InfoCommand.cs

@@ -1,5 +1,6 @@
 using System.Runtime.CompilerServices;
 using Torch;
+using Torch.Views;
 
 namespace Essentials
 {
@@ -10,24 +11,28 @@ public class InfoCommand : ViewModel
         private string _dialogResponse;
         private string _urlResponse;
 
+        [Display(Order = 1, Name = "Command", Description = "Type this in chat to activate command")]
         public string Command
         {
             get => _command;
             set => SetValue(ref _command, value);
         }
 
+        [Display(Order = 2, Name = "Chat Response", Description = "Chat response to command")]
         public string ChatResponse
         {
             get => _chatResponse;
             set =>SetValue(ref _chatResponse, value);
         }
 
+        [Display(Order = 3, Name = "Dialog Response", Description = "Dialog box response")]
         public string DialogResponse
         {
             get => _dialogResponse;
             set => SetValue(ref _dialogResponse, value);
         }
 
+        [Display(Order = 4, Name = "URL", Description = "url response to command")]
         public string URL
         {
             get => _urlResponse;