octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 15:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't rename duplicate folders (fixes #1675)

Browse Source 
Renaming them puts the user in a difficult situation as they can't
rename them back in the GUI. This way, they need to fix the config in
the same way it got broken (manual editing or external tool).
This commit is contained in:
Jakob Borg 2015-06-22 11:27:44 +02:00
parent 0450d48f89
commit e936890927
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/config/config.go
View File

@ -9,7 +9,6 @@ package config
import (
"encoding/xml"
"fmt"
"io"
"math/rand"
"os"
@ -310,7 +309,6 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
// Check for missing, bad or duplicate folder ID:s
var seenFolders = map[string]*FolderConfiguration{}
var uniqueCounter int
for i := range cfg.Folders {
folder := &cfg.Folders[i]
@ -339,15 +337,8 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
if seen, ok := seenFolders[folder.ID]; ok {
l.Warnf("Multiple folders with ID %q; disabling", folder.ID)
seen.Invalid = "duplicate folder ID"
if seen.ID == folder.ID {
uniqueCounter++
seen.ID = fmt.Sprintf("%s~%d", folder.ID, uniqueCounter)
}
folder.Invalid = "duplicate folder ID"
uniqueCounter++
folder.ID = fmt.Sprintf("%s~%d", folder.ID, uniqueCounter)
} else {
seenFolders[folder.ID] = folder
}