add subfolders support - both encrypted and normal

anadius · Jun 15, 2020 · a1ff8d1 · a1ff8d1
1 parent 9ee57df
commit a1ff8d1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/main.obf.js b/main.obf.js
diff --git a/templates/decrypt.php.template b/templates/decrypt.php.template
@@ -32,7 +32,7 @@ function decode($encoded) {
 
 /* END OF DECRYPT FUNCTIONS */
 
-$VERSION = 3;
+$VERSION = 4;
 
 function fail($reason, $status = 400) {
     global $VERSION;
@@ -99,9 +99,9 @@ $info = function($data) {
         $folderContents = apiRequest(
             $data['auth'],
             'files?q="' . $folderId . '"+in+parents'
-            . '+and+mimeType+!%3D+"application%2Fvnd.google-apps.folder"'
-            . '&fields=files(id,size,name,mimeType,md5Checksum,shortcutDetails/*)'
-            . '&orderBy=name_natural&supportsAllDrives=true&includeItemsFromAllDrives=true&pageSize=1000'
+            . '&fields=nextPageToken,files(id,size,name,mimeType,md5Checksum,shortcutDetails/*)'
+            . '&orderBy=name_natural&supportsAllDrives=true&includeItemsFromAllDrives=true&pageSize=100'
+            . (isset($data['pageToken']) ? '&pageToken=' . $data['pageToken'] : '')
         );
     }
     // if it's shortcut/file, set notLoaded to true and grab the info later
@@ -138,6 +138,10 @@ $info = function($data) {
         }
 
         if(isset($file['notLoaded']) && $file['notLoaded'] === TRUE) {
+            // ignore shortcuts to folders
+            if($file['mimeType'] === 'application/vnd.google-apps.folder') {
+                continue;
+            }
             $fileInfo = apiRequest(
                 $data['auth'],
                 'files/' . $file['id'] . '?supportsAllDrives=true&fields=size,md5Checksum'

diff --git a/templates/worker.js.template b/templates/worker.js.template
@@ -19,7 +19,7 @@ const CORS_HEADERS = {
 const DEFAULT_HEADERS = Object.assign({
   "Content-Type": "application/json"
 }, CORS_HEADERS);
-const VERSION = 3;
+const VERSION = 4;
 
 addEventListener("fetch", event => {
   event.respondWith(handleRequest(event.request))
@@ -82,9 +82,9 @@ async function info(data) {
     folderContents = await apiRequest(
       data.auth,
       `files?q="${folderId}"+in+parents`
-      + "+and+mimeType+!%3D+'application%2Fvnd.google-apps.folder'"
-      + "&fields=files(id,size,name,mimeType,md5Checksum,shortcutDetails/*)"
-      + "&orderBy=name_natural&supportsAllDrives=true&includeItemsFromAllDrives=true&pageSize=1000"
+      + "&fields=nextPageToken,files(id,size,name,mimeType,md5Checksum,shortcutDetails/*)"
+      + "&orderBy=name_natural&supportsAllDrives=true&includeItemsFromAllDrives=true&pageSize=100"
+      + (typeof data.pageToken !== "undefined" ? `&pageToken=${data.pageToken}` : '')
     );
   }
   // if it's shortcut/file, set notLoaded to true and grab the info later
@@ -122,6 +122,10 @@ async function info(data) {
 
     let fileInfo;
     if(file.notLoaded === true) {
+      // ignore shortcuts to folders
+      if(file.mimeType === "application/vnd.google-apps.folder") {
+        continue;
+      }
       fileInfo = await this.apiRequest(
         data.auth,
         `files/${file.id}?supportsAllDrives=true&fields=size,md5Checksum`