SharpTerminal refactored part of the remote object system and loading…

… code

src/BrokerLib/dcc/Decoder.h

@@ -60,7 +60,7 @@ namespace dcclite::broker
 				return "Decoder";
 			}
 
-			void Serialize(dcclite::JsonOutputStream_t &stream) const override;				
+			void Serialize(dcclite::JsonOutputStream_t &stream) const override;
 
 		private:
 			DccAddress m_iAddress;				

src/BrokerLib/dcc/LocationManager.cpp

@@ -70,19 +70,17 @@ namespace dcclite::broker
 			if (m_vecDecoders.empty())
 				return;
 
-			auto outputArray = stream.AddArray("decoders");
+			auto outputArray = stream.AddArray("decodersPath");
 
-			for (auto &dec : m_vecDecoders)
+			for(size_t i = 0, sz = m_vecDecoders.size(); i < sz; ++i)
 			{
-				if (dec == nullptr)
-				{
-					outputArray.AddNull();
-				}
-				else
-				{
-					auto obj = outputArray.AddObject();
-					dec->Serialize(obj);
-				}
+				auto dec = m_vecDecoders[i];
+				if (!dec)
+					continue;
+
+				auto obj = outputArray.AddObject();
+				obj.AddIntValue("index", i);
+				obj.AddStringValue("path", dec->GetPath().string());
 			}
 		}
 
@@ -278,10 +276,8 @@ namespace dcclite::broker
 		{
 			auto obj = mismatchesArray.AddObject();
 			obj.AddStringValue("reason", LocationMismatchReason2String(std::get<1>(tuple)));
-
-			auto decoderObj = obj.AddObject("decoder");
-			std::get<0>(tuple)->Serialize(decoderObj);
-
+			obj.AddStringValue("decoderPath", std::get<0>(tuple)->GetPath().string());
+
 			auto location = std::get<2>(tuple);
 			if(location != nullptr)
 				obj.AddStringValue("location", location->GetName().GetData());

src/Common/Object.cpp

@@ -102,7 +102,11 @@ namespace dcclite
 		{
 			stream.AddStringValue("parentName", parent->GetNameData());
 			stream.AddPointerValue("parentInternalId", parent);
-		}			
+		}
+		else
+		{
+			stream.AddPointerValue("parentInternalId", nullptr);
+		}
 	}
 
 	Object::Object(RName name) :

src/SharpTools/SharpTerminal/Forms/ObjectsTreeViewUserControl.cs

@@ -183,7 +183,7 @@ private async void mRequestManager_ConnectionStateChanged(RequestManager sender,
                 mTreeView.Nodes.Clear();
                 RemoteObjectManager.Clear();
 
-				var rootFolder = (RemoteFolder) await RemoteObjectManager.GetRemoteObjectAsync("/");
+				var rootFolder = await RemoteObjectManager.LoadRoot();
 
                 var brokerNode = mTreeView.Nodes.Add("Broker");
                 brokerNode.Name = "Broker";
@@ -193,7 +193,7 @@ private async void mRequestManager_ConnectionStateChanged(RequestManager sender,
                 if (children != null)
                     FillTree(brokerNode, children);
 
-                var servicesFolder = (RemoteFolder)await RemoteObjectManager.GetRemoteObjectAsync("/services");
+                var servicesFolder = (RemoteFolder) rootFolder.TryFindChildByName("services");
                 var services = await servicesFolder.LoadChildrenAsync(mRequestManager);
 
                 var locationService = services.Where(x => x.Name == "locationManager").FirstOrDefault();

src/SharpTools/SharpTerminal/Forms/RemoteDeviceRenameForm.cs

@@ -0,0 +1,12 @@
+using System.Windows.Forms;
+
+namespace SharpTerminal.Forms
+{
+	public partial class RemoteDeviceRenameForm : Form
+	{
+		public RemoteDeviceRenameForm()
+		{
+			InitializeComponent();
+		}
+	}
+}

src/SharpTools/SharpTerminal/Forms/RemoteDeviceRenameForm.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

src/SharpTools/SharpTerminal/Forms/RemoteDeviceUserControl.cs

@@ -8,6 +8,7 @@
 // This Source Code Form is "Incompatible With Secondary Licenses", as
 // defined by the Mozilla Public License, v. 2.0.
 
+using SharpTerminal.Forms;
 using System;
 using System.Drawing;
 using System.Runtime.Versioning;
@@ -74,9 +75,14 @@ private void RemoteDevice_PropertyChanged(object sender, System.ComponentModel.P
 		}
 
 		private async void m_btnRename_Click(object sender, EventArgs e)
-		{
-			m_btnRename.Enabled = false;
+		{			
+			using var form = new RemoteDeviceRenameForm();
+			form.ShowDialog();
 
+			if (form.DialogResult == DialogResult.Cancel)
+				return;
+
+			m_btnRename.Enabled = false;
 			try
 			{
 				await mConsole.RequestAsync(["Rename-Item", mRemoteDevice.Path, "newName"]);