Allow setting a friendly name for the local node (fixes #65)

config.go

@@ -178,3 +178,25 @@ func clusterHash(nodes []NodeConfiguration) string {
 	}
 	return fmt.Sprintf("%x", h.Sum(nil))
 }
+
+func cleanNodeList(nodes []NodeConfiguration, myID string) []NodeConfiguration {
+	var myIDExists bool
+	for _, node := range nodes {
+		if node.NodeID == myID {
+			myIDExists = true
+			break
+		}
+	}
+
+	if !myIDExists {
+		nodes = append(nodes, NodeConfiguration{
+			NodeID:    myID,
+			Addresses: []string{"dynamic"},
+			Name:      "",
+		})
+	}
+
+	sort.Sort(NodeConfigurationList(nodes))
+
+	return nodes
+}

gui/app.js

@@ -1,8 +1,13 @@
+/*jslint browser: true, continue: true, plusplus: true */
+/*global $: false, angular: false */
+
+"use strict";
+
 var syncthing = angular.module('syncthing', []);
 
 syncthing.controller('SyncthingCtrl', function ($scope, $http) {
-    var prevDate = 0;
+    var prevDate = 0,
-    var modelGetOK = true;
+        modelGetOK = true;
 
     $scope.connections = {};
     $scope.config = {};
@@ -11,7 +16,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
 
     // Strings before bools look better
     $scope.settings = [
-        {id: 'ListenStr', descr:"Sync Protocol Listen Addresses", type: 'string', restart: true},
+        {id: 'ListenStr', descr: "Sync Protocol Listen Addresses", type: 'string', restart: true},
         {id: 'GUIAddress', descr: "GUI Listen Address", type: 'string', restart: true},
         {id: 'MaxSendKbps', descr: "Outgoing Rate Limit (KBps)", type: 'string', restart: true},
         {id: 'RescanIntervalS', descr: "Rescan Interval (s)", type: 'string', restart: true},
@@ -40,6 +45,19 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
         }
     }
 
+    function nodeCompare(a, b) {
+        if (a.NodeID === $scope.myID) {
+            return -1;
+        }
+        if (b.NodeID === $scope.myID) {
+            return 1;
+        }
+        if (a.NodeID < b.NodeID) {
+            return -1;
+        }
+        return a.NodeID > b.NodeID;
+    }
+
     $http.get("/rest/version").success(function (data) {
         $scope.version = data;
     });
@@ -49,15 +67,10 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
 
         $http.get("/rest/config").success(function (data) {
             $scope.config = data;
-            $scope.config.Options.ListenStr = $scope.config.Options.ListenAddress.join(", ")
+            $scope.config.Options.ListenStr = $scope.config.Options.ListenAddress.join(", ");
 
             var nodes = $scope.config.Repositories[0].Nodes;
-            nodes = nodes.filter(function (x) { return x.NodeID != $scope.myID; });
+            nodes.sort(nodeCompare);
-            nodes.sort(function (a, b) {
-                if (a.NodeID < b.NodeID)
-                    return -1;
-                return a.NodeID > b.NodeID;
-            })
             $scope.nodes = nodes;
         });
     });
@@ -73,13 +86,18 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
             modelGetFailed();
         });
         $http.get("/rest/connections").success(function (data) {
-            var now = Date.now();
+            var now = Date.now(),
-            var td = (now - prevDate) / 1000;
+                td = (now - prevDate) / 1000,
-            prevDate = now;
+                id;
 
-            $scope.inbps = 0
+            prevDate = now;
-            $scope.outbps = 0
+            $scope.inbps = 0;
-            for (var id in data) {
+            $scope.outbps = 0;
+
+            for (id in data) {
+                if (!data.hasOwnProperty(id)) {
+                    continue;
+                }
                 try {
                     data[id].inbps = Math.max(0, 8 * (data[id].InBytesTotal - $scope.connections[id].InBytesTotal) / td);
                     data[id].outbps = Math.max(0, 8 * (data[id].OutBytesTotal - $scope.connections[id].OutBytesTotal) / td);
@@ -96,7 +114,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
             var i, name;
             for (i = 0; i < data.length; i++) {
                 name = data[i].Name.split("/");
-                data[i].ShortName = name[name.length-1];
+                data[i].ShortName = name[name.length - 1];
             }
             data.sort(function (a, b) {
                 if (a.ShortName < b.ShortName) {
@@ -179,7 +197,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
     $scope.editNode = function (nodeCfg) {
         $scope.currentNode = nodeCfg;
         $scope.editingExisting = true;
-        $scope.currentNode.AddressesStr = nodeCfg.Addresses.join(", ")
+        $scope.currentNode.AddressesStr = nodeCfg.Addresses.join(", ");
         $('#editNode').modal({backdrop: 'static', keyboard: false});
     };
 
@@ -190,12 +208,14 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
     };
 
     $scope.deleteNode = function () {
-        $('#editNode').modal('hide');
+        var newNodes = [], i;
-        if (!$scope.editingExisting)
-            return;
 
-        var newNodes = [];
+        $('#editNode').modal('hide');
-        for (var i = 0; i < $scope.nodes.length; i++) {
+        if (!$scope.editingExisting) {
+            return;
+        }
+
+        for (i = 0; i < $scope.nodes.length; i++) {
             if ($scope.nodes[i].NodeID !== $scope.currentNode.NodeID) {
                 newNodes.push($scope.nodes[i]);
             }
@@ -204,16 +224,18 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
         $scope.nodes = newNodes;
         $scope.config.Repositories[0].Nodes = newNodes;
 
-        $http.post('/rest/config', JSON.stringify($scope.config), {headers: {'Content-Type': 'application/json'}})
+        $http.post('/rest/config', JSON.stringify($scope.config), {headers: {'Content-Type': 'application/json'}});
-    }
+    };
 
     $scope.saveNode = function () {
+        var nodeCfg, done, i;
+
         $('#editNode').modal('hide');
         nodeCfg = $scope.currentNode;
         nodeCfg.Addresses = nodeCfg.AddressesStr.split(',').map(function (x) { return x.trim(); });
 
-        var done = false;
+        done = false;
-        for (var i = 0; i < $scope.nodes.length; i++) {
+        for (i = 0; i < $scope.nodes.length; i++) {
             if ($scope.nodes[i].NodeID === nodeCfg.NodeID) {
                 $scope.nodes[i] = nodeCfg;
                 done = true;
@@ -225,15 +247,33 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
             $scope.nodes.push(nodeCfg);
         }
 
-        $scope.nodes.sort(function (a, b) {
+        $scope.nodes.sort(nodeCompare);
-            if (a.NodeID < b.NodeID)
-                return -1;
-            return a.NodeID > b.NodeID;
-        })
-
         $scope.config.Repositories[0].Nodes = $scope.nodes;
 
-        $http.post('/rest/config', JSON.stringify($scope.config), {headers: {'Content-Type': 'application/json'}})
+        $http.post('/rest/config', JSON.stringify($scope.config), {headers: {'Content-Type': 'application/json'}});
+    };
+
+    $scope.otherNodes = function () {
+        var nodes = [], i, n;
+
+        for (i = 0; i < $scope.nodes.length; i++) {
+            n = $scope.nodes[i];
+            if (n.NodeID !== $scope.myID) {
+                nodes.push(n);
+            }
+        }
+        return nodes;
+    };
+
+    $scope.thisNode = function () {
+        var i, n;
+
+        for (i = 0; i < $scope.nodes.length; i++) {
+            n = $scope.nodes[i];
+            if (n.NodeID === $scope.myID) {
+                return [n];
+            }
+        }
     };
 
     $scope.refresh();
@@ -241,22 +281,27 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
 });
 
 function decimals(val, num) {
-    if (val === 0) { return 0; }
+    var digits, decs;
-    var digits = Math.floor(Math.log(Math.abs(val))/Math.log(10));
+
-    var decimals = Math.max(0, num - digits);
+    if (val === 0) {
-    return decimals;
+        return 0;
+    }
+
+    digits = Math.floor(Math.log(Math.abs(val)) / Math.log(10));
+    decs = Math.max(0, num - digits);
+    return decs;
 }
 
-syncthing.filter('natural', function() {
+syncthing.filter('natural', function () {
-    return function(input, valid) {
+    return function (input, valid) {
         return input.toFixed(decimals(input, valid));
-    }
+    };
 });
 
-syncthing.filter('binary', function() {
+syncthing.filter('binary', function () {
-    return function(input) {
+    return function (input) {
         if (input === undefined) {
-            return '0 '
+            return '0 ';
         }
         if (input > 1024 * 1024 * 1024) {
             input /= 1024 * 1024 * 1024;
@@ -271,13 +316,13 @@ syncthing.filter('binary', function() {
             return input.toFixed(decimals(input, 2)) + ' Ki';
         }
         return Math.round(input) + ' ';
-    }
+    };
 });
 
-syncthing.filter('metric', function() {
+syncthing.filter('metric', function () {
-    return function(input) {
+    return function (input) {
         if (input === undefined) {
-            return '0 '
+            return '0 ';
         }
         if (input > 1000 * 1000 * 1000) {
             input /= 1000 * 1000 * 1000;
@@ -292,25 +337,25 @@ syncthing.filter('metric', function() {
             return input.toFixed(decimals(input, 2)) + ' k';
         }
         return Math.round(input) + ' ';
-    }
+    };
 });
 
-syncthing.filter('short', function() {
+syncthing.filter('short', function () {
-    return function(input) {
+    return function (input) {
         return input.substr(0, 6);
-    }
+    };
 });
 
-syncthing.filter('alwaysNumber', function() {
+syncthing.filter('alwaysNumber', function () {
-    return function(input) {
+    return function (input) {
         if (input === undefined) {
             return 0;
         }
         return input;
-    }
+    };
 });
 
-syncthing.directive('optionEditor', function() {
+syncthing.directive('optionEditor', function () {
     return {
         restrict: 'C',
         replace: true,
@@ -320,4 +365,4 @@ syncthing.directive('optionEditor', function() {
         },
         template: '<input type="text" ng-model="config.Options[setting.id]"></input>',
     };
-})
+});

gui/index.html

@@ -75,14 +75,14 @@ html, body {
                     <table class="table table-condensed">
                         <tbody>
                         <!-- myself -->
-                        <tr class="text-muted">
+                        <tr class="text-muted" ng-repeat="nodeCfg in thisNode()">
                             <td style="width:13%">
                                 <span class="label label-default">
                                     <span class="glyphicon glyphicon-ok"></span> This node
                                 </span>
                             </td>
                             <td style="width:12%">
-                                <span class="text-monospace">{{myID | short}}</span>
+                                <span class="text-monospace">{{nodeName(nodeCfg)}}</span>
                             </td>
                             <td style="width:20%">{{version}}</td>
                             <td style="width:25%"></td>
@@ -98,10 +98,12 @@ html, body {
                                     <span class="text-muted glyphicon glyphicon-chevron-up"></span>
                                 </span>
                             </td>
-                            <td style="width:10%" class="text-right"></td>
+                            <td class="text-right">
+                                <button type="button" ng-click="editNode(nodeCfg)" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span> Edit</button>
+                            </td>
                         </tr>
                         <!-- all other nodes -->
-                        <tr ng-repeat="nodeCfg in nodes">
+                        <tr ng-repeat="nodeCfg in otherNodes()">
                             <td>
                                 <span class="label label-{{nodeClass(nodeCfg)}}">
                                     <span class="glyphicon glyphicon-{{nodeIcon(nodeCfg)}}"></span> {{nodeStatus(nodeCfg)}}
@@ -248,7 +250,7 @@ html, body {
                     </div>
                     <div class="form-group">
                         <label for="addresses">Addresses</label>
-                        <input placeholder="dynamic" id="addresses" class="form-control" type="text" ng-model="currentNode.AddressesStr"></input>
+                        <input placeholder="dynamic" ng-disabled="currentNode.NodeID == myID" id="addresses" class="form-control" type="text" ng-model="currentNode.AddressesStr"></input>
                         <p class="help-block">Enter comma separated <span class="text-monospace">ip:port</span> addresses or <span class="text-monospace">dynamic</span> to perform automatic discovery of the address.</p>
                     </div>
                 </form>

main.go

@@ -147,6 +147,9 @@ func main() {
 		infof("Edit %s to taste or use the GUI\n", cfgFile)
 	}
 
+	// Make sure the local node is in the node list.
+	cfg.Repositories[0].Nodes = cleanNodeList(cfg.Repositories[0].Nodes, myID)
+
 	var dir = expandTilde(cfg.Repositories[0].Directory)
 
 	if len(profiler) > 0 {