lib/db, lib/model: Refactor removing expired pending folders (#7537)

lib/db/observed.go

@@ -66,16 +66,11 @@ func (db *Lowlevel) PendingDevices() (map[protocol.DeviceID]ObservedDevice, erro
 	return res, nil
 }
 
-func (db *Lowlevel) AddOrUpdatePendingFolder(id, label string, device protocol.DeviceID, receiveEncrypted bool) error {
+func (db *Lowlevel) AddOrUpdatePendingFolder(id string, of ObservedFolder, device protocol.DeviceID) error {
 	key, err := db.keyer.GeneratePendingFolderKey(nil, device[:], []byte(id))
 	if err != nil {
 		return err
 	}
-	of := ObservedFolder{
-		Time:             time.Now().Truncate(time.Second),
-		Label:            label,
-		ReceiveEncrypted: receiveEncrypted,
-	}
 	bs, err := of.Marshal()
 	if err != nil {
 		return err
@@ -112,42 +107,6 @@ func (db *Lowlevel) RemovePendingFolder(id string) {
 	}
 }
 
-// RemovePendingFoldersBeforeTime removes entries for a specific device which are older
-// than a given timestamp or invalid.  It returns only the valid removed folder IDs.
-func (db *Lowlevel) RemovePendingFoldersBeforeTime(device protocol.DeviceID, oldest time.Time) ([]string, error) {
-	prefixKey, err := db.keyer.GeneratePendingFolderKey(nil, device[:], nil)
-	if err != nil {
-		return nil, err
-	}
-	iter, err := db.NewPrefixIterator(prefixKey)
-	if err != nil {
-		return nil, err
-	}
-	defer iter.Release()
-	oldest = oldest.Truncate(time.Second)
-	var res []string
-	for iter.Next() {
-		var of ObservedFolder
-		var folderID string
-		if err = of.Unmarshal(iter.Value()); err != nil {
-			l.Infof("Invalid pending folder entry, deleting from database: %x", iter.Key())
-		} else if of.Time.Before(oldest) {
-			folderID = string(db.keyer.FolderFromPendingFolderKey(iter.Key()))
-			l.Infof("Removing stale pending folder %s (%s) from device %s, last seen %v",
-				folderID, of.Label, device.Short(), of.Time)
-		} else {
-			// Keep entries younger or equal to the given timestamp
-			continue
-		}
-		if err := db.Delete(iter.Key()); err != nil {
-			l.Warnf("Failed to remove pending folder entry: %v", err)
-		} else if len(folderID) > 0 {
-			res = append(res, folderID)
-		}
-	}
-	return res, nil
-}
-
 // Consolidated information about a pending folder
 type PendingFolder struct {
 	OfferedBy map[protocol.DeviceID]ObservedFolder `json:"offeredBy"`