more lingual changes

This commit is contained in:
karl.hudgell 2020-08-28 17:18:57 +01:00
parent 688167f88e
commit ed396e0575
2 changed files with 34 additions and 38 deletions

View File

@ -5,7 +5,7 @@
"main-menu-item-3": "Restore Xiaomi Apps", "main-menu-item-3": "Restore Xiaomi Apps",
"main-menu-item-4": "Install Compatible Apps", "main-menu-item-4": "Install Compatible Apps",
"main-menu-item-5": "Restore ANY app", "main-menu-item-5": "Restore ANY app",
"main-menu-item-6": "Batch Install APKs", "main-menu-item-6": "Batch Install Apps",
"main-menu-item-7": "Batch Remove Installed Apps", "main-menu-item-7": "Batch Remove Installed Apps",
"main-menu-item-8": "Quit", "main-menu-item-8": "Quit",
"connection-type-message": "How do you want to connect?", "connection-type-message": "How do you want to connect?",
@ -36,5 +36,8 @@
"installing-apps": "Installing Apps", "installing-apps": "Installing Apps",
"downloading-latest": "Downloading Latest", "downloading-latest": "Downloading Latest",
"complete": "Complete", "complete": "Complete",
"failed": "Failed" "failed": "Failed",
"restoring-apps-complete": "Restoring Apps Complete",
"batch-install-apps-complete": "Batch Install Apps Complete",
"connect-to-watch": "Connect to watch"
} }

View File

@ -5,6 +5,7 @@ const files = require('../lib/files')
const logger = require('perfect-logger'); const logger = require('perfect-logger');
const Language = require("@shypes/language-translator"); const Language = require("@shypes/language-translator");
const adb = require('../lib/adb'); const adb = require('../lib/adb');
const { dualLog } = require('../lib/common');
logger.info(process.platform + " detected") logger.info(process.platform + " detected")
if (process.platform === 'win32' || process.platform === 'win64') { if (process.platform === 'win32' || process.platform === 'win64') {
@ -32,14 +33,14 @@ module.exports = {
await common.pause(2000) await common.pause(2000)
common.log('removal-complete') common.log('removal-complete')
common.log('compatible-apps') common.log('compatible-apps')
await common.clearApkFolder() await common.clearApkFolder()
const compatibleApps = await common.getCompatibleAppsList() const compatibleApps = await common.getCompatibleAppsList()
console.log(chalk.whiteBright('----------')) console.log(chalk.whiteBright('----------'))
common.print('downloading-compatible-apps', 'whiteBright') common.print('downloading-compatible-apps', 'whiteBright')
for (const package of compatibleApps) { for (const package of compatibleApps) {
if (package.Klean === "X") { if (package.Klean === "X") {
try { try {
@ -65,8 +66,8 @@ module.exports = {
}, },
removeXiaomiApps: async () => { removeXiaomiApps: async () => {
common.header(await Language.get('main-menu-item-2')) common.header('main-menu-item-2')
common.log('main-menu-item-2', 'green') common.log('main-menu-item-2')
const value = await inquirer.removeAppsList(); const value = await inquirer.removeAppsList();
for (let package of value.removeAppsList) { for (let package of value.removeAppsList) {
await adb.removeXiaomiApk(package) await adb.removeXiaomiApk(package)
@ -77,22 +78,20 @@ module.exports = {
}, },
restoreXiaomiApps: async () => { restoreXiaomiApps: async () => {
logger.info("Restore Apps") common.header('main-menu-item-3')
common.header('Restore Apps') common.log('main-menu-item-3')
const value = await inquirer.removeAppsList(); const value = await inquirer.removeAppsList();
for (let package of value.removeAppsList) { for (let package of value.removeAppsList) {
await adb.restoreXiaomiApk(package) await adb.restoreXiaomiApk(package)
} }
console.log(chalk.green('Restore Complete')) common.dualLog('restoring-apps-complete', 'green')
await common.pause(2000) await common.pause(2000)
logger.info("Restore Apps Complete")
module.exports.mainMenu() module.exports.mainMenu()
}, },
installCompatibleApps: async () => { installCompatibleApps: async () => {
logger.info(await Language.get('install-compatible-apps-header', 'en')) common.header('main-menu-item-4')
common.header(await Language.get('install-compatible-apps-header')) common.log('main-menu-item-4')
const compatibleApps = await common.getCompatibleAppsList() const compatibleApps = await common.getCompatibleAppsList()
const value = await inquirer.compatibleApps(); const value = await inquirer.compatibleApps();
@ -110,49 +109,45 @@ module.exports = {
const apkList = await files.getListOfAPk('./data/apps') const apkList = await files.getListOfAPk('./data/apps')
for (let package of apkList) { for (let package of apkList) {
console.log(await Language.get('installing') + ' ' + package) common.dualLog('installing', 'whiteBright')
logger.info(await Language.get('installing', 'en') + ' ' + package)
await adb.installApk(package) await adb.installApk(package)
} }
console.log(chalk.green(await Language.get('compatible-apps-installed'))) common.dualLog('compatible-apps-installed', 'green')
logger.info(await Language.get('compatible-apps-installed', 'en'))
await common.pause(2000) await common.pause(2000)
module.exports.mainMenu() module.exports.mainMenu()
}, },
restoreAnyApp: async () => { restoreAnyApp: async () => {
logger.info("Restore Any App") common.header('main-menu-item-5')
common.header('Restore Any App') common.log('main-menu-item-5')
const value = await inquirer.restoreAnyApp(); const value = await inquirer.restoreAnyApp();
await adb.restoreAnyApk(value) await adb.restoreAnyApk(value)
console.log(chalk.green('Restore Complete')) common.dualLog('restoring-apps-complete', 'green')
await common.pause(2000) await common.pause(2000)
logger.info("App Restore Complete")
module.exports.mainMenu() module.exports.mainMenu()
}, },
batchInstallApks: async () => { batchInstallApps: async () => {
logger.info("Batch Install Apks") common.header('main-menu-item-6')
common.header('Batch Install Apks') common.log('main-menu-item-6')
let apkList = await files.getListOfAPk('./my-apk/') let apkList = await files.getListOfAPk('./my-apk/')
await files.renameLocalApk(apkList) await files.renameLocalApk(apkList)
apkList = await files.getListOfAPk('./my-apk/') apkList = await files.getListOfAPk('./my-apk/')
for (let element of apkList) { for (let element of apkList) {
console.log('Installing ' + element) console.log(await Language.get('installing') + ' ' + element)
logger.info('Installing ' + element) logger.info(await Language.get('installing') + ' ' + element)
await adb.installApk(element) await adb.installApk(element)
} }
console.log(chalk.green('Batch Install Apks Completed')) common.dualLog('batch-install-apps-complete', 'green')
logger.info('Batch Install Apks Completed')
await common.pause(2000) await common.pause(2000)
module.exports.mainMenu() module.exports.mainMenu()
}, },
batchRemoveInstalledApps: async () => { batchRemoveInstalledApps: async () => {
common.header(await Language.get('header-remove-installed-apps')) common.header('main-menu-item-7')
logger.info(await Language.get('header-remove-installed-apps', 'en')) common.log('main-menu-item-7')
value = await adb.getInstalledPacakges() value = await adb.getInstalledPacakges()
@ -162,16 +157,14 @@ module.exports = {
const package = element.substring(8) const package = element.substring(8)
await adb.removeApk(package) await adb.removeApk(package)
} }
console.log(chalk.green(await Language.get('remove-selected-user-apps'))) common.dualLog('remove-selected-user-apps', 'green')
logger.info(await Language.get('remove-selected-user-apps', 'en'))
await common.pause(2000) await common.pause(2000)
module.exports.mainMenu() module.exports.mainMenu()
}, },
connectWatch: async () => { connectWatch: async () => {
logger.info("Connect to watch") common.header('connect-to-watch')
common.header('Connect to watch') common.log('connect-to-watch')
const value = await inquirer.connectionType() const value = await inquirer.connectionType()
connected = await adb.watchConnection(value) connected = await adb.watchConnection(value)
if (connected != true) { if (connected != true) {
@ -200,8 +193,8 @@ module.exports = {
case 'restore any app': case 'restore any app':
module.exports.restoreAnyApp() module.exports.restoreAnyApp()
break; break;
case 'batch install apks': case 'batch install apps':
module.exports.batchInstallApks() module.exports.batchInstallApps()
break; break;
case 'batch remove installed apps': case 'batch remove installed apps':
module.exports.batchRemoveInstalledApps() module.exports.batchRemoveInstalledApps()