bug fix minor

dpt-tools.py

@@ -70,10 +70,12 @@ def main():
     p.add_argument(
         '--client-id', '-id',
         dest="dpt_id",
+        default="",
         help="File containing the device's client id")
     p.add_argument(
         '--key', '-k',
         dest="dpt_key",
+        default="",
         help="File containing the device's private key")
     p.add_argument(
         '--addr', '-ip',

python_api/libDPT.py

@@ -87,6 +87,14 @@ class DPT():
             return True
         return False
 
+    def diagnosis_remove_file(self, fp):
+        '''
+        remove a file
+        '''
+        if self.diagnosis_isfile(fp):
+            self.diagnosis_write("rm {}".format(fp))
+        return True
+
     def diagnosis_isfile(self, fp):
         '''
         check if file exists given file path
@@ -137,7 +145,6 @@ class DPT():
             resp = self.serial.read_until(b'# ')
             # change back the original timeout
             self.serial.timeout = self.serialReadTimeout
-            self.dbg_print(resp)
         except serial.SerialTimeoutException as e:
             self.err_print('Timeout: {}'.format(e))
             self.err_print("Do NOT panic. Command may be still running.")
@@ -153,12 +160,16 @@ class DPT():
             self.err_print("   the process by pressing Ctrl + C. Depending on")
             self.err_print("   what you ran, you may or may not have troubles")
             self.err_print("4. Worst case is to flash the stock pkg, I think.")
+            return ""
         except BaseException as e:
             self.err_print(str(e))
             return ""
         if echo:
-            return resp.decode("utf-8").replace('\r\r\n', '')
-        return resp.decode("utf-8").replace('\r\r\n', '').replace(cmd, '')
+            resp = resp.decode("utf-8").replace("\r\r\n", '')
+        else:
+            resp = resp.decode("utf-8").replace("\r\r\n", '').replace(cmd, '')
+        self.dbg_print("len of {}; dbg: ".format(len(resp), resp.splitlines()))
+        return resp
 
 
     def shut_down_diagnosis(self):

python_api/libInteractive.py

@@ -132,7 +132,9 @@ Supported commands:
 """)
 
 
-def diagnosis_pull_file(dpt, remotefp=None, folder=None, overwrite=None):
+def diagnosis_pull_file(
+    dpt, remotefp=None, folder=None, overwrite=None
+):
     '''
     pull file from device to local via xxd and parsing in 
     python
@@ -161,28 +163,44 @@ def diagnosis_pull_file(dpt, remotefp=None, folder=None, overwrite=None):
                     return None
         # check if local fp exists
         localfp = "{0}/{1}".format(folder, os.path.basename(remotefp))
-        if os.path.isfile(localfp) and overwrite is None::
-            resp = input('> {} exist, overwrite? [yes/no]: '.format(localfp))
-            overwrite = True resp == 'yes' else False
+        if overwrite is None:
+            overwrite = True
+            if os.path.isfile(localfp):
+                resp = input(
+                    '> {} exist, overwrite? [yes/no]: '.format(localfp))
+                overwrite = True if resp == 'yes' else False
+        dpt.info_print("Pulling file {}, plz be patient...".format(localfp))
         if overwrite:
-            # read from xxd, parse, and write to local file
+            # read from hexdump, parse, and write to local file
             startTime = int(time.time() * 1000)
-            s = "xxd -p {}".format(remotefp)
+            offset = 0
+            count = 2
             with open("{}.tmp".format(localfp), 'w') as f:
-                for each in dpt.diagnosis_write(s, timeout=999).splitlines():
-                    f.write(each)
-            subprocess.call(
-                ['xxd', '-r', '-p', "{}.tmp".format(localfp), '>', localfp]
-            )
+                while 1:
+                    cmd = (
+                        "dd if={0} skip={1} ".format(remotefp, offset) +
+                        "count={0} | ".format(count) +
+                        "hexdump -ve '32/1 \"%.2x\" \"\\n\"'"
+                    )
+                    resp = dpt.diagnosis_write(cmd, timeout=99).splitlines()
+                    if len(resp[4:-1]) > 0:
+                        for each in resp[4:-1]:
+                            f.write(each)
+                    else:
+                        break
+                    offset += count
+            # use xxd to convert back to binary file
+            subprocess.call('xxd -r -p {0}.tmp > {0}'.format(localfp), shell=True)
             duration = int(time.time() * 1000) - startTime
             dpt.info_print('Finished in {0:.2f}sec'.format(duration / 1000.0))
             if os.path.isfile(localfp):
                 # TODO: add md5 validation
                 dpt.info_print("File pulled to: {}".format(localfp))
-                os.remove("{}.tmp".format(localfp))
+                # os.remove("{}.tmp".format(localfp))
                 return localfp
     except BaseException as e:
         dpt.err_print(str(e))
+    dpt.err_print("Failed to pull file {}".format(remotefp))
     return None
 
 
@@ -225,7 +243,7 @@ def diagnosis_push_file(
         remotefp = "{0}/{1}".format(folder, os.path.basename(localfp))
         if dpt.diagnosis_isfile(remotefp) and overwrite is None:
             resp = input('> {} exist, overwrite? [yes/no]: '.format(remotefp))
-            overwrite = True resp == 'yes' else False
+            overwrite = True if resp == 'yes' else False
         if overwrite:
             # write through echo
             firstRun = True
@@ -280,7 +298,7 @@ def diagnosis_restore_bootimg(dpt, usetmpfp=None, bootimgfp=None):
     '''
     if usetmpfp is None:
         resp = input('> Use local boot img? [yes/no]: ')
-        usetmpfp = False resp == 'yes' else True
+        usetmpfp = False if resp == 'yes' else True
     # directly use the original backup, if exists
     if usetmpfp:
         return dpt.diagnosis_restore_boot(self, fp="/tmp/boot.img.bak")
@@ -353,7 +371,7 @@ def diagnosis_mode(dpt):
     dpt.info_print('1. Turn of DPT')
     dpt.info_print('2. Hold HOME button')
     dpt.info_print('3. Press POWER button once. Then light blinks yellow')
-    dpt.info_print('4. Wait till a black square appear on the screen')
+    dpt.info_print('4. Release HOME button, a black square will show up')
     dpt.info_print('5. Connect to computer')
     try:
         resp = input('>>> Black square on the screen? [yes/no]: ')