Merge pull request #184 from iot-dsa-v2/develop

0.75.1

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.75.0'
+    version '0.75.1'
 
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8

dslink-v2-api/src/main/java/org/iot/dsa/node/DSInfo.java

@@ -201,6 +201,19 @@ public void getMetadata(DSMap bucket) {
         if (metadata != null) {
             bucket.putAll(metadata);
         }
+        if (isNode()) {
+            DSNode node = getNode();
+            DSInfo<?> info = node.getFirstInfo();
+            while (info != null) {
+                if (info.isValue()) {
+                    char ch = info.getName().charAt(0);
+                    if ((ch == '$') || (ch == '@')) {
+                        bucket.put(info.getName(), info.getElement());
+                    }
+                }
+                info = info.next;
+            }
+        }
     }
 
     /**

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundList.java

@@ -142,14 +142,33 @@ public void onEvent(DSEvent event, DSNode node, DSInfo<?> child, DSIValue data)
             return;
         }
         switch (event.getEventId()) {
+            case DSNode.METADATA_CHANGED:
+                if (target.getTarget() == node) {
+                    cacheMap.clear();
+                    node.getInfo().getMetadata(cacheMap);
+                    encodeTargetMetadata(cacheMap);
+                    cacheMap.clear();
+                }
+                break;
+            case DSNode.VALUE_CHANGED:
+                char ch = child.getName().charAt(0);
+                if ((ch == '@') || (ch == '$')) {
+                    send(child.getName(), child.getElement());
+                }
+                break;
             case DSNode.CHILD_RENAMED:
                 if (target.getTarget() == node) {
                     sendRemove(data.toString());
                 }
                 //fall through to add the child
             case DSNode.CHILD_ADDED:
                 if (target.getTarget() == node) {
-                    encodeChild(child);
+                    char c = child.getName().charAt(0);
+                    if ((c == '@') || (c == '$')) {
+                        send(child.getName(), child.getElement());
+                    } else {
+                        encodeChild(child);
+                    }
                 }
                 break;
             case DSNode.CHILD_REMOVED:

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/backup/SysBackupService.java

@@ -47,6 +47,7 @@ public class SysBackupService extends DSNode implements Runnable {
     private Object lock = new Object();
     private DSInfo<?> maximum = getInfo(MAXIMUM);
     private Timer nextSave;
+    private boolean saving = false;
 
     public boolean isEnabled() {
         return enabled.getElement().toBoolean();
@@ -102,6 +103,12 @@ public void save() {
         if (!isEnabled()) {
             return;
         }
+        synchronized (this) {
+            if (saving) {
+                return;
+            }
+            saving = true;
+        }
         ZipOutputStream zos = null;
         InputStream in = null;
         try {
@@ -173,6 +180,9 @@ public void save() {
         } catch (IOException x) {
             error("Closing output", x);
         }
+        synchronized (this) {
+            saving = false;
+        }
     }
 
     @Override