Update app.py

app.py

@@ -85,7 +85,7 @@ def create_html_message(text: str):
     return {"parse_mode": "HTML", "text": f"<pre>{text}</pre>"}
 
 def get_inline_keyboard_for_stream():
-    # Inline keyboard for streaming controls that remain visible in the message
+    # Inline keyboard for streaming controls after the stream has started
     keyboard = {
         "inline_keyboard": [
             [
@@ -101,7 +101,7 @@ def get_inline_keyboard_for_stream():
     return keyboard
 
 def get_inline_keyboard_for_start():
-    # Inline keyboard with a start button for when setup is complete.
+    # Inline keyboard with a start button for when conversation is complete.
     keyboard = {
         "inline_keyboard": [
             [
@@ -127,7 +127,7 @@ def help_text():
     )
 
 def send_guide_message(chat_id, message):
-    # Returns a response dictionary (Markdown format) to be sent as the webhook reply
+    # Return a response dictionary to be sent as the webhook reply
     logging.info(f"Sending message to chat {chat_id}: {message}")
     return {
         "method": "sendMessage",
@@ -136,16 +136,6 @@ def send_guide_message(chat_id, message):
         "parse_mode": "Markdown"
     }
 
-def send_guide_message_html(chat_id, message):
-    # Returns a response dictionary (HTML format) to be sent as the webhook reply
-    logging.info(f"Sending HTML message to chat {chat_id}: {message}")
-    return {
-        "method": "sendMessage",
-        "chat_id": chat_id,
-        "text": message,
-        "parse_mode": "HTML"
-    }
-
 def reset_statistics():
     global stream_start_time, frames_encoded, bytes_sent
     stream_start_time = datetime.datetime.now()
@@ -165,19 +155,6 @@ def validate_inputs():
         return False, f"Missing fields: {', '.join(missing)}"
     return True, ""
 
-def get_streaming_display_message(prefix=""):
-    # Build an HTML message with a prefix, current streaming status, and live logs.
-    global live_log_display, streaming_state, frames_encoded, bytes_sent
-    status = (
-        f"<b>Stream Status:</b>\n"
-        f"State: {streaming_state}\n"
-        f"Uptime: {get_uptime()}\n"
-        f"Frames Encoded: {frames_encoded}\n"
-        f"Bytes Sent: {bytes_sent}\n"
-    )
-    logs = live_log_display if live_log_display.strip() != "" else "<pre>No logs available yet.</pre>"
-    return f"{prefix}\n{status}\n\nLive Logs:\n{logs}"
-
 # -------------------------------------------------------------------
 # Error Notification Helper
 # -------------------------------------------------------------------
@@ -192,12 +169,10 @@ def notify_error(chat_id, error_message):
 def live_log_updater():
     global live_log_display, streaming_state
     try:
-        while True:
+        while streaming_state in ["streaming", "paused"]:
+            # Update the global live_log_display with the last 15 log lines in HTML format
             live_log_display = "<pre>" + "\n".join(live_log_lines[-15:]) + "</pre>"
             time.sleep(1)
-            # If streaming has ended, break out after updating one last time.
-            if streaming_state == "idle":
-                break
     except Exception as e:
         logging.error(f"Error in live log updater: {e}")
 
@@ -206,9 +181,9 @@ def live_log_updater():
 # -------------------------------------------------------------------
 def logs_history(chat_id):
     global live_log_display, error_notification
-    # Use live_log_display if available; otherwise, show a default message.
-    log_text = live_log_display if live_log_display.strip() != "" else "<pre>No logs available yet.</pre>"
-    # Prepend any error notification if present.
+    # 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:]
@@ -221,30 +196,39 @@ 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
-    # Use simple mode by default (unless advanced_mode was set via /setting)
+    # By default, 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 = (
-        "👋 <b>Welcome to the Stream Bot!</b>\n\n"
-        "Let's set up your stream.\n"
-        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]})'}:"
-    )
+    text = ("👋 *Welcome to the Stream Bot!*\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]})_'}:")
     logging.info(f"/start command from chat {chat_id} (advanced_mode={advanced_mode})")
     return {
         "method": "sendMessage",
         "chat_id": chat_id,
         "text": text,
-        "parse_mode": "HTML"
+        "parse_mode": "Markdown"
     }
 
 def handle_setting(chat_id):
@@ -253,16 +237,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 = (
-        "⚙️ <b>Advanced Mode Activated!</b>\n\n"
-        "Please enter the <b>input url</b>:"
-    )
+    text = ("⚙️ *Advanced Mode Activated!*\n\n"
+            "Please enter the *input url*:")
     logging.info(f"/setting command from chat {chat_id} - advanced mode enabled")
     return {
         "method": "sendMessage",
         "chat_id": chat_id,
         "text": text,
-        "parse_mode": "HTML"
+        "parse_mode": "Markdown"
     }
 
 def handle_help(chat_id):
@@ -286,15 +268,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 <b>{current_step.replace('_', ' ')}</b>"
+            prompt = f"Please enter the *{current_step.replace('_', ' ')}*"
             if current_step in default_settings:
-                prompt += f" (default: {default_settings[current_step]})"
-            return send_guide_message_html(chat_id, prompt)
+                prompt += f" _(default: {default_settings[current_step]})_"
+            return send_guide_message(chat_id, prompt)
         else:
             current_step = None
             valid, msg = validate_inputs()
             if not valid:
-                return send_guide_message_html(chat_id, f"Validation error: {msg}")
+                return send_guide_message(chat_id, f"Validation error: {msg}")
             if not advanced_mode:
                 user_inputs.setdefault("quality_settings", default_settings["quality_settings"])
                 user_inputs.setdefault("video_codec", default_settings["video_codec"])
@@ -302,12 +284,12 @@ def handle_conversation(chat_id, text):
             return {
                 "method": "sendMessage",
                 "chat_id": chat_id,
-                "text": "All inputs received. Press <b>🚀 Start Streaming</b> to begin.",
+                "text": "All inputs received. Press *🚀 Start Streaming* to begin.",
                 "reply_markup": get_inline_keyboard_for_start(),
-                "parse_mode": "HTML"
+                "parse_mode": "Markdown"
             }
     else:
-        return send_guide_message_html(chat_id, "Unrecognized input. Type /help for available commands.")
+        return send_guide_message(chat_id, "Unrecognized input. Type /help for available commands.")
 
 # -------------------------------------------------------------------
 # Background Streaming Functions
@@ -339,8 +321,7 @@ def stream_to_youtube(input_url, quality_settings, video_codec, audio_codec, out
         out_audio_stream.layout = "stereo"
         video_stream.codec_context.time_base = fractions.Fraction(1, video_stream.rate)
         logging.info("Streaming started successfully.")
-        # Add an initial log entry so live_log_display is not empty.
-        logging.info("Live log updating has begun.")
+        # Start live log updater thread if not already running
         global live_log_thread
         if live_log_thread is None or not live_log_thread.is_alive():
             live_log_thread = threading.Thread(target=live_log_updater)
@@ -395,7 +376,7 @@ def start_streaming(chat_id):
     global stream_thread, stream_chat_id
     valid, msg = validate_inputs()
     if not valid:
-        return send_guide_message_html(chat_id, f"Validation error: {msg}")
+        return send_guide_message(chat_id, f"Validation error: {msg}")
     stream_chat_id = chat_id
     try:
         stream_thread = threading.Thread(
@@ -412,10 +393,11 @@ 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,
-            "text": get_streaming_display_message("<b>Streaming initiated!</b>"),
+            "text": "🚀 <b>Streaming initiated!</b>\n\n" + compose_streaming_message(),
             "reply_markup": get_inline_keyboard_for_stream(),
             "parse_mode": "HTML"
         }
@@ -423,7 +405,7 @@ def start_streaming(chat_id):
         error_message = f"Failed to start streaming: {str(e)}"
         logging.error(error_message)
         notify_error(chat_id, error_message)
-        return send_guide_message_html(chat_id, error_message)
+        return send_guide_message(chat_id, error_message)
 
 # -------------------------------------------------------------------
 # Stream Control Handlers
@@ -436,11 +418,10 @@ def pause_stream(chat_id):
         return {
             "method": "sendMessage",
             "chat_id": chat_id,
-            "text": get_streaming_display_message("<b>Streaming paused.</b>"),
-            "reply_markup": get_inline_keyboard_for_stream(),
+            "text": "⏸ <b>Streaming paused.</b>\n\n" + compose_streaming_message(),
             "parse_mode": "HTML"
         }
-    return send_guide_message_html(chat_id, "Streaming is not active.")
+    return send_guide_message(chat_id, "Streaming is not active.")
 
 def resume_stream(chat_id):
     global streaming_state
@@ -450,11 +431,10 @@ def resume_stream(chat_id):
         return {
             "method": "sendMessage",
             "chat_id": chat_id,
-            "text": get_streaming_display_message("<b>Streaming resumed.</b>"),
-            "reply_markup": get_inline_keyboard_for_stream(),
+            "text": "▶️ <b>Streaming resumed.</b>\n\n" + compose_streaming_message(),
             "parse_mode": "HTML"
         }
-    return send_guide_message_html(chat_id, "Streaming is not paused.")
+    return send_guide_message(chat_id, "Streaming is not paused.")
 
 def abort_stream(chat_id):
     global streaming_state
@@ -464,19 +444,24 @@ def abort_stream(chat_id):
         return {
             "method": "sendMessage",
             "chat_id": chat_id,
-            "text": get_streaming_display_message("<b>Streaming aborted.</b>"),
-            "reply_markup": get_inline_keyboard_for_stream(),
+            "text": "⏹ <b>Streaming aborted.</b>",
             "parse_mode": "HTML"
         }
-    return send_guide_message_html(chat_id, "No active streaming to abort.")
+    return send_guide_message(chat_id, "No active streaming to abort.")
 
 def stream_status(chat_id):
+    stats = (
+        f"*Stream Status:*\n\n"
+        f"• **State:** {streaming_state}\n"
+        f"• **Uptime:** {get_uptime()}\n"
+        f"• **Frames Encoded:** {frames_encoded}\n"
+        f"• **Bytes Sent:** {bytes_sent}\n"
+    )
     return {
         "method": "sendMessage",
         "chat_id": chat_id,
-        "text": get_streaming_display_message("<b>Current streaming status:</b>"),
-        "reply_markup": get_inline_keyboard_for_stream(),
-        "parse_mode": "HTML"
+        "text": stats,
+        "parse_mode": "Markdown"
     }
 
 # -------------------------------------------------------------------
@@ -486,6 +471,7 @@ def stream_status(chat_id):
 async def telegram_webhook(request: Request):
     update = await request.json()
     logging.debug(f"Received update: {update}")
+    # Process messages from users
     if "message" in update:
         chat_id = update["message"]["chat"]["id"]
         text = update["message"].get("text", "").strip()
@@ -507,6 +493,7 @@ async def telegram_webhook(request: Request):
             return stream_status(chat_id)
         else:
             return handle_conversation(chat_id, text)
+    # Process inline keyboard callback queries
     elif "callback_query" in update:
         callback_data = update["callback_query"]["data"]
         chat_id = update["callback_query"]["message"]["chat"]["id"]
@@ -522,9 +509,15 @@ async def telegram_webhook(request: Request):
         elif callback_data == "start_stream":
             response = start_streaming(chat_id)
         else:
-            response = send_guide_message_html(chat_id, "❓ Unknown callback command.")
-        response["method"] = "editMessageText"
-        response["message_id"] = message_id
-        response["reply_markup"] = get_inline_keyboard_for_stream()
+            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
     return {"status": "ok"}