From bd59ba234cb2271b04fb4313fe5340541240f6be Mon Sep 17 00:00:00 2001 From: Creidsu Date: Tue, 10 Feb 2026 00:56:46 +0000 Subject: [PATCH] =?UTF-8?q?consertada=20a=20indentifica=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/watcher.py | 154 +++++++++----- app/database.py | 24 ++- app/ui/__pycache__/settings.cpython-311.pyc | Bin 34890 -> 32836 bytes app/ui/settings.py | 225 ++++++++------------ 4 files changed, 200 insertions(+), 203 deletions(-) diff --git a/app/core/watcher.py b/app/core/watcher.py index d1849f8..82c726d 100644 --- a/app/core/watcher.py +++ b/app/core/watcher.py @@ -74,7 +74,7 @@ class DirectoryWatcher: self.abort_flag = False state.current_file = fname - # Etapa 1: Identificação (Global 0-15%) + # --- 1. IDENTIFICAÇÃO --- state.update_task(fname, 'running', progress=5, label=f"Identificando: {fname}...") state.log(f"🔄 Iniciando: {fname}") @@ -119,21 +119,35 @@ class DirectoryWatcher: if self.abort_flag: return - # Etapa 2: Categoria - category = self.find_category(target_info['type']) - if not category: - state.update_task(fname, 'error', 0, label="Sem Categoria") - return - - # Etapa 3: Conversão + # --- METADADOS E CATEGORIA --- try: details = self.renamer.get_details(target_info['tmdb_id'], target_info['type']) r_title = getattr(details, 'title', getattr(details, 'name', 'Unknown')) or 'Unknown' + # Extração de IDs e Códigos para a nova Lógica + # IDs de Gênero (Ex: [16, 28]) + tmdb_genre_ids = [str(g['id']) for g in getattr(details, 'genres', [])] + # Países de Origem (Ex: ['JP', 'US']) + origin_countries = getattr(details, 'origin_country', []) + if isinstance(origin_countries, str): origin_countries = [origin_countries] + origin_countries = [c.upper() for c in origin_countries] + + state.log(f"ℹ️ Dados: Gêneros={tmdb_genre_ids} | Países={origin_countries}") + full_details = {'title': r_title, 'year': '0000', 'type': target_info['type']} d_date = getattr(details, 'release_date', getattr(details, 'first_air_date', '0000')) if d_date: full_details['year'] = str(d_date)[:4] + # --- 2. CATEGORIA INTELIGENTE (NOVA LÓGICA) --- + category = self.find_best_category(target_info['type'], tmdb_genre_ids, origin_countries) + + if not category: + state.update_task(fname, 'error', 0, label="Sem Categoria") + return + + state.log(f"📂 Categoria Vencedora: {category.name}") + + # --- 3. CONVERSÃO --- guessed_data = result.get('guessed', {}) relative_path = self.renamer.build_path(category, full_details, guessed_data) @@ -143,71 +157,40 @@ class DirectoryWatcher: state.update_task(fname, 'running', progress=15, label=f"Convertendo: {full_details['title']}") engine = FFmpegEngine() - - # Tenta pegar duração total em Segundos total_duration_sec = engine.get_duration(str(filepath)) - # Converte para microsegundos para bater com o FFmpeg total_duration_us = total_duration_sec * 1000000 cmd = engine.build_command(str(filepath), str(temp_output)) + cmd.insert(1, '-progress'); cmd.insert(2, 'pipe:1') - # --- MODIFICAÇÃO: Injeta flag para saída legível por máquina (stdout) --- - # Isso garante que teremos dados de progresso confiáveis - cmd.insert(1, '-progress') - cmd.insert(2, 'pipe:1') - - # Redireciona stdout para pegarmos os dados. Stderr fica para erros/warnings. self.current_process = await asyncio.create_subprocess_exec( *cmd, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE ) - # --- LOOP DE PROGRESSO (MÉTODO KEY=VALUE) --- current_speed_str = "" - while True: if self.abort_flag: self.current_process.kill() break - - # Lê stdout (progresso) line_bytes = await self.current_process.stdout.readline() if not line_bytes: break - line = line_bytes.decode('utf-8', errors='ignore').strip() - - # O formato é chave=valor if '=' in line: key, value = line.split('=', 1) - key = key.strip() - value = value.strip() - - # 1. Tempo decorrido (em microsegundos) + key = key.strip(); value = value.strip() if key == 'out_time_us': try: current_us = int(value) if total_duration_us > 0: file_pct = (current_us / total_duration_us) * 100 if file_pct > 100: file_pct = 100 - if file_pct < 0: file_pct = 0 # As vezes vem negativo no inicio - - # Global: 15% a 99% + if file_pct < 0: file_pct = 0 global_pct = 15 + (file_pct * 0.84) - - state.update_task( - fname, 'running', - progress=global_pct, - file_progress=file_pct, - speed=current_speed_str, - label=f"Processando: {full_details['title']}" - ) + state.update_task(fname, 'running', progress=global_pct, file_progress=file_pct, speed=current_speed_str, label=f"Processando: {full_details['title']}") except: pass - - # 2. Velocidade - elif key == 'speed': - current_speed_str = value + elif key == 'speed': current_speed_str = value await self.current_process.wait() - # ----------------------------------- if self.abort_flag: state.update_task(fname, 'error', 0, label="Abortado") @@ -215,14 +198,13 @@ class DirectoryWatcher: return if self.current_process.returncode != 0: - # Se falhar, lemos o stderr para saber o motivo err_log = await self.current_process.stderr.read() state.log(f"❌ Erro FFmpeg: {err_log.decode('utf-8')[-200:]}") state.update_task(fname, 'error', 0, label="Erro FFmpeg") return self.current_process = None - # Etapa 4: Deploy + # --- 4. DEPLOY --- state.update_task(fname, 'running', progress=99, label="Organizando...") final_full_path = Path(category.target_path) / relative_path final_full_path.parent.mkdir(parents=True, exist_ok=True) @@ -253,12 +235,78 @@ class DirectoryWatcher: state.log(f"Erro Pipeline: {e}") state.update_task(fname, 'error', 0, label=f"Erro: {e}") - def find_category(self, media_type): - keywords = ['movie', 'film', 'filme'] if media_type == 'movie' else ['tv', 'serie', 'série'] + def find_best_category(self, media_type, genre_ids, countries): + """ + Sistema de Pontuação 3.0 (Regras Estritas) + Agora compara IDs e Siglas, não texto. + """ all_cats = list(Category.select()) + if not all_cats: return None + + candidates = [] + + # 1. Filtro Rígido de TIPO (Movie vs Series) for cat in all_cats: - if not cat.match_keywords: continue - cat_keys = [k.strip().lower() for k in cat.match_keywords.split(',')] - if any(k in cat_keys for k in keywords): - return cat - return all_cats[0] if all_cats else None \ No newline at end of file + if media_type == 'movie' and cat.content_type == 'series': continue + if media_type != 'movie' and cat.content_type == 'movie': continue + candidates.append(cat) + + if not candidates: return all_cats[0] + + scored_cats = [] + for cat in candidates: + score = 0 + + # Carrega filtros da categoria + cat_genres = cat.genre_filters.split(',') if cat.genre_filters else [] + cat_countries = cat.country_filters.split(',') if cat.country_filters else [] + cat_genres = [g for g in cat_genres if g] # Limpa vazios + cat_countries = [c for c in cat_countries if c] + + # --- Lógica de Correspondência --- + match_genre = False + match_country = False + + # Verifica Gêneros (Se a categoria tiver filtros, TEM que bater) + if cat_genres: + # Se o arquivo tiver pelo menos UM dos gêneros da lista + if any(gid in cat_genres for gid in genre_ids): + match_genre = True + score += 50 # Ganha muitos pontos por match específico + else: + # Se a categoria exige gênero e o arquivo não tem -> Categoria Descartada + score = -1000 + else: + # Categoria genérica de gênero (aceita tudo) + match_genre = True + score += 10 # Pontuação base baixa + + # Verifica Países + if cat_countries: + if any(cc in cat_countries for cc in countries): + match_country = True + score += 50 # Ganha pontos por match de país + else: + score = -1000 # Exige país mas não bate -> Descartada + else: + match_country = True + score += 10 + + # Bônus se for categoria Mista (geralmente usada para Anime/Desenho) + if cat.content_type == 'mixed' and score > 0: + score += 5 + + scored_cats.append((score, cat)) + + # Ordena + scored_cats.sort(key=lambda x: x[0], reverse=True) + best_match = scored_cats[0] + + # Se a pontuação for negativa, significa que nenhuma regra bateu. + # Devemos pegar uma categoria genérica (sem filtros) + if best_match[0] < 0: + for cat in candidates: + if not cat.genre_filters and not cat.country_filters: + return cat + + return best_match[1] \ No newline at end of file diff --git a/app/database.py b/app/database.py index e80f61c..5aa5fd9 100755 --- a/app/database.py +++ b/app/database.py @@ -29,9 +29,12 @@ class AppConfig(BaseModel): class Category(BaseModel): name = CharField(unique=True) target_path = CharField() - match_keywords = CharField(null=True) # Ex: movie, film - # NOVO CAMPO: Tipo de conteúdo (movie, series, mixed) - content_type = CharField(default='mixed') + match_keywords = CharField(null=True) # Mantido para legado, mas vamos priorizar os filtros abaixo + content_type = CharField(default='mixed') # movie, series, mixed + + # NOVOS CAMPOS DE FILTRAGEM + genre_filters = CharField(null=True) # Ex: "16,28,35" (IDs do TMDb) + country_filters = CharField(null=True) # Ex: "JP,US,BR" (Siglas ISO) class FFmpegProfile(BaseModel): name = CharField() @@ -46,12 +49,17 @@ def init_db(): db.connect() db.create_tables([AppConfig, Category, FFmpegProfile], safe=True) - # Migração segura para adicionar coluna se não existir - try: - db.execute_sql('ALTER TABLE category ADD COLUMN content_type VARCHAR DEFAULT "mixed"') - except: pass # Já existe + # Migrações Seguras (Adiciona colunas se não existirem) + try: db.execute_sql('ALTER TABLE category ADD COLUMN content_type VARCHAR DEFAULT "mixed"') + except: pass - # Perfil padrão se não existir + try: db.execute_sql('ALTER TABLE category ADD COLUMN genre_filters VARCHAR DEFAULT ""') + except: pass + + try: db.execute_sql('ALTER TABLE category ADD COLUMN country_filters VARCHAR DEFAULT ""') + except: pass + + # Perfil padrão if FFmpegProfile.select().count() == 0: FFmpegProfile.create(name="Padrão VAAPI (Intel)", video_codec="h264_vaapi", is_active=True) diff --git a/app/ui/__pycache__/settings.cpython-311.pyc b/app/ui/__pycache__/settings.cpython-311.pyc index e54e7c44e6c3ec953cf1c503e4b5199e13fbd004..df80688e1747e0730f20218d0f6002a5db4cdcb8 100644 GIT binary patch literal 32836 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 diff --git a/app/ui/settings.py b/app/ui/settings.py index 0911c05..92023ab 100755 --- a/app/ui/settings.py +++ b/app/ui/settings.py @@ -2,67 +2,63 @@ from nicegui import ui import os from database import Category, FFmpegProfile, AppConfig -# Lista de idiomas (ISO 639-2) +# --- CONSTANTES DE DADOS --- + +# 1. Gêneros TMDb (Para as Categorias) +TMDB_GENRES = { + '28': 'Ação (Action)', '12': 'Aventura (Adventure)', '16': 'Animação (Animation)', + '35': 'Comédia (Comedy)', '80': 'Crime', '99': 'Documentário', '18': 'Drama', + '10751': 'Família (Family)', '14': 'Fantasia (Fantasy)', '36': 'História', + '27': 'Terror (Horror)', '10402': 'Música (Music)', '9648': 'Mistério', + '10749': 'Romance', '878': 'Ficção Científica (Sci-Fi)', '10770': 'Cinema TV', + '53': 'Thriller', '10752': 'Guerra (War)', '37': 'Faroeste (Western)', + '10759': 'Action & Adventure (TV)', '10762': 'Kids (TV)', '10765': 'Sci-Fi & Fantasy (TV)' +} + +# 2. Países Comuns (Para as Categorias) +COMMON_COUNTRIES = { + 'JP': '🇯🇵 Japão (Anime)', 'US': '🇺🇸 EUA (Hollywood)', 'BR': '🇧🇷 Brasil', + 'KR': '🇰🇷 Coreia do Sul (Dorama)', 'GB': '🇬🇧 Reino Unido', 'ES': '🇪🇸 Espanha', + 'FR': '🇫🇷 França', 'CN': '🇨🇳 China', 'IN': '🇮🇳 Índia' +} + +# 3. Idiomas ISO-639-2 (Para o FFmpeg - ESTAVA FALTANDO ISSO) ISO_LANGS = { 'por': 'Português (por)', 'eng': 'Inglês (eng)', 'jpn': 'Japonês (jpn)', 'spa': 'Espanhol (spa)', 'fra': 'Francês (fra)', 'ger': 'Alemão (ger)', - 'ita': 'Italiano (ita)', 'rus': 'Russo (rus)', 'und': 'Indefinido (und)' + 'ita': 'Italiano (ita)', 'rus': 'Russo (rus)', 'kor': 'Coreano (kor)', + 'zho': 'Chinês (zho)', 'und': 'Indefinido (und)' } -# --- COMPONENTE: SELETOR DE PASTAS (Restrito ao /media) --- +# --- SELETOR DE PASTAS --- async def pick_folder_dialog(start_path='/media'): - """Abre um modal para escolher pastas, restrito a /media""" ALLOWED_ROOT = '/media' - - # Garante que começa dentro do permitido - if not start_path or not start_path.startswith(ALLOWED_ROOT): - start_path = ALLOWED_ROOT - + if not start_path or not start_path.startswith(ALLOWED_ROOT): start_path = ALLOWED_ROOT result = {'path': None} - with ui.dialog() as dialog, ui.card().classes('w-96 h-[500px] flex flex-col'): ui.label('Selecionar Pasta (/media)').classes('font-bold text-lg mb-2') path_label = ui.label(start_path).classes('text-xs bg-gray-100 p-2 border rounded w-full break-all font-mono') - scroll = ui.scroll_area().classes('flex-grow border rounded p-1 mt-2 bg-white') - async def load_dir(path): - # Segurança extra if not path.startswith(ALLOWED_ROOT): path = ALLOWED_ROOT - path_label.text = path scroll.clear() - try: - # Botão Voltar (Só aparece se NÃO estiver na raiz permitida) if path != ALLOWED_ROOT: parent = os.path.dirname(path) - # Garante que o parent não suba além do permitido if not parent.startswith(ALLOWED_ROOT): parent = ALLOWED_ROOT - - with scroll: - ui.button('.. (Voltar)', on_click=lambda: load_dir(parent)).props('flat dense icon=arrow_upward align=left w-full') - - # Lista Pastas + with scroll: ui.button('.. (Voltar)', on_click=lambda: load_dir(parent)).props('flat dense icon=arrow_upward align=left w-full') with scroll: - # Tenta listar. Se diretório não existir (ex: nome novo), mostra vazio if os.path.exists(path): for entry in sorted([e for e in os.scandir(path) if e.is_dir()], key=lambda x: x.name.lower()): ui.button(entry.name, on_click=lambda p=entry.path: load_dir(p)).props('flat dense icon=folder align=left w-full color=amber-8') - else: - ui.label('Pasta não criada ainda.').classes('text-gray-400 italic p-2') - + else: ui.label('Pasta nova').classes('text-gray-400 italic p-2') except Exception as e: with scroll: ui.label(f'Erro: {e}').classes('text-red text-xs') - - def select_this(): - result['path'] = path_label.text - dialog.close() - + def select_this(): result['path'] = path_label.text; dialog.close() with ui.row().classes('w-full justify-between mt-auto pt-2'): ui.button('Cancelar', on_click=dialog.close).props('flat color=grey') ui.button('Selecionar Esta', on_click=select_this).props('flat icon=check color=green') - await load_dir(start_path) await dialog return result['path'] @@ -79,7 +75,7 @@ def show(): tab_ffmpeg = ui.tab('Motor (FFmpeg)', icon='movie') tab_telegram = ui.tab('Telegram', icon='send') - with ui.tab_panels(tabs, value=tab_ident).classes('w-full bg-gray-50 p-4 rounded border'): + with ui.tab_panels(tabs).classes('w-full bg-gray-50 p-4 rounded border'): # --- ABA 1: IDENTIFICAÇÃO --- with ui.tab_panel(tab_ident): @@ -88,64 +84,64 @@ def show(): tmdb_key = AppConfig.get_val('tmdb_api_key', '') lang = AppConfig.get_val('tmdb_language', 'pt-BR') confidence = AppConfig.get_val('min_confidence', '90') - - ui.label('API Key do TMDb').classes('font-bold text-sm') - key_input = ui.input(placeholder='Ex: 8a9b...', value=tmdb_key).props('password').classes('w-full mb-4') - ui.markdown('[Clique aqui para pegar sua API Key](https://www.themoviedb.org/settings/api)').classes('text-xs text-blue-500 mb-6') + ui.input('API Key do TMDb', value=tmdb_key, password=True, on_change=lambda e: AppConfig.set_val('tmdb_api_key', e.value)).classes('w-full mb-4') with ui.grid(columns=2).classes('w-full gap-4'): - lang_input = ui.input('Idioma', value=lang, placeholder='pt-BR') - conf_input = ui.number('Confiança Auto (%)', value=int(confidence), min=50, max=100) + ui.input('Idioma', value=lang, on_change=lambda e: AppConfig.set_val('tmdb_language', e.value)) + ui.number('Confiança Auto (%)', value=int(confidence), min=50, max=100, on_change=lambda e: AppConfig.set_val('min_confidence', str(int(e.value)))) + ui.notify('As alterações são salvas automaticamente.', type='info', position='bottom') - def save_ident(): - AppConfig.set_val('tmdb_api_key', key_input.value) - AppConfig.set_val('tmdb_language', lang_input.value) - AppConfig.set_val('min_confidence', str(int(conf_input.value))) - ui.notify('Salvo!', type='positive') - - ui.button('Salvar', on_click=save_ident).props('icon=save color=indigo').classes('w-full mt-6') - -# --- ABA 2: CATEGORIAS (ATUALIZADA) --- + # --- ABA 2: CATEGORIAS --- with ui.tab_panel(tab_cats): - ui.label('Bibliotecas e Tipos').classes('text-xl text-gray-700 mb-2') - + ui.label('Regras de Organização').classes('text-xl text-gray-700 mb-2') cats_container = ui.column().classes('w-full gap-2') def load_cats(): cats_container.clear() cats = list(Category.select()) - if not cats: ui.label('Nenhuma categoria.').classes('text-gray-400') + if not cats: ui.label('Nenhuma categoria criada.').classes('text-gray-400') for cat in cats: - # Define ícone e cor baseados no tipo - icon = 'movie' if cat.content_type == 'movie' else 'tv' - if cat.content_type == 'mixed': icon = 'shuffle' + # Processa filtros para exibição + g_ids = cat.genre_filters.split(',') if cat.genre_filters else [] + c_codes = cat.country_filters.split(',') if cat.country_filters else [] - color_cls = 'bg-blue-50 border-blue-200' - if cat.content_type == 'series': color_cls = 'bg-green-50 border-green-200' - if cat.content_type == 'mixed': color_cls = 'bg-purple-50 border-purple-200' + g_names = [TMDB_GENRES.get(gid, gid) for gid in g_ids if gid] + c_names = [COMMON_COUNTRIES.get(cc, cc) for cc in c_codes if cc] + + desc_text = f"Tipo: {cat.content_type.upper()}" + if g_names: desc_text += f" | Gêneros: {', '.join(g_names)}" + if c_names: desc_text += f" | Países: {', '.join(c_names)}" + if not g_names and not c_names: desc_text += " | (Genérico/Padrão)" + + color_cls = 'bg-white border-gray-200' + if 'Animação' in str(g_names) and 'Japão' in str(c_names): color_cls = 'bg-purple-50 border-purple-200' # Anime visual + elif 'Animação' in str(g_names): color_cls = 'bg-yellow-50 border-yellow-200' # Desenho visual with cats_container, ui.card().classes(f'w-full flex-row items-center justify-between p-3 border {color_cls}'): with ui.row().classes('items-center gap-4'): + icon = 'movie' if cat.content_type == 'movie' else ('tv' if cat.content_type == 'series' else 'shuffle') ui.icon(icon).classes('text-gray-600') with ui.column().classes('gap-0'): ui.label(cat.name).classes('font-bold text-lg') - # Mostra o tipo visualmente - type_map = {'movie': 'Só Filmes', 'series': 'Só Séries', 'mixed': 'Misto (Filmes e Séries)'} - ui.label(f"Tipo: {type_map.get(cat.content_type, 'Misto')} | Tags: {cat.match_keywords}").classes('text-xs text-gray-500') - + ui.label(desc_text).classes('text-xs text-gray-500') ui.button(icon='delete', color='red', on_click=lambda c=cat: delete_cat(c)).props('flat dense') def add_cat(): if not name_input.value: return + # Converte listas para string CSV + g_str = ",".join(genre_select.value) if genre_select.value else "" + c_str = ",".join(country_select.value) if country_select.value else "" + try: Category.create( name=name_input.value, target_path=f"/media/{name_input.value}", - match_keywords=keywords_input.value, - content_type=type_select.value # Salva o tipo escolhido + content_type=type_select.value, + genre_filters=g_str, + country_filters=c_str ) - name_input.value = ''; keywords_input.value = '' + name_input.value = ''; genre_select.value = []; country_select.value = [] ui.notify('Categoria criada!', type='positive') load_cats() except Exception as e: ui.notify(f'Erro: {e}', type='negative') @@ -154,132 +150,75 @@ def show(): cat.delete_instance() load_cats() - # Formulário de Criação + # Formulário de Criação Inteligente with ui.card().classes('w-full mb-4 bg-gray-100 p-4'): ui.label('Nova Biblioteca').classes('font-bold text-gray-700') - with ui.row().classes('w-full items-start gap-2'): - name_input = ui.input('Nome (ex: Animes)').classes('w-1/4') - keywords_input = ui.input('Tags (ex: anime, animation)').classes('w-1/4') + with ui.grid(columns=4).classes('w-full gap-2'): + name_input = ui.input('Nome (ex: Animes)') - # NOVO SELETOR DE TIPO type_select = ui.select({ 'mixed': 'Misto (Filmes e Séries)', 'movie': 'Apenas Filmes', 'series': 'Apenas Séries' - }, value='mixed', label='Tipo de Conteúdo').classes('w-1/4') + }, value='mixed', label='Tipo de Conteúdo') + + # Novos Seletores Múltiplos + genre_select = ui.select(TMDB_GENRES, multiple=True, label='Filtrar Gêneros (Opcional)').props('use-chips') + country_select = ui.select(COMMON_COUNTRIES, multiple=True, label='Filtrar País (Opcional)').props('use-chips') - ui.button('Adicionar', on_click=add_cat).props('icon=add color=green').classes('mt-2') + ui.button('Adicionar Regra', on_click=add_cat).props('icon=add color=green').classes('mt-2 w-full') load_cats() - # --- ABA 3: DEPLOY & CAMINHOS --- + + # --- ABA 3: DEPLOY --- with ui.tab_panel(tab_deploy): - - # Helper para o Picker funcionar com categorias ou solto async def open_picker(input_element): - # Seletor de pastas (inicia onde estiver escrito no input ou na raiz) start = input_element.value if input_element.value else '/' selected = await pick_folder_dialog(start) if selected: input_element.value = selected - # --- 1. CONFIGURAÇÃO DA ORIGEM (MONITORAMENTO) --- with ui.card().classes('w-full mb-6 border-l-4 border-amber-500 bg-amber-50'): ui.label('📡 Origem dos Arquivos').classes('text-lg font-bold mb-2 text-amber-900') - ui.label('Qual pasta o Clei-Flow deve vigiar?').classes('text-xs text-amber-700 mb-2') - monitor_path = AppConfig.get_val('monitor_path', '/downloads') - with ui.row().classes('w-full items-center gap-2'): - mon_input = ui.input('Pasta Monitorada (Container)', value=monitor_path).classes('flex-grow font-mono bg-white rounded px-2') - # Botão de Pasta (reutilizando o dialog, mas permitindo sair do /media se quiser, ou ajustamos o dialog depois) - # Nota: O pick_folder_dialog atual trava em /media. Se sua pasta de downloads for fora, - # precisaremos liberar o picker. Por enquanto assumimos que o usuário digita ou está montado. + mon_input = ui.input('Pasta Monitorada', value=monitor_path).classes('flex-grow font-mono bg-white rounded px-2') ui.button(icon='folder', on_click=lambda i=mon_input: open_picker(i)).props('flat dense color=amber-9') - - def save_monitor(): - if not mon_input.value.startswith('/'): - ui.notify('Caminho deve ser absoluto (/...)', type='warning'); return - AppConfig.set_val('monitor_path', mon_input.value) - ui.notify('Pasta de monitoramento salva! (Reinicie se necessário)', type='positive') - - ui.button('Salvar Origem', on_click=save_monitor).classes('mt-2 bg-amber-600 text-white') + ui.button('Salvar Origem', on_click=lambda: (AppConfig.set_val('monitor_path', mon_input.value), ui.notify('Salvo!'))).classes('mt-2 bg-amber-600 text-white') - ui.separator() - - # --- 2. REGRAS GLOBAIS DE DEPLOY --- - with ui.card().classes('w-full mb-6 border-l-4 border-indigo-500'): - ui.label('⚙️ Regras de Destino (Deploy)').classes('font-bold mb-2') - deploy_mode = AppConfig.get_val('deploy_mode', 'move') - conflict_mode = AppConfig.get_val('conflict_mode', 'skip') - cleanup = AppConfig.get_val('cleanup_empty_folders', 'true') - - with ui.grid(columns=2).classes('w-full gap-4'): - mode_select = ui.select({'move': 'Mover (Recortar)', 'copy': 'Copiar'}, value=deploy_mode, label='Modo') - conflict_select = ui.select({'skip': 'Ignorar', 'overwrite': 'Sobrescrever', 'rename': 'Renomear Auto'}, value=conflict_mode, label='Conflito') - - cleanup_switch = ui.switch('Limpar pastas vazias na origem', value=(cleanup == 'true')).classes('mt-2') - - def save_global_deploy(): - AppConfig.set_val('deploy_mode', mode_select.value) - AppConfig.set_val('conflict_mode', conflict_select.value) - AppConfig.set_val('cleanup_empty_folders', str(cleanup_switch.value).lower()) - ui.notify('Regras salvas!', type='positive') - ui.button('Salvar Regras', on_click=save_global_deploy).classes('mt-2') - - ui.separator() - - # --- 3. MAPEAMENTO DE DESTINOS --- ui.label('📂 Mapeamento de Destinos (/media)').classes('text-xl text-gray-700 mt-4') paths_container = ui.column().classes('w-full gap-2') - - def save_cat_path(cat, new_path): - if not new_path.startswith('/media'): - ui.notify('O caminho deve começar com /media', type='warning'); return - cat.target_path = new_path - cat.save() - ui.notify(f'Caminho de "{cat.name}" salvo!') - + def load_deploy_paths(): paths_container.clear() - cats = list(Category.select()) - if not cats: return - for cat in cats: + for cat in list(Category.select()): with paths_container, ui.card().classes('w-full p-4 flex-row items-center gap-4'): - with ui.column().classes('min-w-[150px]'): - ui.label(cat.name).classes('font-bold') - ui.icon('arrow_forward', color='gray') - with ui.row().classes('flex-grow items-center gap-2'): - path_input = ui.input(value=cat.target_path).classes('flex-grow font-mono') - ui.button(icon='folder', on_click=lambda i=path_input: open_picker(i)).props('flat dense color=amber-8') - ui.button(icon='save', on_click=lambda c=cat, p=path_input: save_cat_path(c, p.value)).props('flat round color=green') - + ui.label(cat.name).classes('font-bold w-32') + path_input = ui.input(value=cat.target_path).classes('flex-grow font-mono') + ui.button(icon='folder', on_click=lambda i=path_input: open_picker(i)).props('flat dense color=amber-8') + ui.button(icon='save', on_click=lambda c=cat, p=path_input: (setattr(c, 'target_path', p.value), c.save(), ui.notify('Salvo!'))).props('flat round color=green') + load_deploy_paths() - ui.button('Recarregar', on_click=load_deploy_paths, icon='refresh').props('flat dense').classes('mt-2 self-center') - # --- ABA 4: FFMPEG (Com VAAPI) --- + # --- ABA 4: FFMPEG (AGORA COM ISO_LANGS CORRIGIDO) --- with ui.tab_panel(tab_ffmpeg): ui.label('Perfis de Conversão').classes('text-xl text-gray-700') - # 1. Carrega dados profiles_query = list(FFmpegProfile.select()) profiles_dict = {p.id: p.name for p in profiles_query} - # 2. Ativo active_profile = next((p for p in profiles_query if p.is_active), None) initial_val = active_profile.id if active_profile else None - # 3. Função def set_active_profile(e): if not e.value: return FFmpegProfile.update(is_active=False).execute() FFmpegProfile.update(is_active=True).where(FFmpegProfile.id == int(e.value)).execute() ui.notify(f'Perfil "{profiles_dict[e.value]}" ativado!', type='positive') - # 4. Select select_profile = ui.select(profiles_dict, value=initial_val, label='Perfil Ativo', on_change=set_active_profile).classes('w-64 mb-6') ui.separator() - # Editor for p in profiles_query: with ui.expansion(f"{p.name}", icon='tune').classes('w-full bg-white mb-2 border rounded'): with ui.column().classes('p-4 w-full'): @@ -297,6 +236,8 @@ def show(): audios = p.audio_langs.split(',') if p.audio_langs else [] subs = p.subtitle_langs.split(',') if p.subtitle_langs else [] + + # AQUI ESTAVA O ERRO (ISO_LANGS faltando) c_audio = ui.select(ISO_LANGS, value=audios, multiple=True, label='Áudios').props('use-chips') c_sub = ui.select(ISO_LANGS, value=subs, multiple=True, label='Legendas').props('use-chips')