perso/syncthing-arm
Archived
4
0 Fork 0
Code Issues 1 Actions Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jakob Borg committed 2014-02-10 20:54:57 +01:00
1 parent b6814241cc
commit 3a5b816125
5 files changed
+137 -65
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

auto/gui.files.go
+1 -1
View File
@@ -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, 0x6b, 0x8c, 0x24, 0xc9, 0x76, 0x1e, 0xd6, 0x97, 0xe2, 0xe5, 0x25, 0x9b, 0x6f, 0xd1, 0xb6, 0x24, 0xc3, 0x16, 0xaa, 0xf3, 0xf6, 0xed, 0xcd, 0xdc, 0xca, 0xae, 0xee, 0x9e, 0xdd, 0xbb, 0xbc, 0x37, 0xb3, 0x73, 0x8a, 0x3d, 0x3d, 0x3d, 0xaf, 0x9d, 0x9e, 0x99, 0xed, 0x9e, 0x99, 0x7d, 0x54, 0xd7, 0x2e, 0xf3, 0x55, 0x8f, 0xad, 0xaa, 0xac, 0x9a, 0xca, 0xaa, 0x7e, 0x4c, 0x77, 0x59, 0x80, 0x60, 0x41, 0xa6, 0x49, 0x2, 0x86, 0x2c, 0xd8, 0xb4, 0x4d, 0xc0, 0x36, 0x4d, 0xc3, 0x7f, 0xc, 0xca, 0x82, 0x5, 0xd8, 0x3f, 0x4c, 0x9, 0xb0, 0x65, 0xc2, 0xa0, 0x49, 0xe8, 0x87, 0xf5, 0x47, 0x4, 0x25, 0xeb, 0x61, 0xd9, 0xb0, 0x41, 0x58, 0x36, 0x6c, 0x43, 0x32, 0x6d, 0xd0, 0xfe, 0xce, 0x89, 0x88, 0xcc, 0xc8, 0xaa, 0xec, 0x9e, 0x99, 0xbd, 0x7b, 0xf9, 0xb0, 0xbb, 0x77, 0x63, 0x2a, 0x33, 0x32, 0x32, 0x22, 0xf2, 0xc4, 0x89, 0x13, 0xe7, 0x15, 0x27, 0x7e, 0x74, 0x69, 0x69, 0xa9, 0xd6, 0x4d, 0xa2, 0xf8, 0xb4, 0xd6, 0x99, 0xc, 0xfa, 0xb5, 0xf4, 0x64, 0xb4, 0x34, 0x5a, 0x5a, 0xa, 0x36, 0x9f, 0xdf, 0xdf, 0xaf, 0xfc, 0x64, 0xed, 0x5d, 0x3c, 0x5e, 0xfa, 0xb1, 0xa5, 0xa5, 0x5f, 0x7b, 0xff, 0xff, 0x38, 0x8, 0x7e, 0xf6, 0x9f, 0x59, 0xba, 0x87, 0xf2, 0x9f, 0x7, 0x4b, 0xaf, 0xf5, 0xf7, 0x79, 0x30, 0x1c, 0xb7, 0xd7, 0x7, 0xc1, 0xa8, 0xd6, 0x1f, 0x86, 0x7e, 0xff, 0xd2, 0x72, 0xff, 0xc2, 0xe7, 0xc1, 0x46, 0x3a, 0xe, 0x37, 0xda, 0xdd, 0x49, 0x67, 0x1a, 0xd4, 0xc2, 0xe1, 0x60, 0x3, 0xc5, 0x7, 0x9d, 0x8d, 0xf4, 0x2c, 0x9, 0x27, 0x9d, 0x6e, 0xd2, 0xde, 0x68, 0x4f, 0xbb, 0x1b, 0x79, 0x27, 0x97, 0xae, 0xff, 0xae, 0xff, 0xae, 0xff, 0xbe, 0x94, 0xbf, 0xe9, 0xa4, 0xb5, 0xfe, 0xad, 0x1f, 0x5e, 0x7a, 0xe7, 0xc6, 0xd6, 0x26, 0xdd, 0x7e, 0xdd, 0x58, 0xa9, 0xfc, 0xc4, 0x1f, 0x7f, 0x76, 0xd, 0x97, 0xeb, 0xbf, 0xeb, 0xbf, 0xeb, 0xbf, 0xeb, 0xbf, 0xeb, 0xbf, 0xeb, 0xbf, 0xeb, 0xbf, 0xeb, 0xbf, 0xeb, 0xbf, 0xeb, 0xbf, 0xff, 0x1f, 0xfd, 0x4d, 0x46, 0x5f, 0x5d, 0xfa, 0x33, 0xf8, 0xfd, 0x1e, 0x79, 0xbf, 0x25, 0x7f, 0xbf, 0x32, 0xf7, 0xfb, 0xbd, 0xf2, 0xd7, 0x96, 0xbf, 0xef, 0xce, 0x3d, 0xff, 0xaa, 0xfc, 0xbd, 0x2d, 0x7f, 0x3f, 0x9d, 0x7b, 0xfe, 0x7d, 0xf2, 0x77, 0x5f, 0xfe, 0xfe, 0xd2, 0xdc, 0xf3, 0x3f, 0x26, 0x7f, 0x57, 0xe5, 0xef, 0x3f, 0x9a, 0x7b, 0x7e, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0x77, 0xfd, 0xf7, 0xc5, 0xff, 0xfc, 0x68, 0x69, 0xe9, 0x3f, 0x5c, 0x5e, 0x5a, 0xfa, 0xb9, 0x1f, 0x5c, 0x62, 0xfb, 0xbf, 0x92, 0xff, 0xff, 0x97, 0x1f, 0x5d, 0x5a, 0xfa, 0xd, 0xa4, 0xff, 0x12, 0xe9, 0x57, 0x90, 0x4e, 0x91, 0xb6, 0x90, 0x7e, 0x8, 0xe9, 0x77, 0x7e, 0x64, 0x69, 0xe9, 0xaf, 0x22, 0xfd, 0x2a, 0xd2, 0x2f, 0x23, 0xc5, 0x48, 0xfb, 0x48, 0x3f, 0x85, 0x54, 0x43, 0xb2, 0x91, 0xbe, 0x81, 0xf4, 0x23, 0x48, 0xff, 0xe4, 0x87, 0x97, 0x96, 0xfe, 0x7b, 0xa4, 0xdf, 0x40, 0xfa, 0x8f, 0x90, 0x7e, 0x5, 0xe9, 0x97, 0x91, 0xfe, 0x2, 0xd2, 0x9f, 0x41, 0xfa, 0x69, 0xa4, 0x4f, 0x91, 0x9a, 0x48, 0x87, 0x48, 0xeb, 0x48, 0x3f, 0x81, 0xf4, 0xe3, 0x48, 0x3f, 0x86, 0xf4, 0x7b, 0x3f, 0xb4, 0xb4, 0xf4, 0xf7, 0x91, 0xfe, 0x2e, 0xd2, 0x7f, 0x8b, 0xf4, 0x36, 0xd2, 0x3f, 0x85, 0xf4, 0xc7, 0x91, 0x7e, 0x1c, 0xe9, 0xfb, 0x91, 0x96, 0x90, 0xfe, 0x1f, 0xf4, 0xff, 0xb7, 0x90, 0x7e, 0x1d, 0xe9, 0x57, 0x7e, 0x50, 0x7c, 0x4f, 0x82, 0xf4, 0x0, 0xc9, 0x40, 0x5a, 0x41, 0xfa, 0x1a, 0xd2, 0x3f, 0xc0, 0xb7, 0x86, 0x48, 0x5f, 0x41, 0xfa, 0x9b, 0x3f, 0xb0, 0xb4, 0xf4, 0xef, 0x23, 0x7d, 0x1d, 0xe9, 0x17, 0xbf, 0x7f, 0x69, 0x69, 0x3, 0xe9, 0xaf, 0x7f, 0x6d, 0x69, 0xe9, 0xdf, 0x45, 0xfa, 0xb3, 0x48, 0xff, 0xe4, 0xfb, 0x96, 0x96, 0xfe, 0x36, 0xd2, 0xaf, 0x21, 0xfd, 0xc7, 0x48, 0xbf, 0x8c, 0xf4, 0xef, 0x21, 0xfd, 0xc, 0x52, 0x8c, 0xf4, 0x1e, 0xd2, 0x6f, 0x7f, 0x75, 0x69, 0xe9, 0x97, 0x90, 0xfe, 0x2c, 0xd2, 0x27, 0x48, 0x6f, 0x23, 0xfd, 0xe3, 0xef, 0x5d, 0x5a, 0xfa, 0x2b, 0x48, 0x1f, 0x23, 0x6d, 0x21, 0xfd, 0x28, 0xd2, 0x6f, 0xff, 0xb1, 0xa5, 0xa5, 0x3f, 0x8f, 0x14, 0x23, 0x19, 0x48, 0xff, 0xd3, 0xf7, 0xa0, 0x3e, 0xa4, 0x23, 0x24, 0x3, 0xe9, 0x3f, 0xfb, 0xca, 0xd2, 0xd2, 0x5f, 0x94, 0xca, 0x8e, 0xca, 0x2b, 0xfe, 0xb6, 0x37, 0xd2, 0x91, 0x9f, 0xdc, 0x7c, 0x65, 0x39, 0x2e, 0x4b, 0x45, 0x2b, 0x61, 0xdf, 0x4f, 0x53, 0xcf, 0x98, 0xc4, 0xa7, 0x93, 0xf5, 0xc1, 0x74, 0x12, 0x47, 0x95, 0x76, 0xff, 0x6c, 0xd4, 0xe9, 0x86, 0xc3, 0x24, 0xbf, 0x5a, 0xf, 0x3b, 0xf1, 0xf1, 0x18, 0xbf, 0xd1, 0xf0, 0x24, 0x31, 0x6e, 0xbe, 0x49, 0x2b, 0xe7, 0xe7, 0xdd, 0x24, 0x18, 0xa5, 0x95, 0x8b, 0xca, 0x20, 0x9e, 0x8c, 0xbb, 0xe1, 0x6c, 0x86, 0xbb, 0xa5, 0xd7, 0xeb, 0x5b, 0xd2, 0x5e, 0x4f, 0x3b, 0xc3, 0x13, 0xcf, 0x48, 0x86, 0x51, 0xbc, 0xdb, 0x6a, 0xd7, 0x1e, 0xe1, 0xf7, 0xfe, 0xed, 0xca, 0x8a, 0x57, 0x19, 0x9c, 0xdd, 0xbf, 0x6d, 0x5c, 0xdd, 0x83, 0xed, 0x49, 0x54, 0x49, 0x27, 0x67, 0xfd, 0xd8, 0x33, 0x4e, 0xba, 0xd1, 0xa4, 0xe3, 0x6c, 0x6d, 0x7e, 0xc3, 0x28, 0x7c, 0xef, 0xb8, 0xdb, 0xee, 0x4c, 0xde, 0xb4, 0x96, 0x1b, 0xdf, 0xfc, 0x6, 0x41, 0x60, 0x12, 0xbd, 0xe9, 0x7b, 0x68, 0xfd, 0xe6, 0xf9, 0xf9, 0x71, 0x3c, 0x4Line truncated
var Resources embed.PackedResourceMap = embed.PackedResourceMap{0x1f, 0x8b, 0x8, 0x0, 0x0, 0x9, 0x6e, 0x88, 0x2, 0xff, 0xec, 0xbd, 0xb, 0x7c, 0x24, 0xd9, 0x59, 0x1f, 0xda, 0xbb, 0xf6, 0x7a, 0x6d, 0xed, 0x82, 0x1, 0x13, 0x8c, 0xe3, 0xe4, 0x47, 0xa9, 0x76, 0x56, 0x53, 0xb5, 0x2a, 0xb5, 0xa4, 0xd9, 0x97, 0xdd, 0xa5, 0x9a, 0xb6, 0x46, 0xa3, 0x79, 0xec, 0x8c, 0x66, 0x66, 0xa5, 0x99, 0xd9, 0xd9, 0xd5, 0x68, 0xd7, 0xf5, 0xea, 0xc7, 0xa8, 0xbb, 0xba, 0xa7, 0xab, 0x5b, 0x1a, 0x8d, 0xd4, 0x36, 0x37, 0x21, 0x1, 0xf2, 0x73, 0xc, 0x21, 0xc9, 0xcf, 0xc1, 0xe0, 0x4, 0xe2, 0xdc, 0x1f, 0x8f, 0xdc, 0x60, 0xe2, 0xe4, 0x86, 0xbc, 0x30, 0x49, 0xc, 0x24, 0x60, 0xf3, 0x8, 0x37, 0xf, 0x1e, 0x37, 0x5c, 0x92, 0x5f, 0x20, 0xc1, 0x37, 0x26, 0x98, 0x40, 0x82, 0x7d, 0x43, 0xb8, 0xff, 0xef, 0x3b, 0xa7, 0xaa, 0x4e, 0x75, 0xb7, 0x34, 0xd2, 0x78, 0x17, 0xdb, 0xd0, 0x35, 0xf3, 0x57, 0xd7, 0xe3, 0xd4, 0x39, 0xa7, 0xce, 0xe3, 0x3b, 0xdf, 0xf7, 0x9d, 0xef, 0x7c, 0xe7, 0x91, 0x42, 0xa1, 0x50, 0x74, 0xdb, 0xed, 0xe2, 0xad, 0xb8, 0x18, 0x6f, 0xb7, 0xb, 0x5f, 0x5f, 0x28, 0x78, 0x73, 0xd7, 0xcf, 0xaf, 0x68, 0xcf, 0x16, 0x9f, 0xc2, 0xa3, 0xc2, 0x57, 0x14, 0xa, 0xbf, 0x39, 0xf3, 0xd9, 0xd5, 0x8f, 0x9d, 0xfd, 0xba, 0xc2, 0xc4, 0xdb, 0xa, 0x85, 0x5b, 0x5e, 0xe1, 0x50, 0xc7, 0x2d, 0xaf, 0xd5, 0xa9, 0xce, 0x34, 0xbd, 0x76, 0xb1, 0xd1, 0xf2, 0xdd, 0xc6, 0xbe, 0xe1, 0xde, 0x73, 0xcb, 0x9b, 0x8d, 0x3b, 0xfe, 0x6c, 0xb5, 0xde, 0xad, 0xf5, 0xbc, 0xa2, 0xdf, 0x6a, 0xce, 0x22, 0x78, 0xb3, 0x36, 0x1b, 0xef, 0x44, 0x7e, 0xb7, 0x56, 0x8f, 0xaa, 0xb3, 0xd5, 0x5e, 0x7d, 0x56, 0x64, 0xb0, 0x30, 0x3e, 0xc6, 0xc7, 0xf8, 0x78, 0xd5, 0x8e, 0x5e, 0xb7, 0x32, 0xf3, 0x8e, 0x2f, 0x2b, 0x3c, 0x79, 0x62, 0x7e, 0x8e, 0x2e, 0x1f, 0xd3, 0x27, 0xb5, 0xb7, 0x7c, 0xd5, 0xb5, 0x71, 0xb9, 0x8c, 0x8f, 0xf1, 0x31, 0x3e, 0xc6, 0xc7, 0xf8, 0x18, 0x1f, 0xe3, 0x63, 0x7c, 0x8c, 0x8f, 0xf1, 0xf1, 0x47, 0xe8, 0xe8, 0xb6, 0xdf, 0x50, 0x78, 0x2f, 0x7e, 0x1f, 0x94, 0xd7, 0xaf, 0x97, 0xbf, 0xf, 0xc, 0xfc, 0x3e, 0x24, 0x7f, 0x9f, 0x96, 0xbf, 0xaf, 0x1b, 0x78, 0xfe, 0x6, 0xf9, 0xfb, 0xa4, 0xfc, 0xb5, 0x7, 0x9e, 0xf, 0xc6, 0xfb, 0xee, 0x81, 0xeb, 0x87, 0xe5, 0x6f, 0x5f, 0xfe, 0x36, 0x7, 0x9e, 0x27, 0xe9, 0xfd, 0x59, 0xf9, 0xfb, 0x8b, 0x3, 0xcf, 0xc7, 0xc7, 0xf8, 0x18, 0x1f, 0xe3, 0x63, 0x7c, 0x8c, 0x8f, 0xf1, 0x31, 0x3e, 0xc6, 0xc7, 0xf8, 0x18, 0x1f, 0xe3, 0x63, 0x7c, 0x8c, 0x8f, 0xf1, 0xb1, 0xff, 0xe1, 0x6, 0x85, 0x42, 0xe5, 0xcd, 0x85, 0xc2, 0xb7, 0x1, 0x34, 0xff, 0x9f, 0xc8, 0xe9, 0x3f, 0x8e, 0xeb, 0xef, 0x6, 0xbe, 0x4b, 0x3e, 0xb, 0x81, 0xcb, 0xc0, 0x53, 0xc0, 0x93, 0xc0, 0xd7, 0x0, 0xff, 0xeb, 0xcb, 0xb, 0x85, 0xff, 0xc, 0xfc, 0x4b, 0xe0, 0x67, 0x81, 0xef, 0x5, 0xbe, 0x15, 0x98, 0x1, 0xfe, 0xf5, 0x97, 0x15, 0xa, 0x5d, 0xe0, 0x6b, 0x80, 0x8f, 0x3e, 0x5a, 0x28, 0x5c, 0x2, 0x3e, 0xf5, 0x48, 0xa1, 0xf0, 0xeb, 0xc0, 0x5f, 0x5, 0x56, 0x80, 0xff, 0x3e, 0x51, 0x28, 0x7c, 0x8, 0x38, 0x3, 0x94, 0x81, 0x93, 0xc0, 0xdb, 0x81, 0x2, 0xf0, 0x73, 0x6f, 0x2a, 0x14, 0xfe, 0xe, 0xf0, 0x7d, 0xc0, 0x87, 0x81, 0xbf, 0xe, 0xfc, 0x29, 0xa0, 0x6, 0xbc, 0x1d, 0xf8, 0xff, 0xde, 0x58, 0x28, 0x7c, 0x6, 0xf8, 0x7f, 0x81, 0x4f, 0x1, 0x3f, 0x1, 0x7c, 0x18, 0x78, 0x1f, 0x50, 0x1, 0xae, 0x0, 0xb3, 0xc0, 0xd7, 0x2, 0xbf, 0xfd, 0x70, 0xa1, 0xf0, 0x1b, 0xc0, 0xa7, 0x81, 0xbf, 0xb, 0xfc, 0x65, 0xe0, 0xcf, 0x3, 0xd7, 0x80, 0x67, 0x81, 0xaf, 0x1, 0xfe, 0x18, 0xf0, 0xb, 0x6f, 0x28, 0x14, 0x7e, 0x8, 0x78, 0x9, 0x78, 0x11, 0xf8, 0x13, 0xc0, 0xef, 0x3e, 0x54, 0x28, 0xfc, 0x1b, 0xe0, 0x27, 0x81, 0x7f, 0x6, 0xfc, 0x53, 0xe0, 0xaf, 0x2, 0x1e, 0xf0, 0x2e, 0xe0, 0x29, 0xe0, 0xb3, 0x28, 0xb4, 0x9f, 0x7, 0x7e, 0x8, 0xf8, 0x2b, 0xc0, 0x5d, 0x20, 0x2, 0x66, 0x80, 0x47, 0x80, 0x7f, 0xf7, 0x3a, 0xbc, 0x7, 0xfc, 0x13, 0xe0, 0xc3, 0xc0, 0x9f, 0x1, 0x3c, 0xe0, 0x22, 0xf0, 0x73, 0xf, 0x22, 0x1f, 0xc0, 0xb3, 0xc0, 0x9b, 0x81, 0x5f, 0x7b, 0xa0, 0x50, 0xf8, 0x57, 0xc0, 0x87, 0x33, 0xc5, 0x86, 0x36, 0x70, 0x1c, 0x8b, 0xfd, 0x56, 0x3b, 0x2c, 0xd6, 0x23, 0xaf, 0x1d, 0x6b, 0xd3, 0x8e, 0x16, 0xb8, 0x5d, 0x77, 0xbd, 0x1e, 0x6c, 0x14, 0x5b, 0xbd, 0x2e, 0x6e, 0xd9, 0x43, 0x2f, 0xf4, 0x87, 0xee, 0xd0, 0x31, 0xf0, 0x9a, 0xe6, 0x68, 0x73, 0xf6, 0xc1, 0x1, 0x45, 0x8a, 0x23, 0xc3, 0xf5, 0x35, 0xdf, 0xed, 0xfa, 0x35, 0xcd, 0x8, 0x4d, 0x6d, 0xf7, 0x90, 0xc9, 0xad, 0xb8, 0xdd, 0x5a, 0xb1, 0xe9, 0xde, 0x31, 0xe6, 0x2c, 0xed, 0x1d, 0xda, 0x13, 0x9a, 0x91, 0x6, 0xb9, 0xdc, 0xeb, 0x9e, 0xda, 0xe9, 0x86, 0xf1, 0xd5, 0x56, 0xd7, 0x6d, 0x68, 0x33, 0xc9, 0x17, 0xfb, 0xad, 0x28, 0xa, 0xfd, 0x6e, 0xbd, 0x15, 0xc5, 0xc3, 0xc1, 0x4c, 0x6d, 0x56, 0xeb, 0x6, 0xe6, 0x21, 0x3f, 0x61, 0xff, 0xb4, 0xcf, 0x47, 0x87, 0x49, 0x5a, 0xd, 0xb5, 0x6f, 0xca, 0xdd, 0xce, 0xce, 0x40, 0x61, 0x54, 0x5a, 0x1d, 0xcd, 0xd8, 0x72, 0x3b, 0x5a, 0x3d, 0xd0, 0xea, 0x11, 0x67, 0x6b, 0xb0, 0xbc, 0x64, 0x82, 0x59, 0xa5, 0x14, 0xf6, 0xad, 0x7b, 0x7a, 0x98, 0x7b, 0xda, 0xee, 0x84, 0x5b, 0xa7, 0xdd, 0x6e, 0x88, 0x27, 0x51, 0x6b, 0x3b, 0x9f, 0x21, 0x4a, 0xb5, 0x1b, 0xe0, 0x89, 0x81, 0x47, 0xf8, 0xb0, 0x24, 0x2c, 0xe5, 0x7e, 0x7e, 0x6e, 0x6e, 0x6e, 0x38, 0x34, 0x85, 0x73, 0x34, 0xa, 0x53, 0xc4, 0xa9, 0xa1, 0x7c, 0xe0,Line truncated
config.go
+22
View File
@@ -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
+104 -59
View File
@@ -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 modelGetOK = true;
var prevDate = 0,
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(function (a, b) {
if (a.NodeID < b.NodeID)
return -1;
return a.NodeID > b.NodeID;
})
nodes.sort(nodeCompare);
$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 td = (now - prevDate) / 1000;
prevDate = now;
var now = Date.now(),
td = (now - prevDate) / 1000,
id;
$scope.inbps = 0
$scope.outbps = 0
for (var id in data) {
prevDate = now;
$scope.inbps = 0;
$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,50 +208,72 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
};
$scope.deleteNode = function () {
$('#editNode').modal('hide');
if (!$scope.editingExisting)
return;
var newNodes = [], i;
var newNodes = [];
for (var i = 0; i < $scope.nodes.length; i++) {
$('#editNode').modal('hide');
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]);
}
}
}
$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;
for (var i = 0; i < $scope.nodes.length; i++) {
done = false;
for (i = 0; i < $scope.nodes.length; i++) {
if ($scope.nodes[i].NodeID === nodeCfg.NodeID) {
$scope.nodes[i] = nodeCfg;
done = true;
break;
}
}
}
if (!done) {
$scope.nodes.push(nodeCfg);
}
$scope.nodes.sort(function (a, b) {
if (a.NodeID < b.NodeID)
return -1;
return a.NodeID > b.NodeID;
})
$scope.nodes.sort(nodeCompare);
$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 = Math.floor(Math.log(Math.abs(val))/Math.log(10));
var decimals = Math.max(0, num - digits);
return decimals;
var digits, decs;
if (val === 0) {
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() {
return function(input, valid) {
syncthing.filter('natural', function () {
return function (input, valid) {
return input.toFixed(decimals(input, valid));
}
};
});
syncthing.filter('binary', function() {
return function(input) {
syncthing.filter('binary', function () {
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() {
return function(input) {
syncthing.filter('metric', function () {
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() {
return function(input) {
syncthing.filter('short', function () {
return function (input) {
return input.substr(0, 6);
}
};
});
syncthing.filter('alwaysNumber', function() {
return function(input) {
syncthing.filter('alwaysNumber', function () {
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
+7 -5
View File
@@ -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
+3
View File
@@ -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 {