locize-cli 8.1.0 → 8.2.0

package/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [8.2.0](https://github.com/locize/locize-cli/compare/v8.1.1...v8.2.0) - 2024-11-12
+
+- introduce `--backup-deleted-path` argument (#98)
+
+## [8.1.1](https://github.com/locize/locize-cli/compare/v8.1.0...v8.1.1) - 2024-10-29
+
+- improve some error logs
+
 ## [8.1.0](https://github.com/locize/locize-cli/compare/v8.0.2...v8.1.0) - 2024-09-19
 
 - introduce `--languages lng1,lng2` argument (#96)

package/bin/locize

@@ -359,6 +359,7 @@ program
   .option('-i, --project-id <projectId>', 'The project-id that should be used')
   .option('-v, --ver <version>', 'Found namespaces will be matched to this version (default: latest)')
   .option('-p, --path <path>', `Specify the path that should be used (default: ${process.cwd()})`, process.cwd())
+  .option('-B, --backup-deleted-path <path>', 'Saves the segments that will be deleted in this path')
   .option('-A, --auto-create-path <true|false>', 'This will automatically make sure the --path is created. (default: true)', 'true')
   .option('-f, --format <json>', 'File format of namespaces (default: json; [nested, flat, xliff2, xliff12, xlf2, xlf12, android, yaml, yaml-rails, yaml-nested, csv, xlsx, po, strings, resx, fluent, tmx, laravel, properties])', 'json')
   .option('-s, --skip-empty <true|false>', 'Skips to download empty files (default: false)', 'false')
@@ -423,6 +424,7 @@ program
     const pathMask = options.pathMask;
     const unpublished = options.unpublished === 'true';
     const autoCreatePath = options.autoCreatePath === 'true';
+    const backupDeletedPath = options.backupDeletedPath;
 
     sync({
       apiPath: url.parse(getPath).protocol + '//' + url.parse(getPath).host,
@@ -446,7 +448,8 @@ program
       dry: dry,
       pathMask: pathMask,
       unpublished: unpublished,
-      autoCreatePath: autoCreatePath
+      autoCreatePath: autoCreatePath,
+      backupDeletedPath: backupDeletedPath
     });
   })
   .on('--help', () => {

package/getRemoteLanguages.js

@@ -6,7 +6,12 @@ const getRemoteLanguages = (opt, cb) => {
   }, (err, res, obj) => {
     if (err || (obj && (obj.errorMessage || obj.message))) {
       if (err) return cb(err);
-      if (obj && (obj.errorMessage || obj.message)) return cb(new Error((obj.errorMessage || obj.message)));
+      if (obj && (obj.errorMessage || obj.message)) {
+        if (res && res.statusText && res.status) {
+          return cb(new Error(res.statusText + ' (' + res.status + ') | ' + (obj.errorMessage || obj.message)));
+        }
+        return cb(new Error((obj.errorMessage || obj.message)));
+      }
     }
     if (res.status >= 300) return cb(new Error(res.statusText + ' (' + res.status + ')'));
 

package/getRemoteNamespace.js

@@ -22,6 +22,9 @@ const pullNamespacePaged = (opt, lng, ns, cb, next, retry) => {
         return;
       }
       if (obj && (obj.errorMessage || obj.message)) {
+        if (res.statusText && res.status) {
+          return cb(new Error(res.statusText + ' (' + res.status + ') | ' + (obj.errorMessage || obj.message)));
+        }
         return cb(new Error((obj.errorMessage || obj.message)));
       }
       return cb(new Error(res.statusText + ' (' + res.status + ')'));
@@ -70,6 +73,9 @@ const getRemoteNamespace = (opt, lng, ns, cb) => {
     if (err) return cb(err);
     if (res.status >= 300) {
       if (obj && (obj.errorMessage || obj.message)) {
+        if (res.statusText && res.status) {
+          return cb(new Error(res.statusText + ' (' + res.status + ') | ' + (obj.errorMessage || obj.message)));
+        }
         return cb(new Error((obj.errorMessage || obj.message)));
       }
       return cb(new Error(res.statusText + ' (' + res.status + ')'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "locize-cli",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "description": "locize cli to import locales",
   "main": "index.js",
   "bin": {

package/request.js

@@ -11,6 +11,8 @@ const httpProxy = process.env.http_proxy || process.env.HTTP_PROXY || process.en
 const isRetriableError = (err) => {
   return err && err.message && (
     err.message.indexOf('ETIMEDOUT') > -1 || // on timeout retry
+    err.message.indexOf('FetchError') > -1 ||
+    err.code === 'ETIMEDOUT' ||
     // on dns errors
     err.message.indexOf('ENOTFOUND') > -1 ||
     err.message.indexOf('ENODATA') > -1 ||

package/sync.js

@@ -35,6 +35,9 @@ const getDownloads = (opt, cb) => {
       if (err) return cb(err);
       if (res.status >= 300) {
         if (obj && (obj.errorMessage || obj.message)) {
+          if (res.statusText && res.status) {
+            return cb(new Error(res.statusText + ' (' + res.status + ') | ' + (obj.errorMessage || obj.message)));
+          }
           return cb(new Error((obj.errorMessage || obj.message)));
         }
         return cb(new Error(res.statusText + ' (' + res.status + ')'));
@@ -135,7 +138,7 @@ const compareNamespace = (local, remote, lastModifiedLocal, lastModifiedRemote)
 };
 
 const compareNamespaces = (opt, localNamespaces, cb) => {
-  async.map(localNamespaces, (ns, clb) => {
+  async.mapLimit(localNamespaces, 20, (ns, clb) => {
     getRemoteNamespace(opt, ns.language, ns.namespace, (err, remoteNamespace, lastModified) => {
       if (err) return clb(err);
 
@@ -378,6 +381,28 @@ const checkForMissingLocalNamespaces = (downloads, localNamespaces, opt) => {
   return localMissingNamespaces;
 };
 
+const backupDeleted = (opt, ns, now) => {
+  if (opt.dry || ns.diff.toRemove.length === 0) return;
+  var m = now.getMonth() + 1;
+  if (m < 10) m = `0${m}`;
+  var d = now.getDate();
+  if (d < 10) d = `0${d}`;
+  var h = now.getHours();
+  if (h < 10) h = `0${h}`;
+  var mi = now.getMinutes();
+  if (mi < 10) mi = `0${mi}`;
+  var s = now.getSeconds();
+  if (s < 10) s = `0${s}`;
+  const currentBackupPath = path.join(opt.backupDeletedPath, `${now.getFullYear()}${m}${d}-${h}${mi}${s}`);
+  mkdirp.sync(currentBackupPath);
+  const removingRemote = ns.diff.toRemove.reduce((prev, k) => {
+    prev[k] = ns.remoteContent[k];
+    return prev;
+  }, {});
+  mkdirp.sync(path.join(currentBackupPath, ns.language));
+  fs.writeFileSync(path.join(currentBackupPath, ns.language, `${ns.namespace}.json`), JSON.stringify(removingRemote, null, 2));
+};
+
 const handleSync = (opt, remoteLanguages, localNamespaces, cb) => {
   if (!localNamespaces || localNamespaces.length === 0) {
     downloadAll(opt, remoteLanguages, (err) => {
@@ -415,6 +440,7 @@ const handleSync = (opt, remoteLanguages, localNamespaces, cb) => {
       var wasThereSomethingToUpdate = false;
 
       function updateComparedNamespaces() {
+        const now = new Date();
         async.eachLimit(compared, Math.round(require('os').cpus().length / 2), (ns, clb) => {
           if (!cb) {
             if (ns.diff.toRemove.length > 0) {
@@ -424,6 +450,7 @@ const handleSync = (opt, remoteLanguages, localNamespaces, cb) => {
               } else {
                 console.log(colors.red(`removing ${ns.diff.toRemove.length} keys in ${ns.language}/${ns.namespace}...`));
                 if (opt.dry) console.log(colors.red(`would remove ${ns.diff.toRemove.join(', ')} in ${ns.language}/${ns.namespace}...`));
+                if (!opt.dry && opt.backupDeletedPath) backupDeleted(opt, ns, now);
               }
             }
             if (ns.diff.toRemoveLocally.length > 0) {