diff options
Diffstat (limited to 'backends/cloud/googledrive')
5 files changed, 19 insertions, 11 deletions
diff --git a/backends/cloud/googledrive/googledrivecreatedirectoryrequest.cpp b/backends/cloud/googledrive/googledrivecreatedirectoryrequest.cpp index 213f030c26..1554fef200 100644 --- a/backends/cloud/googledrive/googledrivecreatedirectoryrequest.cpp +++ b/backends/cloud/googledrive/googledrivecreatedirectoryrequest.cpp @@ -45,8 +45,6 @@ void GoogleDriveCreateDirectoryRequest::start() { _ignoreCallback = true; if (_workingRequest) _workingRequest->finish(); _workingRequest = nullptr; - _currentDirectory = ""; - _currentDirectoryId = "appDataFolder"; _ignoreCallback = false; //find out the parent id diff --git a/backends/cloud/googledrive/googledrivecreatedirectoryrequest.h b/backends/cloud/googledrive/googledrivecreatedirectoryrequest.h index 0ac178e8a6..6c5ccddf6c 100644 --- a/backends/cloud/googledrive/googledrivecreatedirectoryrequest.h +++ b/backends/cloud/googledrive/googledrivecreatedirectoryrequest.h @@ -37,8 +37,6 @@ class GoogleDriveCreateDirectoryRequest: public Networking::Request { Common::String _requestedDirectoryName; GoogleDriveStorage *_storage; Storage::BoolCallback _boolCallback; - Common::String _currentDirectory; - Common::String _currentDirectoryId; Request *_workingRequest; bool _ignoreCallback; diff --git a/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp b/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp index 0915b623f3..f7aa7a1c0c 100644 --- a/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp +++ b/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp @@ -55,7 +55,8 @@ void GoogleDriveListDirectoryByIdRequest::start() { } void GoogleDriveListDirectoryByIdRequest::makeRequest(Common::String pageToken) { - Common::String url = "https://www.googleapis.com/drive/v3/files?spaces=appDataFolder"; + Common::String url = "https://www.googleapis.com/drive/v3/files?spaces=drive&fields=files%28id,mimeType,modifiedTime,name,size%29,nextPageToken"; + //files(id,mimeType,modifiedTime,name,size),nextPageToken if (pageToken != "") url += "&pageToken=" + pageToken; url += "&q=%27" + _requestedId + "%27+in+parents"; @@ -66,6 +67,17 @@ void GoogleDriveListDirectoryByIdRequest::makeRequest(Common::String pageToken) _workingRequest = ConnMan.addRequest(request); } +namespace { +uint64 atoull(Common::String s) { + uint64 result = 0; + for (uint32 i = 0; i < s.size(); ++i) { + if (s[i] < '0' || s[i] > '9') break; + result = result * 10L + (s[i] - '0'); + } + return result; +} +} + void GoogleDriveListDirectoryByIdRequest::responseCallback(Networking::JsonResponse response) { _workingRequest = nullptr; if (_ignoreCallback) return; @@ -100,10 +112,10 @@ void GoogleDriveListDirectoryByIdRequest::responseCallback(Networking::JsonRespo Common::String name = item.getVal("name")->asString(); bool isDirectory = (item.getVal("mimeType")->asString() == "application/vnd.google-apps.folder"); uint32 size = 0, timestamp = 0; - if (!isDirectory) { - size = item.getVal("size")->asIntegerNumber(); + if (item.contains("size") && item.getVal("size")->isString()) + size = atoull(item.getVal("size")->asString()); + if (item.contains("modifiedTime") && item.getVal("modifiedTime")->isString()) timestamp = ISO8601::convertToTimestamp(item.getVal("modifiedTime")->asString()); - } _files.push_back(StorageFile(path, name, size, timestamp, isDirectory)); } } diff --git a/backends/cloud/googledrive/googledriveresolveidrequest.cpp b/backends/cloud/googledrive/googledriveresolveidrequest.cpp index 0ef0cd982f..a9adb82969 100644 --- a/backends/cloud/googledrive/googledriveresolveidrequest.cpp +++ b/backends/cloud/googledrive/googledriveresolveidrequest.cpp @@ -50,7 +50,7 @@ void GoogleDriveResolveIdRequest::start() { if (_workingRequest) _workingRequest->finish(); _workingRequest = nullptr; _currentDirectory = ""; - _currentDirectoryId = "appDataFolder"; + _currentDirectoryId = "root"; _ignoreCallback = false; listNextDirectory(StorageFile(_currentDirectoryId, 0, 0, true)); diff --git a/backends/cloud/googledrive/googledrivestorage.cpp b/backends/cloud/googledrive/googledrivestorage.cpp index 3c85b1f074..dce35b5904 100644 --- a/backends/cloud/googledrive/googledrivestorage.cpp +++ b/backends/cloud/googledrive/googledrivestorage.cpp @@ -316,7 +316,7 @@ Networking::Request *GoogleDriveStorage::createDirectory(Common::String path, Bo } if (parentPath == "") { - return createDirectoryWithParentId("appDataFolder", directoryName, callback, errorCallback); + return createDirectoryWithParentId("root", directoryName, callback, errorCallback); } return addRequest(new GoogleDriveCreateDirectoryRequest(this, parentPath, directoryName, callback, errorCallback)); @@ -379,7 +379,7 @@ Common::String GoogleDriveStorage::getAuthLink() { url += "&redirect_uri=http://localhost"; //that's for copy-pasting //url += "&redirect_uri=http%3A%2F%2Flocalhost"; //that's "http://localhost" for automatic opening url += "&client_id="; url += KEY; - url += "&scope=https://www.googleapis.com/auth/drive.appfolder"; //for copy-pasting + url += "&scope=https://www.googleapis.com/auth/drive"; //for copy-pasting return url; } |