diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index af4f5ff6..3d0afd64 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -54,7 +54,7 @@ Dependencies point one way: `Core` ← `Core.Windows`, `Data`, `Protocol` ← `S |---|---| | `Sqlite`, `Postgres` | SQLite P/Invoke binding (winsqlite3 / libsqlite3), in-house PostgreSQL wire protocol v3 client with pool and LISTEN | | `Migrations/{sqlite,postgres}/NNNN_name.sql` | Embedded, applied in one transaction at open (`MigrationRunner`) | -| `Repositories` | `TitanoDatabase` facade: archives, sequences, frames, tags, renders, jobs, cards, users, tokens, uploads, render nodes, settings, audit; `DatabaseBackups` (daily `VACUUM INTO` copies of an SQLite index kept ×3, restore staged for the next open) | +| `Repositories` | `TitanoDatabase` facade: archives, sequences, frames, tags, renders, jobs, cards, users, tokens, uploads, render nodes, settings, audit; `DatabaseBackups` (daily `VACUUM INTO` copies of an SQLite index kept ×3, restore staged for the next start and carried out before the index opens, so it also recovers one that no longer opens) | | `Jobs` | `JobEngine` (its number of workers can change while it runs), `IJobHandler`, `IJobHandlerProvider`, `JobContext` (progress, checkpoints, follow-up jobs) | | `Archiving` | `ArchiveService` (create/adopt/open, archive settings written to `archive.json` then the index), `ArchiveIndexer` (scan, rebuild), `ArchiveIngest` (uploads and imports), `ImportService`, `ArchiveVerifier`, `ArchiveImages`, `ArchiveMaintenance`, `MassRenamer`, `SequenceTrash` (delete into the archive's hidden trash with a dry run, restore; the folder moves back when the index step fails), job handlers | | `Processing` | `ProcessingService`, `SequenceAnalyser`, `SequenceRender`, `ProjectStore`, `RenderNodeClient`, job handlers | diff --git a/i18n/ar/Tooltips.ar.resx b/i18n/ar/Tooltips.ar.resx index c9cfcc9a..1a865acf 100644 --- a/i18n/ar/Tooltips.ar.resx +++ b/i18n/ar/Tooltips.ar.resx @@ -566,8 +566,6 @@ الخادم الافتراضي، وعقدة التصيير، والشهادات الموثوقة مجلد التخزين المؤقت، والصور المصغرة في الذاكرة، وحد التخزين المؤقت التحقق من التحديثات عند البدء - تلقائي: عدد الأنوية ناقص أربعة لتبقى الواجهة سريعة الاستجابة - العودة إلى «تلقائي»: عدد الأنوية ناقص أربعة مفعّل عند وجود portable.txt بجانب Titano.exe: تبقى كل البيانات في مجلد البيانات الخاص به استخدام مرمّز عتادي عندما يدعم الإعداد المسبق، وإلا فالمرمّز البرمجي أول ثلاثة أسماء لاستيراد تجريبي بهذه القوالب diff --git a/i18n/bg/Tooltips.bg.resx b/i18n/bg/Tooltips.bg.resx index dcfe8de7..f8d1c859 100644 --- a/i18n/bg/Tooltips.bg.resx +++ b/i18n/bg/Tooltips.bg.resx @@ -536,8 +536,6 @@ Сървър по подразбиране, възел за рендериране, доверени сертификати Папка на кеша, миниатюри в паметта, лимит на кеша Проверка за актуализации при стартиране - Авто: броят ядра минус четири, за да остане интерфейсът отзивчив - Връщане към „Авто“: броят ядра минус четири Включен, когато portable.txt е до Titano.exe: всички данни остават в неговата папка с данни Използва хардуерен кодер, когато някой поддържа пресета; иначе софтуерен Първите три имена от примерно импортиране с тези шаблони diff --git a/i18n/cs/Tooltips.cs.resx b/i18n/cs/Tooltips.cs.resx index 1e9d8ebf..e2d5f579 100644 --- a/i18n/cs/Tooltips.cs.resx +++ b/i18n/cs/Tooltips.cs.resx @@ -551,8 +551,6 @@ Výchozí server, renderovací uzel, důvěryhodné certifikáty Složka mezipaměti, miniatury v paměti, limit mezipaměti Kontrola aktualizací při spuštění - Auto: počet jader minus čtyři, aby rozhraní zůstalo svižné - Zpět na Auto: počet jader minus čtyři Zapnuto, když vedle souboru Titano.exe leží portable.txt: všechna data zůstávají v jeho datové složce Použije hardwarový kodér, pokud předvolbu podporuje; jinak softwarový První tři názvy ukázkového importu s těmito šablonami diff --git a/i18n/da/Tooltips.da.resx b/i18n/da/Tooltips.da.resx index 50528e14..666a1dae 100644 --- a/i18n/da/Tooltips.da.resx +++ b/i18n/da/Tooltips.da.resx @@ -536,8 +536,6 @@ Standardserver, renderingsnode, betroede certifikater Cachemappe, miniaturer i hukommelsen, cachegrænse Søg efter opdateringer ved start - Auto: antal kerner minus fire, så brugerfladen forbliver responsiv - Tilbage til Auto: antal kerner minus fire Til, når portable.txt ligger ved siden af Titano.exe: alle data bliver i programmets datamappe Brug en hardwareencoder, når en understøtter forudindstillingen; ellers software De tre første navne fra en prøveimport med disse skabeloner diff --git a/i18n/de/Tooltips.de.resx b/i18n/de/Tooltips.de.resx index c540ebc2..b0f4c22c 100644 --- a/i18n/de/Tooltips.de.resx +++ b/i18n/de/Tooltips.de.resx @@ -536,8 +536,6 @@ Standardserver, Render-Knoten, vertrauenswürdige Zertifikate Cache-Ordner, Miniaturansichten im Arbeitsspeicher, Cache-Limit Updateprüfung beim Start - Auto: Kerne minus vier, damit die Oberfläche reaktionsfähig bleibt - Zurück zu Auto: Kerne minus vier Aktiv, wenn portable.txt neben Titano.exe liegt: Alle Daten bleiben im Datenordner daneben Einen Hardware-Encoder verwenden, wenn einer die Vorgabe unterstützt, sonst Software Die ersten drei Namen eines Beispielimports mit diesen Vorlagen diff --git a/i18n/el/Tooltips.el.resx b/i18n/el/Tooltips.el.resx index 6e2b4e3c..c037cf84 100644 --- a/i18n/el/Tooltips.el.resx +++ b/i18n/el/Tooltips.el.resx @@ -536,8 +536,6 @@ Προεπιλεγμένος διακομιστής, κόμβος απόδοσης, αξιόπιστα πιστοποιητικά Φάκελος κρυφής μνήμης, μικρογραφίες στη μνήμη, όριο κρυφής μνήμης Έλεγχος για ενημερώσεις κατά την εκκίνηση - Αυτόματο: πυρήνες μείον τέσσερις, ώστε το περιβάλλον εργασίας να ανταποκρίνεται - Επαναφορά σε Αυτόματο: πυρήνες μείον τέσσερις Ενεργή όταν το portable.txt βρίσκεται δίπλα στο Titano.exe: όλα τα δεδομένα μένουν στον φάκελο δεδομένων του Χρήση κωδικοποιητή υλικού όταν κάποιος υποστηρίζει την προρύθμιση, διαφορετικά κωδικοποιητή λογισμικού Τα τρία πρώτα ονόματα μιας δοκιμαστικής εισαγωγής με αυτά τα πρότυπα diff --git a/i18n/en/Archive.resx b/i18n/en/Archive.resx index b0fa151b..cdc3820a 100644 --- a/i18n/en/Archive.resx +++ b/i18n/en/Archive.resx @@ -140,6 +140,7 @@ Dry run Rebuild proxies Relink moved archive… + Restore database… Run maintenance Trash… {0:N0} issue diff --git a/i18n/en/Server.resx b/i18n/en/Server.resx index 543c7626..d21c9f01 100644 --- a/i18n/en/Server.resx +++ b/i18n/en/Server.resx @@ -26,6 +26,8 @@ Disconnect Not connected to a server Too many failed sign-ins; the account is locked for a while.long + Another program is changing the archive's settings; try again shortly.long + The archive's archive.json is damaged, from a newer Titano or of another archive; check the archive folder.long The archive is offline or read-only; try again when it is back.long Its photos are the archive's root folder, which never moves to the trash.long Wrong user name or password.long diff --git a/i18n/en/Settings.resx b/i18n/en/Settings.resx index b67cd880..5175d1c5 100644 --- a/i18n/en/Settings.resx +++ b/i18n/en/Settings.resx @@ -35,6 +35,7 @@ Waiting for restart Restore ready Restore the index of {0}?long + Now: unreadable Index restored from a backuplong After import After a scan @@ -55,6 +56,9 @@ Rescan every Preview Proxy size + Reset archive + Its naming templates, proxy size and thumbnail size return to their defaults for every PC and server that uses it. Folders and files already in the archive keep their names.long + Reset the settings of {0}?long; {0} archive name Archive folder Thumbnail size Back to Auto diff --git a/i18n/en/Tooltips.resx b/i18n/en/Tooltips.resx index 2de80576..3275731e 100644 --- a/i18n/en/Tooltips.resx +++ b/i18n/en/Tooltips.resx @@ -74,6 +74,7 @@ Queue the rebuild · the archive stays usable meanwhile Choose the new folder of an archive you moved; its sequences follow Make exactly these changes to folders, sidecars and index · resumes after a crash + Choose a daily backup of the index in Settings › Advanced; it replaces the index at the next start Change the tags of these sequences in sidecars and index Run the same action again Incremental scan: new, changed and removed files by modification time and size @@ -530,6 +531,7 @@ Load settings from a JSON file; the session and the window layout stay as they are Open the Microsoft Store page of this free or paid extension; Re-detect after installing it While Titano is in front, its interface runs ahead of the jobs so it stays fluid during renders and analyses + Leave this archive's settings as they are Keep the cache as it is Keep the index as it is Keep every setting as it is @@ -551,8 +553,6 @@ Default server, render node, trusted certificates Cache folder, thumbnails in memory, cache limit Update check on start - Auto: cores minus four so the interface stays responsive - Back to Auto: cores minus four How often Titano rescans the archive for changes made elsewhere, such as by a server sharing it On when portable.txt sits next to Titano.exe: all data stays in its data folder Use a hardware encoder when one supports the preset; software otherwise @@ -563,6 +563,7 @@ List the encoders again after a driver or codec install Look for codec extensions again after installing one; the next jobs use them Return every setting of this PC to its default; asks first + Write the default templates and sizes into this archive's archive.json now Reset every setting now Return every control of this section to its default Compare the chosen backup with the index, then restore it at the next start; asks first @@ -584,6 +585,8 @@ No decoder on this PC reads its pixels; such frames are left out of renders Send a daily anonymous count of versions and languages in use; nothing else, off by default Jobs and frames processed at once; fewer leave more room to other programs · Enter applies, Esc reverts + Auto: half the logical cores run jobs at once, each with its own number of threads + Back to Auto: half the logical cores Install in Program Files for every account · asks for administrator approval Return to the options without changing anything Choose the installation folder diff --git a/i18n/es/Tooltips.es.resx b/i18n/es/Tooltips.es.resx index ab490a8e..03521147 100644 --- a/i18n/es/Tooltips.es.resx +++ b/i18n/es/Tooltips.es.resx @@ -536,8 +536,6 @@ Servidor predeterminado, nodo de renderizado, certificados de confianza Carpeta de caché, miniaturas en memoria, límite de caché Búsqueda de actualizaciones al iniciar - Auto: núcleos menos cuatro para que la interfaz siga respondiendo - Volver a Auto: núcleos menos cuatro Activado cuando portable.txt está junto a Titano.exe: todos los datos se quedan en su carpeta de datos Usa un codificador por hardware cuando alguno admite el preajuste; si no, por software Primeros tres nombres de una importación de ejemplo con estas plantillas diff --git a/i18n/et/Tooltips.et.resx b/i18n/et/Tooltips.et.resx index c7859b3b..4a397d82 100644 --- a/i18n/et/Tooltips.et.resx +++ b/i18n/et/Tooltips.et.resx @@ -536,8 +536,6 @@ Vaikeserver, renderdussõlm, usaldatud sertifikaadid Vahemälu kaust, pisipildid mälus, vahemälu piirang Värskenduste otsimine käivitamisel - Auto: tuumade arv miinus neli, et liides jääks reageerivaks - Tagasi režiimile Auto: tuumade arv miinus neli Sees, kui portable.txt asub Titano.exe kõrval: kõik andmed jäävad selle andmekausta Kasutab riistvarakodeerijat, kui see toetab eelseadistust; muul juhul tarkvara Nende mallidega näidisimpordi kolm esimest nime diff --git a/i18n/fi/Tooltips.fi.resx b/i18n/fi/Tooltips.fi.resx index 930d8980..14cdea9d 100644 --- a/i18n/fi/Tooltips.fi.resx +++ b/i18n/fi/Tooltips.fi.resx @@ -536,8 +536,6 @@ Oletuspalvelin, renderöintisolmu, luotetut varmenteet Välimuistikansio, pikkukuvat muistissa, välimuistin raja Päivitysten tarkistus käynnistettäessä - Automaattinen: ytimet miinus neljä, jotta käyttöliittymä pysyy reagoivana - Palauta automaattinen: ytimet miinus neljä Käytössä, kun portable.txt on Titano.exe-tiedoston vieressä: kaikki tiedot pysyvät sen datakansiossa Käytä laitteistokooderia, kun jokin tukee esiasetusta; muuten ohjelmistoa Näillä malleilla tehdyn esimerkkituonnin kolme ensimmäistä nimeä diff --git a/i18n/fr/Tooltips.fr.resx b/i18n/fr/Tooltips.fr.resx index 481b6e65..416d39e8 100644 --- a/i18n/fr/Tooltips.fr.resx +++ b/i18n/fr/Tooltips.fr.resx @@ -536,8 +536,6 @@ Serveur par défaut, nœud de rendu, certificats approuvés Dossier du cache, miniatures en mémoire, limite du cache Recherche de mises à jour au démarrage - Auto : nombre de cœurs moins quatre, pour que l'interface reste réactive - Revenir à Auto : nombre de cœurs moins quatre Activé quand portable.txt se trouve à côté de Titano.exe : toutes les données restent dans son dossier de données Utiliser un encodeur matériel s'il prend en charge le préréglage, sinon l'encodeur logiciel Trois premiers noms d'un exemple d'importation avec ces modèles diff --git a/i18n/he/Tooltips.he.resx b/i18n/he/Tooltips.he.resx index 961c17ec..1f59d5c7 100644 --- a/i18n/he/Tooltips.he.resx +++ b/i18n/he/Tooltips.he.resx @@ -551,8 +551,6 @@ שרת ברירת מחדל, צומת רינדור, תעודות מהימנות תיקיית מטמון, תמונות ממוזערות בזיכרון, מגבלת מטמון בדיקת עדכונים בעת ההפעלה - אוטומטי: מספר הליבות פחות ארבע, כדי שהממשק יישאר מגיב - חזרה לאוטומטי: מספר הליבות פחות ארבע פעיל כאשר portable.txt נמצא לצד Titano.exe: כל הנתונים נשמרים בתיקיית הנתונים שלו שימוש במקודד חומרה כאשר יש כזה שתומך בפריסט; אחרת, קידוד בתוכנה שלושת השמות הראשונים בייבוא לדוגמה עם התבניות האלה diff --git a/i18n/hi/Tooltips.hi.resx b/i18n/hi/Tooltips.hi.resx index 1f8fa9e2..09e7d7c0 100644 --- a/i18n/hi/Tooltips.hi.resx +++ b/i18n/hi/Tooltips.hi.resx @@ -536,8 +536,6 @@ डिफ़ॉल्ट सर्वर, रेंडर नोड, विश्वसनीय प्रमाणपत्र कैश फ़ोल्डर, मेमोरी में थंबनेल, कैश सीमा शुरू होने पर अपडेट की जाँच - ऑटो: कोर की संख्या में से चार कम, ताकि इंटरफ़ेस प्रतिक्रियाशील रहे - ऑटो पर लौटें: कोर की संख्या में से चार कम जब portable.txt, Titano.exe के बगल में हो तब चालू: सारा डेटा उसके डेटा फ़ोल्डर में रहता है जब कोई हार्डवेयर एनकोडर प्रीसेट को सपोर्ट करे तो उसका उपयोग करें; अन्यथा सॉफ़्टवेयर इन टेम्पलेट के साथ नमूना आयात के पहले तीन नाम diff --git a/i18n/hr/Tooltips.hr.resx b/i18n/hr/Tooltips.hr.resx index d103788a..91e4ba6b 100644 --- a/i18n/hr/Tooltips.hr.resx +++ b/i18n/hr/Tooltips.hr.resx @@ -551,8 +551,6 @@ Zadani poslužitelj, čvor za renderiranje, pouzdani certifikati Mapa predmemorije, minijature u memoriji, ograničenje predmemorije Provjera ažuriranja pri pokretanju - Auto: broj jezgri umanjen za četiri kako bi sučelje ostalo responzivno - Vraća na Auto: broj jezgri umanjen za četiri Uključeno kada se portable.txt nalazi pokraj datoteke Titano.exe: svi podaci ostaju u njezinoj mapi data Upotrebljava hardverski koder kada podržava preset; inače softverski Prva tri naziva oglednog uvoza s ovim predlošcima diff --git a/i18n/hu/Tooltips.hu.resx b/i18n/hu/Tooltips.hu.resx index cf0759f3..f86e6521 100644 --- a/i18n/hu/Tooltips.hu.resx +++ b/i18n/hu/Tooltips.hu.resx @@ -536,8 +536,6 @@ Alapértelmezett szerver, renderelő csomópont, megbízható tanúsítványok Gyorsítótár mappája, miniatűrök a memóriában, gyorsítótár korlátja Frissítések keresése indításkor - Auto: a magok száma mínusz négy, így a felület gyorsan reagál - Vissza Auto értékre: a magok száma mínusz négy Bekapcsolva, ha a portable.txt a Titano.exe mellett van: minden adat a saját data mappájában marad Hardveres kódolót használ, ha valamelyik támogatja az előbeállítást; egyébként szoftverest Egy mintaimportálás első három neve ezekkel a sablonokkal diff --git a/i18n/id/Tooltips.id.resx b/i18n/id/Tooltips.id.resx index 939c91b5..6312dc7e 100644 --- a/i18n/id/Tooltips.id.resx +++ b/i18n/id/Tooltips.id.resx @@ -536,8 +536,6 @@ Server default, node render, sertifikat tepercaya Folder cache, gambar mini di memori, batas cache Pemeriksaan pembaruan saat mulai - Otomatis: jumlah inti dikurangi empat agar antarmuka tetap responsif - Kembali ke Otomatis: jumlah inti dikurangi empat Aktif bila portable.txt berada di samping Titano.exe: semua data tetap di folder data miliknya Gunakan encoder perangkat keras jika ada yang mendukung preset; jika tidak, gunakan perangkat lunak Tiga nama pertama dari contoh impor dengan templat ini diff --git a/i18n/it/Archive.it.resx b/i18n/it/Archive.it.resx index c1126ee8..8c2c51d1 100644 --- a/i18n/it/Archive.it.resx +++ b/i18n/it/Archive.it.resx @@ -135,6 +135,7 @@ Simulazione Ricrea proxy Ricollega archivio spostato… + Ripristina database… Esegui manutenzione Cestino… {0:N0} problema diff --git a/i18n/it/Server.it.resx b/i18n/it/Server.it.resx index 8baccf97..f5bc4e1e 100644 --- a/i18n/it/Server.it.resx +++ b/i18n/it/Server.it.resx @@ -24,6 +24,8 @@ Disconnetti Non connesso a un server Troppi accessi falliti; l'account è bloccato per un po'. + Un altro programma sta modificando le impostazioni dell'archivio; riprova tra poco. + Il file archive.json dell'archivio è danneggiato, di un Titano più recente o di un altro archivio; controlla la cartella dell'archivio. L'archivio non è raggiungibile o è di sola lettura; riprova quando torna disponibile. Le sue foto sono la cartella principale dell'archivio, che non va mai nel cestino. Nome utente o password errati. diff --git a/i18n/it/Settings.it.resx b/i18n/it/Settings.it.resx index d3ffd928..8a7369cf 100644 --- a/i18n/it/Settings.it.resx +++ b/i18n/it/Settings.it.resx @@ -35,6 +35,7 @@ In attesa di riavvio Ripristino pronto Ripristinare l'indice del {0}? + Ora: illeggibile Indice ripristinato da una copia Dopo l'importazione Dopo una scansione @@ -55,6 +56,9 @@ Riscansiona ogni Anteprima Dimensione proxy + Reimposta archivio + I modelli di nome, la dimensione dei proxy e quella delle miniature tornano ai valori predefiniti per ogni PC e server che lo usa. Le cartelle e i file già nell'archivio mantengono i loro nomi. + Reimpostare le impostazioni di {0}? Cartella archivio Dimensione miniature Torna ad Auto diff --git a/i18n/it/Tooltips.it.resx b/i18n/it/Tooltips.it.resx index 932ee8f3..fa89d2e0 100644 --- a/i18n/it/Tooltips.it.resx +++ b/i18n/it/Tooltips.it.resx @@ -74,6 +74,7 @@ Metti in coda la ricostruzione · l'archivio resta utilizzabile Scegli la nuova cartella di un archivio spostato; le sequenze lo seguono Applica esattamente queste modifiche a cartelle, sidecar e indice · riprende dopo un arresto + Scegli una copia giornaliera dell'indice in Impostazioni › Avanzate; sostituisce l'indice al prossimo avvio Cambia i tag di queste sequenze in sidecar e indice Esegui di nuovo la stessa azione Scansione incrementale: file nuovi, modificati e rimossi per data e dimensione @@ -530,6 +531,7 @@ Carica le impostazioni da un file JSON; la sessione e la disposizione della finestra restano invariate Apri la pagina del Microsoft Store di questa estensione, gratuita o a pagamento; dopo averla installata premi Rileva di nuovo Mentre Titano è in primo piano, l'interfaccia ha la precedenza sulle attività e resta fluida durante rendering e analisi + Lascia le impostazioni dell'archivio come sono Lascia la cache com'è Lascia l'indice com'è Lascia ogni impostazione com'è @@ -551,8 +553,6 @@ Server predefinito, nodo di rendering, certificati attendibili Cartella della cache, miniature in memoria, limite della cache Controllo degli aggiornamenti all'avvio - Auto: core meno quattro, così l'interfaccia resta reattiva - Torna ad Auto: core meno quattro Ogni quanto Titano riscansiona l'archivio per le modifiche fatte altrove, per esempio da un server che lo condivide Attiva quando portable.txt si trova accanto a Titano.exe: tutti i dati restano nella sua cartella data Usa un encoder hardware quando supporta il preset; altrimenti il software @@ -563,6 +563,7 @@ Elenca di nuovo gli encoder dopo l'installazione di un driver o di un codec Cerca di nuovo le estensioni codec dopo averne installata una; le prossime attività le usano Riporta ogni impostazione di questo PC al valore predefinito; chiede prima + Scrivi ora i modelli e le dimensioni predefiniti nel file archive.json dell'archivio Reimposta ora ogni impostazione Riporta ogni controllo di questa sezione al valore predefinito Confronta la copia scelta con l'indice, poi la ripristina al prossimo avvio; chiede prima @@ -584,6 +585,8 @@ Nessun decodificatore su questo PC ne legge i pixel; questi fotogrammi restano fuori dai rendering Invia ogni giorno un conteggio anonimo di versioni e lingue in uso; nient'altro, disattivato per impostazione predefinita Attività e fotogrammi elaborati insieme; meno lasciano più spazio agli altri programmi · Invio applica, Esc annulla + Auto: metà dei core logici esegue attività insieme, ognuna con il proprio numero di thread + Torna ad Auto: metà dei core logici Installa in Programmi per tutti gli account · chiede l'autorizzazione di amministratore Torna alle opzioni senza modificare nulla Scegli la cartella di installazione diff --git a/i18n/ja/Tooltips.ja.resx b/i18n/ja/Tooltips.ja.resx index 7cc372f8..9c05b606 100644 --- a/i18n/ja/Tooltips.ja.resx +++ b/i18n/ja/Tooltips.ja.resx @@ -536,8 +536,6 @@ 既定のサーバー、レンダリングノード、信頼済みの証明書 キャッシュフォルダー、メモリ内のサムネイル、キャッシュの上限 起動時のアップデート確認 - 自動: インターフェイスの応答性を保つため、コア数から 4 を引いた値 - 自動に戻す: コア数から 4 を引いた値 Titano.exe と同じ場所に portable.txt があるとオンになります。すべてのデータはそのデータフォルダーに保存されます。 プリセットに対応するハードウェアエンコーダーがあればそれを使用し、なければソフトウェアを使用します。 これらのテンプレートでインポートした場合の、最初の 3 つの名前の例 diff --git a/i18n/ko/Tooltips.ko.resx b/i18n/ko/Tooltips.ko.resx index 7c250700..c88c44c0 100644 --- a/i18n/ko/Tooltips.ko.resx +++ b/i18n/ko/Tooltips.ko.resx @@ -536,8 +536,6 @@ 기본 서버, 렌더링 노드, 신뢰하는 인증서 캐시 폴더, 메모리 내 썸네일, 캐시 한도 시작할 때 업데이트 확인 - 자동: 인터페이스가 원활하도록 코어 수에서 4를 뺀 값 - 자동으로 되돌리기: 코어 수에서 4를 뺀 값 Titano.exe 옆에 portable.txt가 있으면 켜집니다. 모든 데이터가 해당 데이터 폴더에 보관됩니다. 프리셋을 지원하는 하드웨어 인코더가 있으면 사용하고, 없으면 소프트웨어를 사용합니다. 이 템플릿으로 가져올 때의 처음 세 이름 예시 diff --git a/i18n/lt/Tooltips.lt.resx b/i18n/lt/Tooltips.lt.resx index 7b0482f7..c7d79a02 100644 --- a/i18n/lt/Tooltips.lt.resx +++ b/i18n/lt/Tooltips.lt.resx @@ -551,8 +551,6 @@ Numatytasis serveris, atvaizdavimo mazgas, patikimi sertifikatai Talpyklos aplankas, miniatiūros atmintyje, talpyklos riba Naujinimų tikrinimas paleidžiant - Auto: branduolių skaičius minus keturi, kad sąsaja greitai reaguotų - Grįžti į Auto: branduolių skaičius minus keturi Įjungta, kai šalia Titano.exe yra portable.txt: visi duomenys lieka programos duomenų aplanke Naudoti aparatinį koduotuvą, kai jis palaiko išankstinę nuostatą; kitu atveju – programinį Pirmieji trys pavyzdinio importavimo pavadinimai pagal šiuos šablonus diff --git a/i18n/lv/Tooltips.lv.resx b/i18n/lv/Tooltips.lv.resx index 813a6a2d..438d99c8 100644 --- a/i18n/lv/Tooltips.lv.resx +++ b/i18n/lv/Tooltips.lv.resx @@ -551,8 +551,6 @@ Noklusējuma serveris, renderēšanas mezgls, uzticamie sertifikāti Kešatmiņas mape, sīktēli atmiņā, kešatmiņas ierobežojums Atjauninājumu pārbaude startējot - Auto: kodoli mīnus četri, lai saskarne paliktu atsaucīga - Atpakaļ uz Auto: kodoli mīnus četri Ieslēgts, ja blakus Titano.exe atrodas portable.txt: visi dati paliek tā datu mapē Izmantot aparatūras kodētāju, ja kāds atbalsta priekšiestatījumu; citādi programmatūras Pirmie trīs nosaukumi parauga importēšanai ar šīm veidnēm diff --git a/i18n/ms/Tooltips.ms.resx b/i18n/ms/Tooltips.ms.resx index 339db12a..cb749353 100644 --- a/i18n/ms/Tooltips.ms.resx +++ b/i18n/ms/Tooltips.ms.resx @@ -536,8 +536,6 @@ Pelayan lalai, nod render, sijil dipercayai Folder cache, lakaran kecil dalam memori, had cache Semakan kemas kini semasa mula - Auto: bilangan teras tolak empat supaya antara muka kekal responsif - Kembali ke Auto: bilangan teras tolak empat Hidup apabila portable.txt terletak di sebelah Titano.exe: semua data kekal dalam folder datanya Gunakan pengekod perkakasan apabila ada yang menyokong praset; jika tidak, gunakan perisian Tiga nama pertama bagi contoh import dengan templat ini diff --git a/i18n/nb/Tooltips.nb.resx b/i18n/nb/Tooltips.nb.resx index d50e2d90..0ca5581a 100644 --- a/i18n/nb/Tooltips.nb.resx +++ b/i18n/nb/Tooltips.nb.resx @@ -536,8 +536,6 @@ Standardserver, renderingsnode, klarerte sertifikater Hurtigbuffermappe, miniatyrbilder i minnet, hurtigbuffergrense Se etter oppdateringer ved oppstart - Auto: antall kjerner minus fire, slik at grensesnittet reagerer raskt - Tilbake til Auto: antall kjerner minus fire På når portable.txt ligger ved siden av Titano.exe: alle data blir liggende i programmets egen datamappe Bruk en maskinvarekoder når en støtter forhåndsinnstillingen, ellers programvare De tre første navnene fra en eksempelimport med disse malene diff --git a/i18n/nl/Tooltips.nl.resx b/i18n/nl/Tooltips.nl.resx index 367ddcb3..48cb65f4 100644 --- a/i18n/nl/Tooltips.nl.resx +++ b/i18n/nl/Tooltips.nl.resx @@ -536,8 +536,6 @@ Standaardserver, renderknooppunt, vertrouwde certificaten Cachemap, miniaturen in geheugen, cachelimiet Controleren op updates bij starten - Auto: aantal kernen min vier, zodat de interface responsief blijft - Terug naar Auto: aantal kernen min vier Aan wanneer portable.txt naast Titano.exe staat: alle gegevens blijven in de bijbehorende gegevensmap Gebruik een hardware-encoder als die de voorinstelling ondersteunt; anders software Eerste drie namen van een voorbeeldimport met deze sjablonen diff --git a/i18n/pl/Tooltips.pl.resx b/i18n/pl/Tooltips.pl.resx index 7ce08783..f2db21ee 100644 --- a/i18n/pl/Tooltips.pl.resx +++ b/i18n/pl/Tooltips.pl.resx @@ -566,8 +566,6 @@ Serwer domyślny, węzeł renderowania, zaufane certyfikaty Folder pamięci podręcznej, miniatury w pamięci, limit pamięci podręcznej Sprawdzanie aktualizacji przy uruchomieniu - Auto: liczba rdzeni minus cztery, aby interfejs pozostał responsywny - Przywróć Auto: liczba rdzeni minus cztery Włączony, gdy obok Titano.exe znajduje się plik portable.txt: wszystkie dane pozostają w jego folderze danych Używaj enkodera sprzętowego, jeśli obsługuje on preset; w przeciwnym razie programowego Pierwsze trzy nazwy przykładowego importu z tymi szablonami diff --git a/i18n/pt-BR/Tooltips.pt-BR.resx b/i18n/pt-BR/Tooltips.pt-BR.resx index 246101a2..ab90ad41 100644 --- a/i18n/pt-BR/Tooltips.pt-BR.resx +++ b/i18n/pt-BR/Tooltips.pt-BR.resx @@ -536,8 +536,6 @@ Servidor padrão, nó de renderização, certificados confiáveis Pasta do cache, miniaturas na memória, limite do cache Verificação de atualizações ao iniciar - Auto: núcleos menos quatro, para a interface continuar responsiva - Volta para Auto: núcleos menos quatro Ativado quando portable.txt está ao lado de Titano.exe: todos os dados ficam na pasta data dele Usa um codificador de hardware quando algum suporta a predefinição; caso contrário, software Os três primeiros nomes de uma importação de exemplo com estes modelos diff --git a/i18n/pt-PT/Tooltips.pt-PT.resx b/i18n/pt-PT/Tooltips.pt-PT.resx index fbb8b59d..483b5380 100644 --- a/i18n/pt-PT/Tooltips.pt-PT.resx +++ b/i18n/pt-PT/Tooltips.pt-PT.resx @@ -536,8 +536,6 @@ Servidor predefinido, nó de renderização, certificados fidedignos Pasta da cache, miniaturas em memória, limite da cache Verificação de atualizações ao iniciar - Auto: número de núcleos menos quatro, para que a interface continue a responder - Voltar a Auto: número de núcleos menos quatro Ativado quando o portable.txt está junto ao Titano.exe: todos os dados ficam na respetiva pasta de dados Utilizar um codificador de hardware quando algum suporta a predefinição; caso contrário, software Os três primeiros nomes de uma importação de exemplo com estes modelos diff --git a/i18n/ro/Tooltips.ro.resx b/i18n/ro/Tooltips.ro.resx index aab545ee..ae17f31f 100644 --- a/i18n/ro/Tooltips.ro.resx +++ b/i18n/ro/Tooltips.ro.resx @@ -551,8 +551,6 @@ Server implicit, nod de randare, certificate de încredere Folderul cache, miniaturi în memorie, limita cache Verificarea actualizărilor la pornire - Auto: numărul de nuclee minus patru, pentru ca interfața să rămână receptivă - Revenire la Auto: numărul de nuclee minus patru Activat când portable.txt se află lângă Titano.exe: toate datele rămân în folderul său de date Folosiți un codificator hardware când acesta acceptă presetarea; altfel, software Primele trei nume ale unui import de probă cu aceste șabloane diff --git a/i18n/ru/Tooltips.ru.resx b/i18n/ru/Tooltips.ru.resx index 13957f60..ed6358e1 100644 --- a/i18n/ru/Tooltips.ru.resx +++ b/i18n/ru/Tooltips.ru.resx @@ -566,8 +566,6 @@ Сервер по умолчанию, узел рендеринга, доверенные сертификаты Папка кэша, эскизы в памяти, лимит кэша Проверка обновлений при запуске - Авто: число ядер минус четыре, чтобы интерфейс оставался отзывчивым - Вернуть «Авто»: число ядер минус четыре Включён, если рядом с Titano.exe лежит portable.txt: все данные хранятся в его папке данных Использовать аппаратный кодировщик, если он поддерживает пресет; иначе программный Первые три имени примерного импорта с этими шаблонами diff --git a/i18n/sk/Tooltips.sk.resx b/i18n/sk/Tooltips.sk.resx index 911557b5..f7219a62 100644 --- a/i18n/sk/Tooltips.sk.resx +++ b/i18n/sk/Tooltips.sk.resx @@ -551,8 +551,6 @@ Predvolený server, renderovací uzol, dôveryhodné certifikáty Priečinok vyrovnávacej pamäte, miniatúry v pamäti, limit vyrovnávacej pamäte Kontrola aktualizácií pri spustení - Auto: počet jadier mínus štyri, aby rozhranie pohotovo reagovalo - Späť na Auto: počet jadier mínus štyri Zapnutý, keď je vedľa Titano.exe súbor portable.txt: všetky údaje zostávajú v jeho priečinku údajov Použije hardvérový kodér, ak niektorý podporuje predvoľbu; inak softvérový Prvé tri názvy vzorového importu s týmito šablónami diff --git a/i18n/sl/Tooltips.sl.resx b/i18n/sl/Tooltips.sl.resx index 7bc2c18f..87fd46fb 100644 --- a/i18n/sl/Tooltips.sl.resx +++ b/i18n/sl/Tooltips.sl.resx @@ -551,8 +551,6 @@ Privzeti strežnik, vozlišče za upodabljanje, zaupanja vredna potrdila Mapa predpomnilnika, miniature v pomnilniku, omejitev predpomnilnika Preverjanje posodobitev ob zagonu - Samodejno: jedra minus štiri, da se vmesnik še naprej odziva - Nazaj na samodejno: jedra minus štiri Vklopljeno, ko je portable.txt poleg Titano.exe: vsi podatki ostanejo v njegovi mapi s podatki Uporabi strojni kodirnik, kadar podpira prednastavitev, sicer programskega Prva tri imena vzorčnega uvoza s temi predlogami diff --git a/i18n/sv/Tooltips.sv.resx b/i18n/sv/Tooltips.sv.resx index 11a55726..9f11a173 100644 --- a/i18n/sv/Tooltips.sv.resx +++ b/i18n/sv/Tooltips.sv.resx @@ -536,8 +536,6 @@ Standardserver, renderingsnod, betrodda certifikat Cachemapp, miniatyrer i minnet, cachegräns Sök efter uppdateringar vid start - Auto: antal kärnor minus fyra så att gränssnittet förblir responsivt - Tillbaka till Auto: antal kärnor minus fyra På när portable.txt ligger bredvid Titano.exe: alla data stannar i dess datamapp Använd en maskinvarukodare när någon stöder förinställningen; annars programvara De tre första namnen i en exempelimport med de här mallarna diff --git a/i18n/th/Tooltips.th.resx b/i18n/th/Tooltips.th.resx index 0f4ca9e7..32ce6383 100644 --- a/i18n/th/Tooltips.th.resx +++ b/i18n/th/Tooltips.th.resx @@ -536,8 +536,6 @@ เซิร์ฟเวอร์เริ่มต้น โหนดเรนเดอร์ ใบรับรองที่เชื่อถือ โฟลเดอร์แคช ภาพขนาดย่อในหน่วยความจำ ขีดจำกัดแคช ตรวจหาการอัปเดตเมื่อเริ่มต้น - อัตโนมัติ: จำนวนคอร์ลบสี่ เพื่อให้อินเทอร์เฟซตอบสนองได้ดี - กลับเป็นอัตโนมัติ: จำนวนคอร์ลบสี่ เปิดเมื่อมี portable.txt อยู่ข้าง Titano.exe: ข้อมูลทั้งหมดจะอยู่ในโฟลเดอร์ข้อมูลของโปรแกรม ใช้ตัวเข้ารหัสฮาร์ดแวร์เมื่อมีตัวที่รองรับพรีเซ็ต มิฉะนั้นใช้ซอฟต์แวร์ สามชื่อแรกของการนำเข้าตัวอย่างด้วยเทมเพลตเหล่านี้ diff --git a/i18n/tr/Tooltips.tr.resx b/i18n/tr/Tooltips.tr.resx index 1cdc2ae6..b6b0bba3 100644 --- a/i18n/tr/Tooltips.tr.resx +++ b/i18n/tr/Tooltips.tr.resx @@ -536,8 +536,6 @@ Varsayılan sunucu, işleme düğümü, güvenilen sertifikalar Önbellek klasörü, bellekteki küçük resimler, önbellek sınırı Başlangıçta güncelleme denetimi - Otomatik: arayüz duyarlı kalsın diye çekirdek sayısı eksi dört - Otomatiğe dön: çekirdek sayısı eksi dört Titano.exe dosyasının yanında portable.txt varsa açıktır: tüm veriler onun veri klasöründe kalır Hazır ayarı destekleyen bir donanım kodlayıcısı varsa onu, yoksa yazılımı kullanır Bu şablonlarla örnek bir içe aktarmanın ilk üç adı diff --git a/i18n/uk/Tooltips.uk.resx b/i18n/uk/Tooltips.uk.resx index 63e5d89d..30c72305 100644 --- a/i18n/uk/Tooltips.uk.resx +++ b/i18n/uk/Tooltips.uk.resx @@ -566,8 +566,6 @@ Сервер за замовчуванням, вузол рендерингу, довірені сертифікати Папка кешу, мініатюри в пам’яті, ліміт кешу Перевірка оновлень під час запуску - Авто: кількість ядер мінус чотири, щоб інтерфейс залишався чутливим - Повернути «Авто»: кількість ядер мінус чотири Увімкнено, коли portable.txt лежить поруч із Titano.exe: усі дані зберігаються в його папці даних Використовувати апаратний кодувальник, якщо він підтримує пресет; інакше — програмний Перші три імені зразкового імпорту з цими шаблонами diff --git a/i18n/vi/Tooltips.vi.resx b/i18n/vi/Tooltips.vi.resx index 69d7b16e..f50e9d49 100644 --- a/i18n/vi/Tooltips.vi.resx +++ b/i18n/vi/Tooltips.vi.resx @@ -536,8 +536,6 @@ Máy chủ mặc định, nút kết xuất, chứng chỉ tin cậy Thư mục bộ nhớ đệm, hình thu nhỏ trong bộ nhớ, giới hạn bộ nhớ đệm Kiểm tra cập nhật khi khởi động - Tự động: số lõi trừ bốn để giao diện luôn phản hồi nhanh - Về Tự động: số lõi trừ bốn Bật khi có portable.txt nằm cạnh Titano.exe: mọi dữ liệu nằm trong thư mục dữ liệu của nó Dùng bộ mã hóa phần cứng khi có bộ hỗ trợ cài đặt sẵn; nếu không thì dùng phần mềm Ba tên đầu tiên của một lượt nhập mẫu với các mẫu này diff --git a/i18n/zh-Hans/Tooltips.zh-Hans.resx b/i18n/zh-Hans/Tooltips.zh-Hans.resx index 42702e75..57bd7cf3 100644 --- a/i18n/zh-Hans/Tooltips.zh-Hans.resx +++ b/i18n/zh-Hans/Tooltips.zh-Hans.resx @@ -536,8 +536,6 @@ 默认服务器、渲染节点、受信任的证书 缓存文件夹、内存中的缩略图、缓存上限 启动时检查更新 - 自动:核心数减四,使界面保持响应 - 恢复自动:核心数减四 当 portable.txt 与 Titano.exe 位于同一文件夹时开启:所有数据都保存在其数据文件夹中 有硬件编码器支持该预设时使用硬件编码器,否则使用软件编码 使用这些模板时示例导入的前三个名称 diff --git a/i18n/zh-Hant/Tooltips.zh-Hant.resx b/i18n/zh-Hant/Tooltips.zh-Hant.resx index 15791c61..4d6aab39 100644 --- a/i18n/zh-Hant/Tooltips.zh-Hant.resx +++ b/i18n/zh-Hant/Tooltips.zh-Hant.resx @@ -536,8 +536,6 @@ 預設伺服器、算圖節點、信任的憑證 快取資料夾、記憶體中的縮圖、快取上限 啟動時檢查更新 - 自動:核心數減四,讓介面保持回應 - 恢復自動:核心數減四 當 portable.txt 與 Titano.exe 位於同一資料夾時開啟:所有資料都保留在其 data 資料夾中 預設集支援時使用硬體編碼器;否則使用軟體 以這些範本進行範例匯入時的前三個名稱 diff --git a/src/Titano.App/Archive/CurrentArchive.cs b/src/Titano.App/Archive/CurrentArchive.cs index b4357c93..ddd5f54d 100644 --- a/src/Titano.App/Archive/CurrentArchive.cs +++ b/src/Titano.App/Archive/CurrentArchive.cs @@ -10,8 +10,14 @@ public static class CurrentArchive { if (archives.Count == 0) return null; if (string.IsNullOrWhiteSpace(lastRoot)) return archives[0]; - var wanted = Normalize(lastRoot); - return archives.FirstOrDefault(a => string.Equals(Normalize(a.RootPath), wanted, StringComparison.OrdinalIgnoreCase)) ?? archives[0]; + return At(archives, lastRoot) ?? archives[0]; + } + + /// The archive indexed at ; null when none is (Settings › Archive never edits another one). + public static Core.Model.Archive? At(IReadOnlyList archives, string root) + { + var wanted = Normalize(root); + return archives.FirstOrDefault(a => string.Equals(Normalize(a.RootPath), wanted, StringComparison.OrdinalIgnoreCase)); } public static async Task FindAsync(TitanoDatabase db, string? lastRoot, CancellationToken cancellationToken = default) => diff --git a/src/Titano.App/Infrastructure/AppServices.cs b/src/Titano.App/Infrastructure/AppServices.cs index 83891860..699422bf 100644 --- a/src/Titano.App/Infrastructure/AppServices.cs +++ b/src/Titano.App/Infrastructure/AppServices.cs @@ -188,7 +188,7 @@ public sealed class AppServices : IAsyncDisposable if (_pollTimer is { } timer && timer.Period != ScanInterval) timer.Period = ScanInterval; } - /// Workers of this PC's job engine (Settings › Rendering › Parallelism, Auto: cores minus four). + /// Workers of this PC's job engine (Settings › Rendering › Parallelism, Auto: half the logical cores). public int Parallelism => ProcessingTuning.Parallelism(Settings, System.Environment.ProcessorCount); /// Starts, restarts or stops the render node to match the opt-in, the server session and the trusted certificates (BRIEF §14.7). @@ -206,10 +206,12 @@ public sealed class AppServices : IAsyncDisposable /// /// Opens (or creates) the index at , migrates it (after a restore staged in Settings › - /// Advanced replaced it), starts the job engine and the daily backups. + /// Advanced replaced it, which needs no open index: it also recovers one that no longer opens), starts the job engine + /// and the daily backups. /// public async Task OpenAsync(string databasePath, CancellationToken ct = default) { + await RestoreStagedAsync(databasePath, ct); try { Database = await Task.Run(() => TitanoDatabase.OpenAsync(DatabaseOptions.Sqlite(databasePath), ct), ct); @@ -221,7 +223,6 @@ public sealed class AppServices : IAsyncDisposable Log.Error("app", "The index could not be opened", ex); return; } - await RestoreStagedAsync(Database, ct); await StartJobsAsync(Database, startEngine: true, ct); Thumbnails = new ThumbnailService(Database, Settings.ThumbnailMemoryItems); Devices.Start(); @@ -286,15 +287,18 @@ public sealed class AppServices : IAsyncDisposable } } - /// A restore staged in Settings › Advanced replaces the index before anything reads it (). - private async Task RestoreStagedAsync(TitanoDatabase database, CancellationToken ct) + /// + /// A restore staged in Settings › Advanced replaces the index file before the index is opened, so it also recovers an + /// index that no longer opens (). + /// + private async Task RestoreStagedAsync(string databasePath, CancellationToken ct) { try { - if (await Task.Run(() => DatabaseBackups.RestoreStagedAsync(database, Environment.BackupDirectory, ct), ct)) + if (await Task.Run(() => DatabaseBackups.RestoreStagedAsync(databasePath, Environment.BackupDirectory, ct), ct)) { StagedRestore = StagedRestoreResult.Restored; - Log.Info("app", $"Index restored (schema {database.SchemaVersion})"); + Log.Info("app", $"Index at {databasePath} restored from the staged copy"); } } catch (InvalidDataException ex) @@ -302,7 +306,7 @@ public sealed class AppServices : IAsyncDisposable StagedRestore = StagedRestoreResult.Unreadable; Log.Error("app", "The staged index copy failed its checks; it was set aside and the index kept", ex); } - catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or DatabaseException) + catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or DatabaseException or DllNotFoundException) { StagedRestore = StagedRestoreResult.Deferred; Log.Error("app", "The staged index restore could not run; the index was kept and the restore stays staged", ex); diff --git a/src/Titano.App/Infrastructure/AppSettings.cs b/src/Titano.App/Infrastructure/AppSettings.cs index 6dfc120b..d40907a6 100644 --- a/src/Titano.App/Infrastructure/AppSettings.cs +++ b/src/Titano.App/Infrastructure/AppSettings.cs @@ -125,7 +125,7 @@ public sealed class AppSettings /// Frame memory budget in GB; null = Auto (a quarter of installed memory). public int? MemoryBudgetGb { get; set; } - /// Worker threads; null = Auto (cores minus four, at least one). + /// Jobs run at once, also capping their decode and analysis threads; null = Auto (half the logical cores, at least one, with the jobs' own thread counts). public int? Parallelism { get; set; } public bool BackgroundPriority { get; set; } = true; diff --git a/src/Titano.App/Infrastructure/ArchiveSetup.cs b/src/Titano.App/Infrastructure/ArchiveSetup.cs index 71380e74..feaa7e42 100644 --- a/src/Titano.App/Infrastructure/ArchiveSetup.cs +++ b/src/Titano.App/Infrastructure/ArchiveSetup.cs @@ -68,11 +68,12 @@ public static class ArchiveActions } /// - /// Why creating or opening an archive failed: the archive's own sentences for files, access and the index - /// (), otherwise (a catalog sentence, or "Something went wrong"). + /// Why creating, opening or changing an archive failed: the archive's own sentences for files (an unreadable + /// archive.json included), access and the index (), otherwise + /// (a catalog sentence, or "Something went wrong"). /// public static string Cause(Exception ex) => - ex is IOException or UnauthorizedAccessException or Data.DatabaseException ? ArchiveFailures.Cause(ex) : Shell.ErrorText.For(ex); + ex is IOException or InvalidDataException or UnauthorizedAccessException or Data.DatabaseException ? ArchiveFailures.Cause(ex) : Shell.ErrorText.For(ex); } /// Archive roots offered by default and their free space. diff --git a/src/Titano.App/Sections/ArchiveView.xaml b/src/Titano.App/Sections/ArchiveView.xaml index a0d1f5d5..4dd396da 100644 --- a/src/Titano.App/Sections/ArchiveView.xaml +++ b/src/Titano.App/Sections/ArchiveView.xaml @@ -85,6 +85,7 @@ + diff --git a/src/Titano.App/Sections/ArchiveViewModel.cs b/src/Titano.App/Sections/ArchiveViewModel.cs index c73a7674..9f4cf246 100644 --- a/src/Titano.App/Sections/ArchiveViewModel.cs +++ b/src/Titano.App/Sections/ArchiveViewModel.cs @@ -83,6 +83,11 @@ public sealed class ArchiveViewModel : SectionViewModel AdoptCommand = new AsyncRelayCommand(AdoptAsync); CopyFolderCommand = new RelayCommand(CopyFolder, () => _archive is not null); BackupCommand = new AsyncRelayCommand(BackupAsync, () => Services.Database is not null); + RestoreCommand = new RelayCommand(() => + { + Shell.Settings.Page = Titano.App.Settings.SettingsPage.Advanced; + Shell.Navigate(SectionKey.Settings); + }); MaintenanceCommand = new AsyncRelayCommand(() => QueueAsync(a => ArchiveJobs.Maintenance(a)), IsOnline); MaintenanceDryRunCommand = new AsyncRelayCommand(() => QueueAsync(a => ArchiveJobs.Maintenance(a, dryRun: true)), () => _archive is not null); RebuildProxiesCommand = new AsyncRelayCommand(() => QueueSetAsync(ids => ArchiveJobs.Proxies(ids, _archive!.Name, force: true), All()), IsOnline); @@ -176,6 +181,10 @@ public sealed class ArchiveViewModel : SectionViewModel public ICommand CopyFolderCommand { get; } public ICommand BackupCommand { get; } + + /// "Maintenance ▾ › Restore database…" (BRIEF §12.5): Settings › Advanced, where a daily copy is compared and restored (§6.2). + public ICommand RestoreCommand { get; } + public ICommand MaintenanceCommand { get; } public ICommand MaintenanceDryRunCommand { get; } public ICommand RebuildProxiesCommand { get; } diff --git a/src/Titano.App/Sections/SettingsView.xaml b/src/Titano.App/Sections/SettingsView.xaml index b40ff0d6..4cdde826 100644 --- a/src/Titano.App/Sections/SettingsView.xaml +++ b/src/Titano.App/Sections/SettingsView.xaml @@ -283,11 +283,11 @@ - -