Update app.py

app.py

@@ -6,6 +6,7 @@ from queue import Queue
 import os
 import shlex
 import signal
+import glob
 from telegram import Update
 from telegram.ext import ApplicationBuilder, CommandHandler, ContextTypes
 
@@ -19,13 +20,22 @@ bot_app = None
 bot_running = False
 bot_thread = None
 current_dir = os.getcwd()
+current_proc = None  # Track running process
+LOG_FILE = "terminal_logs.txt"
 
-# Track current running subprocess for Ctrl+C
-current_proc = None
+# Load previous logs if available
+if os.path.exists(LOG_FILE):
+    with open(LOG_FILE, "r") as f:
+        terminal_logs = f.read().splitlines()[-MAX_LOGS:]
+
+# Logging
+def save_log_to_file(entry):
+    with open(LOG_FILE, "a") as f:
+        f.write(entry + "\n")
 
-# --- Logging ---
 def add_terminal_log(entry):
     terminal_logs.append(entry)
+    save_log_to_file(entry)
     if len(terminal_logs) > MAX_LOGS:
         terminal_logs.pop(0)
 
@@ -34,7 +44,7 @@ def add_bot_log(entry):
     if len(bot_logs) > MAX_LOGS:
         bot_logs.pop(0)
 
-# --- Command Execution ---
+# Command Execution
 def execute_command(cmd):
     global current_dir, current_proc
     output = []
@@ -54,14 +64,21 @@ def execute_command(cmd):
     if cmd.strip().startswith("cd"):
         parts = shlex.split(cmd)
         if len(parts) > 1:
-            new_path = os.path.join(current_dir, parts[1])
-            if os.path.isdir(new_path):
-                current_dir = os.path.abspath(new_path)
-                msg = f"Changed directory to {current_dir}"
-                output.append(msg)
-                add_terminal_log(msg)
+            pattern = os.path.join(current_dir, parts[1])
+            matches = glob.glob(pattern)
+            if matches:
+                new_path = os.path.abspath(matches[0])
+                if os.path.isdir(new_path):
+                    current_dir = new_path
+                    msg = f"Changed directory to {current_dir}"
+                    output.append(msg)
+                    add_terminal_log(msg)
+                else:
+                    msg = f"Not a directory: {new_path}"
+                    output.append(msg)
+                    add_terminal_log(msg)
             else:
-                msg = f"Directory not found: {new_path}"
+                msg = f"No matching path for: {parts[1]}"
                 output.append(msg)
                 add_terminal_log(msg)
         else:
@@ -69,46 +86,37 @@ def execute_command(cmd):
             output.append(msg)
             add_terminal_log(msg)
     else:
-        current_proc = subprocess.Popen(cmd, cwd=current_dir, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
-        for line in iter(current_proc.stdout.readline, ''):
-            line = line.strip()
-            if line:
-                output.append(line)
-                add_terminal_log(line)
-        current_proc.stdout.close()
-        current_proc.wait()
-        current_proc = None
-    return "\n".join(output)
-
-# --- Telegram Bot Handlers ---
-from telegram import Update
-from telegram.ext import ApplicationBuilder, CommandHandler, ContextTypes
-import threading
-import asyncio
-
-BOT_TOKEN = ""
-bot_app = None
-bot_running = False
-bot_thread = None
-bot_logs = []
-MAX_LOGS = 20000
-
-# --- Logging ---
-def add_bot_log(entry):
-    bot_logs.append(entry)
-    if len(bot_logs) > MAX_LOGS:
-        bot_logs.pop(0)
+        try:
+            current_proc = subprocess.Popen(
+                cmd,
+                cwd=current_dir,
+                shell=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,
+                text=True,
+                bufsize=1
+            )
+            for line in iter(current_proc.stdout.readline, ''):
+                line = line.strip()
+                if line:
+                    output.append(line)
+                    add_terminal_log(line)
+            current_proc.stdout.close()
+            current_proc.wait()
+        except Exception as e:
+            error_msg = f"[Error] {e}"
+            output.append(error_msg)
+            add_terminal_log(error_msg)
+        finally:
+            current_proc = None
 
-# --- Placeholder: You must define this elsewhere ---
-def execute_command(cmd):
-    return f"Executed: {cmd}"
+    return "\n".join(output)
 
-# --- /start Handler ---
+# Telegram Bot
 async def start_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     await update.message.reply_text("Hello! I'm your terminal bot.\nUse /bash <command> to execute shell commands.")
     add_bot_log("[Bot] Received /start command.")
 
-# --- /bash Handler ---
 async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     cmd = ' '.join(context.args)
     if not cmd:
@@ -116,7 +124,6 @@ async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
         return
 
     add_bot_log(f"[Bot] $ {cmd}")
-
     try:
         result = execute_command(cmd)
     except Exception as e:
@@ -125,7 +132,6 @@ async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     add_bot_log(result)
     await update.message.reply_text(f"$ {cmd}\n{result}")
 
-# --- Start Bot ---
 def start_bot():
     global bot_app, bot_running, bot_thread, BOT_TOKEN
     if bot_running or not BOT_TOKEN:
@@ -155,7 +161,6 @@ def start_bot():
     bot_thread.start()
     add_bot_log("[Bot] Bot thread started.")
 
-# --- Stop Bot ---
 def stop_bot():
     global bot_app, bot_running
     if not bot_running or not bot_app:
@@ -171,14 +176,13 @@ def stop_bot():
 
     threading.Thread(target=lambda: asyncio.run(shutdown()), daemon=True).start()
 
-# --- Optional: Live UI logs if used elsewhere ---
+# UI Hooks
 def update_bot_logs():
     return "\n".join(bot_logs[-100:])
-# --- UI Update Functions ---
+
 def update_terminal_logs():
     return "\n".join(terminal_logs[-100:])
 
-
 def live_terminal(cmd):
     result = [f"$ {cmd}"]
     try:
@@ -188,7 +192,7 @@ def live_terminal(cmd):
     result.append(f"$ {current_dir} >")
     return "\n".join(result)
 
-# --- Gradio UI ---
+# Gradio UI
 with gr.Blocks() as demo:
     with gr.Tab("💻 Terminal"):
         gr.Markdown("## 🖥️ Interactive Terminal")
@@ -228,5 +232,5 @@ with gr.Blocks() as demo:
         stop_btn.click(fn=handle_stop, outputs=bot_output)
         demo.load(fn=update_bot_logs, outputs=bot_output)
 
-# --- Launch the App ---
+# Launch App
 demo.launch()