alexvanin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

protondrive: fix missing file sha1 and appstring issues (#7163)

Browse source
This commit is contained in:
Chun-Hung Tseng 2023-07-24 08:56:21 +02:00 committed by GitHub
parent 70cbcef624
commit 1845c261c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
backend/protondrive/protondrive.go
View file

@ -7,7 +7,6 @@ import (
"io" "io"
"log" "log"
"path" "path"
"runtime"
"strings" "strings"
"time" "time"
@ -48,29 +47,12 @@ const (
var ( var (
ErrCanNotUploadFileWithUnknownSize = errors.New("proton Drive can't upload files with unknown size") ErrCanNotUploadFileWithUnknownSize = errors.New("proton Drive can't upload files with unknown size")
ErrCanNotPurgeRootDirectory = errors.New("can't purge root directory") ErrCanNotPurgeRootDirectory = errors.New("can't purge root directory")
ErrFileSHA1Missing = errors.New("file sha1 digest not found")
// for the auth/deauth handler // for the auth/deauth handler
_mapper configmap.Mapper _mapper configmap.Mapper
_saltedKeyPass string _saltedKeyPass string
) )
func getAPIOS() string {
switch runtime.GOOS {
case "darwin":
return "macos"
case "linux":
return "linux"
case "windows":
return "windows"
default:
return "linux"
}
}
// Register with Fs // Register with Fs
func init() { func init() {
fs.Register(&fs.RegInfo{ fs.Register(&fs.RegInfo{
@ -117,12 +99,9 @@ size, will fail to operate properly`,
The app version string indicates the client that is currently performing The app version string indicates the client that is currently performing
the API request. This information is required and will be sent with every the API request. This information is required and will be sent with every
API request. API request.`,
Looks like using [OS]-drive (e.g. windows-drive) prefix will spare us from
getting aggressive human verification blocking.`,
Advanced: true, Advanced: true,
Default: getAPIOS() + "-drive@1.0.0-alpha.1+rclone", Default: "macos-drive@1.0.0-alpha.1+rclone",
}, { }, {
Name: "replace_existing_draft", Name: "replace_existing_draft",
Help: `Create a new revision when filename conflict is detected Help: `Create a new revision when filename conflict is detected
@ -810,7 +789,8 @@ func (o *Object) Hash(ctx context.Context, t hash.Type) (string, error) {
} }
if fileSystemAttrs == nil || fileSystemAttrs.Digests == "" { if fileSystemAttrs == nil || fileSystemAttrs.Digests == "" {
return "", ErrFileSHA1Missing fs.Debugf(o, "file sha1 digest missing")
return "", nil
} }
return fileSystemAttrs.Digests, nil return fileSystemAttrs.Digests, nil
} }