gdrive-syncer 2.2.0 → 3.1.0

package/src/gdriveCmd.js

@@ -0,0 +1,301 @@
+#!/usr/bin/env node
+
+const shell = require('shelljs');
+
+let cachedVersion = null;
+
+/**
+ * Detect gdrive version (2 or 3)
+ * gdrive@2: "gdrive v2.1.1"
+ * gdrive@3: "gdrive 3.9.1 ..."
+ */
+const detectVersion = () => {
+  if (cachedVersion !== null) {
+    return cachedVersion;
+  }
+
+  const result = shell.exec('gdrive version', { silent: true });
+  if (result.code !== 0) {
+    // Try gdrive about as fallback (gdrive@2)
+    const aboutResult = shell.exec('gdrive about', { silent: true });
+    if (aboutResult.code === 0) {
+      cachedVersion = 2;
+      return cachedVersion;
+    }
+    throw new Error('gdrive not found. Please install gdrive CLI.');
+  }
+
+  const output = result.stdout.toLowerCase();
+  // gdrive@3 outputs: "gdrive 3.x.x ..."
+  // gdrive@2 outputs: "gdrive v2.x.x"
+  if (output.includes('v2.') || output.includes('gdrive 2.')) {
+    cachedVersion = 2;
+  } else if (output.match(/gdrive\s+3\./)) {
+    cachedVersion = 3;
+  } else {
+    // Default to 3 for newer versions
+    cachedVersion = 3;
+  }
+
+  return cachedVersion;
+};
+
+/**
+ * Get the detected gdrive version
+ */
+const getVersion = () => detectVersion();
+
+/**
+ * Check if sync commands are available (only in gdrive@2)
+ */
+const hasSyncSupport = () => detectVersion() === 2;
+
+/**
+ * List files in Google Drive
+ * @param {Object} options
+ * @param {string} options.query - Search query
+ * @param {number} options.max - Max results
+ * @param {boolean} options.noHeader - Skip header row
+ * @param {boolean} options.absolute - Show absolute paths (v2 only)
+ * @param {string} options.parent - Parent folder ID (v3 only, alternative to query)
+ */
+const list = (options = {}) => {
+  const version = detectVersion();
+  const { query, max = 30, noHeader = false, absolute = false, parent } = options;
+
+  let cmd;
+  if (version === 2) {
+    cmd = 'gdrive list';
+    if (max) cmd += ` --max ${max}`;
+    if (query) cmd += ` --query "${query}"`;
+    if (noHeader) cmd += ' --no-header';
+    if (absolute) cmd += ' --absolute';
+  } else {
+    cmd = 'gdrive files list';
+    if (max) cmd += ` --max ${max}`;
+    if (parent) {
+      cmd += ` --parent ${parent}`;
+    } else if (query) {
+      cmd += ` --query "${query}"`;
+    }
+    if (noHeader) cmd += ' --skip-header';
+    // Note: --absolute not available in v3
+  }
+
+  return shell.exec(cmd, { silent: true });
+};
+
+/**
+ * Download a file from Google Drive
+ * @param {string} fileId - File ID to download
+ * @param {Object} options
+ * @param {string} options.destination - Download destination path
+ * @param {boolean} options.overwrite - Overwrite existing files
+ * @param {boolean} options.recursive - Download directory recursively
+ */
+const download = (fileId, options = {}) => {
+  const version = detectVersion();
+  const { destination, overwrite = false, recursive = false } = options;
+
+  let cmd;
+  if (version === 2) {
+    cmd = `gdrive download "${fileId}"`;
+    if (destination) cmd += ` --path "${destination}"`;
+    if (overwrite) cmd += ' --force';
+    if (recursive) cmd += ' -r';
+  } else {
+    cmd = `gdrive files download "${fileId}"`;
+    if (destination) cmd += ` --destination "${destination}"`;
+    if (overwrite) cmd += ' --overwrite';
+    if (recursive) cmd += ' --recursive';
+  }
+
+  return shell.exec(cmd, { silent: true });
+};
+
+/**
+ * Upload a file to Google Drive
+ * @param {string} filePath - Local file path to upload
+ * @param {Object} options
+ * @param {string} options.parent - Parent folder ID
+ * @param {boolean} options.recursive - Upload directory recursively
+ */
+const upload = (filePath, options = {}) => {
+  const version = detectVersion();
+  const { parent, recursive = false } = options;
+
+  let cmd;
+  if (version === 2) {
+    cmd = `gdrive upload "${filePath}"`;
+    if (parent) cmd += ` --parent "${parent}"`;
+    if (recursive) cmd += ' -r';
+  } else {
+    cmd = `gdrive files upload "${filePath}"`;
+    if (parent) cmd += ` --parent "${parent}"`;
+    if (recursive) cmd += ' --recursive';
+  }
+
+  return shell.exec(cmd, { silent: true });
+};
+
+/**
+ * Update an existing file on Google Drive
+ * @param {string} fileId - File ID to update
+ * @param {string} filePath - Local file path with new content
+ */
+const update = (fileId, filePath) => {
+  const version = detectVersion();
+
+  let cmd;
+  if (version === 2) {
+    cmd = `gdrive update "${fileId}" "${filePath}"`;
+  } else {
+    cmd = `gdrive files update "${fileId}" "${filePath}"`;
+  }
+
+  return shell.exec(cmd, { silent: true });
+};
+
+/**
+ * Create a directory on Google Drive
+ * @param {string} name - Directory name
+ * @param {Object} options
+ * @param {string} options.parent - Parent folder ID
+ */
+const mkdir = (name, options = {}) => {
+  const version = detectVersion();
+  const { parent } = options;
+
+  let cmd;
+  if (version === 2) {
+    if (parent) {
+      cmd = `gdrive mkdir -p ${parent} "${name}"`;
+    } else {
+      cmd = `gdrive mkdir "${name}"`;
+    }
+  } else {
+    cmd = `gdrive files mkdir "${name}"`;
+    if (parent) cmd += ` --parent ${parent}`;
+  }
+
+  return shell.exec(cmd, { silent: true });
+};
+
+/**
+ * Delete a file or directory on Google Drive
+ * @param {string} fileId - File/folder ID to delete
+ * @param {Object} options
+ * @param {boolean} options.recursive - Delete directory recursively
+ */
+const remove = (fileId, options = {}) => {
+  const version = detectVersion();
+  const { recursive = false } = options;
+
+  let cmd;
+  if (version === 2) {
+    cmd = `gdrive delete ${fileId}`;
+    if (recursive) cmd += ' -r';
+  } else {
+    cmd = `gdrive files delete ${fileId}`;
+    if (recursive) cmd += ' --recursive';
+  }
+
+  return shell.exec(cmd, { silent: true });
+};
+
+/**
+ * Sync upload (gdrive@2 only) - uploads local to drive
+ * @param {string} localPath - Local directory path
+ * @param {string} driveId - Drive folder ID
+ * @param {Object} options
+ * @param {boolean} options.dryRun - Preview changes without applying
+ * @param {boolean} options.keepLocal - Don't delete local files
+ * @param {boolean} options.deleteExtraneous - Delete files on drive not in local
+ */
+const syncUpload = (localPath, driveId, options = {}) => {
+  const version = detectVersion();
+  const { dryRun = false, keepLocal = true, deleteExtraneous = false } = options;
+
+  if (version !== 2) {
+    return {
+      code: 1,
+      stdout: '',
+      stderr: 'gdrive sync commands are not available in gdrive@3. Use envSync instead.',
+    };
+  }
+
+  let cmd = `gdrive sync upload`;
+  if (dryRun) cmd += ' --dry-run';
+  if (keepLocal) cmd += ' --keep-local';
+  if (deleteExtraneous) cmd += ' --delete-extraneous';
+  cmd += ` "${localPath}" ${driveId}`;
+
+  return shell.exec(cmd, { silent: true });
+};
+
+/**
+ * List sync tasks (gdrive@2 only)
+ */
+const syncList = () => {
+  const version = detectVersion();
+
+  if (version !== 2) {
+    return {
+      code: 1,
+      stdout: '',
+      stderr: 'gdrive sync commands are not available in gdrive@3.',
+    };
+  }
+
+  return shell.exec('gdrive sync list', { silent: true });
+};
+
+/**
+ * Parse list output into structured data
+ * Works with both v2 and v3 output formats
+ * @param {string} stdout - Raw stdout from list command
+ * @returns {Array<{id: string, name: string, type: string, size: string, date: string}>}
+ */
+const parseListOutput = (stdout) => {
+  const lines = stdout.trim().split('\n').filter((line) => line.trim());
+
+  if (lines.length === 0) return [];
+
+  // Both v2 and v3 use space-padded columns for alignment
+  // Split by 2+ whitespace characters to handle this
+  const separator = /\s{2,}/;
+
+  return lines.map((line) => {
+    const parts = line.trim().split(separator);
+    return {
+      id: parts[0] || '',
+      name: parts[1] || '',
+      type: parts[2] || '',
+      size: parts[3] || '',
+      date: parts[4] || '',
+    };
+  });
+};
+
+/**
+ * Clear the cached version (useful for testing)
+ */
+const clearCache = () => {
+  cachedVersion = null;
+};
+
+module.exports = {
+  detectVersion,
+  getVersion,
+  hasSyncSupport,
+  list,
+  download,
+  upload,
+  update,
+  mkdir,
+  remove,
+  syncUpload,
+  syncList,
+  parseListOutput,
+  clearCache,
+};

package/src/list.js

@@ -3,6 +3,7 @@
 const shell = require('shelljs');
 const { text, isCancel, cancel, spinner, confirm, log } = require('@clack/prompts');
 const color = require('picocolors');
+const gdrive = require('./gdriveCmd');
 
 const runSearch = async () => {
   try {
@@ -38,10 +39,11 @@ const runSearch = async () => {
     const s = spinner();
     s.start(`Searching for "${search}"...`);
 
-    const result = shell.exec(
-      `gdrive list --max ${maxResults} --query "name contains '${search.trim()}'" --absolute`,
-      { silent: true }
-    );
+    const result = gdrive.list({
+      max: maxResults,
+      query: `name contains '${search.trim()}'`,
+      absolute: true, // Only works with gdrive@2
+    });
 
     s.stop(color.green('Search complete!'));
     console.log(result.stdout);
@@ -88,10 +90,11 @@ const runList = async () => {
     const s = spinner();
     s.start('Fetching folder contents...');
 
-    const result = shell.exec(
-      `gdrive list --max ${maxResults} --query "parents in '${driveId.trim()}'" --absolute`,
-      { silent: true }
-    );
+    const result = gdrive.list({
+      max: maxResults,
+      query: `parents in '${driveId.trim()}'`,
+      absolute: true, // Only works with gdrive@2
+    });
 
     s.stop(color.green('Done!'));
     console.log(result.stdout);
@@ -106,10 +109,16 @@ const runList = async () => {
 
 const runListSync = async () => {
   try {
+    if (!gdrive.hasSyncSupport()) {
+      log.warn('gdrive sync commands are not available in gdrive@3.');
+      log.info('Use "gdrive-syncer env" for file sync functionality instead.');
+      return;
+    }
+
     const s = spinner();
     s.start('Fetching sync list...');
 
-    const result = shell.exec('gdrive sync list', { silent: true });
+    const result = gdrive.syncList();
 
     s.stop(color.green('Done!'));
     console.log(result.stdout);
@@ -153,7 +162,7 @@ const runMkdir = async () => {
     const s = spinner();
     s.start(`Creating folder "${folder}"...`);
 
-    const result = shell.exec(`gdrive mkdir -p ${parentId.trim()} ${folder.trim()}`, { silent: true });
+    const result = gdrive.mkdir(folder.trim(), { parent: parentId.trim() });
 
     s.stop(color.green(`Folder "${folder}" created!`));
     console.log(result.stdout);
@@ -194,7 +203,7 @@ const runDelete = async () => {
     const s = spinner();
     s.start('Deleting...');
 
-    const result = shell.exec(`gdrive delete -r ${driveId.trim()}`, { silent: true });
+    const result = gdrive.remove(driveId.trim(), { recursive: true });
 
     s.stop(color.green('Deleted successfully!'));
     console.log(result.stdout);

package/src/sync.js

@@ -6,12 +6,10 @@ const os = require('os');
 const { select, isCancel, cancel, spinner, note, log, confirm } = require('@clack/prompts');
 const color = require('picocolors');
 const { getCfgFile } = require('./helpers');
+const gdrive = require('./gdriveCmd');
 
 const homedir = os.homedir();
 
-const getQuery = ({ dry, pth, dId }) =>
-  `gdrive sync upload ${dry ? '--dry-run' : ''} --keep-local --delete-extraneous ${pth} ${dId}`;
-
 const syncOne = (cfg, dryRun) => {
   const fullpath = cfg.fullpath;
   const driveId = cfg.driveId;
@@ -29,7 +27,14 @@ const syncOne = (cfg, dryRun) => {
     return;
   }
 
-  shell.exec(getQuery({ dry: !!dryRun, dId: driveId, pth: fullpath }));
+  const result = gdrive.syncUpload(fullpath, driveId, {
+    dryRun: !!dryRun,
+    keepLocal: true,
+    deleteExtraneous: true,
+  });
+
+  if (result.stdout) console.log(result.stdout);
+  if (result.stderr) log.error(result.stderr);
 };
 
 const syncAll = (syncs, dryRun) => {
@@ -44,6 +49,16 @@ const syncAll = (syncs, dryRun) => {
 
 const runSync = async (dryRun) => {
   try {
+    // Check if sync commands are available (gdrive@2 only)
+    if (!gdrive.hasSyncSupport()) {
+      log.error('gdrive sync commands are not available in gdrive@3.');
+      log.info('');
+      log.info('Options:');
+      log.info('  1. Use "gdrive-syncer env" for file sync functionality (recommended)');
+      log.info('  2. Install gdrive@2 if you need legacy sync support');
+      return;
+    }
+
     note(
       dryRun ? color.yellow('Running Dry Run') : color.green('Actual Sync'),
       dryRun ? 'Preview Mode' : 'Upload Mode'

package/gdrive.config.json

@@ -1,16 +0,0 @@
-{
-  "syncs": [
-    {
-      "localpath": "project_envs/php-sayhey",
-      "driveId": "1jN1oOZKETwQL4FyoEoCCLlqBwLmYJLRd"
-    },
-    {
-      "localpath": "project_envs/sayhey",
-      "driveId": "1movI2Vgu2OMFRUl_aWvJqeQ65c_LZJG8"
-    },
-    {
-      "localpath": "project_envs/pipeline-test",
-      "driveId": "19rP3yIsLNQ2V4ViahgGyK-BJu60W6rEp"
-    }
-  ]
-}