Fix: bugs in util scripts (#62)

Author: FoxyHunter7

util/install_walter_modem/install_walter_modem.sh

@@ -18,82 +18,55 @@ spinner() {
     local delay=0.1
     local spinstr=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏')
     local i=0
-    tput civis 2>/dev/null  # Hide cursor
+    tput civis 2>/dev/null
     while kill -0 "$pid" 2>/dev/null; do
         printf "\r  %s  " "${spinstr[i]}"
         i=$(( (i+1) % ${#spinstr[@]} ))
         sleep $delay
     done
-    printf "\r\033[K"  # Clear line
-    tput cnorm 2>/dev/null  # Show cursor
+    printf "\r\033[K"
+    tput cnorm 2>/dev/null
 }
 
 # Verify dependencies
 if ! command -v mpremote &>/dev/null; then
-    echo -e "${RED}Warning:${RESET} 'mpremote' is not installed or not in your PATH." >&2
+    echo -e "${RED}Error:${RESET} 'mpremote' is not installed or not in your PATH." >&2
     exit 1
 fi
 
-DEVICE=$1
-if [ -n "$DEVICE" ]; then
-    DEVICE="connect $DEVICE"
+# Build device connection argument
+DEVICE_ARG=""
+if [ -n "$1" ]; then
+    DEVICE_ARG="connect $1"
 fi
 
 PROJECT_DIR=$(dirname "$(dirname "$(dirname "$(readlink -f "$0")")")")
 LOCAL_DIR="${PROJECT_DIR}/walter_modem"
 REMOTE_DIR=":lib/walter_modem"
 
-echo -e "${BOLDWHITE}Verifying directory structure${RESET}"
-mpremote $DEVICE fs mkdir ":lib" &>/dev/null || true
-mpremote $DEVICE fs mkdir "$REMOTE_DIR" &>/dev/null || true
+# Clean and prepare remote directory
+echo -e "${BOLDWHITE}Preparing remote directory${RESET}"
+mpremote $DEVICE_ARG fs rm -r "$REMOTE_DIR" &>/dev/null || true
+mpremote $DEVICE_ARG fs mkdir ":lib" &>/dev/null || true
+mpremote $DEVICE_ARG fs mkdir "$REMOTE_DIR" &>/dev/null || true
+echo -e "  ${RED}[CLEAN]${RESET}${REMOTE_DIR}"
 
 cd "$LOCAL_DIR"
 
-# Create all directories (except .)
-echo -e "${BOLDWHITE}Copying library files${RESET}"
-find . -type d | while read -r d; do
-    [ "$d" = "." ] && continue
-    mpremote $DEVICE fs mkdir "$REMOTE_DIR/${d#./}" &>/dev/null || true
+# Create subdirectories
+echo -e "${BOLDWHITE}Creating directory structure${RESET}"
+find . -type d ! -name '.' | sort | while read -r d; do
+    mpremote $DEVICE_ARG fs mkdir "$REMOTE_DIR/${d#./}" &>/dev/null || true
     echo -e "  ${BLUE}[DIR]${RESET}  ${REMOTE_DIR}/${d#./}"
 done
 
 # Copy all files except *.pyi
-find . -type f ! -name '*.pyi' | while read -r f; do
+echo -e "${BOLDWHITE}Copying library files${RESET}"
+find . -type f ! -name '*.pyi' | sort | while read -r f; do
     printf "  ${YELLOW}•${RESET} ${REMOTE_DIR}/${f#./}"
-    (
-        mpremote $DEVICE fs cp "$LOCAL_DIR/$f" "$REMOTE_DIR/${f#./}" &>/dev/null
-    ) &
-    cp_pid=$!
-    spinner $cp_pid
+    (mpremote $DEVICE_ARG fs cp "$f" "$REMOTE_DIR/${f#./}" &>/dev/null) &
+    spinner $!
     echo -e "\r  ${GREEN}[FILE]${RESET} ${REMOTE_DIR}/${f#./}"
 done
 
-echo -e "${BOLDWHITE}Cleaning up remote files not present locally${RESET}"
-
-# ---
-
-REMOTE_LIST=$(mpremote $DEVICE fs ls -r "$REMOTE_DIR" | awk '{$1=""; print substr($0,2)}' | sed 's|^/||')
-LOCAL_LIST=$(find . -type f ! -name '*.pyi' -printf "%P\n"; find . -type d -printf "%P/\n")
-
-# Clean up remote files/dirs not present locally
-CLEANED_REMOTE_LIST=()
-for entry in $REMOTE_LIST; do
-    if [[ "$entry" == "$REMOTE_DIR/"* ]]; then
-        cleaned="${entry#$REMOTE_DIR/}"
-    else
-        cleaned="$entry"
-    fi
-    [[ -z "$cleaned" || "$cleaned" == "$REMOTE_DIR" || "$cleaned" == "." ]] && continue
-    [[ "$cleaned" == "$REMOTE_DIR"* ]] && continue
-    CLEANED_REMOTE_LIST+=("$cleaned")
-done
-
-for remote_item in "${CLEANED_REMOTE_LIST[@]}"; do
-    if ! grep -Fxq "$remote_item" <<< "$LOCAL_LIST"; then
-        echo -e "  ${RED}[REMOVED]${RESET} ${REMOTE_DIR}/$remote_item"
-        mpremote $DEVICE fs rm "$REMOTE_DIR/$remote_item" &>/dev/null || \
-        mpremote $DEVICE fs rmdir "$REMOTE_DIR/$remote_item" &>/dev/null || true
-    fi
-done
-
 echo -e "${BOLDWHITE}Sync Complete!${RESET}"

util/modem_passthrough/modem_passthrough.py

@@ -81,6 +81,7 @@ def build_ui(self):
         self.output_text.pack(fill=tk.BOTH, expand=True, padx=5, pady=5)
         for tag, opts in self.output_tags.items():
             self.output_text.tag_config(tag, **opts)
+        self.output_text.tag_config('command', foreground='cyan')
 
         self.command_status_label = tk.Label(
             self.root,
@@ -162,7 +163,9 @@ def refresh_ui(self):
         self.output_text.config(state=tk.NORMAL)
         self.output_text.delete('1.0', tk.END)
         for line in display:
-            if 'ERROR' in line:
+            if line.startswith('>> '):
+                tag = 'command'
+            elif 'ERROR' in line:
                 tag = 'error'
             elif 'OK' in line:
                 tag = 'ok'
@@ -190,6 +193,18 @@ def refresh_ui(self):
             cs_fg = 'black'
         self.command_status_label.config(text=self.command_result, fg=cs_fg)
 
+    def _attempt_reconnect(self, delay=3):
+        """Schedule a reconnection attempt without recursion."""
+        if not self.running:
+            return
+        time.sleep(delay)
+        self.output_lines = []
+        self.output_queue.put('[i] >> Retrying device connection...')
+        self.schedule_refresh()
+        # Use a new thread to avoid stack buildup from recursion
+        reconnect_thread = threading.Thread(target=self.start_modem_process, daemon=True)
+        reconnect_thread.start()
+
     def start_modem_process(self):
         try:
             self.output_queue.put('[i] >> Starting modem process...')
@@ -227,57 +242,54 @@ def start_modem_process(self):
                 if 'Local directory .' not in line:
                     self.output_queue.put(line.strip())
                 self.schedule_refresh()
-            
-            def attempt_reconnect():
-                time.sleep(3)
-                self.output_lines = []
-                self.output_queue.put(f'[i] >> Retrying device connection...')
-                self.schedule_refresh()
-                self.start_modem_process()
 
-            proc.stdout.close(); proc.wait()
+            proc.stdout.close()
+            proc.wait()
             self.output_queue.put('[i] >> Modem process terminated.')
             self.passthrough_state = 'NO COMM'
             self.schedule_refresh()
-            attempt_reconnect()
+            self._attempt_reconnect(delay=3)
         except FileNotFoundError as e:
             if self.logging: self.log(line='===== PROGRAM CRASHED =====\n', raw=True)
             self.output_queue.put(f'[i] >> Error: {e}')
             self.passthrough_state = 'ERROR'
             self.schedule_refresh()
-            attempt_reconnect()
+            self._attempt_reconnect(delay=3)
         except Exception as e:
             if self.logging: self.log(line='===== PROGRAM CRASHED (Device disconnect?) =====\n', raw=True)
             self.output_queue.put(f'[i] >> Error in modem process: {e}')
             self.passthrough_state = 'NO COMM'
             self.schedule_refresh()
-            time.sleep(7)
-            self.start_modem_process()
+            self._attempt_reconnect(delay=7)
 
     def log(self, line, meta=None, raw=False):
         try:
-            with open(LOG_FILE, 'a+') as f:
+            with open(LOG_FILE, 'a') as f:
                 if raw:
                     f.write(line)
                 else:
                     ts = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
                     f.write(f"[{ts}] {meta:>9}: {line.strip()}\n")
-        except:
+        except OSError:
             pass
 
     def read_cmd_file(self):
         try:
-            return open(CMD_FILE,'r').read().strip()
-        except:
+            with open(CMD_FILE, 'r') as f:
+                return f.read().strip()
+        except OSError:
             return 'TUI-ERROR'
 
     def write_cmd_file(self, command):
         try:
-            with open(CMD_FILE,'r+') as f:
-                if f.read().strip() != 'READ': return False
-                f.seek(0); f.write(command); f.truncate()
+            with open(CMD_FILE, 'r+') as f:
+                if f.read().strip() != 'READ':
+                    return False
+                f.seek(0)
+                f.write(command)
+                f.truncate()
             return True
-        except:
+        except OSError:
             return False
 
     def send_interrupt_and_exit(self):
@@ -302,6 +314,8 @@ def process_command(self):
             self.command_result = f'Reserved: {cmd}'
         elif self.passthrough_state == 'READY' and self.read_cmd_file()=='READ':
             if self.write_cmd_file(cmd):
+                self.output_queue.put('')
+                self.output_queue.put(f'>> {cmd}')
                 self.command_result = f'Sent: {cmd}'
                 self.passthrough_state = f'WAITING ({cmd})'
                 self.history.append(cmd); self.history_index=None