Give friendly names to nodes (fixes #54)

auto/gui.files.go

@@ -3,4 +3,4 @@ package auto
 
 import "github.com/cratonica/embed"
 
-var Resources embed.PackedResourceMap = embed.PackedResourceMap{0x1f, 0x8b, 0x8, 0x0, 0x0, 0x9, 0x6e, 0x88, 0x2, 0xff, 0xec, 0xbd, 0x9, 0x78, 0x24, 0x5b, 0x56, 0x1e, 0x98, 0xbd, 0x83, 0x9a, 0xa6, 0x1b, 0x1a, 0x1b, 0xb0, 0x8d, 0x9, 0x45, 0x57, 0xab, 0x22, 0x9e, 0x42, 0x29, 0xa9, 0xde, 0xeb, 0x2d, 0x42, 0x51, 0x89, 0x4a, 0xa5, 0xda, 0x5e, 0xa9, 0xaa, 0x9e, 0x54, 0xf5, 0x36, 0x49, 0xef, 0x75, 0x6c, 0xb9, 0x3c, 0x65, 0x46, 0x66, 0x45, 0x64, 0x4a, 0xa5, 0x92, 0x12, 0x8f, 0xfd, 0x8d, 0x3f, 0x30, 0x9f, 0x6d, 0x6, 0xf8, 0xcc, 0x60, 0x96, 0x36, 0x9e, 0xf1, 0x7c, 0xde, 0xf8, 0xb0, 0xf1, 0x30, 0x18, 0xec, 0x19, 0x63, 0x1b, 0x33, 0x33, 0x60, 0x96, 0x66, 0x6c, 0x18, 0x6, 0x30, 0x3, 0xd8, 0x7c, 0x83, 0x6d, 0x98, 0x31, 0x60, 0x1b, 0x2f, 0x18, 0xcf, 0x7f, 0xce, 0xbd, 0x11, 0x71, 0x23, 0x33, 0xa5, 0x52, 0x55, 0xd7, 0x6b, 0xba, 0x71, 0x46, 0xd5, 0x51, 0x46, 0xdc, 0xb8, 0x71, 0xd7, 0x73, 0xcf, 0x3d, 0xe7, 0xdc, 0x73, 0xcf, 0x7d, 0x77, 0xa5, 0x52, 0xa9, 0x7a, 0xbd, 0x5e, 0xf5, 0x8d, 0xb4, 0x9a, 0x1e, 0xf4, 0x2a, 0x1f, 0xaf, 0x54, 0xfc, 0xa5, 0x17, 0xaf, 0x6f, 0x68, 0x1f, 0xa9, 0x3e, 0x87, 0x57, 0x95, 0xf7, 0x55, 0x2a, 0xbf, 0xf3, 0x89, 0xdf, 0xd8, 0x1c, 0x7c, 0xf9, 0x7, 0x2a, 0x97, 0x5e, 0xad, 0x54, 0xde, 0xf0, 0x2b, 0x67, 0xba, 0xde, 0xf0, 0xbb, 0x49, 0x63, 0xa1, 0xe3, 0xf7, 0x1e, 0x11, 0xef, 0x2b, 0xdf, 0xf0, 0x17, 0xd3, 0x24, 0x58, 0x6c, 0xb4, 0xfa, 0xcd, 0x81, 0x5f, 0xd, 0xba, 0x9d, 0xc5, 0xc0, 0x6b, 0x77, 0x9a, 0x8b, 0xe9, 0x61, 0x1c, 0xf4, 0x9b, 0xad, 0xb8, 0xb1, 0xd8, 0x18, 0xb4, 0x16, 0x45, 0x1, 0x2b, 0xd3, 0x6b, 0x7a, 0x4d, 0xaf, 0xa7, 0x76, 0xd, 0xfa, 0xf5, 0x85, 0x8f, 0xbe, 0xa7, 0xf2, 0xec, 0x85, 0xe5, 0x25, 0x7a, 0xfc, 0x80, 0x3e, 0xab, 0xbd, 0xff, 0xb, 0xef, 0x4d, 0xdb, 0x65, 0x7a, 0x4d, 0xaf, 0xe9, 0x35, 0xbd, 0xa6, 0xd7, 0xf4, 0x9a, 0x5e, 0xd3, 0x6b, 0x7a, 0x4d, 0xaf, 0xff, 0x82, 0xae, 0x7e, 0xef, 0xed, 0x95, 0x3f, 0x82, 0xdf, 0xb7, 0xca, 0xe7, 0x3b, 0xf2, 0xf7, 0x2d, 0x23, 0xbf, 0xef, 0x90, 0xbf, 0xef, 0x93, 0xbf, 0x77, 0x47, 0xde, 0xbf, 0x5d, 0xfe, 0xee, 0xc9, 0xdf, 0x8f, 0x8f, 0xbc, 0x7f, 0x9b, 0xfc, 0x7d, 0x5d, 0xfe, 0xfe, 0xcc, 0xc8, 0xfb, 0xe9, 0x35, 0xbd, 0xa6, 0xd7, 0xf4, 0x9a, 0x5e, 0xd3, 0x6b, 0x7a, 0x4d, 0xaf, 0xe9, 0x35, 0xbd, 0xa6, 0xd7, 0xf4, 0x9a, 0x5e, 0xd3, 0x6b, 0x7a, 0xbd, 0x79, 0x97, 0x17, 0x56, 0x2a, 0x3f, 0x6, 0xe1, 0xff, 0x99, 0xb7, 0xb, 0xe1, 0x3e, 0x93, 0xff, 0x7f, 0xfc, 0xbd, 0x8, 0x7, 0xfc, 0x29, 0xc0, 0x1, 0x60, 0x7, 0xb0, 0xd, 0xb8, 0x8, 0x98, 0x3, 0xbc, 0xf, 0xf0, 0xef, 0x3f, 0xbf, 0x52, 0xf9, 0x77, 0x80, 0x4f, 0x2, 0xbe, 0x17, 0x70, 0x17, 0xf0, 0xdb, 0xef, 0xa9, 0x54, 0xbe, 0x5, 0xe0, 0x2, 0xfe, 0xaf, 0xcf, 0xab, 0x54, 0x6, 0x80, 0x2f, 0x0, 0xbc, 0xf, 0xf0, 0x83, 0xef, 0xae, 0x54, 0xfa, 0x80, 0x2f, 0x3, 0xfc, 0x83, 0x99, 0x4a, 0xa5, 0x3, 0xa8, 0x3, 0x22, 0xc0, 0x25, 0xc0, 0x79, 0xc0, 0xbf, 0xff, 0xdc, 0x4a, 0xe5, 0x67, 0x0, 0x9f, 0x4, 0xfc, 0x30, 0xe0, 0x87, 0x0, 0x7f, 0x19, 0xf0, 0xb5, 0x80, 0x4b, 0x0, 0x1d, 0xf0, 0x25, 0x80, 0x2f, 0x4, 0x7c, 0x1, 0xe0, 0xa7, 0x3f, 0xa7, 0x52, 0xf9, 0x3e, 0xc0, 0x77, 0x1, 0xe, 0x1, 0xdb, 0x0, 0x1b, 0xf0, 0x31, 0xc0, 0x7f, 0x7a, 0x57, 0xa5, 0xf2, 0xb3, 0x80, 0x9f, 0x1, 0x7c, 0x1b, 0xe0, 0x3a, 0x40, 0x3, 0xfc, 0xd6, 0x3b, 0xf1, 0x1d, 0xe0, 0x3b, 0x0, 0xdf, 0x6, 0x38, 0x2, 0x74, 0x1, 0xd, 0x40, 0x1d, 0xb0, 0x6, 0x78, 0x17, 0xe0, 0x97, 0xdf, 0x81, 0x3a, 0x0, 0x3e, 0x1, 0x18, 0x2, 0x76, 0x0, 0x2e, 0xe0, 0xcb, 0x1, 0xef, 0x7, 0xfc, 0x1f, 0x68, 0xb3, 0xbf, 0xe, 0xf8, 0x63, 0x80, 0x3a, 0x20, 0x2, 0x5c, 0x7b, 0xbb, 0x68, 0xcb, 0x67, 0x1, 0x5f, 0x4, 0xf8, 0x7f, 0xde, 0x56, 0xa9, 0xfc, 0xef, 0x80, 0x4f, 0x0, 0x7e, 0x11, 0xed, 0xfc, 0x3, 0x80, 0x6f, 0x1, 0x24, 0x80, 0x8f, 0x3, 0x36, 0x1, 0xf3, 0x80, 0x2f, 0x7, 0xfc, 0xf2, 0x5b, 0x2a, 0x95, 0x1f, 0x1, 0x7c, 0xab, 0x54, 0x8a, 0x68, 0xca, 0x55, 0xef, 0x26, 0x9a, 0xd1, 0xd2, 0x5c, 0x6d, 0xc9, 0xd1, 0x5a, 0xda, 0x8a, 0x16, 0x7a, 0x7d, 0xaf, 0xda, 0x8e, 0xe2, 0x46, 0xbf, 0x89, 0x80, 0xf9, 0x79, 0x53, 0x3b, 0x2a, 0xc5, 0xdf, 0xf7, 0x12, 0xad, 0x65, 0x69, 0xb1, 0xd7, 0x89, 0x9c, 0xfc, 0xc5, 0xb9, 0x66, 0xbf, 0xdf, 0xab, 0x36, 0xa2, 0xbe, 0xa1, 0x2f, 0x26, 0x51, 0xda, 0x5f, 0x8c, 0xa3, 0x28, 0xd4, 0xcd, 0x6a, 0x3a, 0x8, 0x82, 0x28, 0x4d, 0x8d, 0xfa, 0x20, 0xe, 0xfa, 0xad, 0x6e, 0xac, 0x19, 0x94, 0xbc, 0x9a, 0xe4, 0xd0, 0x74, 0x4a, 0xc9, 0x9f, 0x4b, 0x83, 0x6e, 0x2f, 0xaa, 0x6, 0xdd, 0x38, 0x8e, 0xf8, 0x93, 0x14, 0x45, 0xa3, 0x8f, 0xca, 0xd1, 0x86, 0xa5, 0xa7, 0xc9, 0x21, 0x74, 0xd1, 0x97, 0xdb, 0xad, 0x70, 0xb7, 0xda, 0x1d, 0xf4, 0xfd, 0x5e, 0xca, 0xd5, 0x3c, 0x3d, 0x62, 0x2b, 0x3e, 0x31, 0xde, 0x50, 0xb, 0xbc, 0x7e, 0xd0, 0xd4, 0x8c, 0x68, 0xb4, 0x51, 0x4e, 0xce, 0x6e, 0xc3, 0xeb, 0x37, 0xab, 0x1d, 0xef, 0x81, 0xb1, 0x64, 0x69, 0x1f, 0xd5, 0x9e, 0x11, 0xd, 0xc0, 0x51, 0x6e, 0xf, 0xfa, 0x97, 0xe, 0xfb, 0x51, 0x7a, 0xb7, 0xdb, 0xf7, 0xda, 0xda, 0xc2, 0x84, 0x9a, 0x8f, 0x47, 0x33, 0xb5, 0x45, 0xad, 0x1f, 0x9a, 0x67, 0xac, 0xc2, 0xc9, 0x79, 0x5f, 0x9f, 0xd0, 0xe4, 0xe5, 0xf2, 0xa0, 0x1, 0xc6, 0x73, 0x90, 0x31, 0x8b, 0xb6, 0xac, 0x3c, 0xc6, 0x6b, 0xbc, 0x9d, 0x1c, 0xf9, 0xb1, 0x92, 0xa0, 0xb7, 0x79, 0x17, 0x95, 0x31, 0xLine truncated
+var Resources embed.PackedResourceMap = embed.PackedResourceMap{0x1f, 0x8b, 0x8, 0x0, 0x0, 0x9, 0x6e, 0x88, 0x2, 0xff, 0xec, 0xbd, 0x6b, 0x8c, 0x24, 0x59, 0x97, 0x18, 0x54, 0xdf, 0x7a, 0x97, 0xb5, 0x73, 0x9f, 0xb0, 0xc0, 0xee, 0x22, 0xb, 0xb2, 0x62, 0xea, 0xcb, 0x89, 0xe8, 0x8c, 0xca, 0xaa, 0xea, 0x99, 0xef, 0x15, 0x51, 0xd1, 0xb9, 0xd5, 0xd5, 0xd5, 0xaf, 0xe9, 0xaa, 0xea, 0xa9, 0xaa, 0xee, 0xe9, 0x99, 0xac, 0x9c, 0xd9, 0x1b, 0x8f, 0x7c, 0x4c, 0x46, 0x46, 0x66, 0x47, 0x64, 0xd6, 0xa3, 0x2b, 0x13, 0xfe, 0x60, 0x81, 0x41, 0xb6, 0x10, 0x48, 0xb0, 0x5a, 0x59, 0x2, 0x56, 0x96, 0x8c, 0x84, 0x85, 0xb5, 0xd2, 0x8a, 0xa7, 0x8d, 0x25, 0x4, 0x8, 0xd6, 0x1f, 0x12, 0x12, 0xfe, 0x63, 0xcb, 0x18, 0xc, 0x58, 0x60, 0xb4, 0xc2, 0xc8, 0x5a, 0x4, 0xec, 0x9a, 0x15, 0xe7, 0x9c, 0xfb, 0x88, 0x1b, 0x99, 0x51, 0xd5, 0xdd, 0xf3, 0xcd, 0xb7, 0xeb, 0x85, 0xae, 0x99, 0xdb, 0x19, 0x71, 0xe3, 0xc6, 0xbd, 0x37, 0xce, 0x3d, 0xf7, 0xdc, 0xf3, 0xba, 0xe7, 0xfe, 0xcc, 0xca, 0xca, 0x4a, 0xa3, 0x9f, 0x84, 0xd1, 0x45, 0xa3, 0x37, 0x19, 0xc6, 0x8d, 0xec, 0x7c, 0xbc, 0xf2, 0xcb, 0x2b, 0x2b, 0xfe, 0xe6, 0xf3, 0x47, 0xfb, 0xd5, 0xef, 0x34, 0x3e, 0x84, 0xc7, 0x2b, 0x3f, 0xbb, 0xb2, 0xf2, 0x6f, 0xfc, 0xfa, 0xdf, 0x3b, 0x1a, 0xfd, 0xd2, 0x7b, 0x2b, 0x77, 0x3f, 0x5b, 0x59, 0xf9, 0xd2, 0x5f, 0x79, 0xa3, 0xbf, 0x2f, 0xfd, 0x51, 0xda, 0x5d, 0x1f, 0xfa, 0xe3, 0xd7, 0x94, 0xfb, 0xa7, 0xbf, 0xf4, 0x37, 0xb2, 0x34, 0xd8, 0xe8, 0xf6, 0x27, 0xbd, 0xa9, 0xdf, 0x8, 0x46, 0xc3, 0x8d, 0x80, 0xc5, 0xc3, 0xde, 0x46, 0x76, 0x99, 0x4, 0x93, 0x5e, 0x3f, 0xe9, 0x6e, 0x74, 0xa7, 0xfd, 0x8d, 0xbc, 0x93, 0x2b, 0xef, 0xfe, 0xde, 0xfd, 0xbd, 0xfb, 0xfb, 0x5a, 0xfe, 0xa6, 0x93, 0xce, 0xfa, 0x77, 0x7f, 0x6a, 0xe5, 0x83, 0xdb, 0x5b, 0x9b, 0x78, 0xfb, 0x9e, 0xb1, 0x5a, 0xfd, 0xb9, 0x7f, 0xe4, 0xd9, 0x3b, 0xb8, 0xbc, 0xfb, 0x7b, 0xf7, 0xf7, 0xee, 0xef, 0xdd, 0xdf, 0xbb, 0xbf, 0x77, 0x7f, 0xef, 0xfe, 0xde, 0xfd, 0xbd, 0xfb, 0x7b, 0xf7, 0xf7, 0xff, 0xa3, 0xbf, 0xc9, 0xf8, 0x47, 0x57, 0xfe, 0x19, 0xf8, 0xfd, 0x11, 0x71, 0xdf, 0x16, 0xbf, 0xdf, 0x58, 0xf8, 0xfd, 0x51, 0xf1, 0x7b, 0x4f, 0xfc, 0x7e, 0xbe, 0xf0, 0xfc, 0xc7, 0xc4, 0xef, 0xbe, 0xf8, 0xfd, 0xb5, 0x85, 0xe7, 0x7f, 0x44, 0xfc, 0xae, 0x89, 0xdf, 0xbf, 0xbb, 0xf0, 0xfc, 0xdd, 0xdf, 0xbb, 0xbf, 0x77, 0x7f, 0xef, 0xfe, 0xde, 0xfd, 0xbd, 0xfb, 0x7b, 0xf7, 0xf7, 0xee, 0xef, 0xdd, 0xdf, 0xbb, 0xbf, 0x77, 0x7f, 0xef, 0xfe, 0xde, 0xfd, 0xbd, 0xfb, 0x7b, 0xf7, 0xf7, 0xc3, 0xfb, 0x63, 0xe1, 0xca, 0xca, 0x1f, 0x87, 0xdf, 0x3f, 0x8f, 0x82, 0xf8, 0xcf, 0xe6, 0xf2, 0xff, 0xff, 0xfe, 0x33, 0x2b, 0x2b, 0xdf, 0x87, 0xf4, 0x9f, 0x41, 0xfa, 0x77, 0x20, 0x5d, 0x40, 0xda, 0x82, 0xf4, 0x93, 0x90, 0x7e, 0xeb, 0xa7, 0x57, 0x56, 0xfe, 0x2d, 0x48, 0x7f, 0xe, 0xd2, 0x9f, 0x86, 0x74, 0x8, 0xe9, 0x3b, 0x90, 0x6e, 0x41, 0xfa, 0x5, 0x48, 0xff, 0x38, 0xa4, 0x9f, 0x81, 0xf4, 0x7f, 0xfd, 0xd4, 0xca, 0xca, 0xff, 0x0, 0xe9, 0xbf, 0x86, 0xf4, 0xef, 0x42, 0xfa, 0x55, 0x48, 0xbf, 0x2, 0xe9, 0x4f, 0x43, 0x9a, 0x41, 0xea, 0x43, 0x7a, 0xc, 0xe9, 0x21, 0xa4, 0x7, 0x90, 0x3c, 0x48, 0x3f, 0xf, 0xe9, 0xff, 0xf9, 0xc9, 0x95, 0x95, 0xdf, 0x85, 0xf4, 0x3b, 0x90, 0xfe, 0x17, 0x48, 0xdf, 0x87, 0xf4, 0x9b, 0x90, 0xfe, 0x4b, 0x48, 0xff, 0x28, 0xa4, 0xdf, 0xfb, 0x89, 0x95, 0x95, 0xbf, 0xf, 0xe9, 0x77, 0x21, 0xfd, 0x3d, 0x48, 0xff, 0x2b, 0xa4, 0xbf, 0x3, 0xe9, 0x3f, 0x85, 0xf4, 0x1b, 0x90, 0x7e, 0x5, 0xd2, 0x15, 0xa4, 0x47, 0x90, 0x1c, 0x48, 0xdf, 0x83, 0xf4, 0x4f, 0x61, 0xf9, 0xa, 0xe4, 0x43, 0xfa, 0x45, 0x48, 0xbf, 0xf5, 0xc7, 0x56, 0x56, 0xfe, 0x12, 0x24, 0x17, 0xd2, 0x6f, 0xfc, 0x51, 0x68, 0x1f, 0xd2, 0xdf, 0xf8, 0xf1, 0x95, 0x95, 0xff, 0x0, 0xd2, 0xaf, 0x42, 0xfa, 0x59, 0x48, 0xff, 0xc7, 0x3f, 0xb4, 0xb2, 0xf2, 0x37, 0x21, 0xfd, 0x15, 0x48, 0x7f, 0x11, 0xd2, 0x7f, 0x4, 0xe9, 0xdf, 0x84, 0x34, 0x87, 0x74, 0x0, 0xe9, 0xb7, 0x7f, 0x6c, 0x65, 0xe5, 0x3f, 0x84, 0xf4, 0xab, 0x90, 0x52, 0x48, 0x77, 0x21, 0xfd, 0xc, 0xa4, 0xef, 0xff, 0xe8, 0xca, 0xca, 0x4b, 0x48, 0x8f, 0x20, 0xbd, 0xf, 0xe9, 0xb7, 0xff, 0xc8, 0xca, 0xca, 0xbf, 0xe, 0x69, 0xe, 0xc9, 0x81, 0xf4, 0x23, 0x90, 0xfe, 0xe2, 0x8f, 0xac, 0xac, 0x4c, 0x20, 0x39, 0x90, 0xfe, 0xea, 0x37, 0x38, 0xfc, 0xff, 0xed, 0xd7, 0x28, 0x43, 0xaa, 0xaf, 0xf9, 0xdb, 0xde, 0xc8, 0xc6, 0x2c, 0xb9, 0xf3, 0xda, 0x72, 0x54, 0x16, 0x8b, 0x56, 0x83, 0x98, 0x65, 0x99, 0x67, 0x4c, 0xa2, 0x8b, 0xc9, 0xfa, 0x70, 0x3a, 0x89, 0xc2, 0x6a, 0x37, 0xbe, 0x1c, 0xf7, 0xfa, 0xc1, 0x28, 0xc9, 0xaf, 0xd6, 0x83, 0x5e, 0x74, 0x96, 0xc2, 0x6f, 0x38, 0x3a, 0x4f, 0x8c, 0x3b, 0x6f, 0xd3, 0xca, 0xd5, 0x55, 0x3f, 0xf1, 0xc7, 0x59, 0x75, 0x56, 0x1d, 0x46, 0x93, 0xb4, 0x1f, 0xcc, 0xe7, 0x70, 0xb7, 0xf2, 0x66, 0x7d, 0x4b, 0xba, 0xeb, 0x59, 0x6f, 0x74, 0xee, 0x19, 0xc9, 0x28, 0x8c, 0x76, 0x3b, 0xdd, 0xc6, 0x1, 0xfc, 0x3e, 0xba, 0x57, 0x5d, 0xf5, 0xaa, 0xc3, 0xcb, 0x47, 0xf7, 0x8c, 0x9b, 0x7b, 0xb0, 0x3d, 0x9, 0xab, 0xd9, 0xe4, 0x32, 0x8e, 0x3c, 0xe3, 0xbc, 0x1f, 0x4e, 0x7a, 0xce, 0xd6, 0xe6, 0x37, 0x8d, 0xc2, 0xf7, 0xa6, 0xfd, 0x6e, 0x6f, 0xf2, 0xb6, 0xb5, 0xdc, 0xfe, 0xd6, 0x37, 0x11, 0x2, 0x93, 0xf0, 0x6d, 0xdf, 0x83, 0xd6, 0xef, 0x5c, 0x5d, 0x9d, 0x45, 0x69, 0xd6, 0x1f, 0xLine truncated

config.go

@@ -22,6 +22,7 @@ type RepositoryConfiguration struct {
 
 type NodeConfiguration struct {
 	NodeID    string   `xml:"id,attr"`
+	Name      string   `xml:"name,attr"`
 	Addresses []string `xml:"address"`
 }
 

gui/app.js

@@ -162,6 +162,13 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
         return "";
     };
 
+    $scope.nodeName = function (nodeCfg) {
+        if (nodeCfg.Name) {
+            return nodeCfg.Name;
+        }
+        return nodeCfg.NodeID.substr(0, 6);
+    };
+
     $scope.saveSettings = function () {
         $http.post('/rest/config', JSON.stringify($scope.config), {headers: {'Content-Type': 'application/json'}});
         $('#settingsTable').collapse('hide');

gui/index.html

@@ -108,7 +108,7 @@ html, body {
                                 </span>
                             </td>
                             <td>
-                                <span class="text-monospace">{{nodeCfg.NodeID | short}}</span>
+                                <span class="text-monospace">{{nodeName(nodeCfg)}}</span>
                             </td>
                             <td>
                                 {{nodeVer(nodeCfg)}}
@@ -241,6 +241,11 @@ html, body {
                         <input placeholder="YUFJOUDPORCMA..." ng-disabled="editingExisting" id="nodeID" class="form-control" type="text" ng-model="currentNode.NodeID"></input>
                         <p class="help-block">The node ID can be found in the logs or in the "Add Node" dialog on the other node.</p>
                     </div>
+                    <div class="form-group">
+                        <label for="name">Name</label>
+                        <input placeholder="Home Server" id="name" class="form-control" type="text" ng-model="currentNode.Name"></input>
+                        <p class="help-block">Shown instead of Node ID in the cluster status.</p>
+                    </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>