octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-07 00:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/config, lib/protocol: Improve folder description with empty label

Browse Source
This commit is contained in:
Jakob Borg 2016-12-19 10:12:06 +01:00
parent f09698d845
commit 2f770f8bfb
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/config/folderconfiguration.go
View File

@ -106,6 +106,9 @@ func (f *FolderConfiguration) HasMarker() bool {
} }
func (f FolderConfiguration) Description() string { func (f FolderConfiguration) Description() string {
if f.Label == "" {
return f.ID
}
return fmt.Sprintf("%q (%s)", f.Label, f.ID) return fmt.Sprintf("%q (%s)", f.Label, f.ID)
} }

3
lib/model/model.go
View File

@ -184,9 +184,10 @@ func (m *Model) StartDeadlockDetector(timeout time.Duration) {
func (m *Model) StartFolder(folder string) { func (m *Model) StartFolder(folder string) {
m.fmut.Lock() m.fmut.Lock()
folderType := m.startFolderLocked(folder) folderType := m.startFolderLocked(folder)
folderCfg := m.folderCfgs[folder]
m.fmut.Unlock() m.fmut.Unlock()
l.Infoln("Ready to synchronize", folder, fmt.Sprintf("(%s)", folderType)) l.Infof("Ready to synchronize %s (%s)", folderCfg.Description(), folderType)
} }
func (m *Model) startFolderLocked(folder string) config.FolderType { func (m *Model) startFolderLocked(folder string) config.FolderType {

3
lib/protocol/bep_extensions.go
View File

@ -148,5 +148,8 @@ func NewIndexID() IndexID {
func (f Folder) Description() string { func (f Folder) Description() string {
// used by logging stuff // used by logging stuff
if f.Label == "" {
return f.ID
}
return fmt.Sprintf("%q (%s)", f.Label, f.ID) return fmt.Sprintf("%q (%s)", f.Label, f.ID)
} }