Remove "I: " prefix from Apktool logs

shroudedcode · Oct 12, 2019 · 0cb553e · 0cb553e
1 parent d14c1c7
commit 0cb553e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -11,7 +11,6 @@ const { version } = require('../package.json')
 import modifyManifest from './tasks/modify-manifest'
 import modifyNetworkSecurityConfig from './tasks/modify-netsec-config'
 import disableCertificatePinning from './tasks/disable-certificate-pinning'
-import observeProcess from './utils/observe-process'
 
 import apktool from './tools/apktool'
 import uberApkSigner from './tools/uber-apk-signer'
@@ -39,9 +38,7 @@ export default async function prepareApk(apkPath: string) {
   await new Listr([
     {
       title: 'Decoding APK file',
-      task: () => observeProcess(
-        apktool.decode(apkPath, decodeDir),
-      ),
+      task: () => apktool.decode(apkPath, decodeDir),
     },
     {
       title: 'Modifying app manifest',
@@ -60,18 +57,15 @@ export default async function prepareApk(apkPath: string) {
     },
     {
       title: 'Encoding patched APK file',
-      task: () => observeProcess(
-        apktool.encode(decodeDir, unsignedApkPath),
-      ),
+      task: () => apktool.encode(decodeDir, unsignedApkPath),
     },
     {
       title: 'Signing patched APK file',
       task: () => {
         return new Observable(subscriber => {
           (async () => {
-            await observeProcess(
-              uberApkSigner.sign(unsignedApkPath),
-            ).forEach(line => subscriber.next(line))
+            await uberApkSigner.sign(unsignedApkPath)
+              .forEach(line => subscriber.next(line))
 
             await fs.copyFile(
               path.join(tmpDir, 'unsigned-aligned-debugSigned.apk'),

diff --git a/src/tools/apktool.ts b/src/tools/apktool.ts
@@ -1,17 +1,24 @@
+import { ExecaChildProcess } from 'execa'
 import * as path from 'path'
+import { map } from 'rxjs/operators'
 
 import executeJar from '../utils/execute-jar'
+import observeProcess from '../utils/observe-process'
 
 const jar = path.join(__dirname, '../../jar/apktool.jar')
 
 const apktool = {
-  decode(inputPath: string, outputPath: string) {
-    return executeJar(jar, ['decode', inputPath, '--output', outputPath])
-  },
-  encode(inputPath: string, outputPath: string) {
-    return executeJar(jar, ['build', inputPath, '--output', outputPath, '--use-aapt2'])
-  },
+  decode: (inputPath: string, outputPath: string) => observeApktool(
+    executeJar(jar, ['decode', inputPath, '--output', outputPath]),
+  ),
+  encode: (inputPath: string, outputPath: string) => observeApktool(
+    executeJar(jar, ['build', inputPath, '--output', outputPath, '--use-aapt2']),
+  ),
   version: 'v2.4.1 SNAPSHOT@197d46',
 }
 
+function observeApktool(process: ExecaChildProcess) {
+  return map((line: string) => line.replace(/I: /g, ''))(observeProcess(process))
+}
+
 export default apktool
diff --git a/src/tools/uber-apk-signer.ts b/src/tools/uber-apk-signer.ts
@@ -1,13 +1,14 @@
 import * as path from 'path'
 
 import executeJar from '../utils/execute-jar'
+import observeProcess from '../utils/observe-process'
 
 const jar = path.join(__dirname, '../../jar/uber-apk-signer.jar')
 
 const uberApkSigner = {
-  sign(inputPath: string) {
-    return executeJar(jar, ['--apks', inputPath])
-  },
+  sign: (inputPath: string) => observeProcess(
+    executeJar(jar, ['--apks', inputPath]),
+  ),
   version: 'v1.1.0',
 }
 

diff --git a/src/utils/observe-process.ts b/src/utils/observe-process.ts
@@ -1,7 +1,7 @@
 import { ExecaChildProcess } from 'execa'
 import { Observable } from 'rxjs'
 
-export default function observeProcess(process: ExecaChildProcess) {
+export default function observeProcess(process: ExecaChildProcess): Observable<string> {
   return new Observable(subscriber => {
     process
       .then(() => subscriber.complete())