fix: 'remove file on all devices' does not work correctly in selective folders (fixes #324)

Signed-off-by: Tommy van der Vorst <tommy@pixelspark.nl>

Author: pixelspark

SushitrainCore/src/entry.go

@@ -479,5 +479,15 @@ func (entry *Entry) MIMEType() string {
 }
 
 func (entry *Entry) Remove() error {
-	return entry.Folder.deleteAndDeselectLocalFile(entry.Path())
+	path := entry.Path()
+	err := entry.Folder.deleteLocalFileAndRedundantChildren(path)
+	if err != nil {
+		return err
+	}
+	containingDir := filepath.Dir(path)
+	return entry.Folder.RescanSubdirectory(containingDir)
+	// In selective folders, the entry will remain selected until the app cleans the entry in .stignore up.
+	// It would be better to also deselect the file immediately after the deletion has been picked up by Syncthing,
+	// but there appears not to be a reliable way to do this. Hence deleted files may become unintentionally selected
+	// again if another peer re-adds them.
 }

SushitrainCore/src/folder.go

@@ -964,25 +964,6 @@ func (fld *Folder) deleteLocalFileAndRedundantChildren(path string) error {
 	return nil
 }
 
-func (fld *Folder) deleteAndDeselectLocalFile(path string) error {
-	err := fld.deleteLocalFileAndRedundantChildren(path)
-	if err != nil {
-		return err
-	}
-
-	err = fld.client.app.Internals.ScanFolderSubdirs(fld.FolderID, []string{path})
-	if err != nil {
-		return err
-	}
-
-	err = fld.SetLocalFileExplicitlySelected(path, false)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (fld *Folder) reloadIgnores() error {
 	if !fld.IsPaused() {
 		err := fld.SetPaused(true)