Have WriteChanges update the RetrievalState

References #21
Lawo · Apr 26, 2016 · 9c8b7db · 9c8b7db
1 parent 7fe7989
commit 9c8b7db
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 9 deletions.
diff --git a/Lawo.EmberPlusSharp/Model/Consumer.cs b/Lawo.EmberPlusSharp/Model/Consumer.cs
@@ -108,6 +108,7 @@ public async Task SendAsync()
                 }
 
                 await this.client.SendMessageAsync(this.emberDataMessage, stream.ToArray());
+                await this.RetrieveChildrenAsync();
             }
         }
 

diff --git a/Lawo.EmberPlusSharp/Model/Element.cs b/Lawo.EmberPlusSharp/Model/Element.cs
@@ -265,7 +265,7 @@ internal virtual bool WriteRequest(EmberWriter writer, IStreamedParameterCollect
             return false;
         }
 
-        internal abstract void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations);
+        internal abstract RetrievalState WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations);
 
         internal virtual void SetComplete()
         {

diff --git a/Lawo.EmberPlusSharp/Model/FunctionBase.cs b/Lawo.EmberPlusSharp/Model/FunctionBase.cs
@@ -105,7 +105,8 @@ internal override RetrievalState ReadContents(EmberReader reader, ElementType ac
             return RetrievalState.Complete;
         }
 
-        internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations)
+        internal sealed override RetrievalState WriteChanges(
+            EmberWriter writer, IInvocationCollection pendingInvocations)
         {
             if (this.HasChanges)
             {
@@ -120,6 +121,8 @@ internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollec
                 writer.WriteEndContainer();
                 this.HasChanges = false;
             }
+
+            return RetrievalState.Complete;
         }
 
         internal abstract KeyValuePair<string, ParameterType>[] ReadTupleDescription(

diff --git a/Lawo.EmberPlusSharp/Model/Matrix.cs b/Lawo.EmberPlusSharp/Model/Matrix.cs
@@ -188,7 +188,8 @@ internal override RetrievalState ReadContents(EmberReader reader, ElementType ac
             return this.RetrievalState;
         }
 
-        internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations)
+        internal sealed override RetrievalState WriteChanges(
+            EmberWriter writer, IInvocationCollection pendingInvocations)
         {
             ////if (this.HasChanges)
             ////{
@@ -212,6 +213,8 @@ internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollec
             ////    writer.WriteEndContainer();
             ////    this.HasChanges = false;
             ////}
+
+            return this.RetrievalState;
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/Lawo.EmberPlusSharp/Model/Node.cs b/Lawo.EmberPlusSharp/Model/Node.cs
@@ -115,13 +115,16 @@ internal sealed override RetrievalState ReadContents(EmberReader reader, Element
             return this.RetrievalState;
         }
 
-        internal override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations)
+        internal override RetrievalState WriteChanges(
+            EmberWriter writer, IInvocationCollection pendingInvocations)
         {
             if (this.HasChanges)
             {
                 this.WriteChangesCollection(writer, pendingInvocations);
                 this.HasChanges = false;
             }
+
+            return this.RetrievalState;
         }
 
         internal sealed override IElement GetElement(string[] pathElements, int index)

diff --git a/Lawo.EmberPlusSharp/Model/NodeBase.cs b/Lawo.EmberPlusSharp/Model/NodeBase.cs
@@ -132,9 +132,19 @@ internal bool WriteCommandCollection(EmberWriter writer, IStreamedParameterColle
 
         internal void WriteChangesCollection(EmberWriter writer, IInvocationCollection pendingInvocations)
         {
-            foreach (var child in this.children.Values)
+            if (this.children.Count == 0)
+            {
+                if (this.RetrieveDetails && (this.RetrieveDetailsChangeStatus == RetrieveDetailsChangeStatus.Changed))
+                {
+                    this.WriteCommandCollection(writer, GlowCommandNumber.GetDirectory, RetrievalState.RequestSent);
+                }
+            }
+            else
             {
-                child.WriteChanges(writer, pendingInvocations);
+                foreach (var child in this.children.Values)
+                {
+                    this.RetrievalState &= child.WriteChanges(writer, pendingInvocations);
+                }
             }
         }
 

diff --git a/Lawo.EmberPlusSharp/Model/ParameterBase.cs b/Lawo.EmberPlusSharp/Model/ParameterBase.cs
@@ -318,7 +318,8 @@ internal override RetrievalState ReadContents(EmberReader reader, ElementType ac
             return this.RetrievalState;
         }
 
-        internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations)
+        internal sealed override RetrievalState WriteChanges(
+            EmberWriter writer, IInvocationCollection pendingInvocations)
         {
             if (this.HasChanges)
             {
@@ -342,6 +343,8 @@ internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollec
                 writer.WriteEndContainer();
                 this.HasChanges = false;
             }
+
+            return this.RetrievalState;
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/Lawo.EmberPlusSharp/Model/Root.cs b/Lawo.EmberPlusSharp/Model/Root.cs
@@ -142,7 +142,8 @@ internal sealed override bool WriteRequest(EmberWriter writer, IStreamedParamete
         }
 
         [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", Justification = "Method is not public, CA bug?")]
-        internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations)
+        internal sealed override RetrievalState WriteChanges(
+            EmberWriter writer, IInvocationCollection pendingInvocations)
         {
             if (this.HasChanges)
             {
@@ -151,6 +152,8 @@ internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollec
                 writer.WriteEndContainer();
                 this.HasChanges = false;
             }
+
+            return this.RetrievalState;
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/Lawo.EmberPlusSharp/Model/ShadowNode.cs b/Lawo.EmberPlusSharp/Model/ShadowNode.cs
@@ -25,9 +25,11 @@ internal sealed override RetrievalState ReadContents(EmberReader reader, Element
             throw new ModelException("Unexpected contents for intermediate node in basePath.");
         }
 
-        internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations)
+        internal sealed override RetrievalState WriteChanges(
+            EmberWriter writer, IInvocationCollection pendingInvocations)
         {
             this.HasChanges = false;
+            return this.RetrievalState;
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,6 +108,7 @@ public async Task SendAsync() @@
                     }
                     await this.client.SendMessageAsync(this.emberDataMessage, stream.ToArray());
+                    await this.RetrieveChildrenAsync();
                 }
             }
@@ Expand Down @@