diff --git a/app.py b/app.py index 742d61e..b88b591 100644 --- a/app.py +++ b/app.py @@ -238,17 +238,23 @@ def api_datos(): def api_regenerar(): usuario = session["usuario"] try: - subprocess.run( + r1 = subprocess.run( [sys.executable, str(BASE_DIR / "autocompra7.py"), "--usuario", usuario], - cwd=str(BASE_DIR), check=True, capture_output=True, timeout=120 + cwd=str(BASE_DIR), capture_output=True, text=True, timeout=120 ) - subprocess.run( + if r1.returncode != 0: + return jsonify({"ok": False, "mensaje": "Error en pipeline", + "detalle": r1.stderr or r1.stdout}), 500 + + r2 = subprocess.run( [sys.executable, str(BASE_DIR / "generar_lista.py"), "--usuario", usuario], - cwd=str(BASE_DIR), check=True, capture_output=True, timeout=30 + cwd=str(BASE_DIR), capture_output=True, text=True, timeout=30 ) + if r2.returncode != 0: + return jsonify({"ok": False, "mensaje": "Error generando lista", + "detalle": r2.stderr or r2.stdout}), 500 + return jsonify({"ok": True, "mensaje": "Pipeline ejecutado correctamente"}) - except subprocess.CalledProcessError as e: - return jsonify({"ok": False, "mensaje": str(e)}), 500 except subprocess.TimeoutExpired: return jsonify({"ok": False, "mensaje": "Timeout al ejecutar el pipeline"}), 500 diff --git a/templates/index.html b/templates/index.html index aa9fd0e..b5bc83c 100644 --- a/templates/index.html +++ b/templates/index.html @@ -247,8 +247,16 @@ try { const res = await fetch('/api/regenerar', { method: 'POST' }); const data = await res.json(); - estado.textContent = data.mensaje; - if (data.ok) setTimeout(() => location.reload(), 1500); + if (data.ok) { + estado.textContent = '✅ ' + data.mensaje; + setTimeout(() => location.reload(), 1500); + } else { + estado.style.color = '#f97316'; + estado.textContent = '❌ ' + data.mensaje; + if (data.detalle) { + estado.innerHTML += '
' + data.detalle + '
'; + } + } } catch(e) { estado.textContent = 'Error de conexion'; } finally { diff --git a/tickets/20250102 Mercadona 111,58 €.pdf b/tickets/20250102 Mercadona 111,58 €.pdf deleted file mode 100644 index 229dcaa..0000000 Binary files a/tickets/20250102 Mercadona 111,58 €.pdf and /dev/null differ diff --git a/tickets/20250109 Mercadona 170,12 €.pdf b/tickets/20250109 Mercadona 170,12 €.pdf deleted file mode 100644 index bcdfa71..0000000 Binary files a/tickets/20250109 Mercadona 170,12 €.pdf and /dev/null differ diff --git a/tickets/20250114 Mercadona 6,02 €.pdf b/tickets/20250114 Mercadona 6,02 €.pdf deleted file mode 100644 index 8ab57ed..0000000 Binary files a/tickets/20250114 Mercadona 6,02 €.pdf and /dev/null differ diff --git a/tickets/20250116 Mercadona 1,41 €.pdf b/tickets/20250116 Mercadona 1,41 €.pdf deleted file mode 100644 index 5f4d6b8..0000000 Binary files a/tickets/20250116 Mercadona 1,41 €.pdf and /dev/null differ diff --git a/tickets/20250116 Mercadona 145,05 €.pdf b/tickets/20250116 Mercadona 145,05 €.pdf deleted file mode 100644 index b4609b5..0000000 Binary files a/tickets/20250116 Mercadona 145,05 €.pdf and /dev/null differ diff --git a/tickets/20250123 Mercadona 173,05 €.pdf b/tickets/20250123 Mercadona 173,05 €.pdf deleted file mode 100644 index 30a54ed..0000000 Binary files a/tickets/20250123 Mercadona 173,05 €.pdf and /dev/null differ diff --git a/tickets/20250129 Mercadona 197,27 €.pdf b/tickets/20250129 Mercadona 197,27 €.pdf deleted file mode 100644 index fd64cd4..0000000 Binary files a/tickets/20250129 Mercadona 197,27 €.pdf and /dev/null differ diff --git a/tickets/20250207 Mercadona 158,19 €.pdf b/tickets/20250207 Mercadona 158,19 €.pdf deleted file mode 100644 index 9e135c2..0000000 Binary files a/tickets/20250207 Mercadona 158,19 €.pdf and /dev/null differ diff --git a/tickets/20250213 Mercadona 154,63 €.pdf b/tickets/20250213 Mercadona 154,63 €.pdf deleted file mode 100644 index f19534d..0000000 Binary files a/tickets/20250213 Mercadona 154,63 €.pdf and /dev/null differ diff --git a/tickets/20250220 Mercadona 166,99 €.pdf b/tickets/20250220 Mercadona 166,99 €.pdf deleted file mode 100644 index 989d49a..0000000 Binary files a/tickets/20250220 Mercadona 166,99 €.pdf and /dev/null differ diff --git a/tickets/20250227 Mercadona 168,62 €.pdf b/tickets/20250227 Mercadona 168,62 €.pdf deleted file mode 100644 index 1f2690a..0000000 Binary files a/tickets/20250227 Mercadona 168,62 €.pdf and /dev/null differ diff --git a/tickets/20250227 Mercadona 3,61 €.pdf b/tickets/20250227 Mercadona 3,61 €.pdf deleted file mode 100644 index 4e54c79..0000000 Binary files a/tickets/20250227 Mercadona 3,61 €.pdf and /dev/null differ diff --git a/tickets/20250305 Mercadona 129,33 €.pdf b/tickets/20250305 Mercadona 129,33 €.pdf deleted file mode 100644 index 101293c..0000000 Binary files a/tickets/20250305 Mercadona 129,33 €.pdf and /dev/null differ diff --git a/tickets/20250312 Mercadona 193,95 €.pdf b/tickets/20250312 Mercadona 193,95 €.pdf deleted file mode 100644 index 9197c37..0000000 Binary files a/tickets/20250312 Mercadona 193,95 €.pdf and /dev/null differ diff --git a/tickets/20250320 Mercadona 144,50 €.pdf b/tickets/20250320 Mercadona 144,50 €.pdf deleted file mode 100644 index 64fc9db..0000000 Binary files a/tickets/20250320 Mercadona 144,50 €.pdf and /dev/null differ diff --git a/tickets/20250326 Mercadona 162,57 €.pdf b/tickets/20250326 Mercadona 162,57 €.pdf deleted file mode 100644 index cb521b3..0000000 Binary files a/tickets/20250326 Mercadona 162,57 €.pdf and /dev/null differ diff --git a/tickets/20250403 Mercadona 104,58 €.pdf b/tickets/20250403 Mercadona 104,58 €.pdf deleted file mode 100644 index 8431a75..0000000 Binary files a/tickets/20250403 Mercadona 104,58 €.pdf and /dev/null differ diff --git a/tickets/20250410 Mercadona 190,44 €.pdf b/tickets/20250410 Mercadona 190,44 €.pdf deleted file mode 100644 index eb6be8a..0000000 Binary files a/tickets/20250410 Mercadona 190,44 €.pdf and /dev/null differ diff --git a/tickets/20250416 Mercadona 184,99 €.pdf b/tickets/20250416 Mercadona 184,99 €.pdf deleted file mode 100644 index f27ab6c..0000000 Binary files a/tickets/20250416 Mercadona 184,99 €.pdf and /dev/null differ diff --git a/tickets/20250424 Mercadona 166,83 €.pdf b/tickets/20250424 Mercadona 166,83 €.pdf deleted file mode 100644 index 61295c4..0000000 Binary files a/tickets/20250424 Mercadona 166,83 €.pdf and /dev/null differ diff --git a/tickets/20250430 Mercadona 148,40 €.pdf b/tickets/20250430 Mercadona 148,40 €.pdf deleted file mode 100644 index 475ec03..0000000 Binary files a/tickets/20250430 Mercadona 148,40 €.pdf and /dev/null differ