Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

dropbox: preserve Paper export paths on lookup - fixes #9691

Loi Nguyen8c8062da782e
diff --git a/backend/dropbox/dropbox.go b/backend/dropbox/dropbox.go
index 11a3360ac..fb34b02cb 100644
--- a/backend/dropbox/dropbox.go
+++ b/backend/dropbox/dropbox.go
@@ -693,7 +693,7 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (fs.Fs, e
// See if the root is actually an object
if f.root != "" {
- _, err = f.getFileMetadata(ctx, f.slashRoot)
+ _, _, err = f.getFileMetadata(ctx, f.slashRoot)
if err == nil {
newRoot := path.Dir(f.root)
if newRoot == "." {
@@ -728,9 +728,10 @@ func (f *Fs) setRoot(root string) {
}
type getMetadataResult struct {
- entry files.IsMetadata
- notFound bool
- err error
+ entry files.IsMetadata
+ remoteIsExportPath bool
+ notFound bool
+ err error
}
// getMetadata gets the metadata for a file or directory
@@ -779,6 +780,7 @@ func (f *Fs) getMetadataForExt(ctx context.Context, filePath string, wantExportE
ch <- getMetadataResult{notFound: true}
return
}
+ res.remoteIsExportPath = true
}
// Return our real result or error
@@ -824,7 +826,7 @@ func (f *Fs) possibleMetadatas(ctx context.Context, filePath string) (ret []<-ch
}
// getFileMetadata gets the metadata for a file
-func (f *Fs) getFileMetadata(ctx context.Context, filePath string) (*files.FileMetadata, error) {
+func (f *Fs) getFileMetadata(ctx context.Context, filePath string) (*files.FileMetadata, bool, error) {
var res getMetadataResult
// Try all possible metadatas
@@ -833,7 +835,7 @@ func (f *Fs) getFileMetadata(ctx context.Context, filePath string) (*files.FileM
res = <-ch
if res.err != nil {
- return nil, res.err
+ return nil, false, res.err
}
if !res.notFound {
break
@@ -841,17 +843,17 @@ func (f *Fs) getFileMetadata(ctx context.Context, filePath string) (*files.FileM
}
if res.notFound {
- return nil, fs.ErrorObjectNotFound
+ return nil, false, fs.ErrorObjectNotFound
}
fileInfo, ok := res.entry.(*files.FileMetadata)
if !ok {
if _, ok = res.entry.(*files.FolderMetadata); ok {
- return nil, fs.ErrorIsDir
+ return nil, false, fs.ErrorIsDir
}
- return nil, fs.ErrorNotAFile
+ return nil, false, fs.ErrorNotAFile
}
- return fileInfo, nil
+ return fileInfo, res.remoteIsExportPath, nil
}
// getDirMetadata gets the metadata for a directory
@@ -1851,7 +1853,7 @@ func (o *Object) Size() int64 {
return o.bytes
}
-func (o *Object) setMetadataForExport(info *files.FileMetadata) {
+func (o *Object) setMetadataForExport(info *files.FileMetadata, remoteIsExportPath bool) {
o.bytes = -1
o.hash = ""
@@ -1872,8 +1874,10 @@ func (o *Object) setMetadataForExport(info *files.FileMetadata) {
o.exportType = exportExportable
// get rid of any paper extension, if present
o.remote = strings.TrimSuffix(o.remote, paperExtension)
- // add the export extension
- o.remote += "." + string(exportExt)
+ if !remoteIsExportPath {
+ // add the export extension
+ o.remote += "." + string(exportExt)
+ }
}
}
@@ -1881,19 +1885,23 @@ func (o *Object) setMetadataForExport(info *files.FileMetadata) {
//
// This isn't a complete set of metadata and has an inaccurate date
func (o *Object) setMetadataFromEntry(info *files.FileMetadata) error {
+ return o.setMetadataFromEntryWithExportPath(info, false)
+}
+
+func (o *Object) setMetadataFromEntryWithExportPath(info *files.FileMetadata, remoteIsExportPath bool) error {
o.id = info.Id
o.bytes = int64(info.Size)
o.modTime = time.Time(info.ClientModified)
o.hash = info.ContentHash
if !info.IsDownloadable {
- o.setMetadataForExport(info)
+ o.setMetadataForExport(info, remoteIsExportPath)
}
return nil
}
// Reads the entry for a file from dropbox
-func (o *Object) readEntry(ctx context.Context) (*files.FileMetadata, error) {
+func (o *Object) readEntry(ctx context.Context) (*files.FileMetadata, bool, error) {
return o.fs.getFileMetadata(ctx, o.remotePath())
}
@@ -1903,11 +1911,11 @@ func (o *Object) readEntryAndSetMetadata(ctx context.Context) error {
if !o.modTime.IsZero() {
return nil
}
- entry, err := o.readEntry(ctx)
+ entry, remoteIsExportPath, err := o.readEntry(ctx)
if err != nil {
return err
}
- return o.setMetadataFromEntry(entry)
+ return o.setMetadataFromEntryWithExportPath(entry, remoteIsExportPath)
}
// Returns the remote path for the object
diff --git a/backend/dropbox/dropbox_internal_test.go b/backend/dropbox/dropbox_internal_test.go
index 431660ab3..99130c155 100644
--- a/backend/dropbox/dropbox_internal_test.go
+++ b/backend/dropbox/dropbox_internal_test.go
@@ -8,11 +8,33 @@ import (
"github.com/dropbox/dropbox-sdk-go-unofficial/v6/dropbox"
"github.com/dropbox/dropbox-sdk-go-unofficial/v6/dropbox/files"
+ "github.com/rclone/rclone/fs"
"github.com/rclone/rclone/fstest/fstests"
+ "github.com/rclone/rclone/lib/pacer"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
+type paperMetadataClient struct {
+ files.Client
+ info *files.FileMetadata
+}
+
+func (c paperMetadataClient) GetMetadata(arg *files.GetMetadataArg) (files.IsMetadata, error) {
+ if arg.Path == "document" {
+ return c.info, nil
+ }
+ return nil, files.GetMetadataAPIError{
+ APIError: dropbox.APIError{ErrorSummary: "path/not_found/"},
+ EndpointError: &files.GetMetadataError{
+ Tagged: dropbox.Tagged{Tag: files.GetMetadataErrorPath},
+ Path: &files.LookupError{
+ Tagged: dropbox.Tagged{Tag: files.LookupErrorNotFound},
+ },
+ },
+ }
+}
+
func TestInternalCheckPathLength(t *testing.T) {
rep := func(n int, r rune) (out string) {
rs := make([]rune, n)
@@ -50,6 +72,30 @@ func TestInternalCheckPathLength(t *testing.T) {
}
}
+func TestPaperExportRemote(t *testing.T) {
+ ctx := context.Background()
+ info := &files.FileMetadata{
+ ExportInfo: &files.ExportInfo{ExportAs: "markdown"},
+ }
+ f := &Fs{
+ exportExts: []exportExtension{"md"},
+ pacer: fs.NewPacer(ctx, pacer.NewDefault()),
+ srv: paperMetadataClient{info: info},
+ }
+
+ direct, err := f.NewObject(ctx, "document.md")
+ require.NoError(t, err)
+ assert.Equal(t, "document.md", direct.Remote())
+
+ listed, err := f.newObjectWithInfo(ctx, "document.md", info)
+ require.NoError(t, err)
+ assert.Equal(t, "document.md.md", listed.Remote())
+
+ legacy, err := f.newObjectWithInfo(ctx, "document.paper", info)
+ require.NoError(t, err)
+ assert.Equal(t, "document.md", legacy.Remote())
+}
+
func (f *Fs) importPaperForTest(t *testing.T) {
content := `# test doc