Browse Source

Move to seperate folder

tznind 9 months ago
parent
commit
3b53363b74

+ 9 - 9
Terminal.Gui/ConsoleDrivers/AnsiRequestScheduler.cs → Terminal.Gui/ConsoleDrivers/AnsiResponseParser/AnsiRequestScheduler.cs

@@ -4,9 +4,9 @@ using System.Diagnostics;
 
 
 namespace Terminal.Gui;
 namespace Terminal.Gui;
 
 
-public class AnsiRequestScheduler(IAnsiResponseParser parser)
+public class AnsiRequestScheduler (IAnsiResponseParser parser)
 {
 {
-    private readonly List<Tuple<AnsiEscapeSequenceRequest,DateTime>> _requests = new  ();
+    private readonly List<Tuple<AnsiEscapeSequenceRequest, DateTime>> _requests = new ();
 
 
     /// <summary>
     /// <summary>
     ///<para>
     ///<para>
@@ -38,10 +38,10 @@ public class AnsiRequestScheduler(IAnsiResponseParser parser)
     /// </summary>
     /// </summary>
     /// <param name="request"></param>
     /// <param name="request"></param>
     /// <returns><see langword="true"/> if request was sent immediately. <see langword="false"/> if it was queued.</returns>
     /// <returns><see langword="true"/> if request was sent immediately. <see langword="false"/> if it was queued.</returns>
-    public bool SendOrSchedule (AnsiEscapeSequenceRequest request )
+    public bool SendOrSchedule (AnsiEscapeSequenceRequest request)
     {
     {
 
 
-        if (CanSend(request, out var reason))
+        if (CanSend (request, out var reason))
         {
         {
             Send (request);
             Send (request);
             return true;
             return true;
@@ -59,7 +59,7 @@ public class AnsiRequestScheduler(IAnsiResponseParser parser)
             }
             }
         }
         }
 
 
-        _requests.Add (Tuple.Create(request,DateTime.Now));
+        _requests.Add (Tuple.Create (request, DateTime.Now));
         return false;
         return false;
     }
     }
 
 
@@ -76,7 +76,7 @@ public class AnsiRequestScheduler(IAnsiResponseParser parser)
         {
         {
             if (DateTime.Now - dt > _staleTimeout)
             if (DateTime.Now - dt > _staleTimeout)
             {
             {
-                parser.StopExpecting (withTerminator,false);
+                parser.StopExpecting (withTerminator, false);
 
 
                 return true;
                 return true;
             }
             }
@@ -102,7 +102,7 @@ public class AnsiRequestScheduler(IAnsiResponseParser parser)
             return false;
             return false;
         }
         }
 
 
-        var opportunity = _requests.FirstOrDefault (r=>CanSend(r.Item1, out _));
+        var opportunity = _requests.FirstOrDefault (r => CanSend (r.Item1, out _));
 
 
         if (opportunity != null)
         if (opportunity != null)
         {
         {
@@ -117,8 +117,8 @@ public class AnsiRequestScheduler(IAnsiResponseParser parser)
 
 
     private void Send (AnsiEscapeSequenceRequest r)
     private void Send (AnsiEscapeSequenceRequest r)
     {
     {
-        _lastSend.AddOrUpdate (r.Terminator,(s)=>DateTime.Now,(s,v)=>DateTime.Now);
-        parser.ExpectResponse (r.Terminator,r.ResponseReceived,false);
+        _lastSend.AddOrUpdate (r.Terminator, (s) => DateTime.Now, (s, v) => DateTime.Now);
+        parser.ExpectResponse (r.Terminator, r.ResponseReceived, false);
         r.Send ();
         r.Send ();
     }
     }
 
 

+ 2 - 0
Terminal.Gui/ConsoleDrivers/AnsiResponseExpectation.cs → Terminal.Gui/ConsoleDrivers/AnsiResponseParser/AnsiResponseExpectation.cs

@@ -1,4 +1,6 @@
 #nullable enable
 #nullable enable
+using Terminal;
+
 namespace Terminal.Gui;
 namespace Terminal.Gui;
 
 
 public record AnsiResponseExpectation (string Terminator, Action<string> Response)
 public record AnsiResponseExpectation (string Terminator, Action<string> Response)

+ 6 - 6
Terminal.Gui/ConsoleDrivers/AnsiResponseParser.cs → Terminal.Gui/ConsoleDrivers/AnsiResponseParser/AnsiResponseParser.cs

@@ -171,7 +171,7 @@ internal abstract class AnsiResponseParserBase : IAnsiResponseParser
         if (MatchResponse (cur,
         if (MatchResponse (cur,
                            expectedResponses,
                            expectedResponses,
                            invokeCallback: true,
                            invokeCallback: true,
-                           removeExpectation:true))
+                           removeExpectation: true))
         {
         {
             return false;
             return false;
         }
         }
@@ -180,7 +180,7 @@ internal abstract class AnsiResponseParserBase : IAnsiResponseParser
         if (MatchResponse (cur,
         if (MatchResponse (cur,
                            lateResponses,
                            lateResponses,
                            invokeCallback: false,
                            invokeCallback: false,
-                           removeExpectation:true))
+                           removeExpectation: true))
         {
         {
             return false;
             return false;
         }
         }
@@ -189,7 +189,7 @@ internal abstract class AnsiResponseParserBase : IAnsiResponseParser
         if (MatchResponse (cur,
         if (MatchResponse (cur,
                            persistentExpectations,
                            persistentExpectations,
                            invokeCallback: true,
                            invokeCallback: true,
-                           removeExpectation:false))
+                           removeExpectation: false))
         {
         {
             return false;
             return false;
         }
         }
@@ -209,7 +209,7 @@ internal abstract class AnsiResponseParserBase : IAnsiResponseParser
     private bool MatchResponse (string cur, List<AnsiResponseExpectation> collection, bool invokeCallback, bool removeExpectation)
     private bool MatchResponse (string cur, List<AnsiResponseExpectation> collection, bool invokeCallback, bool removeExpectation)
     {
     {
         // Check for expected responses
         // Check for expected responses
-        var matchingResponse = collection.FirstOrDefault (r => r.Matches(cur));
+        var matchingResponse = collection.FirstOrDefault (r => r.Matches (cur));
 
 
         if (matchingResponse?.Response != null)
         if (matchingResponse?.Response != null)
         {
         {
@@ -247,7 +247,7 @@ internal abstract class AnsiResponseParserBase : IAnsiResponseParser
     public bool IsExpecting (string terminator)
     public bool IsExpecting (string terminator)
     {
     {
         // If any of the new terminator matches any existing terminators characters it's a collision so true.
         // If any of the new terminator matches any existing terminators characters it's a collision so true.
-        return expectedResponses.Any (r => r.Terminator.Intersect (terminator).Any());
+        return expectedResponses.Any (r => r.Terminator.Intersect (terminator).Any ());
     }
     }
 
 
     /// <inheritdoc />
     /// <inheritdoc />
@@ -255,7 +255,7 @@ internal abstract class AnsiResponseParserBase : IAnsiResponseParser
     {
     {
         if (persistent)
         if (persistent)
         {
         {
-            persistentExpectations.RemoveAll (r=>r.Matches (terminator));
+            persistentExpectations.RemoveAll (r => r.Matches (terminator));
         }
         }
         else
         else
         {
         {

+ 0 - 0
Terminal.Gui/ConsoleDrivers/IAnsiResponseParser.cs → Terminal.Gui/ConsoleDrivers/AnsiResponseParser/IAnsiResponseParser.cs