octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-04 04:48:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(model): correct type of fileInfoType in API browse response (fixes #9904) (#9905)

Browse Source 
This was broken in the Protobuf refactor. The reason is that with the
previous library, generated types would have a JSON marshalling method
that would automatically return strings for enums. In the current
library you need to use the jsonpb marshaller for that, but these are
hand crafted structs so we can't do that. The easy solution is to just
use strings directly, since this is an API-only type anyway.
This commit is contained in:
Jakob Borg 2025-01-08 11:08:33 +01:00 committed by GitHub
parent dcd280e6e2
commit 74ffb85467
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/model/model.go
View File

@ -2732,11 +2732,11 @@ func (m *model) Revert(folder string) {
} }
type TreeEntry struct { type TreeEntry struct {
Name string `json:"name"` Name string `json:"name"`
ModTime time.Time `json:"modTime"` ModTime time.Time `json:"modTime"`
Size int64 `json:"size"` Size int64 `json:"size"`
Type protocol.FileInfoType `json:"type"` Type string `json:"type"`
Children []*TreeEntry `json:"children,omitempty"` Children []*TreeEntry `json:"children,omitempty"`
} }
func findByName(slice []*TreeEntry, name string) *TreeEntry { func findByName(slice []*TreeEntry, name string) *TreeEntry {
@ -2804,7 +2804,7 @@ func (m *model) GlobalDirectoryTree(folder, prefix string, levels int, dirsOnly
parent.Children = append(parent.Children, &TreeEntry{ parent.Children = append(parent.Children, &TreeEntry{
Name: base, Name: base,
Type: f.Type, Type: f.Type.String(),
ModTime: f.ModTime(), ModTime: f.ModTime(),
Size: f.FileSize(), Size: f.FileSize(),
}) })

4
lib/model/model_test.go
View File

@ -1729,7 +1729,7 @@ func TestGlobalDirectoryTree(t *testing.T) {
Name: name, Name: name,
ModTime: time.Unix(0x666, 0), ModTime: time.Unix(0x666, 0),
Size: 0xa, Size: 0xa,
Type: protocol.FileInfoTypeFile, Type: protocol.FileInfoTypeFile.String(),
} }
} }
d := func(name string, entries ...*TreeEntry) *TreeEntry { d := func(name string, entries ...*TreeEntry) *TreeEntry {
@ -1737,7 +1737,7 @@ func TestGlobalDirectoryTree(t *testing.T) {
Name: name, Name: name,
ModTime: time.Unix(0x666, 0), ModTime: time.Unix(0x666, 0),
Size: 128, Size: 128,
Type: protocol.FileInfoTypeDirectory, Type: protocol.FileInfoTypeDirectory.String(),
Children: entries, Children: entries,
} }
} }