taotoolkit 1.0.4__tar.gz → 1.0.7__tar.gz

{taotoolkit-1.0.4 → taotoolkit-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 1.0.4
+Version: 1.0.7
 Summary: Tao ToolKit
 Author-email: taotaoli <taotaoli@asrmicro.com>
 License-Expression: MIT

{taotoolkit-1.0.4 → taotoolkit-1.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "taotoolkit"
-version = "1.0.4"
+version = "1.0.7"
 description = "Tao ToolKit"
 readme = "README.md"
 requires-python = ">=3.8"

{taotoolkit-1.0.4 → taotoolkit-1.0.7}/taotoolkit/tao_camDvt.py

@@ -940,8 +940,8 @@ class CamDvt(asrCamOp):
             fullpath1 = os.path.join(outPath, ch1)
             newfile0 = os.path.join(outPath, str(posCode) + "_L.vrf")
             newfile1 = os.path.join(outPath, str(posCode) + "_R.vrf")
-            renameFile(newfile0, fullpath0)
-            renameFile(newfile1, fullpath1)
+            renameFile(fullpath0, newfile0)
+            renameFile(fullpath1, newfile1)
         else:
             print("抓取vrf失败")
             sys.exit()

{taotoolkit-1.0.4 → taotoolkit-1.0.7}/taotoolkit/tao_common.py

@@ -200,6 +200,9 @@ def removeAnyContainStr(string: str, subStringList: list, matchCase=True) -> Lis
 
 
 def renameFile(old_path: str, new_path: str) -> None:
+    logd("Rename file:", old_path, "to", new_path)
+    if os.path.exists(new_path):
+        os.remove(new_path)
     os.rename(old_path, new_path)
 
 

{taotoolkit-1.0.4 → taotoolkit-1.0.7}/taotoolkit/tao_device.py

@@ -385,7 +385,7 @@ class DevOp:
 
         cmd3 = f"--size {recordWidth}x{recordHeight} /sdcard/{mp4Name}"
         cmd = f"{cmd1} {cmd2} {cmd3}"
-        if sysVersion == "Linux":
+        if sysVersion == "linux":
             pCmd(cmd, showCmd=True, splitCmd=False, shell=True, logLevel="info", waitDone=False)
         else:
             pCmd(cmd, showCmd=True, splitCmd=False, shell=False, logLevel="info", waitDone=False)

{taotoolkit-1.0.4 → taotoolkit-1.0.7}/taotoolkit/tao_flash.py

@@ -52,13 +52,13 @@ class jenkinsTool:
         self.isUserDebug = True if isUserDebug == "1" else False
         self.packageFile = "release.zip"
         self.retainUserData = False  # 是否保留用户数据，默认不保留
-        if sysVersion == "Linux":
+        if sysVersion == "linux":
             self.downloadPath = "/home/local/Downloads/jenkin"  # 下载路径和解压路径
-            self.extractPath = "/home/local/Downloads/jenkin"
+            self.extractPath = self.downloadPath
             self.aimgTool = "aimgtool"
         else:
             self.downloadPath = r"D:\jenkin"  # 下载路径和解压路径
-            self.extractPath = r"D:\jenkin"
+            self.extractPath = self.downloadPath
             self.aimgTool = "aimgtool.exe"
         # logi(f"download package to {self.downloadPath}")
 
@@ -341,7 +341,7 @@ class jenkinsTool:
         return dict_from_list
 
     def browserDownload(self, url, timeOut=600):
-        if sysVersion == "Linux":
+        if sysVersion == "linux":
             browser = "wget"
         else:
             browser = "C:\\Program Files\\Mozilla Firefox\\firefox.exe -headless"
@@ -511,12 +511,11 @@ class jenkinsTool:
         logd(f"{url} {dest_path}")
         start = time.time()
 
-        windowsDownloadPath = r"D:\jenkin"
-        if sysVersion == "Linux":
+        if sysVersion == "linux":
             targetZip = os.path.join(os.getcwd(), self.packageFile)
         else:
-            targetZip = os.path.join(windowsDownloadPath, self.packageFile)
-            partFile = findFilesBySuffixKeyword(windowsDownloadPath, ".part", "release")
+            targetZip = os.path.join(self.downloadPath, self.packageFile)
+            partFile = findFilesBySuffixKeyword(self.downloadPath, ".part", "release")
             for i in partFile:
                 os.remove(targetZip)
 
@@ -635,7 +634,7 @@ class jenkinsTool:
         logi(f"download {finalCfg}, wait for download port ready ... ")
         refreshWait("usbdownload", 60, 0.3, self.getInfo, devSerial)
         cmd = ""
-        if sysVersion == "Linux":
+        if sysVersion == "linux":
             cmd = f"./{self.aimgTool} download -t {finalCfg}"
         else:
             cmd = f"{self.aimgTool} download -t {finalCfg}"
@@ -761,7 +760,7 @@ def getInfo(acmd):
 
 
 def CLI_aimgDownload(args):
-    if sysVersion == "Linux":
+    if sysVersion == "linux":
         aimgTool = "aimgtool"
         acmd = "./aimgtool"
     else:

{taotoolkit-1.0.4 → taotoolkit-1.0.7}/taotoolkit/tao_tuning.py

@@ -540,7 +540,7 @@ class asrCamOp(DevOp):
     def __init__(self, checkCam=False, useUi=False, **kwargs):
         logd(f"needroot = {kwargs.get('needRoot', False)}, serial = {kwargs.get('serial', '')}")
         super().__init__(**kwargs)
-        if sysVersion == "Linux":
+        if sysVersion == "linux":
             self.tuning_assistant = "tuning_assistant64.out"
         else:
             self.tuning_assistant = "tuning_assistant64.exe"
@@ -623,7 +623,7 @@ class asrCamOp(DevOp):
     def netCon(self, on=True):
         if on:
             logi("ip connect on")
-            if sysVersion == "Linux":
+            if sysVersion == "linux":
                 rCmd(
                     "echo AAbbcc123 |sudo -S sysctl -w net.ipv4.conf.enp3s0.route_localnet=1",
                     showCmd=True,
@@ -660,7 +660,7 @@ class asrCamOp(DevOp):
 
         else:
             logi("ip connect off")
-            if sysVersion == "Linux":
+            if sysVersion == "linux":
                 rCmd(
                     "sudo iptables -t nat -F PREROUTING ",
                     showRet=True,
@@ -686,7 +686,7 @@ class asrCamOp(DevOp):
         self.tuningGetModuleGroup()
 
     def readIsp(self, CFliter: str, param: str, row=0, col=0, is_float=False, showCmd=False, module=0, group=0)-> Union[int, float]:
-        if sysVersion == "Linux":
+        if sysVersion == "linux":
             eExit("tuning_assistant not support linux")
         cmd = f"{self.tuning_assistant} 127.0.0.1 t 3000 3000 3000 r m{module}_g{group} {CFliter} {param} {row} {col}"
         try:
@@ -712,7 +712,7 @@ class asrCamOp(DevOp):
             return 0
 
     def writeIsp(self, CFliter: str, param: str, row: int, col: int, value: Union[int, float], showCmd=False):
-        if sysVersion == "Linux":
+        if sysVersion == "linux":
             eExit("tuning_assistant not support linux")
         if isinstance(value, float):
             cf = ctypes.c_float(value)
@@ -947,7 +947,7 @@ class asrCamOp(DevOp):
             newfile = os.path.join(outPath, str(vrfName))
             from .tao_common import renameFile
 
-            renameFile(newfile, fullpath)
+            renameFile(fullpath,newfile)
         else:
             eExit("抓取vrf失败")
 
@@ -1153,8 +1153,8 @@ def CLI_capVrf(argsList):
 
 
 def CLI_saveTuning(argsList):
-    if sysVersion == "Linux":
-        loge("Linux not support save tuning!")
+    if sysVersion == "linux":
+        loge("linux not support save tuning!")
         return
     parser = argparse.ArgumentParser(prog="savetuning", description="保存tuning参数")
     parser.add_argument("-a", "--all", type=str, default="1", choices=["0", "1"], help="是否保存包含RO的参数")

{taotoolkit-1.0.4 → taotoolkit-1.0.7}/taotoolkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 1.0.4
+Version: 1.0.7
 Summary: Tao ToolKit
 Author-email: taotaoli <taotaoli@asrmicro.com>
 License-Expression: MIT