Update app.py

app.py

@@ -49,7 +49,7 @@ live_log_thread = None
 
 # Live logging globals
 live_log_lines = []     # Rolling list (max 50 log lines)
-live_log_display = ""   # Global variable updated every second by live_log_updater
+live_log_display = ""   # Global variable updated every second by live_log_updater()
 error_notification = "" # Global variable to hold error details if any
 
 # -------------------------------------------------------------------
@@ -155,6 +155,17 @@ def validate_inputs():
         return False, f"Missing fields: {', '.join(missing)}"
     return True, ""
 
+# -------------------------------------------------------------------
+# Helper to Compose the Streaming Message (HTML)
+# -------------------------------------------------------------------
+def compose_streaming_message():
+    global live_log_display, error_notification
+    msg = ""
+    if error_notification:
+        msg += "<b>ERROR:</b> " + error_notification + "\n\n"
+    msg += "🚀 <b>Streaming in progress!</b>\n\nLive Logs:\n" + live_log_display + "\n\nUse the inline keyboard to control the stream."
+    return msg
+
 # -------------------------------------------------------------------
 # Error Notification Helper
 # -------------------------------------------------------------------
@@ -170,7 +181,7 @@ def live_log_updater():
     global live_log_display, streaming_state
     try:
         while streaming_state in ["streaming", "paused"]:
-            # Update the global live_log_display with the last 15 log lines in HTML format
+            # Update live_log_display with the last 15 log lines (HTML formatted)
             live_log_display = "<pre>" + "\n".join(live_log_lines[-15:]) + "</pre>"
             time.sleep(1)
     except Exception as e:
@@ -181,9 +192,7 @@ def live_log_updater():
 # -------------------------------------------------------------------
 def logs_history(chat_id):
     global live_log_display, error_notification
-    # Use the global live_log_display if available; otherwise, show a default message.
     log_text = live_log_display if live_log_display else "<pre>No logs available yet.</pre>"
-    # If an error occurred, prepend the error notification.
     if error_notification:
         if log_text.startswith("<pre>"):
             log_text = f"<pre>ERROR: {error_notification}\n\n" + log_text[5:]
@@ -196,39 +205,28 @@ def logs_history(chat_id):
          "parse_mode": "HTML"
     }
 
-# -------------------------------------------------------------------
-# Helper to Compose the Streaming Message
-# -------------------------------------------------------------------
-def compose_streaming_message():
-    global live_log_display, error_notification
-    msg = ""
-    if error_notification:
-        msg += "<b>ERROR:</b> " + error_notification + "\n\n"
-    msg += "🚀 <b>Streaming in progress!</b>\n\nLive Logs:\n" + live_log_display + "\n\nUse the inline keyboard to control the stream."
-    return msg
-
 # -------------------------------------------------------------------
 # Conversation Handlers
 # -------------------------------------------------------------------
 def handle_start(chat_id):
     global current_step, user_inputs, conversation_fields, advanced_mode
-    # By default, use simple mode unless advanced_mode is set via /setting
+    # Use simple mode unless advanced_mode is set via /setting
     user_inputs = {}
     if not advanced_mode:
         conversation_fields = ["input_url", "output_url"]
     else:
         conversation_fields = ["input_url", "quality_settings", "video_codec", "audio_codec", "output_url"]
     current_step = conversation_fields[0]
-    text = ("👋 *Welcome to the Stream Bot!*\n\n"
+    text = ("👋 <b>Welcome to the Stream Bot!</b>\n\n"
             "Let's set up your stream.\n"
-            f"Please enter the *{current_step.replace('_', ' ')}*"
-            f"{' (no default)' if current_step not in default_settings else f' _(default: {default_settings[current_step]})_'}:")
+            f"Please enter the <b>{current_step.replace('_', ' ')}</b>"
+            f"{' (no default)' if current_step not in default_settings else f' (default: {default_settings[current_step]})'}:")
     logging.info(f"/start command from chat {chat_id} (advanced_mode={advanced_mode})")
     return {
         "method": "sendMessage",
         "chat_id": chat_id,
         "text": text,
-        "parse_mode": "Markdown"
+        "parse_mode": "HTML"
     }
 
 def handle_setting(chat_id):
@@ -237,14 +235,14 @@ def handle_setting(chat_id):
     conversation_fields = ["input_url", "quality_settings", "video_codec", "audio_codec", "output_url"]
     user_inputs = {}
     current_step = conversation_fields[0]
-    text = ("⚙️ *Advanced Mode Activated!*\n\n"
-            "Please enter the *input url*:")
+    text = ("⚙️ <b>Advanced Mode Activated!</b>\n\n"
+            "Please enter the <b>input url</b>:")
     logging.info(f"/setting command from chat {chat_id} - advanced mode enabled")
     return {
         "method": "sendMessage",
         "chat_id": chat_id,
         "text": text,
-        "parse_mode": "Markdown"
+        "parse_mode": "HTML"
     }
 
 def handle_help(chat_id):
@@ -268,10 +266,15 @@ def handle_conversation(chat_id, text):
         idx = conversation_fields.index(current_step)
         if idx < len(conversation_fields) - 1:
             current_step = conversation_fields[idx + 1]
-            prompt = f"Please enter the *{current_step.replace('_', ' ')}*"
+            prompt = f"Please enter the <b>{current_step.replace('_', ' ')}</b>"
             if current_step in default_settings:
-                prompt += f" _(default: {default_settings[current_step]})_"
-            return send_guide_message(chat_id, prompt)
+                prompt += f" (default: {default_settings[current_step]})"
+            return {
+                "method": "sendMessage",
+                "chat_id": chat_id,
+                "text": prompt,
+                "parse_mode": "HTML"
+            }
         else:
             current_step = None
             valid, msg = validate_inputs()
@@ -284,9 +287,9 @@ def handle_conversation(chat_id, text):
             return {
                 "method": "sendMessage",
                 "chat_id": chat_id,
-                "text": "All inputs received. Press *🚀 Start Streaming* to begin.",
+                "text": "All inputs received. Press <b>🚀 Start Streaming</b> to begin.",
                 "reply_markup": get_inline_keyboard_for_start(),
-                "parse_mode": "Markdown"
+                "parse_mode": "HTML"
             }
     else:
         return send_guide_message(chat_id, "Unrecognized input. Type /help for available commands.")
@@ -393,7 +396,6 @@ def start_streaming(chat_id):
         stream_thread.daemon = True
         stream_thread.start()
         logging.info("Streaming thread started.")
-        # Return a message that includes live log display and inline keyboard.
         return {
             "method": "sendMessage",
             "chat_id": chat_id,
@@ -510,13 +512,11 @@ async def telegram_webhook(request: Request):
             response = start_streaming(chat_id)
         else:
             response = send_guide_message(chat_id, "❓ Unknown callback command.")
-        # For inline queries that control streaming, update the message text
         if callback_data in ["pause", "resume", "abort", "status", "start_stream"]:
             response["method"] = "editMessageText"
             response["message_id"] = message_id
             response["text"] = compose_streaming_message()
             response["parse_mode"] = "HTML"
-            # Always include the inline keyboard if streaming is active
             if streaming_state in ["streaming", "paused"]:
                 response["reply_markup"] = get_inline_keyboard_for_stream()
         return response