Update wltv_server.py

wltv_server.py

@@ -1,14 +1,15 @@
 import os
 import requests
-import zipfile
+import gzip
+import shutil
 import logging
-from flask import Flask, send_file, jsonify, Response
+from flask import Flask, send_file, jsonify
 import xml.etree.ElementTree as ET
 from datetime import datetime
 
 # Set up logging
 logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger('wltv_server')
+logger = logging.getLogger(__name__)
 
 app = Flask(__name__)
 
@@ -17,39 +18,40 @@ extract_to_dir = 'extracted'
 if not os.path.exists(extract_to_dir):
     os.makedirs(extract_to_dir, exist_ok=True)
 
-# Step 1: Download the zip file
-def download_zip_file(url, output_path):
+# Function to download the file
+def download_file(url, output_path):
     logger.info(f"Downloading from {url}...")
     try:
         response = requests.get(url)
-        response.raise_for_status()  # Raise an error for bad responses
-        with open(output_path, 'wb') as f:
-            f.write(response.content)
-        logger.info(f"Downloaded zip file to {output_path} with size {len(response.content)} bytes")
-    except requests.RequestException as e:
+        if response.status_code == 200:
+            with open(output_path, 'wb') as f:
+                f.write(response.content)
+            logger.info(f"Downloaded file to {output_path} with size {len(response.content)} bytes")
+        else:
+            logger.error(f"Failed to download file. Status code: {response.status_code}")
+    except PermissionError as e:
+        logger.error(f"Permission error occurred while downloading the file: {e}")
+    except Exception as e:
         logger.error(f"An error occurred while downloading the file: {e}")
 
-# Step 2: Extract the file from the zip file
-def extract_file(zip_path, extract_to_dir):
-    logger.info(f"Extracting {zip_path} to {extract_to_dir}...")
+# Function to extract .gz files
+def extract_gz_file(gz_path, extract_to_dir):
+    logger.info(f"Extracting {gz_path} to {extract_to_dir}...")
+    if not os.path.exists(gz_path):
+        logger.error(f"GZ file does not exist: {gz_path}")
+        return
     try:
-        if not os.path.exists(zip_path):
-            raise FileNotFoundError(f"Zip file does not exist: {zip_path}")
-        with zipfile.ZipFile(zip_path, 'r') as zip_ref:
-            zip_ref.extractall(extract_to_dir)
-            # Log extracted files and their extensions
-            extracted_files = zip_ref.namelist()
-            logger.info(f"Extracted files: {extracted_files}")
-            for file in extracted_files:
-                logger.info(f"File: {file}, Extension: {os.path.splitext(file)[1]}")
-    except zipfile.BadZipFile:
-        logger.error("The downloaded file is not a zip file or is corrupted.")
+        extracted_file_path = os.path.join(extract_to_dir, 'it_wltv_full.xml')  # Updated file extension
+        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}")
     except Exception as e:
         logger.error(f"An error occurred while extracting the file: {e}")
 
-# New function to get current program on Sky TG24
+# Function to get the current program for Sky TG24
 def get_current_program(channel_id="skytg24"):
-    xml_file = os.path.join(extract_to_dir, 'it_wltv_full')  # Assuming this is the file name
+    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
@@ -75,12 +77,21 @@ def get_current_program(channel_id="skytg24"):
         logger.error(f"Failed to parse XML file: {e}")
         return None
 
-# Step 3: Set up a Flask route to expose the extracted file
+# Flask route to serve the extracted file
 @app.route('/wltv', methods=['GET'])
 def serve_extracted_file():
-    file_name = 'it_wltv_full'  # Update this based on actual file name if needed
+    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')
@@ -88,7 +99,30 @@ def serve_extracted_file():
         logger.error("File not found")
         return "File not found", 404
 
-# New route to serve what's currently on Sky TG24
+# Route to fetch logs
+@app.route('/logs', methods=['GET'])
+def get_logs():
+    try:
+        with open('app.log', 'r') as log_file:
+            logs = log_file.read()
+        return logs, 200
+    except Exception as e:
+        logger.error(f"Failed to read logs: {e}")
+        return jsonify({"error": "Failed to read logs"}), 500
+
+# Route to update (download and extract again)
+@app.route('/update', methods=['POST'])
+def update_files():
+    file_url = 'http://epg-guide.com/wltv.gz'
+    file_path = '/tmp/it_wltv_full.gz'
+
+    # Download and extract the gz file
+    download_file(file_url, file_path)
+    extract_gz_file(file_path, extract_to_dir)
+
+    return "Files updated", 200
+
+# Route to serve the current program on Sky TG24
 @app.route('/skytg24/now', methods=['GET'])
 def current_skytg24_program():
     program_info = get_current_program("skytg24")
@@ -97,22 +131,13 @@ def current_skytg24_program():
     else:
         return "No current program found for Sky TG24.", 404
 
-# Step 4: Set up a Flask route to trigger the update (download and extract)
-@app.route('/update', methods=['POST'])
-def update_wltv():
-    zip_url = 'http://epg-guide.com/wltv.gz'
-    zip_path = '/tmp/it_wltv_full.zip'
-
-    # Download and extract the zip file
-    download_zip_file(zip_url, zip_path)
-    extract_file(zip_path, extract_to_dir)
-
-    return "Update complete", 200
+if __name__ == '__main__':
+    file_url = 'http://epg-guide.com/wltv.gz'
+    file_path = '/tmp/it_wltv_full.gz'
 
-# Set up a Flask route to serve the logs
-@app.route('/logs', methods=['GET'])
-def serve_logs():
-    return Response(log_stream.getvalue(), mimetype='text/plain')
+    # Download and extract the gz file initially
+    download_file(file_url, file_path)
+    extract_gz_file(file_path, extract_to_dir)
 
-if __name__ == '__main__':
+    # Start the Flask web server
     app.run(host='0.0.0.0', port=8080)