From 979ddd7756f8a8d16180c082e569663a6b0dc80b Mon Sep 17 00:00:00 2001
From: jwetzell <jwetzell@yahoo.com>
Date: Wed, 10 Jul 2019 17:26:25 -0500
Subject: [PATCH] Start cleaning up QParser

---
 .../Classes/Communication/QClient.cs          | 22 ++++---------------
 .../Classes/Communication/QParser.cs          |  3 +--
 .../Communication/SharpOSC/TCPSender.cs       |  4 ++--
 .../Communication/SharpOSC/UDPListener.cs     |  4 ++--
 4 files changed, 9 insertions(+), 24 deletions(-)
 mode change 100755 => 100644 qController.Standard/Classes/Communication/SharpOSC/UDPListener.cs

diff --git a/qController.Standard/Classes/Communication/QClient.cs b/qController.Standard/Classes/Communication/QClient.cs
index e613486..81f3f61 100644
--- a/qController.Standard/Classes/Communication/QClient.cs
+++ b/qController.Standard/Classes/Communication/QClient.cs
@@ -36,9 +36,12 @@ namespace qController
         //one method for messages received whether from TCP or UDP (SAME MSG FORMAT)
         private void OnMessageReceived(object source, MessageEventArgs args)
         {
+            Console.WriteLine("QCLIENT MESSAGE RECEIVED: "+args.Message.Address);
             //try to find a better filtering process
             if (!args.Message.Address.Contains("update"))
                 qParser.ParseMessage(args.Message);
+            else if (args.Message.Address.Contains("playbackPosition") || args.Message.Address.Contains("cue_id") || args.Message.Address.Contains("cueList"))
+                qParser.ParseMessage(args.Message);
             else
                 ProcessUpdate(args.Message);
         }
@@ -106,24 +109,7 @@ namespace qController
         public void ProcessUpdate(OscMessage msg)
         {
             Console.WriteLine("PROCESS UPDATE : " + msg.Address);
-            if (msg.Address.Contains("disconnect"))
-            {
-                qParser.ParseMessage(msg);
-            }
-            else if (msg.Address.Contains("cue_id"))
-            {
-                var updateID = msg.Address.Split('/').Last();
-                //UpdateSpecificCue(updateID);
-            }
-            else if (msg.Address.Contains("playbackPosition"))
-            {
-                if (msg.Arguments.Count > 0)
-                {
-                    qParser.ParseMessage(msg);
-                    //UpdateSelectedCue(); 
-                }
-            }
-            else if (msg.Address.Contains("workspace"))
+            if (msg.Address.Contains("workspace"))
             { 
                 UpdateWorkspace("not yet implemented");
             }
diff --git a/qController.Standard/Classes/Communication/QParser.cs b/qController.Standard/Classes/Communication/QParser.cs
index 3518bc0..967a29c 100644
--- a/qController.Standard/Classes/Communication/QParser.cs
+++ b/qController.Standard/Classes/Communication/QParser.cs
@@ -113,8 +113,7 @@ namespace qController
                     ParseQInfo(msg);
                 else
                 {
-                    Console.WriteLine("Unknown message type");
-                    Console.WriteLine(msg.Address);
+                    Console.WriteLine("QParser/Unknown message type: " + msg.Address);
                     foreach (var item in msg.Arguments)
                     {
                         Console.WriteLine(item);
diff --git a/qController.Standard/Classes/Communication/SharpOSC/TCPSender.cs b/qController.Standard/Classes/Communication/SharpOSC/TCPSender.cs
index 247fce2..78341d1 100644
--- a/qController.Standard/Classes/Communication/SharpOSC/TCPSender.cs
+++ b/qController.Standard/Classes/Communication/SharpOSC/TCPSender.cs
@@ -78,7 +78,7 @@ namespace SharpOSC
                         //Console.WriteLine(  "Thread " + num + ":  Bytes read: " + bytesRead + " - " + Encoding.ASCII.GetString(buffer));
                     } while (netStream.DataAvailable);
 
-                    Console.WriteLine("Raw TCP In: " + System.Text.Encoding.ASCII.GetString(responseData.ToArray()));
+                    //Console.WriteLine("Raw TCP In: " + System.Text.Encoding.ASCII.GetString(responseData.ToArray()));
                     response = (OscMessage)OscPacket.GetPacket(responseData.Skip(1).ToArray());
                 }
             } catch(Exception e)
@@ -101,7 +101,7 @@ namespace SharpOSC
         public void SendAndReceive(OscPacket packet)
         {
             OscMessage msg = (OscMessage)packet;
-            Console.WriteLine("TCP Message Sent: " + msg.Address);
+            //Console.WriteLine("TCP Message Sent: " + msg.Address);
             byte[] data = packet.GetBytes();
             SendAndReceive(data);
         }
diff --git a/qController.Standard/Classes/Communication/SharpOSC/UDPListener.cs b/qController.Standard/Classes/Communication/SharpOSC/UDPListener.cs
old mode 100755
new mode 100644
index 1a8f249..0fb61b7
--- a/qController.Standard/Classes/Communication/SharpOSC/UDPListener.cs
+++ b/qController.Standard/Classes/Communication/SharpOSC/UDPListener.cs
@@ -100,7 +100,7 @@ namespace SharpOSC
                         Console.WriteLine(e.ToString());
                         // If there is an error reading the packet, null is sent to the callback
                     }
-                    Console.WriteLine("Raw UDP In: " + System.Text.Encoding.ASCII.GetString(bytes));
+                    //Console.WriteLine("Raw UDP In: " + System.Text.Encoding.ASCII.GetString(bytes));
                     OscPacketCallback(packet);
 				}
 				else
@@ -151,7 +151,7 @@ namespace SharpOSC
 				{
 					byte[] bytes = queue.Dequeue();
 					var packet = OscPacket.GetPacket(bytes);
-                    Console.WriteLine("Raw UDP In: " + System.Text.Encoding.ASCII.GetString(bytes));
+                    //Console.WriteLine("Raw UDP In: " + System.Text.Encoding.ASCII.GetString(bytes));
                     return packet;
 				}
 				else