@pipedream/google_drive 0.6.14 → 0.6.16

package/actions/upload-file/upload-file.mjs

@@ -10,7 +10,7 @@ export default {
   key: "google_drive-upload-file",
   name: "Upload File",
   description: "Copy an existing file to Google Drive. [See the docs](https://developers.google.com/drive/api/v3/manage-uploads) for more information",
-  version: "0.1.2",
+  version: "0.1.3",
   type: "action",
   props: {
     googleDrive,
@@ -69,26 +69,14 @@ export default {
       default: GOOGLE_DRIVE_UPLOAD_TYPE_MULTIPART,
       optional: true,
     },
-    replaceFile: {
-      type: "boolean",
-      label: "Replace File",
-      description: "Whether should replace file case it exists, default: `false`",
+    fileId: {
+      propDefinition: [
+        googleDrive,
+        "fileId",
+      ],
+      label: "File to replace",
+      description: "Id of the file to replace. Leave it empty to upload a new file.",
       optional: true,
-      default: false,
-    },
-  },
-  methods: {
-    async getFileIdForReplace(filename, parentId) {
-      if (this.replaceFile) {
-        const { files } = await this.googleDrive.listFilesInPage(null, {
-          q: `name = '${filename}' and '${parentId || "root"}' in parents and trashed = false`,
-          fields: "files/id,files/name,files/parents",
-        });
-        if (files.length) {
-          return files[0].id;
-        }
-      }
-      return null;
     },
   },
   async run({ $ }) {
@@ -106,7 +94,6 @@ export default {
     const driveId = this.googleDrive.getDriveId(this.drive);
 
     const filename = name || path.basename(fileUrl || filePath);
-    const fileId = await this.getFileIdForReplace(filename, parentId);
 
     const file = await getFileStream({
       $,
@@ -116,12 +103,12 @@ export default {
     console.log(`Upload type: ${uploadType}.`);
 
     let result = null;
-    if (fileId) {
-      await this.googleDrive.updateFileMedia(fileId, file, omitEmptyStringValues({
+    if (this.fileId) {
+      await this.googleDrive.updateFileMedia(this.fileId, file, omitEmptyStringValues({
         mimeType,
         uploadType,
       }));
-      result = await this.googleDrive.updateFile(fileId, omitEmptyStringValues({
+      result = await this.googleDrive.updateFile(this.fileId, omitEmptyStringValues({
         name: filename,
         mimeType,
         uploadType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/google_drive",
-  "version": "0.6.14",
+  "version": "0.6.16",
   "description": "Pipedream Google_drive Components",
   "main": "google_drive.app.mjs",
   "keywords": [

package/sources/new-or-modified-files/new-or-modified-files.mjs

@@ -21,11 +21,38 @@ export default {
   key: "google_drive-new-or-modified-files",
   name: "New or Modified Files",
   description: "Emit new event any time any file in your linked Google Drive is added, modified, or deleted",
-  version: "0.1.3",
+  version: "0.2.0",
   type: "source",
   // Dedupe events based on the "x-goog-message-number" header for the target channel:
   // https://developers.google.com/drive/api/v3/push#making-watch-requests
   dedupe: "unique",
+  props: {
+    ...common.props,
+    folders: {
+      type: "string[]",
+      label: "Folders",
+      description:
+        "(Optional) The folders you want to watch for changes. Leave blank to watch for any new file in the Drive.",
+      optional: true,
+      default: [],
+      options({ prevContext }) {
+        const { nextPageToken } = prevContext;
+        const baseOpts = {
+          q: "mimeType = 'application/vnd.google-apps.folder' and trashed = false",
+        };
+        const opts = this.isMyDrive()
+          ? baseOpts
+          : {
+            ...baseOpts,
+            corpora: "drive",
+            driveId: this.getDriveId(),
+            includeItemsFromAllDrives: true,
+            supportsAllDrives: true,
+          };
+        return this.googleDrive.listFilesOptions(nextPageToken, opts);
+      },
+    },
+  },
   hooks: {
     async deploy() {
       const daysAgo = new Date();
@@ -45,6 +72,15 @@ export default {
   },
   methods: {
     ...common.methods,
+    shouldProcess(file) {
+      if (file.mimeType !== "application/vnd.google-apps.folder") {
+        const watchedFolders = new Set(this.folders);
+        return (
+          watchedFolders.size == 0 ||
+          (file.parents && file.parents.some((p) => watchedFolders.has(p)))
+        );
+      }
+    },
     getUpdateTypes() {
       return [
         GOOGLE_DRIVE_NOTIFICATION_ADD,
@@ -86,6 +122,17 @@ export default {
       const changes = await this.getChanges(headers);
 
       for (const file of changedFiles) {
+        file.parents = (await this.googleDrive.getFile(file.id, {
+          fields: "parents",
+        })).parents;
+
+        console.log(file); // see what file was processed
+
+        if (!this.shouldProcess(file)) {
+          console.log(`Skipping file ${file.name}`);
+          continue;
+        }
+
         const eventToEmit = {
           file,
           ...changes,