Update --list-shared-folders to only show folders (#1114)

* Update --list-shared-folders to only show folders
This commit is contained in:
abraunegg 2020-11-01 10:06:08 +11:00 committed by GitHub
parent b365ec6322
commit 106e114929
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5920,35 +5920,39 @@ final class SyncEngine
string sharedFolderName;
string sharedByName;
string sharedByEmail;
// Debug response output
log.vdebug("shared folder entry: ", searchResult);
sharedFolderName = searchResult["name"].str;
if ("sharedBy" in searchResult["remoteItem"]["shared"]) {
// we have shared by details we can use
if ("displayName" in searchResult["remoteItem"]["shared"]["sharedBy"]["user"]) {
sharedByName = searchResult["remoteItem"]["shared"]["sharedBy"]["user"]["displayName"].str;
// is the shared item with us a 'folder' ?
// we only handle folders, not files or other items
if (isItemFolder(searchResult)) {
// Debug response output
log.vdebug("shared folder entry: ", searchResult);
sharedFolderName = searchResult["name"].str;
// configure who this was shared by
if ("sharedBy" in searchResult["remoteItem"]["shared"]) {
// we have shared by details we can use
if ("displayName" in searchResult["remoteItem"]["shared"]["sharedBy"]["user"]) {
sharedByName = searchResult["remoteItem"]["shared"]["sharedBy"]["user"]["displayName"].str;
}
if ("email" in searchResult["remoteItem"]["shared"]["sharedBy"]["user"]) {
sharedByEmail = searchResult["remoteItem"]["shared"]["sharedBy"]["user"]["email"].str;
}
}
if ("email" in searchResult["remoteItem"]["shared"]["sharedBy"]["user"]) {
sharedByEmail = searchResult["remoteItem"]["shared"]["sharedBy"]["user"]["email"].str;
// Output query result
log.log("---------------------------------------");
log.log("Shared Folder: ", sharedFolderName);
if ((sharedByName != "") && (sharedByEmail != "")) {
log.log("Shared By: ", sharedByName, " (", sharedByEmail, ")");
} else {
if (sharedByName != "") {
log.log("Shared By: ", sharedByName);
}
}
}
// Output query result
log.log("---------------------------------------");
log.log("Shared Folder: ", sharedFolderName);
if ((sharedByName != "") && (sharedByEmail != "")) {
log.log("Shared By: ", sharedByName, " (", sharedByEmail, ")");
} else {
if (sharedByName != "") {
log.log("Shared By: ", sharedByName);
log.vlog("Item Id: ", searchResult["remoteItem"]["id"].str);
log.vlog("Parent Drive Id: ", searchResult["remoteItem"]["parentReference"]["driveId"].str);
if ("id" in searchResult["remoteItem"]["parentReference"]) {
log.vlog("Parent Item Id: ", searchResult["remoteItem"]["parentReference"]["id"].str);
}
}
log.vlog("Item Id: ", searchResult["remoteItem"]["id"].str);
log.vlog("Parent Drive Id: ", searchResult["remoteItem"]["parentReference"]["driveId"].str);
if ("id" in searchResult["remoteItem"]["parentReference"]) {
log.vlog("Parent Item Id: ", searchResult["remoteItem"]["parentReference"]["id"].str);
}
}
}
write("\n");