Release 0.5.7

jellesiderius · Jun 2, 2022 · c28a825 · c28a825
1 parent a690476
commit c28a825
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 9 deletions.
diff --git a/dist/controllers/mainController.js b/dist/controllers/mainController.js
diff --git a/dist/controllers/mainController.js.map b/dist/controllers/mainController.js.map
diff --git a/dist/questions/configurationQuestions.js b/dist/questions/configurationQuestions.js
diff --git a/dist/questions/configurationQuestions.js.map b/dist/questions/configurationQuestions.js.map
diff --git a/dist/tasks/importTask.js b/dist/tasks/importTask.js
diff --git a/dist/tasks/importTask.js.map b/dist/tasks/importTask.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mage-db-sync",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "Database synchronizer for Magento, based on Magerun",
   "author": {
     "name": "Jelle Siderius"

diff --git a/src/controllers/mainController.ts b/src/controllers/mainController.ts
@@ -32,7 +32,7 @@ class MainController {
             'currentFolder': '',
             'currentFolderName': '',
             'strip': '',
-            'syncImages': false,
+            'syncImages': 'no',
             'magentoLocalhostDomainName': '',
             'rsyncInstalled': false,
             'elasticSearchUsed': false,
@@ -91,4 +91,4 @@ class MainController {
     }
 }
 
-export default MainController
+export default MainController
diff --git a/src/questions/configurationQuestions.ts b/src/questions/configurationQuestions.ts
@@ -18,6 +18,11 @@ class ConfigurationQuestions {
                 // Set import setting for Magento
                 config.settings.import = answers.import
 
+                if (config.settings.rsyncInstalled) {
+                    // Set image import setting for Shopware
+                    config.settings.syncImages = answers.syncImages
+                }
+
                 // Set wordpress download value
                 config.settings.wordpressDownload = answers.wordpressDownload
 
@@ -80,6 +85,21 @@ class ConfigurationQuestions {
             );
         }
 
+        if (config.settings.rsyncInstalled) {
+            this.questionsOne.push(
+                {
+                    type: 'list',
+                    name: 'syncImages',
+                    default: 'yes',
+                    message: 'Synchronize media images?',
+                    choices: ['yes', 'no'],
+                    validate: (input: string) => {
+                        return false;
+                    },
+                }
+            );
+        }
+
         if (config.databases.databaseData.wordpress) {
             this.questionsOne.push(
                 {
@@ -112,4 +132,4 @@ class ConfigurationQuestions {
     }
 }
 
-export default ConfigurationQuestions
+export default ConfigurationQuestions
diff --git a/src/tasks/importTask.ts b/src/tasks/importTask.ts
@@ -37,6 +37,18 @@ class ImportTask {
             }
         );
 
+        if (config.settings.syncImages == 'yes') {
+            this.importTasks.push(
+                {
+                    title: 'Synchronizing media images',
+                    task: async (): Promise<void> => {
+                        // Sync media
+                        await localhostMagentoRootExec(`rsync -avz -e "ssh -p ${config.databases.databaseData.port}" ${config.databases.databaseData.username}@${config.databases.databaseData.server}:${config.serverVariables.magentoRoot}/pub/media/* pub/media/ --exclude 'cache' --exclude 'catalog/product/cache' --exclude 'catalog/category/cache' --exclude 'custom_options' --exclude 'tmp' --exclude 'analytics'`, config, true);
+                    }
+                }
+            );
+        }
+
         this.importTasks.push(
             {
                 title: 'Cleaning up',