Update cemento.py

cemento.py

@@ -2,108 +2,85 @@
 import sys
 import os
 import math
-import subprocess
+import requests # Usiamo requests per bypassare l'errore del comando 'lp'
 import time
 from flask import Flask, render_template, request, Response
 
-# 1. PERCORSO LIBRERIE SYNOLOGY (Identificato con il test)
+# Configurazione per Synology
 sys.path.append('/var/services/homes/Francesco/.local/lib/python3.8/site-packages')
 
 app = Flask(__name__)
 
-# 2. CONFIGURAZIONE VERSIONE E STAMPA
+# CONFIGURAZIONE STAMPA CUPS
-VERSIONE = "V1.1 - Synology CUPS Edition"
+CUPS_URL = "http://192.168.1.14:6310/printers/Virtual_PDF"
-CUPS_SERVER = "192.168.1.14:6310" # Indirizzo container CUPS
+OUTPUT_DIR = "/volume1/docker/cups-pdf/output"
-PRINTER_NAME = "Virtual_PDF"      # Nome stampante configurata
-OUTPUT_DIR = "/volume1/docker/cups-pdf/output" # Cartella destinazione PDF
-
-def calcola(d):
-    try:
-        def to_m(v, u):
-            val = float(v.replace(',', '.')) if v else 0
-            if u == "mm": return val / 1000
-            if u == "cm": return val / 100
-            return val
-
-        # Calcolo Volume e Peso
-        vol = to_m(d.get('a','0'), d.get('ua','m')) * to_m(d.get('l','0'), d.get('ul','m')) * to_m(d.get('p','0'), d.get('up','m'))
-        peso_tot = vol * 2400
-        
-        mats = ['cem', 'sab', 'ghi']
-        p = {m: float(d.get(f'p_{m}', '0').replace(',','.')) for m in mats}
-        w = {m: float(d.get(f'w_{m}', '25').replace(',','.')) for m in mats}
-        c = {m: float(d.get(f'c_{m}', '0').replace(',','.')) for m in mats}
-        
-        somma_p = sum(p.values())
-        res = {"vol": f"{vol:.3f}", "peso": f"{peso_tot:.0f}"}
-        
-        tot_s, costo_t = 0, 0
-        for m in mats:
-            # Correzione BUG: Se la parte è 0, forza a 0 sacchetti
-            if p[m] <= 0:
-                res[f's_{m}'] = 0
-                res[f'cost_{m}'] = "0.00"
-                continue
-                
-            kg = (p[m]/somma_p)*peso_tot if somma_p > 0 else 0
-            s_esatti = kg/w[m] if w[m] > 0 else 0
-            res[f's_{m}'] = math.ceil(s_esatti)
-            res[f'cost_{m}'] = f"{math.ceil(s_esatti)*c[m]:.2f}"
-            tot_s += math.ceil(s_esatti)
-            costo_t += math.ceil(s_esatti)*c[m]
-            
-        res.update({"tot_sacc": tot_s, "costo_tot": f"{costo_t:.2f}", "acqua": f"{vol * 150:.0f}"})
-        
-        # Calcolo carichi betoniera
-        v_b = float(d.get('v_bet', '160').replace(',','.'))
-        n_c = max(1, math.ceil((vol*1000)/v_b)) if vol > 0 else 1
-        res["n_c"] = n_c
-        for m in mats:
-            if p[m] <= 0:
-                res[f'bc_{m}'] = "0.00"
-            else:
-                kg_tot = (p[m]/somma_p)*peso_tot if somma_p > 0 else 0
-                res[f'bc_{m}'] = f"{(kg_tot/w[m])/n_c:.2f}"
-        res["bc_aq"] = f"{(vol*150)/n_c:.2f}"
-        return res
-    except: return None
 
 @app.route('/', methods=['GET', 'POST'])
 def index():
     res = None
-    if request.method == 'POST': res = calcola(request.form)
+    if request.method == 'POST':
-    return render_template('index.html', res=res, form=request.form, rev=VERSIONE)
+        # Calcoli originali preservati
+        try:
+            d = request.form
+            def to_m(v, u):
+                val = float(v.replace(',', '.')) if v else 0
+                if u == "mm": return val / 1000
+                if u == "cm": return val / 100
+                return val
+
+            vol = to_m(d.get('a','0'), d.get('ua','m')) * to_m(d.get('l','0'), d.get('ul','m')) * to_m(d.get('p','0'), d.get('up','m'))
+            peso_tot = vol * 2400
+            
+            mats = ['cem', 'sab', 'ghi']
+            p = {m: float(d.get(f'p_{m}', '0').replace(',','.')) for m in mats}
+            w = {m: float(d.get(f'w_{m}', '25').replace(',','.')) for m in mats}
+            c = {m: float(d.get(f'c_{m}', '0').replace(',','.')) for m in mats}
+            
+            somma_p = sum(p.values())
+            res = {"vol": f"{vol:.3f}", "peso": f"{peso_tot:.0f}"}
+            
+            tot_s, costo_t = 0, 0
+            for m in mats:
+                if p[m] <= 0: # Correzione bug ghiaia
+                    res[f's_{m}'] = 0
+                    res[f'cost_{m}'] = "0.00"
+                    continue
+                kg = (p[m]/somma_p)*peso_tot if somma_p > 0 else 0
+                s_esatti = kg/w[m] if w[m] > 0 else 0
+                res[f's_{m}'] = math.ceil(s_esatti)
+                res[f'cost_{m}'] = f"{math.ceil(s_esatti)*c[m]:.2f}"
+                tot_s += math.ceil(s_esatti)
+                costo_t += math.ceil(s_esatti)*c[m]
+                
+            res.update({"tot_sacc": tot_s, "costo_tot": f"{costo_t:.2f}", "acqua": f"{vol * 150:.0f}"})
+            
+            v_b = float(d.get('v_bet', '160').replace(',','.'))
+            n_c = max(1, math.ceil((vol*1000)/v_b)) if vol > 0 else 1
+            res["n_c"] = n_c
+            for m in mats:
+                if p[m] <= 0: res[f'bc_{m}'] = "0.00"
+                else: res[f'bc_{m}'] = f"{((p[m]/somma_p)*peso_tot/w[m])/n_c:.2f}"
+            res["bc_aq"] = f"{(vol*150)/n_c:.2f}"
+        except: res = None
+            
+    return render_template('index.html', res=res, form=request.form, rev="Rev.11.0")
 
 @app.route('/stampa_pdf', methods=['POST'])
 def stampa_pdf():
     f = request.form
-    # Creazione testo per il PDF
+    testo = f"REPORT CALCOLO CEMENTO\nVol: {f.get('res_vol')} m3\nCosto: {f.get('res_costo_t')} EUR"
-    report_text = f"--- REPORT CALCOLO CEMENTO {VERSIONE} ---\n\n"
-    report_text += f"Volume: {f.get('res_vol')} m3 | Peso: {f.get('res_peso')} kg\n"
-    report_text += f"Sacchetti totali: {f.get('res_tot_s')} | Costo: {f.get('res_costo_t')} EUR\n\n"
-    report_text += f"DOSAGGIO PER {f.get('res_nc')} CARICHI:\n"
-    report_text += f"- Cemento: {f.get('res_bc_cem')} sacch.\n- Sabbia: {f.get('res_bc_sab')} sacch.\n"
-    report_text += f"- Ghiaia: {f.get('res_bc_ghi')} sacch.\n- Acqua: {f.get('res_bc_aq')} L"
-    
-    temp_file = "/tmp/stampa_cemento.txt"
     try:
-        with open(temp_file, "w", encoding="utf-8") as tmp:
+        # Invio diretto via HTTP POST a CUPS
-            tmp.write(report_text)
+        requests.post(CUPS_URL, data=testo.encode('utf-8'), timeout=5)
-        
+        time.sleep(2)
-        # Comando di stampa lp (standard Linux su Synology)
+        return "OK - File inviato a Virtual_PDF"
-        subprocess.run(["lp", "-h", CUPS_SERVER, "-d", PRINTER_NAME, temp_file], check=True)
-        
-        time.sleep(2) # Attesa per scrittura file nel container
-        return f"OK - Inviato a Virtual_PDF. Verifica in: {OUTPUT_DIR}"
     except Exception as e:
-        return f"Errore: {str(e)}"
+        return f"Errore CUPS: {str(e)}"
-    finally:
-        if os.path.exists(temp_file): os.remove(temp_file)
 
 @app.route('/download', methods=['POST'])
 def download():
     f = request.form
-    report = f"REPORT TECNICO - Volume: {f.get('res_vol')} m3 - Totale: {f.get('res_tot_s')} sacchetti"
+    report = f"REPORT\nVolume: {f.get('res_vol')} m3\nSacchetti: {f.get('res_tot_s')}"
     return Response(report, mimetype="text/plain", headers={"Content-disposition":"attachment;filename=Report.txt"})
 
 if __name__ == '__main__':