From 64fa21a1c1a4300804018210f8e4d8e7a39ad92c Mon Sep 17 00:00:00 2001
From: Adam Blank <blank@caltech.edu>
Date: Sun, 20 Oct 2024 04:30:01 +0000
Subject: [PATCH] Update transfer.py

---
 transfer.py | 43 +++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/transfer.py b/transfer.py
index 3416107..fe150d8 100644
--- a/transfer.py
+++ b/transfer.py
@@ -1,15 +1,15 @@
+import subprocess
+import time
+import platform
+import shutil
+import os
 import ports
 import psutil
 import urllib.request
 import ssl
-ssl._create_default_https_context = ssl._create_unverified_context
-
-import os
-import shutil
-import platform
-import time
+from pathlib import Path
 
-import subprocess
+ssl._create_default_https_context = ssl._create_unverified_context
 
 
 def get_drive():
@@ -52,36 +52,27 @@ if not trinkey:
     print("Could not find the Trinkey to connect to...try removing it from the USB drive and plugging it back in.")
     exit(1)
 
-# Kill any running program
-trinkey.write(bytes(chr(0x03), 'utf-8'))
-trinkey.flush()
-
 print("Connected to Trinkey! Transfering files...")
 
 shutil.rmtree(os.path.join('src', '__pycache__'), True)
 shutil.rmtree(os.path.join('support', '__pycache__'), True)
-shutil.rmtree(os.path.join(disk, '__pycache__'), True)
-
-for x in os.listdir(disk):
-    try:
-        os.unlink(os.path.join(disk, x))
-    except (PermissionError, FileNotFoundError, OSError):
-        pass
+shutil.rmtree(disk, True)
 
-shutil.rmtree(os.path.join(disk, 'lib'), True)
-
-shutil.rmtree(os.path.join(disk, 'src'), True)
 shutil.copytree('src', os.path.join(disk, 'src'), dirs_exist_ok=True)
-shutil.rmtree(os.path.join(disk, 'support'), True)
 shutil.copytree('support', os.path.join(disk, 'support'), dirs_exist_ok=True)
-shutil.copy('code.py', os.path.join(disk, 'code.py'))
+
+# Kill any running program
+trinkey.write(bytes(chr(0x03), 'utf-8'))
+trinkey.flush()
+
+Path(os.path.join(disk, 'code.py')).write_bytes(Path("code.py").read_bytes())
 
 print("Files transfered...connecting to Trinkey...")
-time.sleep(1)
+trinkey.flush()
+time.sleep(5)
 
 print("Restarting Trinkey!")
-# Kill any running program
 trinkey.write(bytes(chr(0x04), 'utf-8'))
 trinkey.flush()
-time.sleep(1)
+
 miniterm = ports.connect_to_serial(trinkey)
-- 
GitLab