extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-29 20:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

onedrive: graph: Refine config handling

Browse Source
This commit is contained in:
Cnly 2018-08-21 10:50:17 +08:00 committed by Nick Craig-Wood
parent 1749fb8ebf
commit 85e0839c8b
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
backend/onedrive/onedrive.go
View File

@ -224,6 +224,16 @@ func init() {
Help: "Chunk size to upload files with - must be multiple of 320k.", Help: "Chunk size to upload files with - must be multiple of 320k.",
Default: fs.SizeSuffix(10 * 1024 * 1024), Default: fs.SizeSuffix(10 * 1024 * 1024),
Advanced: true, Advanced: true,
}, {
Name: "drive_id",
Help: "The ID of the drive to use",
Default: "",
Advanced: true,
}, {
Name: "drive_type",
Help: "The type of the drive ( personal | business | documentLibrary )",
Default: "",
Advanced: true,
}}, }},
}) })
} }
@ -231,6 +241,8 @@ func init() {
// Options defines the configuration for this backend // Options defines the configuration for this backend
type Options struct { type Options struct {
ChunkSize fs.SizeSuffix `config:"chunk_size"` ChunkSize fs.SizeSuffix `config:"chunk_size"`
DriveID string `config:"drive_id"`
DriveType string `config:"drive_type"`
} }
// Fs represents a remote one drive // Fs represents a remote one drive
@ -360,9 +372,9 @@ func NewFs(name, root string, m configmap.Mapper) (fs.Fs, error) {
return nil, errors.Errorf("chunk size %d is not a multiple of 320k", opt.ChunkSize) return nil, errors.Errorf("chunk size %d is not a multiple of 320k", opt.ChunkSize)
} }
// get the graphID part from the config file if opt.DriveID == "" || opt.DriveType == "" {
driveID := config.FileGet(name, configDriveID, "") log.Fatalf("Unable to get drive_id and drive_type. If you are upgrading from older versions of rclone, please run `rclone config` and re-configure this backend.")
driveType := config.FileGet(name, configDriveType) }
root = parsePath(root) root = parsePath(root)
oAuthClient, ts, err := oauthutil.NewClient(name, m, oauthConfig) oAuthClient, ts, err := oauthutil.NewClient(name, m, oauthConfig)
@ -374,9 +386,9 @@ func NewFs(name, root string, m configmap.Mapper) (fs.Fs, error) {
name: name, name: name,
root: root, root: root,
opt: *opt, opt: *opt,
driveID: driveID, driveID: opt.DriveID,
driveType: driveType, driveType: opt.DriveType,
srv: rest.NewClient(oAuthClient).SetRoot(graphURL + "/drives/" + driveID), srv: rest.NewClient(oAuthClient).SetRoot(graphURL + "/drives/" + opt.DriveID),
pacer: pacer.New().SetMinSleep(minSleep).SetMaxSleep(maxSleep).SetDecayConstant(decayConstant), pacer: pacer.New().SetMinSleep(minSleep).SetMaxSleep(maxSleep).SetDecayConstant(decayConstant),
} }
f.features = (&fs.Features{ f.features = (&fs.Features{