"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
filelu: migrate API calls to lib/rest
kingston125ae778f1413b3
diff --git a/backend/filelu/filelu_client.go b/backend/filelu/filelu_client.goindex beb9726ad..b1908969c 100644--- a/backend/filelu/filelu_client.go+++ b/backend/filelu/filelu_client.go@@ -1,9 +1,7 @@package fileluimport (- "bytes""context"- "encoding/json""fmt""io""net/http"@@ -72,37 +70,26 @@ func (f *Fs) completeMultipart(ctx context.Context, server string, uploadID stri// createFolder creates a folder at the specified path.func (f *Fs) createFolder(ctx context.Context, dirPath string) (*api.CreateFolderResponse, error) {encodedDir := f.fromStandardPath(dirPath)- apiURL := fmt.Sprintf("%s/folder/create?folder_path=%s&key=%s",- f.endpoint,- url.QueryEscape(encodedDir),- url.QueryEscape(f.opt.Key), // assuming f.opt.Key is the correct field- )- req, err := http.NewRequestWithContext(ctx, "GET", apiURL, nil)- if err != nil {- return nil, fmt.Errorf("failed to create request: %w", err)+ opts := rest.Opts{+ Method: "GET",+ Path: "/folder/create",+ Parameters: url.Values{+ "folder_path": {encodedDir},+ "key": {f.opt.Key},+ },}- var resp *http.Response- result := api.CreateFolderResponse{}- err = f.pacer.Call(func() (bool, error) {- var innerErr error- resp, innerErr = f.client.Do(req)- return fserrors.ShouldRetry(innerErr), innerErr+ var result api.CreateFolderResponse++ err := f.pacer.Call(func() (bool, error) {+ _, err := f.srv.CallJSON(ctx, &opts, nil, &result)+ return fserrors.ShouldRetry(err), err})if err != nil {return nil, fmt.Errorf("request failed: %w", err)}- defer func() {- if err := resp.Body.Close(); err != nil {- fs.Logf(nil, "Failed to close response body: %v", err)- }- }()- err = json.NewDecoder(resp.Body).Decode(&result)- if err != nil {- return nil, fmt.Errorf("error decoding response: %w", err)- }if result.Status != 200 {return nil, fmt.Errorf("error: %s", result.Msg)}@@ -114,44 +101,29 @@ func (f *Fs) createFolder(ctx context.Context, dirPath string) (*api.CreateFolde// getFolderList List both files and folders in a directory.func (f *Fs) getFolderList(ctx context.Context, path string) (*api.FolderListResponse, error) {encodedDir := f.fromStandardPath(path)- apiURL := fmt.Sprintf("%s/folder/list?folder_path=%s&key=%s",- f.endpoint,- url.QueryEscape(encodedDir),- url.QueryEscape(f.opt.Key),- )- var body []byte- err := f.pacer.Call(func() (bool, error) {- req, err := http.NewRequestWithContext(ctx, "GET", apiURL, nil)- if err != nil {- return false, fmt.Errorf("failed to create request: %w", err)- }+ opts := rest.Opts{+ Method: "GET",+ Path: "/folder/list",+ Parameters: url.Values{+ "folder_path": {encodedDir},+ "key": {f.opt.Key},+ },+ }- resp, err := f.client.Do(req)- if err != nil {- return shouldRetry(err), fmt.Errorf("failed to list directory: %w", err)- }- defer func() {- if err := resp.Body.Close(); err != nil {- fs.Logf(nil, "Failed to close response body: %v", err)- }- }()+ var response api.FolderListResponse- body, err = io.ReadAll(resp.Body)+ err := f.pacer.Call(func() (bool, error) {+ _, err := f.srv.CallJSON(ctx, &opts, nil, &response)if err != nil {- return false, fmt.Errorf("error reading response body: %w", err)+ return shouldRetry(err), fmt.Errorf("failed to list directory: %w", err)}-- return shouldRetryHTTP(resp.StatusCode), nil+ return false, nil})if err != nil {return nil, err}- var response api.FolderListResponse- if err := json.NewDecoder(bytes.NewReader(body)).Decode(&response); err != nil {- return nil, fmt.Errorf("error decoding response: %w", err)- }if response.Status != 200 {if strings.Contains(response.Msg, "Folder not found") {return nil, fs.ErrorDirNotFound@@ -168,42 +140,28 @@ func (f *Fs) getFolderList(ctx context.Context, path string) (*api.FolderListRes}return &response, nil-}// deleteFolder deletes a folder at the specified path.func (f *Fs) deleteFolder(ctx context.Context, fullPath string) error {fullPath = f.fromStandardPath(fullPath)- deleteURL := fmt.Sprintf("%s/folder/delete?folder_path=%s&key=%s",- f.endpoint,- url.QueryEscape(fullPath),- url.QueryEscape(f.opt.Key),- )++ opts := rest.Opts{+ Method: "GET",+ Path: "/folder/delete",+ Parameters: url.Values{+ "folder_path": {fullPath},+ "key": {f.opt.Key},+ },+ }delResp := api.DeleteFolderResponse{}+err := f.pacer.Call(func() (bool, error) {- req, err := http.NewRequestWithContext(ctx, "GET", deleteURL, nil)- if err != nil {- return false, err- }- resp, err := f.client.Do(req)+ _, err := f.srv.CallJSON(ctx, &opts, nil, &delResp)if err != nil {return fserrors.ShouldRetry(err), err}- defer func() {- if err := resp.Body.Close(); err != nil {- fs.Logf(nil, "Failed to close response body: %v", err)- }- }()-- body, err := io.ReadAll(resp.Body)- if err != nil {- return false, err- }-- if err := json.Unmarshal(body, &delResp); err != nil {- return false, fmt.Errorf("error decoding delete response: %w", err)- }if delResp.Status != 200 {return false, fmt.Errorf("delete error: %s", delResp.Msg)}@@ -220,38 +178,27 @@ func (f *Fs) deleteFolder(ctx context.Context, fullPath string) error {// getDirectLink of file from FileLu to download.func (f *Fs) getDirectLink(ctx context.Context, filePath string) (string, int64, error) {filePath = f.fromStandardPath(filePath)- apiURL := fmt.Sprintf("%s/file/direct_link?file_path=%s&key=%s",- f.endpoint,- url.QueryEscape(filePath),- url.QueryEscape(f.opt.Key),- )++ opts := rest.Opts{+ Method: "GET",+ Path: "/file/direct_link",+ Parameters: url.Values{+ "file_path": {filePath},+ "key": {f.opt.Key},+ },+ }result := api.FileDirectLinkResponse{}- err := f.pacer.Call(func() (bool, error) {- req, err := http.NewRequestWithContext(ctx, "GET", apiURL, nil)- if err != nil {- return false, fmt.Errorf("failed to create request: %w", err)- }- resp, err := f.client.Do(req)+ err := f.pacer.Call(func() (bool, error) {+ _, err := f.srv.CallJSON(ctx, &opts, nil, &result)if err != nil {return shouldRetry(err), fmt.Errorf("failed to fetch direct link: %w", err)}- defer func() {- if err := resp.Body.Close(); err != nil {- fs.Logf(nil, "Failed to close response body: %v", err)- }- }()-- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return false, fmt.Errorf("error decoding response: %w", err)- }-if result.Status != 200 {return false, fmt.Errorf("API error: %s", result.Msg)}-- return shouldRetryHTTP(resp.StatusCode), nil+ return false, nil})if err != nil {return "", 0, err@@ -263,39 +210,31 @@ func (f *Fs) getDirectLink(ctx context.Context, filePath string) (string, int64,// deleteFile deletes a file based on filePathfunc (f *Fs) deleteFile(ctx context.Context, filePath string) error {filePath = f.fromStandardPath(filePath)- apiURL := fmt.Sprintf("%s/file/remove?file_path=%s&key=%s",- f.endpoint,- url.QueryEscape(filePath),- url.QueryEscape(f.opt.Key),- )++ opts := rest.Opts{+ Method: "GET",+ Path: "/file/remove",+ Parameters: url.Values{+ "file_path": {filePath},+ "key": {f.opt.Key},+ },+ }result := api.DeleteFileResponse{}- err := f.pacer.Call(func() (bool, error) {- req, err := http.NewRequestWithContext(ctx, "GET", apiURL, nil)- if err != nil {- return false, fmt.Errorf("failed to create request: %w", err)- }- resp, err := f.client.Do(req)+ err := f.pacer.Call(func() (bool, error) {+ _, err := f.srv.CallJSON(ctx, &opts, nil, &result)if err != nil {- return shouldRetry(err), fmt.Errorf("failed to fetch direct link: %w", err)- }- defer func() {- if err := resp.Body.Close(); err != nil {- fs.Logf(nil, "Failed to close response body: %v", err)- }- }()-- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return false, fmt.Errorf("error decoding response: %w", err)+ return shouldRetry(err), fmt.Errorf("failed to delete file: %w", err)}if result.Status != 200 {return false, fmt.Errorf("API error: %s", result.Msg)}- return shouldRetryHTTP(resp.StatusCode), nil+ return false, nil})+return err}@@ -328,46 +267,28 @@ func (f *Fs) getAccountInfo(ctx context.Context) (*api.AccountInfoResponse, erro// getFileInfo retrieves file information based on file codefunc (f *Fs) getFileInfo(ctx context.Context, fileCode string) (*api.FileInfoResponse, error) {- u, _ := url.Parse(f.endpoint + "/file/info2")- q := u.Query()- q.Set("file_code", fileCode) // raw path — Go handles escaping properly here- q.Set("key", f.opt.Key)- u.RawQuery = q.Encode()- apiURL := f.endpoint + "/file/info2?" + u.RawQuery+ opts := rest.Opts{+ Method: "GET",+ Path: "/file/info2",+ Parameters: url.Values{+ "file_code": {fileCode},+ "key": {f.opt.Key},+ },+ }- var body []byte- err := f.pacer.Call(func() (bool, error) {- req, err := http.NewRequestWithContext(ctx, "GET", apiURL, nil)- if err != nil {- return false, fmt.Errorf("failed to create request: %w", err)- }+ result := api.FileInfoResponse{}- resp, err := f.client.Do(req)+ err := f.pacer.Call(func() (bool, error) {+ _, err := f.srv.CallJSON(ctx, &opts, nil, &result)if err != nil {return shouldRetry(err), fmt.Errorf("failed to fetch file info: %w", err)}- defer func() {- if err := resp.Body.Close(); err != nil {- fs.Logf(nil, "Failed to close response body: %v", err)- }- }()-- body, err = io.ReadAll(resp.Body)- if err != nil {- return false, fmt.Errorf("error reading response body: %w", err)- }-- return shouldRetryHTTP(resp.StatusCode), nil+ return false, nil})if err != nil {return nil, err}- result := api.FileInfoResponse{}-- if err := json.NewDecoder(bytes.NewReader(body)).Decode(&result); err != nil {- return nil, fmt.Errorf("error decoding response: %w", err)- }if result.Status != 200 || len(result.Result) == 0 {return nil, fs.ErrorObjectNotFounddiff --git a/backend/filelu/filelu_file_uploader.go b/backend/filelu/filelu_file_uploader.goindex 489d45faf..2b8d4ac39 100644--- a/backend/filelu/filelu_file_uploader.go+++ b/backend/filelu/filelu_file_uploader.go@@ -14,6 +14,7 @@ import ("strings""github.com/rclone/rclone/fs"+ "github.com/rclone/rclone/lib/rest")// multipartUpload uploads a file in fixed-size chunks using the multipart API.@@ -168,9 +169,15 @@ func (f *Fs) uploadFile(ctx context.Context, fileContent io.Reader, fileFullPathreturn nil}-// getUploadServer gets the upload server URL with proper key authenticationfunc (f *Fs) getUploadServer(ctx context.Context) (string, string, error) {- apiURL := fmt.Sprintf("%s/upload/server?key=%s", f.endpoint, url.QueryEscape(f.opt.Key))++ opts := rest.Opts{+ Method: "GET",+ Path: "/upload/server",+ Parameters: url.Values{+ "key": {f.opt.Key},+ },+ }var result struct {Status int `json:"status"`@@ -180,36 +187,21 @@ func (f *Fs) getUploadServer(ctx context.Context) (string, string, error) {}err := f.pacer.Call(func() (bool, error) {- req, err := http.NewRequestWithContext(ctx, "GET", apiURL, nil)- if err != nil {- return false, fmt.Errorf("failed to create request: %w", err)- }-- resp, err := f.client.Do(req)+ _, err := f.srv.CallJSON(ctx, &opts, nil, &result)if err != nil {return shouldRetry(err), fmt.Errorf("failed to get upload server: %w", err)}- defer func() {- if err := resp.Body.Close(); err != nil {- fs.Logf(nil, "Failed to close response body: %v", err)- }- }()-- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return false, fmt.Errorf("error decoding response: %w", err)- }-- if result.Status != 200 {- return false, fmt.Errorf("API error: %s", result.Msg)- }-- return shouldRetryHTTP(resp.StatusCode), nil+ return false, nil})if err != nil {return "", "", err}+ if result.Status != 200 {+ return "", "", fmt.Errorf("API error: %s", result.Msg)+ }+return result.Result, result.SessID, nil}diff --git a/backend/filelu/filelu_object.go b/backend/filelu/filelu_object.goindex edc2cff56..6665be767 100644--- a/backend/filelu/filelu_object.go+++ b/backend/filelu/filelu_object.go@@ -2,7 +2,6 @@ package fileluimport ("context"- "encoding/json""fmt""io""net/http"@@ -15,6 +14,7 @@ import ("github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/hash"+ "github.com/rclone/rclone/lib/rest")// Object describes a FileLu object@@ -194,8 +194,14 @@ func (o *Object) Hash(ctx context.Context, t hash.Type) (string, error) {return "", fmt.Errorf("no valid file code found in the remote path")}- apiURL := fmt.Sprintf("%s/file/info?file_code=%s&key=%s",- o.fs.endpoint, url.QueryEscape(fileCode), url.QueryEscape(o.fs.opt.Key))+ opts := rest.Opts{+ Method: "GET",+ Path: "/file/info",+ Parameters: url.Values{+ "file_code": {fileCode},+ "key": {o.fs.opt.Key},+ },+ }var result struct {Status int `json:"status"`@@ -204,29 +210,18 @@ func (o *Object) Hash(ctx context.Context, t hash.Type) (string, error) {Hash string `json:"hash"`} `json:"result"`}+err := o.fs.pacer.Call(func() (bool, error) {- req, err := http.NewRequestWithContext(ctx, "GET", apiURL, nil)- if err != nil {- return false, err- }- resp, err := o.fs.client.Do(req)+ _, err := o.fs.srv.CallJSON(ctx, &opts, nil, &result)if err != nil {return shouldRetry(err), err}- defer func() {- if err := resp.Body.Close(); err != nil {- fs.Logf(nil, "Failed to close response body: %v", err)- }- }()-- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return false, err- }- return shouldRetryHTTP(resp.StatusCode), nil+ return false, nil})if err != nil {return "", err}+if result.Status != 200 || len(result.Result) == 0 {return "", fmt.Errorf("error: unable to fetch hash: %s", result.Msg)}