Karl/MiWatchKleaner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working

Browse Source
This commit is contained in:
karl.hudgell 2020-08-29 21:47:42 +01:00
parent 8a0d5df406
commit ac1b5a4f15
4 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app.js
View File

@ -1,14 +1,4 @@
const pages = require('./pages/pages') const pages = require('./pages/pages')
const Language = require("@shypes/language-translator");
const globalVariables = require('./lib/globalVars');
async function main() {
lang = await pages.selectLanguage();
globalVariables.language = lang.selection
await pages.connectWatch()
}
main()
pages.selectLanguage()

9
buildRelease.sh
View File

@ -8,15 +8,18 @@ mv ./release/miwatchkleaner-macos-* ./release/MacOs && \
cp ./data/xiaomiPackageRemovalList.json ./release/Windows/data/ && \ cp ./data/xiaomiPackageRemovalList.json ./release/Windows/data/ && \
cp ./data/xiaomiPackageRemovalList.json ./release/MacOS/data/ && \ cp ./data/xiaomiPackageRemovalList.json ./release/MacOS/data/ && \
cp ./data/xiaomiPackageRemovalList.json ./release/Linux/data/ && \ cp ./data/xiaomiPackageRemovalList.json ./release/Linux/data/ && \
cp -rf ./lang/ ./release/Windows/ && \
cp -rf ./lang/ ./release/MacOS/ && \
cp -rf ./lang/ ./release/Linux/ && \
chmod 0777 ./release/**/adb && \ chmod 0777 ./release/**/adb && \
chmod 0777 ./release/**/miwatchkleaner-* && \ chmod 0777 ./release/**/miwatchkleaner-* && \
chmod +x ./release/**/adb && \ chmod +x ./release/**/adb && \
chmod +x ./release/**/miwatchkleaner-* && \ chmod +x ./release/**/miwatchkleaner-* && \
cd release/MacOS/ && \ cd release/MacOS/ && \
tar -pcvzf miwatchkleaner.$buildNum-macos.tar.gz adb data/ my_apk/ miwatchkleaner-macos-x64 && \ tar -pcvzf miwatchkleaner.$buildNum-macos.tar.gz adb data/ my_apk/ lang/ miwatchkleaner-macos-x64 && \
cd .. && \ cd .. && \
cd Linux/ && \ cd Linux/ && \
tar -pcvzf miwatchkleaner.$buildNum-Linux.tar.gz adb data/ my_apk/ miwatchkleaner-linux-x64 && \ tar -pcvzf miwatchkleaner.$buildNum-Linux.tar.gz adb data/ my_apk/ lang/ miwatchkleaner-linux-x64 && \
cd .. && \ cd .. && \
cd Windows/ && \ cd Windows/ && \
zip -r miwatchkleaner.$buildNum-win.zip adb.exe AdbWinApi.dll AdbWinUsbApi.dll data/ my_apk/ miwatchkleaner-win-x86.exe zip -r miwatchkleaner.$buildNum-win.zip adb.exe AdbWinApi.dll AdbWinUsbApi.dll data/ my_apk/ lang/ miwatchkleaner-win-x86.exe

3
lib/inquirer.js
View File

@ -20,6 +20,7 @@ module.exports = {
await Language.get('main-menu-item-6'), await Language.get('main-menu-item-6'),
await Language.get('main-menu-item-7'), await Language.get('main-menu-item-7'),
await Language.get('main-menu-item-8'), await Language.get('main-menu-item-8'),
await Language.get('main-menu-item-9'),
], ],
filter: function (val) { filter: function (val) {
return val.toLowerCase(); return val.toLowerCase();
@ -112,7 +113,7 @@ module.exports = {
},]; },];
return inquirer.prompt(questions); return inquirer.prompt(questions);
}, },
restoreAnyApp: async () => { removeAnyApp: async () => {
Language.setActiveLang(globalVariables.language) Language.setActiveLang(globalVariables.language)
const questions = [{ const questions = [{
type: "input", type: "input",

10
pages/pages.js
View File

@ -4,6 +4,7 @@ const inquirer = require('../lib/inquirer');
const files = require('../lib/files') 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 globalVariables = require('../lib/globalVars');
const adb = require('../lib/adb'); const adb = require('../lib/adb');
logger.info(process.platform + " detected") logger.info(process.platform + " detected")
@ -129,7 +130,7 @@ module.exports = {
removeAnyApp: async () => { removeAnyApp: async () => {
common.header('main-menu-item-6') common.header('main-menu-item-6')
common.log('main-menu-item-6') common.log('main-menu-item-6')
const value = await inquirer.restoreAnyApp(); const value = await inquirer.removeAnyApp();
await adb.restoreAnyApk(value) await adb.restoreAnyApk(value)
common.dualLog('removing-apps-complete', 'green') common.dualLog('removing-apps-complete', 'green')
await common.pause(2000) await common.pause(2000)
@ -187,7 +188,8 @@ module.exports = {
common.header('Select Language') common.header('Select Language')
common.log('Select Language') common.log('Select Language')
const v = await inquirer.LanguageSelect() const v = await inquirer.LanguageSelect()
return v globalVariables.language = v.selection
module.exports.connectWatch()
}, },
mainMenu: async () => { mainMenu: async () => {
@ -202,7 +204,6 @@ module.exports = {
menu_7 = await Language.get('main-menu-item-7') menu_7 = await Language.get('main-menu-item-7')
menu_8 = await Language.get('main-menu-item-8') menu_8 = await Language.get('main-menu-item-8')
menu_9 = await Language.get('main-menu-item-9') menu_9 = await Language.get('main-menu-item-9')
menu_10 = await Language.get('main-menu-item-10')
switch (mainMenuSelection.mainMenu) { switch (mainMenuSelection.mainMenu) {
case menu_1.toLowerCase(): case menu_1.toLowerCase():
@ -230,9 +231,6 @@ module.exports = {
module.exports.batchRemoveInstalledApps() module.exports.batchRemoveInstalledApps()
break; break;
case menu_9.toLowerCase(): case menu_9.toLowerCase():
module.exports.connectWatch()
break;
case menu_10.toLowerCase():
break; break;
default: default:
// code block // code block