Skip to content

Google drive fixes #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Google drive fixes #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c691612
Fix not populating file data from Google Drive
boris-petrov Jan 5, 2022
6c13da1
Fix not refreshing a file after it is changed
boris-petrov Jan 5, 2022
d9bb46b
Workaround issue with Google Drive files being unreadable after creation
boris-petrov Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions vfs-googledrive/src/main/java/com/sshtools/vfs/googledrive/GDriveFileObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,13 @@ protected void doAttach() throws IOException {
}
}
com.google.api.services.drive.Drive.Files.List request = null;
// TODO: figure out which fields are needed and add only those instead of using `*` below
if (path.equals("/")) {
/* Root */
request = drive.files().list().setQ("'root' in parents");
request = drive.files().list().setFields("*").setQ("'root' in parents");
} else if (file != null && "application/vnd.google-apps.folder".equals(file.getMimeType())) {
/* If this is known to be a directory, list the files in it */
request = drive.files().list().setQ(String.format("'%s' in parents", file.getId()));
request = drive.files().list().setFields("*").setQ(String.format("'%s' in parents", file.getId()));
}
if (request != null) {
children = new ArrayList<File>();
Expand Down Expand Up @@ -207,6 +208,17 @@ private long processTime(DateTime dateTime) {
return dateTime == null ? 0 : dateTime.getValue();
}

@Override
protected void onChange() throws IOException {
this.refresh();
try {
// TODO: not sure why this sleep is needed but without it creating a file by writing to it and
// then immediately trying to read it fails
Thread.sleep(1000);
} catch (InterruptedException exception) {
}
}

@Override
protected long doGetContentSize() throws Exception {
return file == null ? 0 : (file.getSize() == null ? 0 : file.getSize().longValue());
Expand Down