Update app.py

app.py

@@ -149,48 +149,179 @@ def upload_to_codeberg(output_dir, repo_name, codeberg_token, username, batch_si
 
 def upload_to_cloudflare_pages(output_dir, project_name, cf_token, cf_account_id, stream_format, logs):
     try:
-        msg, logs = log_generator("☁️ Subiendo a Cloudflare Pages...", logs)
+        msg, logs = log_generator("☁️ Iniciando subida a Cloudflare Pages...", logs)
+        yield msg, logs, None
+        
+        headers = {
+            "Authorization": f"Bearer {cf_token}",
+            "Content-Type": "application/json"
+        }
+        
+        # PASO 1: Crear el proyecto en Cloudflare Pages si no existe
+        msg, logs = log_generator("📦 Verificando proyecto en Cloudflare...", logs)
         yield msg, logs, None
         
-        headers = {"Authorization": f"Bearer {cf_token}"}
         project_url = f"https://api.cloudflare.com/client/v4/accounts/{cf_account_id}/pages/projects"
+        project_exists = False
         
         try:
             r = requests.get(project_url, headers=headers, timeout=30)
             if r.status_code == 200:
                 projects = r.json().get('result', [])
-                exists = any(p['name'] == project_name for p in projects)
-                if not exists:
-                    project_data = {"name": project_name, "production_branch": "main"}
-                    requests.post(project_url, headers=headers, json=project_data, timeout=30)
-        except: pass
+                project_exists = any(p['name'] == project_name for p in projects)
+                
+                if not project_exists:
+                    msg, logs = log_generator(f"📦 Creando proyecto: {project_name}", logs)
+                    yield msg, logs, None
+                    
+                    project_data = {
+                        "name": project_name,
+                        "production_branch": "main"
+                    }
+                    r = requests.post(project_url, headers=headers, json=project_data, timeout=30)
+                    
+                    if r.status_code in [200, 201]:
+                        msg, logs = log_generator(f"✅ Proyecto creado exitosamente", logs)
+                        yield msg, logs, None
+                        project_exists = True
+                    else:
+                        error_msg = r.json().get('errors', [{}])[0].get('message', 'Error desconocido')
+                        raise Exception(f"Error creando proyecto: {error_msg}")
+                else:
+                    msg, logs = log_generator(f"✅ Proyecto ya existe", logs)
+                    yield msg, logs, None
+            else:
+                raise Exception(f"Error verificando proyectos: {r.status_code}")
+        except Exception as e:
+            msg, logs = log_generator(f"❌ Error en paso 1: {str(e)}", logs)
+            yield msg, logs, None
+            raise
+        
+        if not project_exists:
+            raise Exception("No se pudo crear o verificar el proyecto")
+        
+        # PASO 2: Iniciar deployment y subir archivos
+        msg, logs = log_generator("📦 Preparando deployment...", logs)
+        yield msg, logs, None
+        
+        # Listar archivos a subir
+        files_to_upload = []
+        for file in output_dir.iterdir():
+            if file.is_file():
+                files_to_upload.append(file)
         
-        zip_path = output_dir.parent / f"{project_name}.zip"
-        with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
-            for file in output_dir.iterdir():
-                if file.is_file():
-                    zipf.write(file, file.name)
+        msg, logs = log_generator(f"📁 {len(files_to_upload)} archivos para subir", logs)
+        yield msg, logs, None
+        
+        # Crear manifest con hashes de archivos
+        import hashlib
+        manifest = {}
+        
+        for file in files_to_upload:
+            with open(file, 'rb') as f:
+                file_hash = hashlib.sha256(f.read()).hexdigest()
+            manifest[f"/{file.name}"] = file_hash
         
-        deploy_url = f"{project_url}/{project_name}/deployments"
+        # Iniciar deployment con Direct Upload
+        deployment_url = f"https://api.cloudflare.com/client/v4/accounts/{cf_account_id}/pages/projects/{project_name}/deployments"
+        
+        deployment_data = {
+            "branch": "main",
+            "manifest": manifest
+        }
+        
+        msg, logs = log_generator("🚀 Iniciando deployment...", logs)
+        yield msg, logs, None
         
-        with open(zip_path, 'rb') as f:
-            files_upload = {'file': (f'{project_name}.zip', f, 'application/zip')}
-            r = requests.post(deploy_url, headers={"Authorization": f"Bearer {cf_token}"}, files=files_upload, timeout=300)
+        r = requests.post(deployment_url, headers=headers, json=deployment_data, timeout=60)
+        
+        if r.status_code not in [200, 201]:
+            error_detail = r.json() if r.content else "Sin detalles"
+            raise Exception(f"Error iniciando deployment ({r.status_code}): {error_detail}")
+        
+        deployment = r.json().get('result', {})
+        deployment_id = deployment.get('id')
+        
+        if not deployment_id:
+            raise Exception("No se recibió deployment_id")
+        
+        msg, logs = log_generator(f"✅ Deployment iniciado: {deployment_id[:8]}...", logs)
+        yield msg, logs, None
+        
+        # PASO 3: Subir cada archivo
+        msg, logs = log_generator(f"⬆️ Subiendo archivos...", logs)
+        yield msg, logs, None
+        
+        uploaded_count = 0
+        for idx, file in enumerate(files_to_upload):
+            try:
+                # URL para subir archivo individual
+                file_upload_url = f"https://api.cloudflare.com/client/v4/accounts/{cf_account_id}/pages/projects/{project_name}/deployments/{deployment_id}/files/{file.name}"
+                
+                with open(file, 'rb') as f:
+                    file_content = f.read()
+                
+                upload_headers = {
+                    "Authorization": f"Bearer {cf_token}",
+                    "Content-Type": "application/octet-stream"
+                }
+                
+                r = requests.put(file_upload_url, headers=upload_headers, data=file_content, timeout=120)
+                
+                if r.status_code in [200, 201]:
+                    uploaded_count += 1
+                    if (idx + 1) % 10 == 0:
+                        msg, logs = log_generator(f"  ⬆️ {uploaded_count}/{len(files_to_upload)} archivos subidos", logs)
+                        yield msg, logs, None
+                else:
+                    msg, logs = log_generator(f"  ⚠️ Error subiendo {file.name}: {r.status_code}", logs)
+                    yield msg, logs, None
+                    
+            except Exception as e:
+                msg, logs = log_generator(f"  ⚠️ Error con {file.name}: {str(e)}", logs)
+                yield msg, logs, None
+                continue
+        
+        msg, logs = log_generator(f"✅ {uploaded_count}/{len(files_to_upload)} archivos subidos", logs)
+        yield msg, logs, None
+        
+        # PASO 4: Finalizar deployment
+        msg, logs = log_generator("🏁 Finalizando deployment...", logs)
+        yield msg, logs, None
+        
+        finalize_url = f"https://api.cloudflare.com/client/v4/accounts/{cf_account_id}/pages/projects/{project_name}/deployments/{deployment_id}/finalize"
+        
+        r = requests.post(finalize_url, headers=headers, timeout=60)
+        
+        if r.status_code in [200, 201]:
+            result = r.json().get('result', {})
+            cf_url = result.get('url', f"https://{project_name}.pages.dev")
+            manifest_name = "manifest.mpd" if stream_format == "DASH (MPD)" else "master.m3u8"
+            final_url = f"{cf_url}/{manifest_name}"
             
-            if r.status_code in [200, 201]:
-                result = r.json().get('result', {})
-                cf_url = result.get('url', f"https://{project_name}.pages.dev")
-                manifest_name = "manifest.mpd" if stream_format == "DASH (MPD)" else "master.m3u8"
-                final_url = f"{cf_url}/{manifest_name}"
-                msg, logs = log_generator(f"✅ Cloudflare: {final_url}", logs)
-                yield msg, logs, final_url
-                zip_path.unlink()
-            else:
-                raise Exception(f"Error: {r.status_code}")
+            msg, logs = log_generator(f"✅ Cloudflare Pages: {final_url}", logs)
+            yield msg, logs, final_url
+        else:
+            # Aunque falle la finalización, el proyecto está creado
+            manifest_name = "manifest.mpd" if stream_format == "DASH (MPD)" else "master.m3u8"
+            final_url = f"https://{project_name}.pages.dev/{manifest_name}"
+            msg, logs = log_generator(f"⚠️ Deployment puede estar procesando", logs)
+            yield msg, logs, None
+            msg, logs = log_generator(f"📋 URL esperada: {final_url}", logs)
+            yield msg, logs, final_url
                 
     except Exception as e:
-        msg, logs = log_generator(f"❌ Error Cloudflare: {str(e)}", logs)
+        msg, logs = log_generator(f"❌ Error Cloudflare Pages: {str(e)}", logs)
         yield msg, logs, None
+        
+        # Proporcionar URL esperada como fallback
+        try:
+            manifest_name = "manifest.mpd" if stream_format == "DASH (MPD)" else "master.m3u8"
+            final_url = f"https://{project_name}.pages.dev/{manifest_name}"
+            msg, logs = log_generator(f"📋 Si el proyecto se creó, la URL será: {final_url}", logs)
+            yield msg, logs, None
+        except:
+            pass
 
 # --- Procesamiento Principal ---