update to 1.3.0

Author: chendianbo

basic/arguments.py

@@ -33,7 +33,7 @@ def has(self, v):
         return False
 
     def get(self, index, default=None):
-        if 0 <= index < self.count(): return self.mKeys[index]
+        if (0-self.count()) <= index < self.count(): return self.mKeys[index]
         return default
 
     def getLast(self, index):
@@ -81,20 +81,22 @@ def __init__(self, argvs=None, help=[]):
         l = len(argvs)
         while i < l:
             k = argvs[i]
-            if len(k) <= 1: continue
+            if len(k) <= 1:
+                i += 1
+                continue
             if k.startswith('-'):
                 if (i + 1) < l and not argvs[i + 1].startswith('-'):
                     self.mKeys[k[1:]] = argvs[i + 1]
-                    i = i + 1
+                    i += 1
                 else:
                     self.mKeys[k[1:]] = ''
-            i = i + 1
+            i += 1
 
     def has(self, k):
-        return self.mKeys.has_key(k)
+        return k in self.mKeys
 
     def get(self, k):
-        if self.mKeys.has_key(k): return self.mKeys[k]
+        if k in self.mKeys: return self.mKeys[k]
         return None
 
     def isEmpty(self):

extend/extend_adb.py

@@ -24,15 +24,22 @@
 
 # --------------------------------------------------------------------------------------------------------------------------
 def doTopInfo():
-    AdbUtils.dumpTop()
+    topWinPackage, topActivityPackage = AdbUtils.dumpTop()
+    LoggerUtils.light('Top window: ' + topWinPackage)
+    LoggerUtils.light('Top activity: ' + topActivityPackage)
 
 
-def doPullPackage(projPath, pkg):
-    if CmnUtils.isEmpty(pkg):
-        LoggerUtils.error('Error: Invalid commands')
-        LoggerUtils.println('The command is: "wing -adb pull {package name}"')
-        return
+def doPullTop(projPath):
+    LoggerUtils.light('do parse top app ...')
+    topWinPackage, topActivityPackage = AdbUtils.dumpTop()
+    if not CmnUtils.isEmpty(topWinPackage):
+        LoggerUtils.light('do pull ' + topWinPackage + ' ...')
+        doPullPackage(projPath, topWinPackage)
+    if not CmnUtils.isEmpty(topActivityPackage) and topWinPackage != topActivityPackage:
+        LoggerUtils.light('do pull ' + topActivityPackage + ' ...')
+        doPullPackage(projPath, topActivityPackage)
 
+def doPullPackage(projPath, pkg):
     pkgFile = AdbUtils.getApkFile(pkg)
     if CmnUtils.isEmpty(pkgFile):
         LoggerUtils.error('Error: ' + pkg + ' not found')
@@ -45,6 +52,28 @@ def doPullPackage(projPath, pkg):
     LoggerUtils.light('  to: ' + os.path.basename(outFile))
 
 
+def doPullPackages(projPath, name):
+    if CmnUtils.isEmpty(name):
+        LoggerUtils.error('Error: Invalid commands')
+        LoggerUtils.println('The command is: "wing -adb pull [package name/all/file]"')
+        return
+
+    if name == 'all':
+        pkgs = AdbUtils.getInstallAppsWithThird()
+        for pkg in pkgs:
+            if CmnUtils.isEmpty(pkg): continue
+            doPullPackage(projPath, pkg)
+    elif os.path.isfile(name):
+        with open(name, 'r') as f:
+            lines = f.readlines()
+            for line in lines:
+                pkg = line.strip()
+                if CmnUtils.isEmpty(pkg): continue
+                doPullPackage(projPath, pkg)
+    else:
+        doPullPackage(projPath, name)
+
+
 def doStopApp(projPath, pkg):
     if not CmnUtils.isEmpty(pkg):
         AdbUtils.stop(pkg)
@@ -162,23 +191,61 @@ def doList():
     apps = AdbUtils.getInstallAppsWithDisable()
     doListPrint('Disabled', apps)
 
+
+def doDevice(help):
+    AdbUtils.isDeviceConnected()
+    LoggerUtils.println(AdbUtils.doAdbCmd('devices'))
+    LoggerUtils.println(' ')
+    LoggerUtils.println(' ')
+    LoggerUtils.println('These are common adb commands used in wing:')
+    LoggerUtils.println(help)
+
+
+def doUninstall(name):
+    if name == 'all':
+        apps = AdbUtils.getInstallAppsWithThird()
+        for app in apps:
+            if CmnUtils.isEmpty(app): continue
+            AdbUtils.uninstall(app)
+            LoggerUtils.println('uninstall: ' + app)
+    elif os.path.isfile(name):
+        with open(name, 'r') as f:
+            lines = f.readlines()
+            for line in lines:
+                pkg = line.strip()
+                if CmnUtils.isEmpty(pkg): continue
+                AdbUtils.uninstall(pkg)
+                LoggerUtils.println('uninstall: ' + pkg)
+    else:
+        AdbUtils.uninstall(name)
+        LoggerUtils.println('uninstall: ' + name)
+
+
 def run():
-    """
+    help = """
     wing -adb top
     wing -adb list
-    wing -adb pull <package name>
+    wing -adb pull [package name/all/file]
     wing -adb stop <package name>
     wing -adb clear <package name>
     wing -adb dump [ui/sys/log]
+    wing -adb uninstall [package name/all/file]
     """
+
     za = BasicArgumentsValue()
     envPath, spacePath, typ = za.get(0), za.get(1), za.get(2)
+    if CmnUtils.isEmpty(typ): return doDevice(help)
     if typ == 'top': return doTopInfo()
-    if typ == 'pull': return doPullPackage(envPath, za.get(3))
+    if typ == 'pull':
+        pkg = za.get(3)
+        if 'top' == pkg:
+            return doPullTop(envPath)
+        return doPullPackage(envPath, pkg)
     if typ == 'stop': return doStopApp(envPath, za.get(3))
     if typ == 'clear': return doClearApp(envPath, za.get(3))
     if typ == 'dump': return doDump(envPath, za.get(3))
     if typ == 'list': return doList()
+    if typ == 'uninstall': return doUninstall(za.get(3))
     assert 0, 'Unsupported type: ' + typ
 
 

extend/extend_build.py

@@ -19,6 +19,10 @@
 
 # --------------------------------------------------------------------------------------------------------------------------
 def doBuild(spacePath, projName, projPath, buildType, subModule):
+    if os.path.isfile(spacePath + "/build.py"):
+        succ = CmnUtils.doCmdCall('cd %s && python build.py %s pre-build' % (spacePath, buildType))
+        assert succ, 'pre build fail'
+
     outPath = '%s/out/%s' % (spacePath, projName)
     try:
         os.makedirs(outPath)
@@ -82,7 +86,9 @@ def run():
     # eg: wing -build [$sub_module], such as:
     # wing -build
     # wing -build jni
-    doBuild(spacePath, projName, projPath, 'all', subModule)
+    # doBuild(spacePath, projName, projPath, 'all', subModule)
+    doBuild(spacePath, projName, projPath, 'debug', subModule)
+    doBuild(spacePath, projName, projPath, 'release', subModule)
 
 
 if __name__ == "__main__":

extend/extend_key.py

@@ -110,6 +110,20 @@ def doHash(str):
     LoggerUtils.println('{ 0x%x, 0x%x }, // %s' % (h, f, str))
 
 
+def showHelp():
+    help = '''
+        -key {type}
+            create {key type} {mode}
+                create RSA public and private keys with 1024 or 2048(default) mode
+            list {file} [pwd]
+                print key/sign information for apk/ipa/mobileprovision/keystore/jks/rsa/... file
+            hash {string}
+                print md5/sha256/hash/... of string
+    '''
+    LoggerUtils.println(' ')
+    LoggerUtils.println(help)
+
+
 def run():
     '''
     wing -key
@@ -123,7 +137,8 @@ def run():
     if cmd == 'create': return doCreate(envPath, argv.get(3), argv.get(4))
     # "wing -key hash ${string}"
     if cmd == 'hash': return doHash(argv.get(3))
-    LoggerUtils.error('Unsupported command: ' + cmd)
+
+    showHelp();
 
 
 if __name__ == "__main__":

extend/extend_plugin.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+# @brief: third plugin
+# @date:  2024.05.10 14:40:50
+
+import os
+import shutil
+import sys
+
+g_this_file = os.path.realpath(sys.argv[0])
+g_this_path = os.path.dirname(g_this_file)
+sys.path.append(os.path.dirname(g_this_path))
+
+from utils.utils_cmn import CmnUtils
+from utils.utils_cmn import CmnVersion
+from utils.utils_logger import LoggerUtils
+from utils.utils_import import ImportUtils
+from utils.utils_zip import ZipUtils
+from utils.utils_net import NetUtils
+from utils.utils_file import FileUtils
+from basic.arguments import BasicArgumentsValue
+
+g_wing_path = ImportUtils.initEnv(os.path.dirname(g_this_path))
+
+#
+# server files:
+#
+# local path:
+# ${wing root path}/plugin/${plugin name}/*
+# ${wing root path}/plugin/${plugin name}/${plugin name}.ver
+#
+
+# --------------------------------------------------------------------------------------------------------------------------
+
+def run():
+    """
+    wing -apktool $@
+    wing -jadx $@
+    """
+    za = BasicArgumentsValue()
+    envPath, spacePath, name = za.get(0), za.get(1), za.get(2)
+    if name == '-jadx':
+        pluginPath = os.path.dirname(g_wing_path) + '/plugin/jadx'
+        if not os.path.isfile(pluginPath + '/jadx.ver'):
+            LoggerUtils.e('\tjadx not install, run \"wing -update\"')
+            return
+        CmnUtils.doCmdCall(pluginPath + '/bin/jadx-gui&')
+        return
+    if name == '-apktool':
+        pluginPath = os.path.dirname(g_wing_path) + '/plugin/apktool'
+        if not os.path.isfile(pluginPath + '/apktool.ver'):
+            LoggerUtils.e('\tapktool not install, run \"wing -update\"')
+            return
+        CmnUtils.doCmdCall('cd ' + envPath + ' && java -jar ' + pluginPath + '/apktool.jar ' + ' '.join(za.getLast(3)))
+        return
+    assert 0, 'Unsupported type: ' + name
+
+
+if __name__ == "__main__":
+    run()
+

extend/extend_screen.py

@@ -23,24 +23,40 @@
 
 BASE_URL_FMT = 'http://www.iofomo.com/download/scrcpy/scrcpy-%s'
 # --------------------------------------------------------------------------------------------------------------------------
-def doScreen():
+def doEnvPrepare():
     AdbUtils.ensureEnv()
     sysEnv = isEnvOK()
     if not sysEnv:
         binFile = getBinFile()
-        if None == binFile: return
+        return sysEnv, binFile
+    return sysEnv, None
 
-    dd = AdbUtils.getDevices()
-    # print(dd)
-    if CmnUtils.isEmpty(dd):
+
+def doLaunchDevice(sysEnv, binFile, did):
+    LoggerUtils.println('Launch device: ' + did)
+    if sysEnv:
+        CmnUtils.doCmd("scrcpy -s " + did + " &")
+    elif binFile is not None:
+        CmnUtils.doCmd('%s -s %s &' % (CmnUtils.formatCmdArg(binFile), did))
+    else:
+        LoggerUtils.e('scrcpy not found')
+
+
+def doScreen(dids):
+    sysEnv, binFile = doEnvPrepare()
+    if CmnUtils.isEmpty(dids):
+        dids = AdbUtils.getDevices()
+    # print(dids)
+    if CmnUtils.isEmpty(dids):
         LoggerUtils.e('No devices found')
         return
-    if sysEnv:
-        for d in dd: CmnUtils.doCmd("scrcpy -s " + d + " &")
+    if sysEnv is None and binFile is None:
+        LoggerUtils.e('scrcpy not found')
         return
 
-    if binFile is None: return
-    for d in dd: CmnUtils.doCmd('%s -s %s &' % (CmnUtils.formatCmdArg(binFile), d))
+    for did in dids:
+        doLaunchDevice(sysEnv, binFile, did)
+
 
 def isEnvOK():
     ret = CmnUtils.doCmd("scrcpy -v")
@@ -81,12 +97,12 @@ def getBinFile():
 
 def run():
     """
-    wing -screen
+    wing -screen [device id]
     """
     za = BasicArgumentsValue()
-    envPath, spacePath, typ = za.get(0), za.get(1), za.get(2)
-    if typ is None: return doScreen()
-    assert 0, 'Unsupported type: ' + typ
+    envPath, spacePath = za.get(0), za.get(1)
+    return doScreen(za.getLast(2))
+    # assert 0, 'Unsupported type: ' + typ
 
 
 if __name__ == "__main__":

extend/extend_test.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+# @brief: Mobile device test commands
+# @date:  2024.02.10 14:40:50
+
+import os
+import shutil
+import sys
+
+g_this_file = os.path.realpath(sys.argv[0])
+g_this_path = os.path.dirname(g_this_file)
+sys.path.append(os.path.dirname(g_this_path))
+
+from utils.utils_cmn import CmnUtils
+from utils.utils_logger import LoggerUtils
+from utils.utils_import import ImportUtils
+from utils.utils_file import FileUtils
+from basic.arguments import BasicArgumentsValue
+
+g_wing_path = ImportUtils.initEnv(os.path.dirname(g_this_path))
+
+# --------------------------------------------------------------------------------------------------------------------------
+def doTest(path, envPath, spacePath, argv):
+    succ = CmnUtils.doCmdCall('cd "%s" && python test.py "%s" "%s" %s' % (path, envPath, spacePath, CmnUtils.joinArgs(argv)))
+    assert succ, 'test run fail'
+
+
+def run():
+    """
+    wing -test <cmds>
+    """
+    za = BasicArgumentsValue()
+    envPath, spacePath, argv = za.get(0), za.get(1), za.getLast(2)
+    if os.path.isfile(envPath + "/test.py"):
+        doTest(envPath, envPath, spacePath, argv)
+    elif os.path.isfile(spacePath + "/test.py"):
+        doTest(spacePath, envPath, spacePath, argv)
+    else:
+        LoggerUtils.e('No test.py found !')
+
+
+if __name__ == "__main__":
+    run()