change duration token validation

Author: Elektryk-Andrzej

Code/MethodSystem/Methods/BroadcastMethods/AnimatedBroadcastMethod.cs

@@ -21,7 +21,7 @@ public class AnimatedBroadcastMethod : SynchronousMethod, IAdditionalDescription
         new DurationArgument("duration"),
         new TextArgument("content")
         {
-            Description = 
+            Description =
                 "Use <charwait=x> and </charwait> tags to specify how much time each character will take to be printed, " +
                 "or <wait=x> to specify a single wait action. " +
                 "Example: \"<charwait=100ms>Slow print</charwait><br><wait=2s>waited 2 seconds for that!\""
@@ -32,23 +32,23 @@ public class AnimatedBroadcastMethod : SynchronousMethod, IAdditionalDescription
             DefaultValue = new(60, null)
         }
     ];
-    
+
     public override void Execute()
     {
         var players = Args.GetPlayers("players");
         var content = Args.GetText("content");
         var duration = Args.GetDuration("duration").TotalSeconds;
         var lineBreakLength = Args.GetInt("line break length");
-        
+
         foreach (var plr in players)
         {
             plr.Connection.Send(new CassieTtsPayload(string.Empty, string.Empty, false));
             plr.SendCassieMessage(
-                $"$SLEEP_{duration-1} .", 
+                $"$SLEEP_{duration-1} .",
                 Helper.FormatToCassieCentralScreenSubtitles(
-                    content, 
+                    content,
                     lineBreakLength
-                ), 
+                ),
                 false,
                 0
             );
@@ -58,15 +58,15 @@ public override void Execute()
     public string AdditionalDescription =>
         "Uses CASSIE to make an animated broadcast - if there is CASSIE playing, it will be stopped. " +
         "Keep custom formatting to a minimum, this system is very limited.";
-    
+
     public static class Helper
     {
         public static string FormatToRawCassieSubtitles(string text, int lineBreakLength)
         {
             var result = new StringBuilder();
             var index = 72;
             var timePerCharStack = new Stack<TimeSpan>();
-        
+
             foreach (var line in text.Split('\n'))
             {
                 // Skip empty lines
@@ -75,11 +75,11 @@ public static string FormatToRawCassieSubtitles(string text, int lineBreakLength
                     index -= 1;
                     continue;
                 }
-        
+
                 // Calculate actual length excluding HTML tags
                 var len = CalculateTextLength(line);
                 var parts = new List<string>();
-        
+
                 // Split long lines
                 if (len > lineBreakLength)
                 {
@@ -89,23 +89,23 @@ public static string FormatToRawCassieSubtitles(string text, int lineBreakLength
                 {
                     parts.Add(line);
                 }
-        
+
                 // Add all parts to result with proper formatting
                 foreach (var part in parts)
                 {
                     index -= 1;
                     result.Append(FormatLine(part, index, timePerCharStack));
                 }
             }
-        
+
             return result.ToString();
         }
-        
+
         private static int CalculateTextLength(string line)
         {
             var len = 0;
             var isTag = false;
-        
+
             foreach (var c in line)
             {
                 switch (c)
@@ -117,17 +117,17 @@ private static int CalculateTextLength(string line)
                         isTag = false;
                         continue;
                 }
-        
+
                 if (!isTag) len++;
             }
-        
+
             return len;
         }
-        
+
         private static void SplitLongLine(string line, List<string> parts, int lineBreakLength)
         {
             int? lastUnusedSpaceIndex = null;
-            
+
             for (var i = 0; i < line.Length; i++)
             {
                 if (!char.IsWhiteSpace(line[i])) continue;
@@ -137,11 +137,11 @@ private static void SplitLongLine(string line, List<string> parts, int lineBreak
                     lastUnusedSpaceIndex = i;
                     continue;
                 }
-                
+
                 var lastAvailableSpaceIndex = lastUnusedSpaceIndex ?? i;
                 var leftPart = line[..lastAvailableSpaceIndex].Trim();
                 parts.Add(leftPart);
-                
+
                 var rightPart = line[(lastAvailableSpaceIndex + 1)..].Trim();
                 if (CalculateTextLength(rightPart) > lineBreakLength)
                 {
@@ -151,10 +151,10 @@ private static void SplitLongLine(string line, List<string> parts, int lineBreak
                 {
                     parts.Add(rightPart);
                 }
-                
+
                 return;
             }
-            
+
             parts.Add(line);
         }
 
@@ -163,12 +163,12 @@ private static string GetDelayString(TimeSpan time)
             var dots = new string('c', (int)Math.Round(time.TotalMilliseconds / 20, MidpointRounding.AwayFromZero));
             return $"<size=0>{dots}</size>";
         }
-        
+
         private static string FormatLine(string text, int index, Stack<TimeSpan> activeDelayTags)
         {
             var openTags = new Regex(@"<charwait=((\d|\.)+(ms|s))>").Matches(text).Cast<Match>().ToArray();
             var closeTags = new Regex("</charwait>").Matches(text).Cast<Match>().ToArray();
-            
+
             StringBuilder newText = new();
             var isTag = false;
             for (int i = 0; i < text.Length; i++)
@@ -183,31 +183,30 @@ private static string FormatLine(string text, int index, Stack<TimeSpan> activeD
 
                 if (openTags.FirstOrDefault(t => t.Index == i) is { } openTag)
                 {
-                    if (DurationToken.Parse(openTag.Groups[1].Value).HasErrored(out _, out var nullableTimeSpan)
-                        || nullableTimeSpan is not { } timeSpan)
+                    if (DurationToken.Parse(openTag.Groups[1].Value) is not { } timeSpan)
                     {
                         newText.Append(c);
                         continue;
                     }
-                    
+
                     activeDelayTags.Push(timeSpan);
                     i = openTag.Index + openTag.Length - 1;
                     continue;
                 }
-                
+
                 if (closeTags.FirstOrDefault(t => t.Index == i) is { } closeTag)
                 {
                     if (activeDelayTags.Count == 0)
                     {
                         newText.Append(c);
                         continue;
                     }
-                    
+
                     activeDelayTags.Pop();
                     i = closeTag.Index + closeTag.Length - 1;
                     continue;
                 }
-                
+
                 isTag = c switch
                 {
                     '<' => true,
@@ -227,15 +226,14 @@ private static string FormatLine(string text, int index, Stack<TimeSpan> activeD
 
             foreach (var match in new Regex(@"<wait=(\d+(ms|s))>").Matches(newText.ToString()).Cast<Match>().ToArray())
             {
-                if (DurationToken.Parse(match.Groups[1].Value).HasErrored(out _, out var nullableTimeSpan)
-                    || nullableTimeSpan is not { } timeSpan)
+                if (DurationToken.Parse(match.Groups[1].Value) is not { } timeSpan)
                 {
                     continue;
                 }
-                
+
                 newText.Replace(match.Value, GetDelayString(timeSpan));
             }
-            
+
             return $"<voffset={index}em>{newText}</voffset>\\n";
         }
 

Code/TokenSystem/Tokens/ValueTokens/DurationToken.cs

@@ -9,21 +9,16 @@ public class DurationToken : LiteralValueToken<DurationValue>
 {
     protected override IParseResult InternalParse(Script scr)
     {
-        if (Parse(RawRep).HasErrored(out var error, out var value))
-        {
-            return new Error(error);
-        }
-
-        if (value is not { } timeSpan)
+        if (Parse(RawRep) is not {} timeSpan)
         {
             return new Ignore();
         }
-        
+
         Value = timeSpan;
         return new Success();
     }
 
-    public static TryGet<TimeSpan?> Parse(string value)
+    public static TimeSpan? Parse(string value)
     {
         if (TimeSpan.TryParse(value, CultureInfo.InvariantCulture, out var result) && result.TotalMilliseconds > 0)
         {
@@ -33,18 +28,18 @@ protected override IParseResult InternalParse(Script scr)
         var unitIndex = Array.FindIndex(value.ToCharArray(), char.IsLetter);
         if (unitIndex == -1)
         {
-            return null as TimeSpan?;
+            return null;
         }
-        
+
         string numberString = string.Join("", value.Take(unitIndex).ToArray());
         if (!double.TryParse(numberString, NumberStyles.Any, CultureInfo.InvariantCulture, out var valueAsDouble))
         {
-            return null as TimeSpan?;
+            return null;
         }
-        
+
         if (valueAsDouble < 0)
         {
-            return "Duration cannot be negative.";
+            return null;
         }
 
         var unit = value[unitIndex..];
@@ -55,7 +50,7 @@ protected override IParseResult InternalParse(Script scr)
             "m" => TimeSpan.FromMinutes(valueAsDouble),
             "h" => TimeSpan.FromHours(valueAsDouble),
             "d" => TimeSpan.FromDays(valueAsDouble),
-            _ => $"Provided unit '{unit}' is not valid."
+            _ => null
         };
     }
-}
+}