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

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

Browse Source
This commit is contained in:
André Colomb
2020-12-17 19:54:31 +01:00
committed by GitHub
parent 4470cd5aaa
commit 7502997e7e
20 changed files with 1259 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proto/lib/config/config.proto
+1 -1
View File
@@ -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];
}
proto/lib/config/deviceconfiguration.proto
+1 -1
View File
@@ -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"];
proto/lib/db/structs.proto
+12
View File
@@ -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;
}