github/rclone
1
Fork 0
mirror of https://github.com/rclone/rclone synced 2025-01-18 23:47:30 +01:00
Code Releases Activity

jottacloud: return direct download link from rclone link command

Browse Source 
If the shared path is a directory, then the download will be a zip archive.

Fixes #5391

See #5399
This commit is contained in:
albertony 2021-06-10 19:44:11 +02:00
parent 78db3dba0e
commit b868561951
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/jottacloud/api/types.go
View File

@ -368,6 +368,7 @@ type JottaFile struct {
XMLName xml.Name XMLName xml.Name
Name string `xml:"name,attr"` Name string `xml:"name,attr"`
Deleted Flag `xml:"deleted,attr"` Deleted Flag `xml:"deleted,attr"`
PublicURI string `xml:"publicURI"`
PublicSharePath string `xml:"publicSharePath"` PublicSharePath string `xml:"publicSharePath"`
State string `xml:"currentRevision>state"` State string `xml:"currentRevision>state"`
CreatedAt Time `xml:"currentRevision>created"` CreatedAt Time `xml:"currentRevision>created"`

18
backend/jottacloud/jottacloud.go
View File

@ -1261,15 +1261,23 @@ func (f *Fs) PublicLink(ctx context.Context, remote string, expire fs.Duration,
return "", errors.Wrap(err, "couldn't create public link") return "", errors.Wrap(err, "couldn't create public link")
} }
if unlink { if unlink {
if result.PublicSharePath != "" { if result.PublicURI != "" {
return "", errors.Errorf("couldn't remove public link - %q", result.PublicSharePath) return "", errors.Errorf("couldn't remove public link - %q", result.PublicURI)
} }
return "", nil return "", nil
} }
if result.PublicSharePath == "" { if result.PublicURI == "" {
return "", errors.New("couldn't create public link - no link path received") return "", errors.New("couldn't create public link - no uri received")
} }
return joinPath(baseURL, result.PublicSharePath), nil if result.PublicSharePath != "" {
webLink := joinPath(baseURL, result.PublicSharePath)
fs.Debugf(nil, "Web link: %s", webLink)
} else {
fs.Debugf(nil, "No web link received")
}
directLink := joinPath(baseURL, fmt.Sprintf("opin/io/downloadPublic/%s/%s", f.user, result.PublicURI))
fs.Debugf(nil, "Direct link: %s", directLink)
return directLink, nil
} }
// About gets quota information // About gets quota information