felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

chore: further minor lint fixes

Browse Source
This commit is contained in:
Jakob Borg
2025-05-20 15:04:33 +02:00
parent 96b03fac04
commit 0a58747eb2
8 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/model/indexhandler.go
+10 -4
View File
@@ -106,7 +106,9 @@ func newIndexHandler(conn protocol.Connection, downloads *deviceDownloadState, f
// information we have from them before accepting their
// index, which will presumably be a full index.
l.Debugf("Device %v folder %s does not announce an index ID", conn.DeviceID().Short(), folder.Description())
sdb.DropAllFiles(folder.ID, conn.DeviceID())
if err := sdb.DropAllFiles(folder.ID, conn.DeviceID()); err != nil {
return nil, err
}
} else if startInfo.remote.IndexID != theirIndexID {
// The index ID we have on file is not what they're
// announcing. They must have reset their database and
@@ -114,8 +116,12 @@ func newIndexHandler(conn protocol.Connection, downloads *deviceDownloadState, f
// information we have and remember this new index ID
// instead.
l.Infof("Device %v folder %s has a new index ID (%v)", conn.DeviceID().Short(), folder.Description(), startInfo.remote.IndexID)
sdb.DropAllFiles(folder.ID, conn.DeviceID())
sdb.SetIndexID(folder.ID, conn.DeviceID(), startInfo.remote.IndexID)
if err := sdb.DropAllFiles(folder.ID, conn.DeviceID()); err != nil {
return nil, err
}
if err := sdb.SetIndexID(folder.ID, conn.DeviceID(), startInfo.remote.IndexID); err != nil {
return nil, err
}
}
return &indexHandler{
@@ -133,7 +139,7 @@ func newIndexHandler(conn protocol.Connection, downloads *deviceDownloadState, f
}, nil
}
// waitWhilePaused waits for the handler to resume
// waitWhilePaused waits for the handler to resume.
func (s *indexHandler) waitWhilePaused(ctx context.Context) error {
s.cond.L.Lock()
defer s.cond.L.Unlock()