The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.
Rust ffmpegfree-video-editormodel-context-protocolnon-linear-editoroffline-firstopen-source-video-editorself-hostedvideo-editingvideo-editing-automationvideo-editing-softwarevideo-editing-toolsvideo-editorvoice-cloningyoutube-automationyoutube-shorts
fix(settings): Automation waits for a strong token and stops without freezing (#337)
Jareerb922f699f85a
diff --git a/src/crates/concat/locales/ar.json b/src/crates/concat/locales/ar.jsonindex d6e97027..0a411977 100644--- a/src/crates/concat/locales/ar.json+++ b/src/crates/concat/locales/ar.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "هذا الجهاز فقط","settings.thisVersion": "هذا الإصدار","settings.token": "الرمز المميّز",+ "settings.tokenTooWeak": "بانتظار رمز مميّز أقوى: {0} حرفًا على الأقل، ولا يكون نمطًا متكررًا. أو اتركه فارغًا، أو اضغط «رمز مميّز جديد».","settings.unpacking": "جارٍ فك الحزمة…","settings.upToDate": "Concat {0} هو أحدث إصدار.","settings.updateAvailable": "صدر Concat {0}. الإصدار الحالي {1}.",diff --git a/src/crates/concat/locales/bn.json b/src/crates/concat/locales/bn.jsonindex 21326d9b..eb6280c9 100644--- a/src/crates/concat/locales/bn.json+++ b/src/crates/concat/locales/bn.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "শুধু এই কম্পিউটার","settings.thisVersion": "এই সংস্করণ","settings.token": "টোকেন",+ "settings.tokenTooWeak": "আরও শক্ত টোকেনের অপেক্ষায়: অন্তত {0}টি অক্ষর, আর কোনো পুনরাবৃত্ত ধাঁচ নয়। অথবা ফাঁকা রাখুন, কিংবা নতুন টোকেন চাপুন।","settings.unpacking": "আনপ্যাক করা হচ্ছে…","settings.upToDate": "Concat {0} সর্বশেষ রিলিজ।","settings.updateAvailable": "Concat {0} বেরিয়েছে। এটি {1}।",diff --git a/src/crates/concat/locales/de.json b/src/crates/concat/locales/de.jsonindex e0bc9c2a..555660a9 100644--- a/src/crates/concat/locales/de.json+++ b/src/crates/concat/locales/de.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Nur dieser Rechner","settings.thisVersion": "diese Version","settings.token": "Token",+ "settings.tokenTooWeak": "Wartet auf ein stärkeres Token: mindestens {0} Zeichen und kein sich wiederholendes Muster. Oder leer lassen oder „Neues Token“ drücken.","settings.unpacking": "Wird entpackt…","settings.upToDate": "Concat {0} ist die neueste Version.","settings.updateAvailable": "Concat {0} ist erschienen. Dies ist {1}.",diff --git a/src/crates/concat/locales/en.json b/src/crates/concat/locales/en.jsonindex ec3fb84c..d5f7fb11 100644--- a/src/crates/concat/locales/en.json+++ b/src/crates/concat/locales/en.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "This computer only","settings.thisVersion": "this version","settings.token": "Token",+ "settings.tokenTooWeak": "Waiting for a stronger token: at least {0} characters, and not a repeated pattern. Or leave it empty, or press New token.","settings.unpacking": "Unpacking…","settings.upToDate": "Concat {0} is the latest release.","settings.updateAvailable": "Concat {0} is out. This is {1}.",diff --git a/src/crates/concat/locales/es.json b/src/crates/concat/locales/es.jsonindex bb2aaabc..2a530565 100644--- a/src/crates/concat/locales/es.json+++ b/src/crates/concat/locales/es.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Solo este equipo","settings.thisVersion": "esta versión","settings.token": "Token",+ "settings.tokenTooWeak": "Esperando un token más fuerte: al menos {0} caracteres y sin un patrón repetido. O déjalo vacío, o pulsa Nuevo token.","settings.unpacking": "Desempaquetando…","settings.upToDate": "Concat {0} es la última versión.","settings.updateAvailable": "Concat {0} ya está disponible. Esta es la {1}.",diff --git a/src/crates/concat/locales/fa.json b/src/crates/concat/locales/fa.jsonindex 0b0f23ac..0c9c80d2 100644--- a/src/crates/concat/locales/fa.json+++ b/src/crates/concat/locales/fa.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "فقط همین دستگاه","settings.thisVersion": "این نسخه","settings.token": "توکن (Token)",+ "settings.tokenTooWeak": "در انتظار توکنی قویتر: دستکم {0} نویسه، و نه یک الگوی تکراری. یا خالی بگذارید، یا «Token جدید» را بزنید.","settings.unpacking": "در حال بازکردن بسته…","settings.upToDate": "Concat {0} آخرین نسخه است.","settings.updateAvailable": "Concat {0} منتشر شده است. این نسخه {1} است.",diff --git a/src/crates/concat/locales/fr.json b/src/crates/concat/locales/fr.jsonindex b81dbe75..9ce68cbc 100644--- a/src/crates/concat/locales/fr.json+++ b/src/crates/concat/locales/fr.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Cette machine seulement","settings.thisVersion": "cette version","settings.token": "Jeton",+ "settings.tokenTooWeak": "En attente d’un jeton plus solide : au moins {0} caractères, et pas un motif répété. Ou laissez-le vide, ou appuyez sur Nouveau jeton.","settings.unpacking": "Décompression…","settings.upToDate": "Concat {0} est la dernière version.","settings.updateAvailable": "Concat {0} est sorti. Ceci est la {1}.",diff --git a/src/crates/concat/locales/he.json b/src/crates/concat/locales/he.jsonindex b596f54e..4c9f44f7 100644--- a/src/crates/concat/locales/he.json+++ b/src/crates/concat/locales/he.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "המחשב הזה בלבד","settings.thisVersion": "הגרסה הזו","settings.token": "אסימון",+ "settings.tokenTooWeak": "ממתין לאסימון חזק יותר: לפחות {0} תווים, ולא תבנית חוזרת. או השאירו ריק, או לחצו על אסימון חדש.","settings.unpacking": "פורס…","settings.upToDate": "Concat {0} היא הגרסה האחרונה.","settings.updateAvailable": "Concat {0} יצא. זו גרסה {1}.",diff --git a/src/crates/concat/locales/hi.json b/src/crates/concat/locales/hi.jsonindex 68e15266..0dce4cf8 100644--- a/src/crates/concat/locales/hi.json+++ b/src/crates/concat/locales/hi.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "सिर्फ़ यही कंप्यूटर","settings.thisVersion": "यह वर्शन","settings.token": "टोकन",+ "settings.tokenTooWeak": "मज़बूत टोकन की प्रतीक्षा: कम से कम {0} अक्षर, और कोई दोहराया हुआ पैटर्न नहीं। या इसे खाली छोड़ दें, या नया टोकन दबाएँ।","settings.unpacking": "अनपैक हो रहा है…","settings.upToDate": "Concat {0} नवीनतम रिलीज़ है।","settings.updateAvailable": "Concat {0} आ गया है। यह {1} है।",diff --git a/src/crates/concat/locales/hr.json b/src/crates/concat/locales/hr.jsonindex d9877bda..1f468ce0 100644--- a/src/crates/concat/locales/hr.json+++ b/src/crates/concat/locales/hr.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Samo ovo računalo","settings.thisVersion": "ova verzija","settings.token": "Token",+ "settings.tokenTooWeak": "Čeka se jači token: najmanje {0} znakova i bez uzorka koji se ponavlja. Ili ga ostavite praznim, ili pritisnite Novi token.","settings.unpacking": "Raspakiranje…","settings.upToDate": "Concat {0} je najnovije izdanje.","settings.updateAvailable": "Concat {0} je izašao. Ovo je {1}.",diff --git a/src/crates/concat/locales/id.json b/src/crates/concat/locales/id.jsonindex c60f17d9..1c200dd7 100644--- a/src/crates/concat/locales/id.json+++ b/src/crates/concat/locales/id.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Hanya komputer ini","settings.thisVersion": "versi ini","settings.token": "Token",+ "settings.tokenTooWeak": "Menunggu token yang lebih kuat: minimal {0} karakter, dan bukan pola yang berulang. Atau biarkan kosong, atau tekan Token baru.","settings.unpacking": "Mengekstrak…","settings.upToDate": "Concat {0} adalah rilis terbaru.","settings.updateAvailable": "Concat {0} sudah tersedia. Ini versi {1}.",diff --git a/src/crates/concat/locales/it.json b/src/crates/concat/locales/it.jsonindex 2a5dd8bf..a3f53b18 100644--- a/src/crates/concat/locales/it.json+++ b/src/crates/concat/locales/it.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Solo questo computer","settings.thisVersion": "questa versione","settings.token": "Token",+ "settings.tokenTooWeak": "In attesa di un token più forte: almeno {0} caratteri e nessuno schema ripetuto. Oppure lascialo vuoto, o premi Nuovo token.","settings.unpacking": "Estrazione…","settings.upToDate": "Concat {0} è l'ultima versione.","settings.updateAvailable": "Concat {0} è disponibile. Questa è la {1}.",diff --git a/src/crates/concat/locales/ja.json b/src/crates/concat/locales/ja.jsonindex 72742ee0..56c39ab1 100644--- a/src/crates/concat/locales/ja.json+++ b/src/crates/concat/locales/ja.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "このコンピューターのみ","settings.thisVersion": "このバージョン","settings.token": "トークン",+ "settings.tokenTooWeak": "より強いトークンを待っています:{0} 文字以上で、繰り返しのパターンでないもの。空のままにするか、「新しいトークン」を押してください。","settings.unpacking": "展開中…","settings.upToDate": "Concat {0} が最新のリリースです。","settings.updateAvailable": "Concat {0} が公開されています。現在は {1} です。",diff --git a/src/crates/concat/locales/ko.json b/src/crates/concat/locales/ko.jsonindex db914e98..d80ec5c5 100644--- a/src/crates/concat/locales/ko.json+++ b/src/crates/concat/locales/ko.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "이 컴퓨터만","settings.thisVersion": "이 버전","settings.token": "토큰",+ "settings.tokenTooWeak": "더 강한 토큰을 기다리는 중: {0}자 이상이고 반복되는 패턴이 아니어야 합니다. 비워 두거나 새 토큰을 누르세요.","settings.unpacking": "압축 해제 중…","settings.upToDate": "Concat {0}이(가) 최신 릴리스입니다.","settings.updateAvailable": "Concat {0}이(가) 나왔습니다. 현재 버전은 {1}입니다.",diff --git a/src/crates/concat/locales/nl.json b/src/crates/concat/locales/nl.jsonindex 568b490a..198dd514 100644--- a/src/crates/concat/locales/nl.json+++ b/src/crates/concat/locales/nl.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Alleen deze computer","settings.thisVersion": "deze versie","settings.token": "Token",+ "settings.tokenTooWeak": "Wacht op een sterker token: minstens {0} tekens, en geen herhalend patroon. Of laat het leeg, of druk op Nieuw token.","settings.unpacking": "Uitpakken…","settings.upToDate": "Concat {0} is de nieuwste release.","settings.updateAvailable": "Concat {0} is uit. Dit is {1}.",diff --git a/src/crates/concat/locales/pl.json b/src/crates/concat/locales/pl.jsonindex cfb00436..bac536c0 100644--- a/src/crates/concat/locales/pl.json+++ b/src/crates/concat/locales/pl.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Tylko ten komputer","settings.thisVersion": "ta wersja","settings.token": "Token",+ "settings.tokenTooWeak": "Czekam na silniejszy token: co najmniej {0} znaków i bez powtarzającego się wzoru. Albo zostaw puste, albo naciśnij Nowy token.","settings.unpacking": "Rozpakowywanie…","settings.upToDate": "Concat {0} to najnowsze wydanie.","settings.updateAvailable": "Dostępny jest Concat {0}. Ta wersja to {1}.",diff --git a/src/crates/concat/locales/pt-BR.json b/src/crates/concat/locales/pt-BR.jsonindex 3a3de780..c1261737 100644--- a/src/crates/concat/locales/pt-BR.json+++ b/src/crates/concat/locales/pt-BR.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Só este computador","settings.thisVersion": "esta versão","settings.token": "Token",+ "settings.tokenTooWeak": "Aguardando um token mais forte: pelo menos {0} caracteres e sem um padrão repetido. Ou deixe vazio, ou pressione Novo token.","settings.unpacking": "Descompactando…","settings.upToDate": "O Concat {0} é a versão mais recente.","settings.updateAvailable": "O Concat {0} já saiu. Esta é a {1}.",diff --git a/src/crates/concat/locales/ru.json b/src/crates/concat/locales/ru.jsonindex ae2d3a7e..fd4458fb 100644--- a/src/crates/concat/locales/ru.json+++ b/src/crates/concat/locales/ru.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Только этот компьютер","settings.thisVersion": "эта версия","settings.token": "Токен",+ "settings.tokenTooWeak": "Нужен более надёжный токен: не меньше {0} символов и без повторяющегося шаблона. Или оставьте поле пустым, или нажмите «Новый токен».","settings.unpacking": "Распаковка…","settings.upToDate": "Concat {0} — последний выпуск.","settings.updateAvailable": "Вышел Concat {0}. Сейчас установлена {1}.",diff --git a/src/crates/concat/locales/th.json b/src/crates/concat/locales/th.jsonindex fc512703..7f3a56a0 100644--- a/src/crates/concat/locales/th.json+++ b/src/crates/concat/locales/th.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "เครื่องนี้เท่านั้น","settings.thisVersion": "เวอร์ชันนี้","settings.token": "โทเค็น",+ "settings.tokenTooWeak": "กำลังรอโทเค็นที่แข็งแรงกว่า: อย่างน้อย {0} อักขระ และไม่ใช่รูปแบบซ้ำ ๆ หรือเว้นว่างไว้ หรือกดโทเค็นใหม่","settings.unpacking": "กำลังแตกไฟล์…","settings.upToDate": "Concat {0} เป็นรุ่นล่าสุดแล้ว","settings.updateAvailable": "Concat {0} ออกแล้ว ตอนนี้ใช้ {1}",diff --git a/src/crates/concat/locales/tr.json b/src/crates/concat/locales/tr.jsonindex d4e874b8..29ffe4ef 100644--- a/src/crates/concat/locales/tr.json+++ b/src/crates/concat/locales/tr.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Yalnızca bu bilgisayar","settings.thisVersion": "bu sürüm","settings.token": "Belirteç",+ "settings.tokenTooWeak": "Daha güçlü bir belirteç bekleniyor: en az {0} karakter ve tekrarlanan bir desen değil. Ya boş bırakın ya da Yeni belirteç'e basın.","settings.unpacking": "Açılıyor…","settings.upToDate": "Concat {0} en son sürüm.","settings.updateAvailable": "Concat {0} çıktı. Bu sürüm {1}.",diff --git a/src/crates/concat/locales/uk.json b/src/crates/concat/locales/uk.jsonindex eef8bc30..3ef28902 100644--- a/src/crates/concat/locales/uk.json+++ b/src/crates/concat/locales/uk.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Лише цей комп’ютер","settings.thisVersion": "ця версія","settings.token": "Токен",+ "settings.tokenTooWeak": "Потрібен надійніший токен: щонайменше {0} символів і без шаблону, що повторюється. Або залиште поле порожнім, або натисніть «Новий токен».","settings.unpacking": "Розпакування…","settings.upToDate": "Concat {0} — найновіший випуск.","settings.updateAvailable": "Вийшов Concat {0}. Зараз встановлено {1}.",diff --git a/src/crates/concat/locales/ur.json b/src/crates/concat/locales/ur.jsonindex ea9609bd..c34db21b 100644--- a/src/crates/concat/locales/ur.json+++ b/src/crates/concat/locales/ur.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "صرف یہی کمپیوٹر","settings.thisVersion": "یہ ورژن","settings.token": "ٹوکن",+ "settings.tokenTooWeak": "زیادہ مضبوط ٹوکن کا انتظار: کم از کم {0} حروف، اور کوئی دہرایا ہوا نمونہ نہیں۔ یا اسے خالی چھوڑ دیں، یا نیا ٹوکن دبائیں۔","settings.unpacking": "کھولا جا رہا ہے…","settings.upToDate": "Concat {0} تازہ ترین ورژن ہے۔","settings.updateAvailable": "Concat {0} آ گیا ہے۔ موجودہ ورژن {1} ہے۔",diff --git a/src/crates/concat/locales/vi.json b/src/crates/concat/locales/vi.jsonindex b594bd91..cd23a933 100644--- a/src/crates/concat/locales/vi.json+++ b/src/crates/concat/locales/vi.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "Chỉ máy này","settings.thisVersion": "phiên bản này","settings.token": "Mã thông báo",+ "settings.tokenTooWeak": "Đang chờ một mã thông báo mạnh hơn: ít nhất {0} ký tự và không phải một mẫu lặp lại. Hoặc để trống, hoặc nhấn Mã thông báo mới.","settings.unpacking": "Đang giải nén…","settings.upToDate": "Concat {0} là bản phát hành mới nhất.","settings.updateAvailable": "Concat {0} đã được phát hành. Phiên bản hiện tại là {1}.",diff --git a/src/crates/concat/locales/zh-Hans.json b/src/crates/concat/locales/zh-Hans.jsonindex 33bba56c..5dc61488 100644--- a/src/crates/concat/locales/zh-Hans.json+++ b/src/crates/concat/locales/zh-Hans.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "仅限本机","settings.thisVersion": "当前版本","settings.token": "令牌",+ "settings.tokenTooWeak": "正在等待更强的令牌:至少 {0} 个字符,且不是重复的模式。也可以留空,或按“生成新令牌”。","settings.unpacking": "正在解包…","settings.upToDate": "Concat {0} 已是最新版本。","settings.updateAvailable": "Concat {0} 已发布。当前版本为 {1}。",diff --git a/src/crates/concat/locales/zh-TW.json b/src/crates/concat/locales/zh-TW.jsonindex 3fbbe448..c775dd25 100644--- a/src/crates/concat/locales/zh-TW.json+++ b/src/crates/concat/locales/zh-TW.json@@ -486,6 +486,7 @@"settings.thisComputerOnly": "僅限本機","settings.thisVersion": "目前版本","settings.token": "權杖",+ "settings.tokenTooWeak": "正在等待更強的權杖:至少 {0} 個字元,且不是重複的模式。也可以留空,或按「產生新權杖」。","settings.unpacking": "正在解壓縮…","settings.upToDate": "Concat {0} 已是最新版本。","settings.updateAvailable": "Concat {0} 已發布。目前版本為 {1}。",diff --git a/src/crates/concat/src/panes/settings.rs b/src/crates/concat/src/panes/settings.rsindex 77282671..c6491d1e 100644--- a/src/crates/concat/src/panes/settings.rs+++ b/src/crates/concat/src/panes/settings.rs@@ -614,8 +614,11 @@ impl SettingsPane {/// takes effect; a bind that fails turns the switch back off and says/// why on the page.fn apply_server(&mut self, studio: &mut Studio) {+ // Detached: the address is free again when this returns, and a+ // call or an export the old server was in the middle of is+ // cancelled and finished off the event loop, not waited for on it.if let Some(server) = studio.host.server.take() {- server.stop();+ server.stop_detached();}self.server_error.clear();let exporter = studio.host.exporter.clone();@@ -624,6 +627,16 @@ impl SettingsPane {if !prefs.enabled {return;}+ // A token being typed is weak until it is long enough; the switch+ // stays on and the server waits for it, rather than the switch+ // flipping off at the first keystroke.+ if !prefs.token.is_empty() && concat_server::check_token(&prefs.token).is_err() {+ self.server_error = tf(+ "settings.tokenTooWeak",+ &[&concat_server::MIN_TOKEN_CHARS],+ );+ return;+ }let started = prefs.listen.trim()@@ -958,6 +971,12 @@ const LOG_LEVELS: [log::LevelFilter; 5] = [];pub fn new_token() -> String {+ // The server's own minting, from the operating system's randomness.+ // The hasher's seed below is the fallback for a platform where that+ // fails, which none the app ships on does.+ if let Ok(token) = concat_server::mint_token() {+ return token;+ }use std::hash::{BuildHasher, Hasher};let word = |salt: u64| {let mut hasher = std::collections::hash_map::RandomState::new().build_hasher();