all: Store pending devices and folders in database (fixes #7178) (#6443)

3 files changed, 14 insertions, 2 deletions

diff --git a/proto/lib/config/config.proto b/proto/lib/config/config.proto
index 3b4f526ce..2cf5aa430 100644
--- a/proto/lib/config/config.proto
+++ b/proto/lib/config/config.proto
@@ -19,5 +19,5 @@ message Configuration {
     LDAPConfiguration            ldap            = 5 [(ext.goname) = "LDAP"];
     OptionsConfiguration         options         = 6;
     repeated ObservedDevice      ignored_devices = 7 [(ext.json) = "remoteIgnoredDevices", (ext.xml) = "remoteIgnoredDevice"];
-    repeated ObservedDevice      pending_devices = 8;
+    repeated ObservedDevice      pending_devices = 8 [deprecated=true];
 }
diff --git a/proto/lib/config/deviceconfiguration.proto b/proto/lib/config/deviceconfiguration.proto
index 98bc597d5..2e0696816 100644
--- a/proto/lib/config/deviceconfiguration.proto
+++ b/proto/lib/config/deviceconfiguration.proto
@@ -22,7 +22,7 @@ message DeviceConfiguration {
     int32                   max_send_kbps              = 12;
     int32                   max_recv_kbps              = 13;
     repeated ObservedFolder ignored_folders            = 14;
-    repeated ObservedFolder pending_folders            = 15;
+    repeated ObservedFolder pending_folders            = 15 [deprecated = true];
     int32                   max_request_kib            = 16 [(ext.goname) = "MaxRequestKiB", (ext.xml) = "maxRequestKiB", (ext.json) = "maxRequestKiB"];
     bool                    untrusted                  = 17;
     int32                   remote_gui_port            = 18 [(ext.goname) = "RemoteGUIPort", (ext.xml) = "remoteGUIPort", (ext.json) = "remoteGUIPort"];
diff --git a/proto/lib/db/structs.proto b/proto/lib/db/structs.proto
index 10e6fef79..f422bc89d 100644
--- a/proto/lib/db/structs.proto
+++ b/proto/lib/db/structs.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package db;
 
 import "repos/protobuf/gogoproto/gogo.proto";
+import "google/protobuf/timestamp.proto";
 import "lib/protocol/bep.proto";
 import "ext.proto";
 
@@ -88,3 +89,14 @@ message VersionListDeprecated {
     option (gogoproto.goproto_stringer) = false;
     repeated FileVersionDeprecated versions = 1;
 }
+
+message ObservedFolder {
+    google.protobuf.Timestamp time  = 1 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
+    string                    label = 2;
+}
+
+message ObservedDevice {
+    google.protobuf.Timestamp time    = 1 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
+    string                    name    = 2;
+    string                    address = 3;
+}