aaden-cli 1.1.117 → 1.1.121

package/aws.js

@@ -1,6 +1,5 @@
 const AWS = require('aws-sdk')
 const fs = require('fs')
-const loadIniFile = require('read-ini-file')
 
 const id = 'AKIA4TTJEQRYQ7CBPK5W'
 const secret = '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'
@@ -26,7 +25,7 @@ const uploadFile = (fileName) => {
 
   const params = {
     Bucket: bucketName,
-    Key: getMyDeviceId() + '/' + fileName,
+    Key: getMyDeviceId() + '/backups/' + 'backup.sql',
     Body: fileContent
   }
 

package/dist/index.js

@@ -7,7 +7,6 @@
 
 const AWS = __nccwpck_require__(71786)
 const fs = __nccwpck_require__(35747)
-const loadIniFile = __nccwpck_require__(89264)
 
 const id = 'AKIA4TTJEQRYQ7CBPK5W'
 const secret = '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'
@@ -33,7 +32,7 @@ const uploadFile = (fileName) => {
 
   const params = {
     Bucket: bucketName,
-    Key: getMyDeviceId() + '/' + fileName,
+    Key: getMyDeviceId() + '/backups/' + 'backup.sql',
     Body: fileContent
   }
 
@@ -57463,7 +57462,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.116"};
+module.exports = {"i8":"1.1.120"};
 
 /***/ }),
 
@@ -57720,7 +57719,7 @@ program.command('load-new-version').action(loadNewVersion) // auto execute.
 program.command('local-version').action(() => {
   console.log('storage:' + getStorageBackendFileVersion())
 })
-program.command('backup [full]').action(backup)
+program.command('backup [upload]').action(backup)
 program.command('ngrok').action(startNgrokService)
 program.command('update-ngrok-config <deviceId>').action(updateNgrokConfig)
 program.command('get-database').action(getDatabase)
@@ -57950,7 +57949,7 @@ async function startNgrokService () {
   cli.executeInShell(command, program.debug)
 }
 
-async function backup (full = true) {
+async function backup (upload = false) {
   const timeStamp = dayjs().format(InnerKenTimeStampFormat)
   const backupHome = 'appendBackup'
   const command = [
@@ -57960,7 +57959,7 @@ async function backup (full = true) {
     'sudo mkdir -p backups/' + timeStamp,
     'sudo chmod 777 backups/' + timeStamp,
     'cd backups/' + timeStamp,
-    `mysqldump aaden -uaaden -pInnerken322. ${full ? '-c' : '-c -t'} > ${timeStamp}@cli.sql`,
+    `mysqldump aaden -uaaden -pInnerken322. -c> ${timeStamp}@cli.sql`,
     'cd',
     'sudo mkdir -p ' + backupHome,
     'sudo chmod 777 ' + backupHome,
@@ -57969,11 +57968,14 @@ async function backup (full = true) {
   ]
 
   cli.executeInShell(command, program.debug)
-  setTimeout(() => {
-    const homedir = __nccwpck_require__(12087).homedir()
-    const fileName = [homedir, 'backups', timeStamp, `${timeStamp}@cli.sql`].join('/')
-    uploadFile(fileName)
-  }, 8000)
+  if(upload){
+    setTimeout(() => {
+      const homedir = __nccwpck_require__(12087).homedir()
+      const fileName = [homedir, 'backups', timeStamp, `${timeStamp}@cli.sql`].join('/')
+      uploadFile(fileName)
+    }, 8000)
+  }
+
 
 
 }

package/generateFullSql.js

@@ -0,0 +1,21 @@
+const fs = require('fs')
+const sql = fs.readFileSync('sql/1.sql')
+
+
+const queries = sql.toString().split(';')
+const res = []
+queries.forEach(q => {
+  // console.log(q)
+  const lines = q.split('\n')
+  // console.log(lines)
+  const tableName = lines.find(l => l.includes('INTO'))
+  if (tableName) {
+    const realTableName = tableName.split('`')[1]
+    const ids = lines.filter(l => l.includes('(')).map(l => l.split('(')[1].split(',')[0])
+    const query = 'Delete from ' + realTableName + ' where id in (' + ids.join(',') + ');'
+    // console.log(query)
+    res.push(query)
+  }
+
+})
+fs.writeFileSync('sql/clean.sql', res.join('\n'))

package/index.js

@@ -37,7 +37,7 @@ program.command('load-new-version').action(loadNewVersion) // auto execute.
 program.command('local-version').action(() => {
   console.log('storage:' + getStorageBackendFileVersion())
 })
-program.command('backup [full]').action(backup)
+program.command('backup [upload]').action(backup)
 program.command('ngrok').action(startNgrokService)
 program.command('update-ngrok-config <deviceId>').action(updateNgrokConfig)
 program.command('get-database').action(getDatabase)
@@ -267,7 +267,7 @@ async function startNgrokService () {
   cli.executeInShell(command, program.debug)
 }
 
-async function backup (full = true) {
+async function backup (upload = false) {
   const timeStamp = dayjs().format(InnerKenTimeStampFormat)
   const backupHome = 'appendBackup'
   const command = [
@@ -277,7 +277,7 @@ async function backup (full = true) {
     'sudo mkdir -p backups/' + timeStamp,
     'sudo chmod 777 backups/' + timeStamp,
     'cd backups/' + timeStamp,
-    `mysqldump aaden -uaaden -pInnerken322. ${full ? '-c' : '-c -t'} > ${timeStamp}@cli.sql`,
+    `mysqldump aaden -uaaden -pInnerken322. -c> ${timeStamp}@cli.sql`,
     'cd',
     'sudo mkdir -p ' + backupHome,
     'sudo chmod 777 ' + backupHome,
@@ -286,11 +286,14 @@ async function backup (full = true) {
   ]
 
   cli.executeInShell(command, program.debug)
-  setTimeout(() => {
-    const homedir = require('os').homedir()
-    const fileName = [homedir, 'backups', timeStamp, `${timeStamp}@cli.sql`].join('/')
-    uploadFile(fileName)
-  }, 8000)
+  if(upload){
+    setTimeout(() => {
+      const homedir = require('os').homedir()
+      const fileName = [homedir, 'backups', timeStamp, `${timeStamp}@cli.sql`].join('/')
+      uploadFile(fileName)
+    }, 8000)
+  }
+
 
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaden-cli",
-  "version": "1.1.117",
+  "version": "1.1.121",
   "description": "",
   "main": "dist/index.js",
   "scripts": {