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

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

View File

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

View File

@ -184,9 +184,10 @@ func (m *Model) StartDeadlockDetector(timeout time.Duration) {
func (m *Model) StartFolder(folder string) {
m.fmut.Lock()
folderType := m.startFolderLocked(folder)
folderCfg := m.folderCfgs[folder]
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 {

View File

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