adicionando suporte para compilação em Linux, atualizando scripts de build e configurando variáveis de ambiente para o frontend

Author: Advansoftware

build.py

@@ -21,8 +21,7 @@ def build_executable():
     if sys.platform == 'win32':
         subprocess.run('pyinstaller m3utostrm.spec --clean', shell=True, check=True)
     else:
-        # No Linux, usar o script de build_windows.sh para cross-compilation
-        subprocess.run('bash build_windows.sh', shell=True, check=True)
+        subprocess.run('pyinstaller linux.spec --clean', shell=True, check=True)
 
 def main():
     # Limpar builds anteriores
@@ -32,11 +31,16 @@ def main():
         shutil.rmtree('build')
 
     try:
-        # Build do frontend
-        build_frontend()
-        
-        # Build do executável
-        build_executable()
+        if len(sys.argv) > 1 and sys.argv[1] == '--windows':
+            # Build para Windows usando Wine
+            subprocess.run('bash build_windows.sh', shell=True, check=True)
+        elif len(sys.argv) > 1 and sys.argv[1] == '--linux':
+            # Build para Linux
+            subprocess.run('bash build_linux.sh', shell=True, check=True)
+        else:
+            # Build para o sistema atual
+            build_frontend()
+            build_executable()
 
         print("Build completed successfully!")
 

build_linux.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Criar diretório de assets se não existir
+mkdir -p src/assets
+
+# Build do frontend Next.js
+echo "Building Next.js frontend..."
+cd frontend
+# Adicionar variável de ambiente para o endereço do servidor
+echo "NEXT_PUBLIC_API_URL=http://localhost:8000" > .env.local
+npm install
+npm run build
+
+# Garantir que todos os arquivos necessários sejam copiados
+mkdir -p dist
+cp -r .next/static dist/
+cp -r .next/standalone/* dist/ 2>/dev/null || true
+cp -r public/* dist/ 2>/dev/null || true
+cd ..
+
+# Build para Linux
+echo "Executando build para Linux..."
+python -m pip install -r requirements.txt
+python -m PyInstaller linux.spec --clean
+
+echo "Build concluído! Verifique a pasta dist/"

build_windows.sh

@@ -12,12 +12,16 @@ fi
 # Build do frontend Next.js
 echo "Building Next.js frontend..."
 cd frontend
+# Adicionar variável de ambiente para o endereço do servidor
+echo "NEXT_PUBLIC_API_URL=http://localhost:8000" > .env.local
 npm install
 npm run build
+
+# Garantir que todos os arquivos necessários sejam copiados
 mkdir -p dist
-if [ -d ".next/static" ]; then
-    cp -r .next/static dist/
-fi
+cp -r .next/static dist/
+cp -r .next/standalone/* dist/ 2>/dev/null || true
+cp -r public/* dist/ 2>/dev/null || true
 cd ..
 
 # Verificar se estamos no Windows

frontend/next.config.js

@@ -1,11 +1,17 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  output: 'export',  // Habilita exportação estática
+  output: 'export',
   images: {
     unoptimized: true
   },
-  trailingSlash: true,
-  distDir: 'dist'
+  basePath: '',
+  distDir: 'dist',
+  assetPrefix: './',  // Importante para caminhos relativos
+  env: {
+    API_URL: process.env.NODE_ENV === 'development' 
+      ? 'http://localhost:8000/api' 
+      : '/api'
+  }
 }
 
 module.exports = nextConfig

linux.spec

@@ -0,0 +1,71 @@
+# -*- mode: python ; coding: utf-8 -*-
+import os
+from PyInstaller.utils.hooks import collect_submodules
+
+block_cipher = None
+
+# Atualizar caminhos do frontend
+added_files = [
+    ('frontend/dist', 'frontend/dist'),      # Next.js files
+    ('config.json', '.'),                    # Config file
+]
+
+# Garantir que todos os arquivos estáticos do Next.js sejam incluídos
+datas = added_files + [
+    ('frontend/dist/static', 'frontend/dist/static'),  # Next.js static files
+    ('frontend/dist/_next', 'frontend/dist/_next'),    # Next.js assets
+]
+
+a = Analysis(
+    ['main.py'],
+    pathex=[],
+    binaries=[],
+    datas=datas,
+    hiddenimports=[
+        'tkinter',
+        'requests',
+        'urllib3',
+        'json',
+        're',
+        '_decimal',
+        'decimal',
+        'asyncio',
+        'pkg_resources.py2_warn',
+        'uvicorn.logging',
+        'uvicorn.loops',
+        'uvicorn.loops.auto',
+        'uvicorn.protocols',
+        'uvicorn.protocols.http',
+        'uvicorn.protocols.http.auto',
+        'uvicorn.protocols.websockets',
+        'uvicorn.protocols.websockets.auto',
+        'uvicorn.lifespan',
+        'uvicorn.lifespan.on',
+        'fastapi',
+        'websockets',
+    ] + collect_submodules('fastapi'),
+    excludes=[],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=block_cipher,
+    noarchive=False,
+)
+
+pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    [],
+    name='M3UtoSTRM',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    runtime_tmpdir=None,
+    console=False,
+    disable_windowed_traceback=False,
+)

m3utostrm.spec

@@ -9,9 +9,16 @@ block_cipher = None
 icon_path = os.path.join('src', 'assets', 'icon.ico')
 icon_file = icon_path if os.path.exists(icon_path) else None
 
+# Atualizar caminhos do frontend
 added_files = [
-    ('frontend/dist', 'frontend/dist'),  # Next.js static files
-    ('config.json', '.'),                # Config file
+    ('frontend/dist', 'frontend/dist'),      # Next.js files
+    ('config.json', '.'),                    # Config file
+]
+
+# Garantir que todos os arquivos estáticos do Next.js sejam incluídos
+datas = added_files + [
+    ('frontend/dist/static', 'frontend/dist/static'),  # Next.js static files
+    ('frontend/dist/_next', 'frontend/dist/_next'),    # Next.js assets
 ]
 
 # Define binaries baseado no sistema operacional
@@ -27,7 +34,7 @@ a = Analysis(
     ['main.py'],
     pathex=[],
     binaries=added_binaries,
-    datas=added_files,
+    datas=datas,  # Usar a nova variável datas
     hiddenimports=[
         'tkinter',
         'requests',

main.py

@@ -5,6 +5,12 @@
 import threading
 import uvicorn
 import logging
+import signal
+import sys
+
+def signal_handler(signum, frame):
+    """Manipulador de sinais para encerramento limpo"""
+    sys.exit(0)
 
 def run_api():
     try:
@@ -13,20 +19,31 @@ def run_api():
         logging.error(f"Erro ao iniciar API: {str(e)}")
 
 def main():
-    # Criar a interface principal
-    app_window = MainWindow()
-    
-    # Iniciar system tray
-    tray = SystemTray(app_window)
-    tray_thread = threading.Thread(target=tray.run, daemon=True)
-    tray_thread.start()
+    # Configurar manipulador de sinais
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGTERM, signal_handler)
+
+    try:
+        # Criar a interface principal
+        app_window = MainWindow()
+        
+        # Iniciar system tray
+        tray = SystemTray(app_window)
+        tray_thread = threading.Thread(target=tray.run, daemon=True)
+        tray_thread.start()
 
-    # Iniciar API em uma thread separada
-    api_thread = threading.Thread(target=run_api, daemon=True)
-    api_thread.start()
+        # Iniciar API em uma thread separada
+        api_thread = threading.Thread(target=run_api, daemon=True)
+        api_thread.start()
 
-    # Iniciar a interface
-    app_window.run()
+        # Iniciar a interface
+        app_window.run()
+    except KeyboardInterrupt:
+        logging.info("Encerrando aplicação...")
+    except Exception as e:
+        logging.error(f"Erro inesperado: {str(e)}")
+    finally:
+        sys.exit(0)
 
 if __name__ == "__main__":
     main()

src/api/app.py

@@ -1,7 +1,9 @@
 from fastapi import FastAPI, UploadFile, File, Form, WebSocket
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
-from fastapi.responses import JSONResponse
+from fastapi.responses import JSONResponse, FileResponse
+import os
+import sys
 from ..services.queue_manager import QueueManager
 from ..services.video_handler import VideoHandler
 from ..services.playlist_manager import PlaylistManager
@@ -19,10 +21,21 @@
 queue_manager = QueueManager()
 connected_clients: Set[WebSocket] = set()
 
+# Determinar o caminho do frontend
+if getattr(sys, 'frozen', False):
+    # Executando como executável
+    frontend_path = os.path.join(sys._MEIPASS, 'frontend', 'dist')
+else:
+    # Executando como script
+    frontend_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'frontend', 'dist')
+
+# Montar arquivos estáticos do Next.js
+app.mount("/static", StaticFiles(directory=os.path.join(frontend_path, "static")), name="static")
+
 # Configurar CORS permitindo o Next.js
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=["http://localhost:3000"],  # Next.js dev server
+    allow_origins=["*"],
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
@@ -241,3 +254,26 @@ async def get_config():
         "omdb_api_key": config_manager.get('omdb_api_key'),
         "tmdb_api_key": config_manager.get('tmdb_api_key')
     }
+
+@app.get("/api/server-url")
+async def get_server_url():
+    """Retorna a URL do servidor"""
+    port = os.getenv("PORT", "8000")
+    return {"url": f"http://localhost:{port}"}
+
+@app.get("/")
+async def serve_frontend():
+    """Serve o frontend Next.js"""
+    return FileResponse(os.path.join(frontend_path, 'index.html'))
+
+@app.get("/{path:path}")
+async def serve_frontend_paths(path: str):
+    """Serve os caminhos do frontend Next.js"""
+    file_path = os.path.join(frontend_path, path)
+    
+    if os.path.exists(file_path):
+        return FileResponse(file_path)
+    elif os.path.exists(file_path + '.html'):
+        return FileResponse(file_path + '.html')
+    else:
+        return FileResponse(os.path.join(frontend_path, 'index.html'))

src/services/system_tray.py

@@ -2,6 +2,7 @@
 from PIL import Image
 from .proxy_server import ProxyServer
 import sys
+import logging
 
 class SystemTray:
     def __init__(self, main_window=None):
@@ -62,8 +63,18 @@ def stop_proxy(self):
             self.proxy_server.stop()
 
     def quit_application(self):
-        self.stop_proxy()
-        self.icon.stop()
+        try:
+            self.stop_proxy()
+            if self.icon:
+                self.icon.stop()
+        except Exception as e:
+            logging.error(f"Erro ao encerrar system tray: {str(e)}")
+        finally:
+            if self.main_window:
+                try:
+                    self.main_window.root.quit()
+                except:
+                    pass
 
     def exit_application(self):
         """Fecha completamente o aplicativo e o proxy"""
@@ -74,5 +85,11 @@ def exit_application(self):
         sys.exit(0)
 
     def run(self):
-        self.start_proxy()
-        self.icon.run()
+        try:
+            self.start_proxy()
+            self.icon.run()
+        except KeyboardInterrupt:
+            self.quit_application()
+        except Exception as e:
+            logging.error(f"Erro no system tray: {str(e)}")
+            self.quit_application()