Update wltv_server.py

wltv_server.py

@@ -2,10 +2,9 @@ import os
 import requests
 import gzip
 import shutil
-import logging
-from flask import Flask, send_file, jsonify
 import xml.etree.ElementTree as ET
-from datetime import datetime
+import logging
+from flask import Flask, send_file, jsonify, abort
 
 # Set up logging
 logging.basicConfig(level=logging.INFO)
@@ -18,6 +17,9 @@ extract_to_dir = 'extracted'
 if not os.path.exists(extract_to_dir):
     os.makedirs(extract_to_dir, exist_ok=True)
 
+# In-memory storage for channel data
+channels = {}
+
 # Function to download the file
 def download_file(url, output_path):
     logger.info(f"Downloading from {url}...")
@@ -41,95 +43,45 @@ def extract_gz_file(gz_path, extract_to_dir):
         logger.error(f"GZ file does not exist: {gz_path}")
         return
     try:
-        extracted_file_path = os.path.join(extract_to_dir, 'it_wltv_full.xml')  # Updated file extension
+        extracted_file_path = os.path.join(extract_to_dir, 'it_wltv_full.xml')
         with gzip.open(gz_path, 'rb') as f_in:
             with open(extracted_file_path, 'wb') as f_out:
                 shutil.copyfileobj(f_in, f_out)
         logger.info(f"Extracted GZ file to {extracted_file_path}")
+        parse_xml(extracted_file_path)  # Update the in-memory data
     except Exception as e:
         logger.error(f"An error occurred while extracting the file: {e}")
 
-# Function to get the current program for a given channel
-def get_current_program(channel_id):
-    xml_file = os.path.join(extract_to_dir, 'it_wltv_full.xml')
-    if not os.path.exists(xml_file):
-        logger.error("XML file does not exist for program data")
-        return None
-
+# Function to parse the XML file and update in-memory data
+def parse_xml(xml_path):
+    logger.info(f"Parsing XML file: {xml_path}")
+    global channels
+    channels = {}  # Clear existing data
     try:
-        tree = ET.parse(xml_file)
+        tree = ET.parse(xml_path)
         root = tree.getroot()
-
-        # Get the current time
-        current_time = datetime.now()
-
-        for programme in root.findall('programme'):
-            if programme.get('channel') == channel_id:
-                start_time = datetime.strptime(programme.get('start')[:14], "%Y%m%d%H%M%S")
-                stop_time = datetime.strptime(programme.get('stop')[:14], "%Y%m%d%H%M%S")
-                if start_time <= current_time < stop_time:
-                    title = programme.find('title').text
-                    desc = programme.find('desc').text
-                    return {"title": title, "description": desc}
-        logger.info(f"No current program found for channel {channel_id}.")
-        return None
-    except Exception as e:
-        logger.error(f"Failed to parse XML file: {e}")
-        return None
-
-# Function to dynamically create routes for each channel
-def create_channel_routes():
-    xml_file = os.path.join(extract_to_dir, 'it_wltv_full.xml')
-    if not os.path.exists(xml_file):
-        logger.error("XML file does not exist to create dynamic routes")
-        return
-
-    try:
-        tree = ET.parse(xml_file)
-        root = tree.getroot()
-
-        # Find all channels in the XML
-        channels = {channel.get('id'): channel.find('display-name').text.replace(" ", "").lower()
-                    for channel in root.findall('channel')}
-
-        for channel_id, route_name in channels.items():
-            # Create a dynamic route for each channel
-            create_route_for_channel(channel_id, route_name)
-
+        
+        for channel in root.findall('channel'):
+            channel_id = channel.get('id')
+            display_name = channel.find('display-name').text if channel.find('display-name') is not None else 'Unknown'
+            icon_url = channel.find('icon').get('src') if channel.find('icon') is not None else 'No icon'
+            channels[channel_id] = {
+                'title': display_name,
+                'icon': icon_url,
+                'now': 'No current program information available'
+            }
+        
+        logger.info(f"Updated channel data: {channels}")
     except Exception as e:
-        logger.error(f"Failed to create dynamic routes from XML file: {e}")
+        logger.error(f"An error occurred while parsing the XML file: {e}")
 
-# Helper function to create route for a specific channel
-def create_route_for_channel(channel_id, route_name):
-    @app.route(f'/{route_name}/now', methods=['GET'])
-    def current_program():
-        program_info = get_current_program(channel_id)
-        if program_info:
-            return jsonify(program_info)
-        else:
-            return f"No current program found for {route_name}.", 404
-
-# Flask route to serve the extracted file
-@app.route('/wltv', methods=['GET'])
-def serve_extracted_file():
-    try:
-        extracted_files = os.listdir(extract_to_dir)
-        logger.info(f"Files in 'extracted' directory: {extracted_files}")
-        for file_name in extracted_files:
-            logger.info(f"File: {file_name}, Extension: {os.path.splitext(file_name)[1]}")
-    except Exception as e:
-        logger.error(f"Error listing files in 'extracted' directory: {e}")
-        return "Error listing files", 500
-    
-    file_name = 'it_wltv_full.xml'  # Updated file name with extension
-    file_path = os.path.join(extract_to_dir, file_name)
-    
-    if os.path.exists(file_path):
-        logger.info(f"Serving file from {file_path}")
-        return send_file(file_path, as_attachment=False, mimetype='text/plain')
-    else:
-        logger.error("File not found")
-        return "File not found", 404
+# Route to fetch channel info
+@app.route('/<channel_id>/now', methods=['GET'])
+def get_channel_info(channel_id):
+    channel = channels.get(channel_id)
+    if not channel:
+        abort(404, description="Channel not found")
+    return jsonify(channel)
 
 # Route to fetch logs
 @app.route('/logs', methods=['GET'])
@@ -152,18 +104,7 @@ def update_files():
     download_file(file_url, file_path)
     extract_gz_file(file_path, extract_to_dir)
 
-    return "Files updated, restart required for changes to take effect.", 200
+    return "Files updated and in-memory data refreshed", 200
 
 if __name__ == '__main__':
-    file_url = 'http://epg-guide.com/wltv.gz'
-    file_path = '/tmp/it_wltv_full.gz'
-
-    # Download and extract the gz file initially
-    download_file(file_url, file_path)
-    extract_gz_file(file_path, extract_to_dir)
-
-    # Create dynamic routes based on the extracted XML data
-    create_channel_routes()
-
-    # Start the Flask web server
     app.run(host='0.0.0.0', port=8080)