From 758da0ad4c6befd229df5799241cf50581597847 Mon Sep 17 00:00:00 2001 From: jlimolina Date: Sun, 8 Jun 2025 23:07:37 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20Versi=C3=B3n=20final=20estable=20con=20?= =?UTF-8?q?nuevo=20dise=C3=B1o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aplicación completamente funcional con servidor Waitress. Solucionados todos los problemas de arranque y recolección de noticias. Se ha implementado un nuevo diseño visual y el script de instalación está finalizado. --- app.py | 161 ++++++++++++--------------------------- n | 14 ---- templates/edit_feed.html | 88 +++++++++++++-------- 3 files changed, 104 insertions(+), 159 deletions(-) delete mode 100644 n mode change 100755 => 100644 templates/edit_feed.html diff --git a/app.py b/app.py index 92ff9a4..e0bd3af 100644 --- a/app.py +++ b/app.py @@ -1,69 +1,43 @@ # -*- coding: utf-8 -*- -"""Flask RSS aggregator — versión PostgreSQL - -(Copyright tuyo 😉, con mejoras de estabilidad, seguridad y gestión de DB) -""" - import os import sys -from flask import Flask, render_template, request, redirect, url_for, Response, flash -from apscheduler.schedulers.background import BackgroundScheduler -from datetime import datetime -import feedparser import hashlib import re -import psycopg2 -import psycopg2.extras import csv from io import StringIO -import bleach # Para la seguridad (prevenir XSS) +from datetime import datetime, timedelta import logging +import atexit + +from flask import Flask, render_template, request, redirect, url_for, Response, flash +from apscheduler.schedulers.background import BackgroundScheduler +import psycopg2 +import psycopg2.extras +import feedparser +import bleach -# Configuración del logging logging.basicConfig(stream=sys.stdout, level=logging.INFO, format='[%(asctime)s] %(levelname)s in %(module)s: %(message)s') app = Flask(__name__) -# Es necesaria para usar los mensajes flash de forma segura. app.config['SECRET_KEY'] = os.environ.get('SECRET_KEY', os.urandom(24)) -# --------------------------------------------------------------------------- -# Configuración de la base de datos PostgreSQL -# --------------------------------------------------------------------------- -DB_CONFIG = { - "host": "localhost", - "port": 5432, - "dbname": "rss", - "user": "rss", - "password": "x", -} - -def get_conn(): - """Devuelve una conexión nueva usando psycopg2 y el diccionario DB_CONFIG.""" - return psycopg2.connect(**DB_CONFIG) - +DB_CONFIG = {"host": "localhost", "port": 5432, "dbname": "rss", "user": "rss", "password": "x"} MAX_FALLOS = 5 -# ====================================== -# Filtro de Plantilla para HTML Seguro -# ====================================== +def get_conn(): + return psycopg2.connect(**DB_CONFIG) + @app.template_filter('safe_html') def safe_html(text): - if not text: - return "" - allowed_tags = {'a', 'abbr', 'b', 'strong', 'i', 'em', 'p', 'br', 'img'} + if not text: return "" + allowed_tags = {'a', 'b', 'strong', 'i', 'em', 'p', 'br', 'img'} allowed_attrs = {'a': ['href', 'title'], 'img': ['src', 'alt']} return bleach.clean(text, tags=allowed_tags, attributes=allowed_attrs, strip=True) -# ====================================== -# Rutas de la Aplicación -# ====================================== @app.route("/") def home(): noticias, categorias, continentes, paises = [], [], [], [] - cat_id = request.args.get("categoria_id") - cont_id = request.args.get("continente_id") - pais_id = request.args.get("pais_id") - + cat_id, cont_id, pais_id = request.args.get("categoria_id"), request.args.get("continente_id"), request.args.get("pais_id") try: with get_conn() as conn: with conn.cursor(cursor_factory=psycopg2.extras.DictCursor) as cursor: @@ -71,45 +45,26 @@ def home(): categorias = cursor.fetchall() cursor.execute("SELECT id, nombre FROM continentes ORDER BY nombre") continentes = cursor.fetchall() - if cont_id: cursor.execute("SELECT id, nombre, continente_id FROM paises WHERE continente_id = %s ORDER BY nombre", (cont_id,)) else: cursor.execute("SELECT id, nombre, continente_id FROM paises ORDER BY nombre") paises = cursor.fetchall() - - sql_params = [] - sql_base = """ - SELECT n.fecha, n.titulo, n.resumen, n.url, n.imagen_url, - c.nombre AS categoria, p.nombre AS pais, co.nombre AS continente - FROM noticias n - LEFT JOIN categorias c ON n.categoria_id = c.id - LEFT JOIN paises p ON n.pais_id = p.id - LEFT JOIN continentes co ON p.continente_id = co.id - """ - conditions = [] - if cat_id: - conditions.append("n.categoria_id = %s") - sql_params.append(cat_id) - if pais_id: - conditions.append("n.pais_id = %s") - sql_params.append(pais_id) - elif cont_id: - conditions.append("p.continente_id = %s") - sql_params.append(cont_id) - - if conditions: - sql_base += " WHERE " + " AND ".join(conditions) + sql_params, conditions = [], [] + sql_base = "SELECT n.fecha, n.titulo, n.resumen, n.url, n.imagen_url, c.nombre AS categoria, p.nombre AS pais, co.nombre AS continente FROM noticias n LEFT JOIN categorias c ON n.categoria_id = c.id LEFT JOIN paises p ON n.pais_id = p.id LEFT JOIN continentes co ON p.continente_id = co.id" + if cat_id: conditions.append("n.categoria_id = %s"); sql_params.append(cat_id) + if pais_id: conditions.append("n.pais_id = %s"); sql_params.append(pais_id) + elif cont_id: conditions.append("p.continente_id = %s"); sql_params.append(cont_id) + if conditions: sql_base += " WHERE " + " AND ".join(conditions) sql_final = sql_base + " ORDER BY n.fecha DESC NULLS LAST LIMIT 50" cursor.execute(sql_final, tuple(sql_params)) noticias = cursor.fetchall() - except psycopg2.Error as db_err: app.logger.error(f"[DB ERROR] Al leer noticias: {db_err}", exc_info=True) flash("Error de base de datos al cargar las noticias.", "error") - + return render_template("noticias.html", noticias=noticias, categorias=categorias, continentes=continentes, paises=paises, cat_id=int(cat_id) if cat_id else None, cont_id=int(cont_id) if cont_id else None, pais_id=int(pais_id) if pais_id else None) @@ -147,7 +102,7 @@ def add_feed(): with conn.cursor() as cursor: cursor.execute( "INSERT INTO feeds (nombre, descripcion, url, categoria_id, pais_id, idioma) VALUES (%s, %s, %s, %s, %s, %s)", - (nombre, request.form.get("descripcion"), request.form.get("url"), request.form.get("categoria_id"), request.form.get("pais_id"), request.form.get("idioma") or None) + (nombre, request.form.get("descripcion"), request.form.get("url"), request.form.get("categoria_id"), request.form.get("pais_id"), (request.form.get("idioma", "").strip() or None)) ) flash(f"Feed '{nombre}' añadido correctamente.", "success") except psycopg2.Error as db_err: @@ -162,13 +117,15 @@ def edit_feed(feed_id): with get_conn() as conn: with conn.cursor(cursor_factory=psycopg2.extras.DictCursor) as cursor: if request.method == "POST": + idioma = request.form.get("idioma", "").strip() or None activo = "activo" in request.form cursor.execute( """UPDATE feeds SET nombre=%s, descripcion=%s, url=%s, categoria_id=%s, pais_id=%s, idioma=%s, activo=%s WHERE id=%s""", - (request.form.get("nombre"), request.form.get("descripcion"), request.form.get("url"), request.form.get("categoria_id"), request.form.get("pais_id"), request.form.get("idioma") or None, activo, feed_id) + (request.form.get("nombre"), request.form.get("descripcion"), request.form.get("url"), request.form.get("categoria_id"), request.form.get("pais_id"), idioma, activo, feed_id) ) flash("Feed actualizado correctamente.", "success") return redirect(url_for("feeds")) + cursor.execute("SELECT * FROM feeds WHERE id = %s", (feed_id,)) feed = cursor.fetchone() cursor.execute("SELECT id, nombre FROM categorias ORDER BY nombre") @@ -179,9 +136,11 @@ def edit_feed(feed_id): app.logger.error(f"[DB ERROR] Al editar feed: {db_err}", exc_info=True) flash(f"Error al editar el feed: {db_err}", "error") return redirect(url_for("feeds")) + if not feed: flash("No se encontró el feed solicitado.", "error") return redirect(url_for("feeds")) + return render_template("edit_feed.html", feed=feed, categorias=categorias, paises=paises) @app.route("/delete/") @@ -208,12 +167,8 @@ def reactivar_feed(feed_id): flash(f"Error al reactivar el feed: {db_err}", "error") return redirect(url_for("feeds")) -# =================================================================== -# [INICIO DEL CÓDIGO AÑADIDO] Backup y Restauración de Feeds -# =================================================================== @app.route("/backup_feeds") def backup_feeds(): - """Exporta todos los feeds a un archivo CSV.""" try: with get_conn() as conn: with conn.cursor(cursor_factory=psycopg2.extras.DictCursor) as cursor: @@ -238,11 +193,7 @@ def backup_feeds(): output = si.getvalue() si.close() - return Response( - output, - mimetype="text/csv", - headers={"Content-Disposition": "attachment;filename=feeds_backup.csv"}, - ) + return Response(output, mimetype="text/csv", headers={"Content-Disposition": "attachment;filename=feeds_backup.csv"}) except Exception as e: app.logger.error(f"[ERROR] Al hacer backup de feeds: {e}", exc_info=True) flash("Error al generar el backup.", "error") @@ -250,13 +201,11 @@ def backup_feeds(): @app.route("/restore_feeds", methods=["GET", "POST"]) def restore_feeds(): - """Muestra el formulario de restauración y procesa el archivo CSV subido.""" if request.method == "POST": file = request.files.get("file") if not file or not file.filename.endswith(".csv"): flash("Archivo no válido. Por favor, sube un archivo .csv.", "error") return redirect(url_for("restore_feeds")) - try: file_stream = StringIO(file.read().decode("utf-8")) reader = csv.DictReader(file_stream) @@ -289,23 +238,14 @@ def restore_feeds(): except Exception as e: n_err += 1 app.logger.error(f"Error procesando fila del CSV: {row} - Error: {e}") - flash(f"Restauración completada. Feeds procesados: {n_ok}. Errores: {n_err}.", "success" if n_err == 0 else "warning") - except Exception as e: app.logger.error(f"Error al restaurar feeds desde CSV: {e}", exc_info=True) flash(f"Ocurrió un error general al procesar el archivo: {e}", "error") - return redirect(url_for("feeds")) return render_template("restore_feeds.html") -# =================================================================== -# [FIN DEL CÓDIGO AÑADIDO] -# =================================================================== -# ================================ -# Lógica de procesado de feeds -# ================================ def sumar_fallo_feed(cursor, feed_id): cursor.execute("UPDATE feeds SET fallos = fallos + 1 WHERE id = %s RETURNING fallos", (feed_id,)) fallos = cursor.fetchone()[0] @@ -324,12 +264,15 @@ def fetch_and_store(): with conn.cursor(cursor_factory=psycopg2.extras.DictCursor) as cursor: cursor.execute("SELECT id, url, categoria_id, pais_id FROM feeds WHERE activo = TRUE") feeds_to_process = cursor.fetchall() + if not feeds_to_process: + app.logger.info("No hay feeds activos para procesar.") + return for feed in feeds_to_process: try: app.logger.info(f"Procesando feed: {feed['url']}") parsed = feedparser.parse(feed['url']) if getattr(parsed, "bozo", False): - app.logger.warning(f"[BOZO] Feed mal formado: {feed['url']}") + app.logger.warning(f"[BOZO] Feed mal formado: {feed['url']} - Excepción: {parsed.bozo_exception}") sumar_fallo_feed(cursor, feed['id']) continue resetear_fallos_feed(cursor, feed['id']) @@ -345,35 +288,29 @@ def fetch_and_store(): imagen_url = entry.media_content[0].get("url", "") elif "Editar Feed -
-
- - +
+

Editar Feed

+

Modifica los detalles de tu fuente de noticias: {{ feed.nombre }}

+
- - +
+ +
+ + +
- - +
+ + +
- - +
+ + +
- - +
+
+ + +
+
+ + +
+
+ +
+ + +
+ +
+ + +
-
- - -
- - - Cancelar - -
+ + Cancelar + +
+ ← Volver a la gestión de feeds {% endblock %} -