diff --git a/i18n/ar/Server.ar.resx b/i18n/ar/Server.ar.resx
index 97ccc47b..1d67a8e8 100644
--- a/i18n/ar/Server.ar.resx
+++ b/i18n/ar/Server.ar.resx
@@ -137,7 +137,6 @@
تسجيل الدخولتسجيل الدخولالمستخدم
- إيقاف الرفع مؤقتًا على اتصال محدود{0} من {1}{0} مستخدمةإتاحة هذا الكمبيوتر كعقدة تصيير
diff --git a/i18n/ar/Tooltips.ar.resx b/i18n/ar/Tooltips.ar.resx
index 0f40257f..9fcc86b9 100644
--- a/i18n/ar/Tooltips.ar.resx
+++ b/i18n/ar/Tooltips.ar.resx
@@ -239,7 +239,6 @@
اسم المشروع الجديد: من 1 إلى 60 حرفًا، وكل اسم مرة واحدة في كل تسلسلمشروع جديد لهذا التسلسل، يبدأ من «الرئيسي»نسخ صور المشروع إلى مساحة العمل، ثم فتحه هناك
- نسخ الملفات الأصلية، للتصيير على هذا الكمبيوتر، سيأتي في تحديث لاحقمشاريع التسلسل في المكتبةمشاريع التسلسل على الخادمنسخ النسخ الوكيلة: خفيفة وسريعة التحرير؛ ويستخدم التصيير الملفات الأصلية في المكتبة
@@ -724,7 +723,6 @@
اسم المستخدم الخاص بك على الخادممرمّزات الفيديو التي يمكن للخادم استخدامها على هذا الكمبيوتر: {0}لم يُعثر على خادم في هذه الشبكة بعد؛ اكتب عنوانه
- إيقاف الرفع مؤقتًا ما دام Windows يعدّ هذا الاتصال محدودًا؛ ويُستأنف تلقائيًا عندما لا يكون كذلكالمساحة التي تستخدمها على الخادم من حصتكالسماح للخادم بإرسال مهام التصيير إلى هذا الكمبيوتر عندما يكون خاملًا؛ تُستخدم مرمّزات GPU لديكيدير المسؤولون المستخدمين والأرشيف والخادم
@@ -886,7 +884,6 @@
لا توجد على هذا الكمبيوتر أداة فك ترميز تقرأ بكسلاته؛ وتُستبعد هذه الإطارات من التصييرإرسال إحصاء يومي مجهول للإصدارات واللغات المستخدمة؛ لا شيء غير ذلك، ومتوقف افتراضيًايستخدم «التحرير» هذا المجلد من الآن؛ ولا يُنقل شيء ولا يُحذف
- مجلد مساحة العمل (يُفضَّل قرص سريع)؛ يستخدم «تغيير» مجلدًا آخر، ونقله سيأتي في تحديث لاحقإرسال كل إصدار تحفظه إلى المكتبة فورًا، وأخذ إصدارات المكتبة الجديدةالتثبيت في Program Files لكل الحسابات · يطلب موافقة المسؤول{0} · يعمل كخدمة Windows، لذا يُثبَّت لكل المستخدمين في Program Files
diff --git a/i18n/bg/Server.bg.resx b/i18n/bg/Server.bg.resx
index d3936659..17bc7a7d 100644
--- a/i18n/bg/Server.bg.resx
+++ b/i18n/bg/Server.bg.resx
@@ -137,7 +137,6 @@
ВлизанеВлизанеПотребител
- Пауза при ограничен трафик{0} от {1}{0} използваниТози компютър като възел за рендериране
diff --git a/i18n/bg/Tooltips.bg.resx b/i18n/bg/Tooltips.bg.resx
index c4f4ef34..cbe136fe 100644
--- a/i18n/bg/Tooltips.bg.resx
+++ b/i18n/bg/Tooltips.bg.resx
@@ -233,7 +233,6 @@
Името на новия проект: от 1 до 60 знака, всяко име само веднъж в серияНов проект на тази серия, започващ от „Основен“Копира снимките на проекта в работното пространство, след което го отваря там
- Копирането на оригиналите, за рендериране на този компютър, идва в по-късна актуализацияПроектите на серията в библиотекатаПроектите на серията на сървъраКопира прокси файловете: леки и бързи за редактиране; рендерирането използва оригиналите от библиотеката
@@ -688,7 +687,6 @@
Вашето потребителско име на сървъраВидеокодери, които сървърът може да използва на този компютър: {0}В тази мрежа още не е открит сървър; въведете адреса му
- Поставя качванията на пауза, докато Windows отчита тази връзка като връзка с ограничен трафик; те се възобновяват сами, когато това престанеМястото, което използвате на сървъра, спрямо квотата виПозволява на сървъра да изпраща задачи за рендериране към този компютър, когато е свободен; използва кодерите на вашия GPUАдминистраторите управляват потребителите, архива и сървъра
@@ -844,7 +842,6 @@
Нито един декодер на този компютър не чете пикселите на този формат; такива кадри се изключват от рендеритеИзпраща ежедневно анонимен брой на използваните версии и езици; нищо друго, изключено по подразбиране„Редактиране“ използва тази папка отсега нататък; нищо не се премества или изтрива
- Папката на работното пространство (най-добре на бърз диск); „Промяна“ използва друга, преместването ѝ идва в по-късна актуализацияИзпраща веднага в библиотеката всяка версия, която запишете, и взема новите версии от библиотекатаИнсталира в Program Files за всички акаунти · изисква одобрение от администратор{0} · работи като услуга на Windows, затова се инсталира за всички потребители в Program Files
diff --git a/i18n/cs/Server.cs.resx b/i18n/cs/Server.cs.resx
index 01147c4f..5efdf836 100644
--- a/i18n/cs/Server.cs.resx
+++ b/i18n/cs/Server.cs.resx
@@ -137,7 +137,6 @@
Přihlásit sePřihlášeníUživatel
- Pozastavit nahrávání při měřeném připojení{0} z {1}Využito {0}Nabízet počítač jako renderovací uzel
diff --git a/i18n/cs/Tooltips.cs.resx b/i18n/cs/Tooltips.cs.resx
index 4634b0f3..861d09a7 100644
--- a/i18n/cs/Tooltips.cs.resx
+++ b/i18n/cs/Tooltips.cs.resx
@@ -236,7 +236,6 @@
Název nového projektu: 1 až 60 znaků, každý název jen jednou v rámci sekvenceNový projekt této sekvence, vycházející z projektu HlavníZkopíruje fotografie projektu do pracovního prostoru a pak ho tam otevře
- Kopírování originálů pro renderování na tomto počítači přijde v pozdější aktualizaciProjekty sekvence v knihovněProjekty sekvence na serveruZkopíruje proxy: jsou lehké a rychle se upravují; renderování používá originály z knihovny
@@ -706,7 +705,6 @@
Vaše uživatelské jméno na serveruKodéry videa, které server může v tomto počítači použít: {0}V této síti zatím nebyl nalezen žádný server; zadejte jeho adresu
- Pozastaví nahrávání, dokud Windows hlásí toto připojení jako měřené; jakmile měřené není, nahrávání se samo obnovíMísto, které na serveru využíváte, z vaší kvótyUmožní serveru posílat renderovací úlohy do tohoto počítače, když je nečinný; využívá kodéry vašeho GPUSprávci spravují uživatele, archiv a server
@@ -865,7 +863,6 @@
Žádný dekodér v tomto počítači nepřečte jeho pixely; takové snímky se do renderů nezahrnouJednou denně odešle anonymní počty používaných verzí a jazyků; nic jiného, ve výchozím nastavení vypnutoÚpravy od teď používají tuto složku; nic se nepřesouvá ani neodstraňuje
- Složka pracovního prostoru (nejlépe na rychlém disku); Změnit použije jinou, přesouvání přijde v pozdější aktualizaciKaždou uloženou verzi hned odešle do knihovny a převezme nové verze z knihovnyNainstaluje do složky Program Files pro všechny účty · vyžaduje souhlas správce{0} · běží jako služba systému Windows, proto se instaluje pro všechny uživatele do složky Program Files
diff --git a/i18n/da/Server.da.resx b/i18n/da/Server.da.resx
index 02fd6114..b55c4541 100644
--- a/i18n/da/Server.da.resx
+++ b/i18n/da/Server.da.resx
@@ -137,7 +137,6 @@
Log påLog påBruger
- Pause uploads ved forbrugsafregning{0} af {1}{0} brugtTilbyd denne pc som renderingsnode
diff --git a/i18n/da/Tooltips.da.resx b/i18n/da/Tooltips.da.resx
index 9accb4cc..7337f51e 100644
--- a/i18n/da/Tooltips.da.resx
+++ b/i18n/da/Tooltips.da.resx
@@ -233,7 +233,6 @@
Det nye projekts navn: 1 til 60 tegn, hvert navn kun én gang pr. sekvensEt nyt projekt i denne sekvens med udgangspunkt i HovedKopiér projektets fotos til arbejdsområdet, og åbn det derefter der
- Kopiering af originalerne, så der kan renderes på denne pc, kommer i en senere opdateringSekvensens projekter i biblioteketSekvensens projekter på serverenKopiér proxyerne: lette og hurtige at redigere; renderinger bruger bibliotekets originaler
@@ -688,7 +687,6 @@
Dit brugernavn på serverenVideoencodere, som serveren kan bruge på denne pc: {0}Ingen server fundet på dette netværk endnu; skriv dens adresse
- Sæt uploads på pause, mens Windows angiver denne forbindelse som forbrugsafregnet; de genoptages af sig selv, når den ikke længere er detDen plads, du bruger på serveren, i forhold til din kvoteLad serveren sende renderingsjob til denne pc, når den er ledig; bruger dine GPU-encodereAdministratorer administrerer brugere, arkivet og serveren
@@ -844,7 +842,6 @@
Ingen dekoder på denne pc kan læse formatets pixel; sådanne billeder udelades fra renderingerSend en daglig anonym optælling af versioner og sprog i brug; intet andet, slået fra som standardRedigering bruger denne mappe fremover; intet flyttes eller slettes
- Arbejdsområdets mappe (en hurtig disk er bedst); Skift bruger en anden, flytning af den kommer i en senere opdateringSend hver version, du gemmer, til biblioteket med det samme, og hent bibliotekets nye versionerInstaller i Program Files for alle konti · beder om administratorgodkendelse{0} · kører som en Windows-tjeneste og installeres derfor for alle brugere i Program Files
diff --git a/i18n/de/Server.de.resx b/i18n/de/Server.de.resx
index d0b23938..120d882e 100644
--- a/i18n/de/Server.de.resx
+++ b/i18n/de/Server.de.resx
@@ -137,7 +137,6 @@
AnmeldenAnmeldenBenutzer
- Uploads bei getakteter Verbindung anhalten{0} von {1}{0} belegtPC als Render-Knoten anbieten
diff --git a/i18n/de/Tooltips.de.resx b/i18n/de/Tooltips.de.resx
index 26e7f49a..3e167bc9 100644
--- a/i18n/de/Tooltips.de.resx
+++ b/i18n/de/Tooltips.de.resx
@@ -233,7 +233,6 @@
Der Name des neuen Projekts: 1 bis 60 Zeichen, jeder Name einmal pro SequenzEin neues Projekt dieser Sequenz, ausgehend vom HauptprojektDie Fotos des Projekts in den Arbeitsbereich kopieren und es dann dort öffnen
- Das Kopieren der Originale, um auf diesem PC zu rendern, folgt in einem späteren UpdateDie Projekte der Sequenz in der BibliothekDie Projekte der Sequenz auf dem ServerDie Proxys kopieren: leicht und schnell zu bearbeiten; beim Rendern werden die Originale der Bibliothek verwendet
@@ -688,7 +687,6 @@
Ihr Benutzername auf dem ServerVideo-Encoder, die der Server auf diesem PC nutzen kann: {0}Noch kein Server in diesem Netzwerk gefunden; geben Sie seine Adresse ein
- Uploads anhalten, solange Windows diese Verbindung als getaktet meldet; sie werden automatisch fortgesetzt, sobald das nicht mehr der Fall istIhr belegter Speicherplatz auf dem Server im Verhältnis zu Ihrem KontingentDem Server erlauben, Renderaufträge an diesen PC zu senden, wenn er im Leerlauf ist; nutzt Ihre GPU-EncoderAdmins verwalten Benutzer, das Archiv und den Server
@@ -844,7 +842,6 @@
Kein Decoder auf diesem PC liest die Pixel; solche Frames werden beim Rendern ausgelassenTäglich eine anonyme Zählung der verwendeten Versionen und Sprachen senden; sonst nichts, standardmäßig aus„Bearbeiten“ verwendet ab jetzt diesen Ordner; es wird nichts verschoben oder gelöscht
- Der Ordner des Arbeitsbereichs (am besten ein schnelles Laufwerk); „Ändern“ verwendet einen anderen, das Verschieben folgt in einem späteren UpdateJede gespeicherte Version sofort an die Bibliothek senden und die neuen Versionen der Bibliothek übernehmenIn „Programme“ für alle Konten installieren · erfordert Administratorgenehmigung{0} · läuft als Windows-Dienst und wird daher für alle Benutzer in „Programme“ installiert
diff --git a/i18n/el/Server.el.resx b/i18n/el/Server.el.resx
index 02f11293..894ce122 100644
--- a/i18n/el/Server.el.resx
+++ b/i18n/el/Server.el.resx
@@ -137,7 +137,6 @@
ΕίσοδοςΕίσοδοςΧρήστης
- Παύση αποστολών σε σύνδεση με μέτρηση{0} από {1}{0} σε χρήσηΔιάθεση ως κόμβος απόδοσης
diff --git a/i18n/el/Tooltips.el.resx b/i18n/el/Tooltips.el.resx
index 1f7ebe5b..834374fb 100644
--- a/i18n/el/Tooltips.el.resx
+++ b/i18n/el/Tooltips.el.resx
@@ -233,7 +233,6 @@
Το όνομα του νέου έργου: 1 έως 60 χαρακτήρες, κάθε όνομα μία φορά ανά ακολουθίαΈνα νέο έργο αυτής της ακολουθίας, με αφετηρία το «Κύριο»Αντιγραφή των φωτογραφιών του έργου στον χώρο εργασίας και άνοιγμά του εκεί
- Η αντιγραφή των πρωτοτύπων, για απόδοση σε αυτόν τον υπολογιστή, έρχεται σε επόμενη ενημέρωσηΤα έργα της ακολουθίας στη βιβλιοθήκηΤα έργα της ακολουθίας στον διακομιστήΑντιγραφή των proxy: ελαφριά και γρήγορα στην επεξεργασία. Η απόδοση χρησιμοποιεί τα πρωτότυπα της βιβλιοθήκης
@@ -688,7 +687,6 @@
Το όνομα χρήστη σας στον διακομιστήΚωδικοποιητές βίντεο που μπορεί να χρησιμοποιήσει ο διακομιστής σε αυτόν τον υπολογιστή: {0}Δεν βρέθηκε ακόμη διακομιστής σε αυτό το δίκτυο. Πληκτρολογήστε τη διεύθυνσή του
- Παύση των αποστολών όσο τα Windows αναφέρουν αυτήν τη σύνδεση ως σύνδεση με μέτρηση. Συνεχίζονται αυτόματα όταν δεν είναιΧώρος που χρησιμοποιείτε στον διακομιστή σε σχέση με το όριο χώρου σαςΟ διακομιστής μπορεί να στέλνει εργασίες απόδοσης σε αυτόν τον υπολογιστή όταν είναι αδρανής. Χρησιμοποιεί τους κωδικοποιητές της GPU σαςΟι διαχειριστές διαχειρίζονται τους χρήστες, την αρχειοθήκη και τον διακομιστή
@@ -844,7 +842,6 @@
Κανένας αποκωδικοποιητής σε αυτόν τον υπολογιστή δεν διαβάζει τα pixel της. Αυτά τα καρέ εξαιρούνται από τις αποδόσειςΑποστολή ημερήσιων ανώνυμων στατιστικών για τις εκδόσεις και τις γλώσσες που χρησιμοποιούνται. Τίποτα άλλο, ανενεργό από προεπιλογήΑπό τώρα η «Επεξεργασία» χρησιμοποιεί αυτόν τον φάκελο. Δεν μετακινείται ούτε διαγράφεται τίποτα
- Ο φάκελος του χώρου εργασίας (ιδανικά ένας γρήγορος δίσκος). Η «Αλλαγή» χρησιμοποιεί άλλον. Η μετακίνησή του έρχεται σε επόμενη ενημέρωσηΑποστολή κάθε έκδοσης που αποθηκεύετε αμέσως στη βιβλιοθήκη και λήψη των νέων εκδόσεων της βιβλιοθήκηςΕγκατάσταση στο Program Files για όλους τους λογαριασμούς · ζητά έγκριση διαχειριστή{0} · εκτελείται ως υπηρεσία των Windows, οπότε εγκαθίσταται για όλους τους χρήστες στο Program Files
diff --git a/i18n/en/Archive.resx b/i18n/en/Archive.resx
index 3c37491a..fcc53c82 100644
--- a/i18n/en/Archive.resx
+++ b/i18n/en/Archive.resx
@@ -443,4 +443,9 @@
Workspace moved to {0}: projects: {1}, files: {2}long: job log line; {0} target folder; {1} and {2} countsMove resumed from its journal: {0}long: job log line; {0} the journal fileMoved: {0}long: job log line; {0} project name
+ Held while the connection is meteredlong: job log line
+ {0}: the home made the version again as version {1}; the render goes with itlong: job log line; {0} project name; {1} version number
+ {0}: the render's version is not at the home; sent with the project onlylong: job log line; {0} project name
+ {0}: the server kept the render without its project; update the server to keep itlong: job log line; {0} render file name
+ Moved; {0} still holds {1} item(s) that could not be clearedlong: job log line; {0} old folder; {1} a count
diff --git a/i18n/en/Editor.resx b/i18n/en/Editor.resx
index 350a4e3f..5124eeb4 100644
--- a/i18n/en/Editor.resx
+++ b/i18n/en/Editor.resx
@@ -447,7 +447,6 @@
UndoUpdate mediaUpdating media
- Originals: {0}long; {0} a size, "1.2 GB"Copy originals…Proxies only…Proxies only for {0}{0} project name
@@ -462,15 +461,10 @@
Originals removedOriginals not removedWithout original: {0}long; {0} a count of frames
- Proxies
- OriginalsOpen which project?{0} has several projects in the workspace: choose the one to open.long; {0} sequence titleRender queued on this PC
- On this PCSent home
- {0} is in the library{0} render file name
- {0} is on the server{0} render file nameNot sentRender not sentSend again
diff --git a/i18n/en/Server.resx b/i18n/en/Server.resx
index 9fc8007c..4746df7d 100644
--- a/i18n/en/Server.resx
+++ b/i18n/en/Server.resx
@@ -140,7 +140,6 @@
Sign inSign inUser
- Pause metered uploads{0} of {1}{0} usedAct as render node
diff --git a/i18n/en/Settings.resx b/i18n/en/Settings.resx
index 62920c2b..e862d95b 100644
--- a/i18n/en/Settings.resx
+++ b/i18n/en/Settings.resx
@@ -255,9 +255,7 @@
Other drive: files copied and checkedlongNot sent yet: {0}long; {0} a count of projectsMove
- Move not possibleMoving the workspace
- Workspace movedWorkspace not movedMove not finishedA move of the workspace to {0} stopped before it ended; its projects are still in {1}.long; {0} the target folder; {1} the folder in use
diff --git a/i18n/en/Tooltips.resx b/i18n/en/Tooltips.resx
index a0dfe097..a5521791 100644
--- a/i18n/en/Tooltips.resx
+++ b/i18n/en/Tooltips.resx
@@ -233,7 +233,6 @@
The new project's name: 1 to 60 characters, each name once per sequenceA new project of this sequence, starting from MainCopy the project's photos into the workspace, then open it there
- Copying the originals, to render on this PC, comes in a later updateThe sequence's projects in the libraryThe sequence's projects on the serverCopy the proxies: light and fast to edit; renders use the library's originals
@@ -690,7 +689,6 @@
Your user name on the serverVideo encoders the server can use on this PC: {0}No server found on this network yet; type its address
- Pause uploads while Windows reports this connection as metered; they resume by themselves when it is notlongSpace you use on the server out of your quotaLet the server send render jobs to this PC when it is idle; uses your GPU encodersAdmins manage users, the archive and the server
@@ -846,7 +844,6 @@
No decoder on this PC reads its pixels; such frames are left out of rendersSend a daily anonymous count of versions and languages in use; nothing else, off by defaultEdit uses this folder from now on; nothing is moved or deleted
- The workspace's folder (a fast disk is best); Change uses another one, moving it comes in a later updateSend each version you save to the library at once, and take the library's new versionsInstall in Program Files for every account · asks for administrator approval{0} · it runs as a Windows service, so it installs for all users in Program Files
@@ -950,12 +947,7 @@
Originals the server no longer holds as they are here: they go to the workspace's trash, not deletedDelete the originals listed from the workspace; the proxies and the project stayKeep the originals in the workspace
- The library had no original of these frames: they stay proxies here, and a local render waits until they are copied
- The server had no original of these frames (or your account cannot read them): they stay proxies here
- The workspace holds the proxies of this project: renders run where the originals are
- The workspace holds the proxies and the originals of this project: renders run on this PCOpen this project of the sequence; Settings › Workspace › Open project says whether Edit asks
- Rendered on this PC from the workspace's originals; the file is in the project's exports folderRendered on this PC, not in the library yet: it is sent with the next send; the file stays in the workspaceRendered on this PC, not on the server yet: it is sent with the next send; the file stays in the workspaceSend the renders made here that the library does not have yet
@@ -974,13 +966,11 @@
Move the workspace folder with its projects to another folder, after a plan; each file is checked before its source goesPast this size, the media of the projects used longest ago are removed once they are in step with their home; their versions stayThe workspace grows as needed; only Clean after removes media
- What Open in workspace copies unless you choose otherwise thereCopy the proxies: light and fast to edit; renders run where the originals areCopy the originals too, to render on this PC; it takes the most spaceA render first saves your changes as a version (sent at once when Sync is on), so the render names the version it showsRemove the media of projects not opened for this long, once they are in step with their home; opening one copies them againMedia stay until you remove them, or Size limit does
- Which project Edit opens for a sequence with several in the workspaceThe project you opened last for the sequenceThe sequence's Main project, which holds its own settingsList the sequence's projects each time
@@ -991,4 +981,7 @@
Queue the move: the projects are moved or copied and checked, then Edit uses the new folderKeep the workspace where it isQueue the move again: it takes up from its journal, nothing is copied twice
+ A move stopped before it ended: resume it first
+ The originals are in the workspace already
+ The workspace holds only the proxies already
diff --git a/i18n/es/Server.es.resx b/i18n/es/Server.es.resx
index 1352fed1..f010be77 100644
--- a/i18n/es/Server.es.resx
+++ b/i18n/es/Server.es.resx
@@ -137,7 +137,6 @@
Iniciar sesiónIniciar sesiónUsuario
- Pausar subidas con conexión de uso medido{0} de {1}{0} usadosOfrecer este equipo como nodo de renderizado
diff --git a/i18n/es/Tooltips.es.resx b/i18n/es/Tooltips.es.resx
index 7dd8f4d9..5114ff64 100644
--- a/i18n/es/Tooltips.es.resx
+++ b/i18n/es/Tooltips.es.resx
@@ -233,7 +233,6 @@
El nombre del nuevo proyecto: de 1 a 60 caracteres, cada nombre una sola vez por secuenciaUn proyecto nuevo de esta secuencia, a partir de PrincipalCopia las fotos del proyecto en el espacio de trabajo y luego lo abre allí
- La copia de los originales, para renderizar en este equipo, llegará en una actualización posteriorLos proyectos de la secuencia en la bibliotecaLos proyectos de la secuencia en el servidorCopia los proxies: ligeros y rápidos de editar; los renderizados usan los originales de la biblioteca
@@ -688,7 +687,6 @@
Tu nombre de usuario en el servidorCodificadores de vídeo que el servidor puede usar en este equipo: {0}Aún no se ha encontrado ningún servidor en esta red; escribe su dirección
- Pausa las subidas mientras Windows indique que esta conexión es de uso medido; se reanudan solas cuando deja de serloEspacio que usas en el servidor respecto a tu cuotaPermite que el servidor envíe tareas de renderizado a este equipo cuando esté inactivo; usa tus codificadores de GPULos administradores gestionan los usuarios, la fototeca y el servidor
@@ -844,7 +842,6 @@
Ningún decodificador de este equipo lee sus píxeles; esos fotogramas quedan fuera de los renderizadosEnvía cada día un recuento anónimo de las versiones e idiomas en uso; nada más, desactivado de forma predeterminadaEdición usa esta carpeta desde ahora; no se mueve ni se elimina nada
- La carpeta del espacio de trabajo (mejor un disco rápido); Cambiar usa otra, moverla llegará en una actualización posteriorEnvía a la biblioteca cada versión en cuanto la guardas, y toma las versiones nuevas de la bibliotecaInstala en Archivos de programa para todas las cuentas · pide aprobación de administrador{0} · se ejecuta como servicio de Windows, así que se instala para todos los usuarios en Archivos de programa
diff --git a/i18n/et/Server.et.resx b/i18n/et/Server.et.resx
index 8673a0d7..21aca90b 100644
--- a/i18n/et/Server.et.resx
+++ b/i18n/et/Server.et.resx
@@ -137,7 +137,6 @@
Logi sisseLogi sisseKasutaja
- Peata üleslaadimine mahupõhisel ühendusel{0} / {1}{0} kasutatudPaku see arvuti renderdussõlmeks
diff --git a/i18n/et/Tooltips.et.resx b/i18n/et/Tooltips.et.resx
index abf62291..f56fb1aa 100644
--- a/i18n/et/Tooltips.et.resx
+++ b/i18n/et/Tooltips.et.resx
@@ -233,7 +233,6 @@
Uue projekti nimi: 1 kuni 60 märki, iga nimi üks kord jada kohtaSelle jada uus projekt, mis lähtub põhiprojektistKopeerige projekti fotod tööruumi ja avage see seal
- Originaalide kopeerimine selles arvutis renderdamiseks tuleb hilisemas värskendusesJada projektid teegisJada projektid serverisKopeerige proksid: kerged ja kiired redigeerida; renderdamine kasutab teegi originaale
@@ -688,7 +687,6 @@
Teie kasutajanimi serverisVideokodeerijad, mida server saab selles arvutis kasutada: {0}Selles võrgus pole veel serverit leitud; tippige selle aadress
- Peatab üleslaadimised, kui Windows märgib selle ühenduse mahupõhiseks; need jätkuvad iseenesest, kui see enam nii poleServeris kasutatav ruum teie kvoodistServer saab saata sellele arvutile renderdustöid, kui see on jõude; kasutab teie GPU kodeerijaidAdministraatorid haldavad kasutajaid, arhiivi ja serverit
@@ -844,7 +842,6 @@
Ükski selle arvuti dekodeerija ei loe selle piksleid; sellised kaadrid jäetakse renderdustest väljaSaadab kord päevas anonüümse kasutusel olevate versioonide ja keelte arvu; mitte midagi muud, vaikimisi väljas„Redigeerimine“ kasutab nüüdsest seda kausta; midagi ei teisaldata ega kustutata
- Tööruumi kaust (parim on kiire ketas); „Muuda“ kasutab muud kausta, teisaldamine tuleb hilisemas värskendusesSaatke iga salvestatud versioon kohe teeki ja võtke teegi uued versioonidInstallib kausta Program Files kõigile kontodele · küsib administraatori kinnitust{0} · töötab Windowsi teenusena, seega installitakse see kõigile kasutajatele kausta Program Files
diff --git a/i18n/fi/Server.fi.resx b/i18n/fi/Server.fi.resx
index 750e5369..69132d95 100644
--- a/i18n/fi/Server.fi.resx
+++ b/i18n/fi/Server.fi.resx
@@ -137,7 +137,6 @@
Kirjaudu sisäänKirjaudu sisäänKäyttäjä
- Keskeytä laskutettavalla yhteydellä{0} / {1}{0} käytössäTarjoa tämä tietokone renderöintisolmuksi
diff --git a/i18n/fi/Tooltips.fi.resx b/i18n/fi/Tooltips.fi.resx
index 0467814a..8bec1700 100644
--- a/i18n/fi/Tooltips.fi.resx
+++ b/i18n/fi/Tooltips.fi.resx
@@ -233,7 +233,6 @@
Uuden projektin nimi: 1–60 merkkiä, kukin nimi kerran sarjaa kohdenTämän sarjan uusi projekti, joka alkaa PääprojektistaKopioi projektin kuvat työtilaan ja avaa se sitten siellä
- Alkuperäisten kopiointi renderöintiä varten tällä tietokoneella tulee myöhemmässä päivityksessäSarjan projektit kirjastossaSarjan projektit palvelimellaKopioi proxyt: kevyitä ja nopeita muokata; renderöinnit käyttävät kirjaston alkuperäisiä
@@ -688,7 +687,6 @@
Käyttäjänimesi palvelimellaVideokooderit, joita palvelin voi käyttää tällä tietokoneella: {0}Tästä verkosta ei ole vielä löytynyt palvelinta; kirjoita sen osoite
- Keskeytä lähetykset, kun Windows ilmoittaa tämän yhteyden käytön mukaan laskutettavaksi; ne jatkuvat itsestään, kun se ei enää olePalvelimella käyttämäsi tila suhteessa kiintiöösiAnna palvelimen lähettää renderöintitöitä tälle tietokoneelle, kun se on vapaana; käyttää GPU-koodereitasiYlläpitäjät hallitsevat käyttäjiä, arkistoa ja palvelinta
@@ -844,7 +842,6 @@
Mikään tämän tietokoneen dekooderi ei lue sen pikseleitä; tällaiset kuvat jätetään pois renderöinneistäLähetä päivittäin nimetön määrä käytössä olevista versioista ja kielistä; ei mitään muuta, oletuksena pois päältäMuokkaus käyttää tätä kansiota tästä lähtien; mitään ei siirretä eikä poisteta
- Työtilan kansio (nopea levy on paras); ”Vaihda” ottaa käyttöön toisen, sen siirtäminen tulee myöhemmässä päivityksessäLähetä jokainen tallentamasi versio heti kirjastoon ja ota kirjaston uudet versiotAsenna Program Files -kansioon kaikille tileille · pyytää järjestelmänvalvojan hyväksynnän{0} · toimii Windows-palveluna, joten se asennetaan kaikille käyttäjille Program Files -kansioon
diff --git a/i18n/fr/Server.fr.resx b/i18n/fr/Server.fr.resx
index 249dea99..d1d63dfb 100644
--- a/i18n/fr/Server.fr.resx
+++ b/i18n/fr/Server.fr.resx
@@ -137,7 +137,6 @@
Ouvrir une sessionOuvrir une sessionUtilisateur
- Suspendre les envois en connexion limitée{0} sur {1}{0} utilisésProposer ce PC comme nœud de rendu
diff --git a/i18n/fr/Tooltips.fr.resx b/i18n/fr/Tooltips.fr.resx
index d5552ec7..651798d5 100644
--- a/i18n/fr/Tooltips.fr.resx
+++ b/i18n/fr/Tooltips.fr.resx
@@ -233,7 +233,6 @@
Nom du nouveau projet : de 1 à 60 caractères, chaque nom une seule fois par séquenceUn nouveau projet de cette séquence, à partir de PrincipalCopier les photos du projet dans l'espace de travail, puis l'y ouvrir
- La copie des originaux, pour effectuer le rendu sur ce PC, arrivera dans une mise à jour ultérieureLes projets de la séquence dans la bibliothèqueLes projets de la séquence sur le serveurCopier les proxys : légers et rapides à modifier ; les rendus utilisent les originaux de la bibliothèque
@@ -688,7 +687,6 @@
Votre nom d'utilisateur sur le serveurEncodeurs vidéo que le serveur peut utiliser sur ce PC : {0}Aucun serveur trouvé sur ce réseau pour l'instant ; saisissez son adresse
- Suspendre les envois quand Windows signale cette connexion comme limitée ; ils reprennent d'eux-mêmes dès qu'elle ne l'est plusEspace que vous utilisez sur le serveur par rapport à votre quotaPermettre au serveur d'envoyer des tâches de rendu à ce PC quand il est inactif ; utilise vos encodeurs GPULes admins gèrent les utilisateurs, l'archive et le serveur
@@ -844,7 +842,6 @@
Aucun décodeur de ce PC ne lit ses pixels ; ces images sont exclues des rendusEnvoyer chaque jour un décompte anonyme des versions et des langues utilisées ; rien d'autre, désactivé par défautÉdition utilise ce dossier à partir de maintenant ; rien n'est déplacé ni supprimé
- Le dossier de l'espace de travail (un disque rapide est préférable) ; « Modifier » en utilise un autre, son déplacement arrivera dans une mise à jour ultérieureEnvoyer immédiatement à la bibliothèque chaque version enregistrée, et récupérer les nouvelles versions de la bibliothèqueInstaller dans Program Files pour tous les comptes · demande l'approbation d'un administrateur{0} · s'exécute en tant que service Windows et s'installe donc pour tous les utilisateurs dans Program Files
diff --git a/i18n/he/Server.he.resx b/i18n/he/Server.he.resx
index b7c043e3..372af2ff 100644
--- a/i18n/he/Server.he.resx
+++ b/i18n/he/Server.he.resx
@@ -137,7 +137,6 @@
היכנסכניסהמשתמש
- השהה העלאות בחיבור מדוד{0} מתוך {1}{0} בשימושהצע את המחשב כצומת רינדור
diff --git a/i18n/he/Tooltips.he.resx b/i18n/he/Tooltips.he.resx
index 635f4f74..24a3c670 100644
--- a/i18n/he/Tooltips.he.resx
+++ b/i18n/he/Tooltips.he.resx
@@ -236,7 +236,6 @@
שם הפרויקט החדש: 1 עד 60 תווים, כל שם פעם אחת לכל רצףפרויקט חדש של הרצף הזה, שמתחיל מ"ראשי"העתקת התמונות של הפרויקט לסביבת העבודה, ולאחר מכן פתיחתו שם
- העתקת הקבצים המקוריים, לרינדור במחשב הזה, תגיע בעדכון מאוחר יותרהפרויקטים של הרצף בספרייההפרויקטים של הרצף בשרתהעתקת קובצי הפרוקסי: קלים ומהירים לעריכה; הרינדורים משתמשים בקבצים המקוריים של הספרייה
@@ -706,7 +705,6 @@
שם המשתמש שלך בשרתמקודדי הווידאו שהשרת יכול להשתמש בהם במחשב הזה: {0}עדיין לא נמצא שרת ברשת הזו; יש להקליד את הכתובת שלו
- השהיית ההעלאות כל עוד Windows מסמן את החיבור הזה כחיבור מדוד; הן ממשיכות מעצמן כשהחיבור כבר אינו מדודהשטח שבשימושך בשרת מתוך המכסה שלךמאפשר לשרת לשלוח משימות רינדור למחשב הזה כשהוא אינו בשימוש; נעשה שימוש במקודדי ה-GPU שלךמנהלים אחראים על המשתמשים, על הארכיון ועל השרת
@@ -865,7 +863,6 @@
אין במחשב הזה מפענח שקורא את הפיקסלים שלו; פריימים כאלה מושמטים מרינדוריםשליחת ספירה יומית אנונימית של הגרסאות והשפות שבשימוש; שום דבר אחר, כבוי כברירת מחדלעריכה משתמשת בתיקייה הזו מעכשיו; דבר לא מועבר או נמחק
- תיקיית סביבת העבודה (עדיף דיסק מהיר); "שנה" עובר לתיקייה אחרת, העברתה תגיע בעדכון מאוחר יותרשליחה מיידית לספרייה של כל גרסה שנשמרת, וקבלת הגרסאות החדשות של הספרייההתקנה ב-Program Files עבור כל החשבונות · נדרש אישור מנהל מערכת{0} · פועל כשירות Windows, ולכן מותקן לכל המשתמשים ב-Program Files
diff --git a/i18n/hi/Server.hi.resx b/i18n/hi/Server.hi.resx
index e5c11b5e..0cac78d1 100644
--- a/i18n/hi/Server.hi.resx
+++ b/i18n/hi/Server.hi.resx
@@ -137,7 +137,6 @@
साइन इन करेंसाइन इन करेंउपयोगकर्ता
- मीटर्ड अपलोड को विराम दें{1} में से {0}{0} उपयोग मेंइस PC को रेंडर नोड बनाएँ
diff --git a/i18n/hi/Tooltips.hi.resx b/i18n/hi/Tooltips.hi.resx
index ef84c48d..6b3f1036 100644
--- a/i18n/hi/Tooltips.hi.resx
+++ b/i18n/hi/Tooltips.hi.resx
@@ -233,7 +233,6 @@
नए प्रोजेक्ट का नाम: 1 से 60 वर्ण, हर नाम प्रति सीक्वेंस एक बारइस सीक्वेंस का एक नया प्रोजेक्ट, “मुख्य” से शुरू होकरप्रोजेक्ट की फ़ोटो वर्कस्पेस में कॉपी करें, फिर उसे वहाँ खोलें
- इस PC पर रेंडर करने के लिए मूल फ़ाइलों की कॉपी बाद के किसी अपडेट में आएगीलाइब्रेरी में सीक्वेंस के प्रोजेक्टसर्वर पर सीक्वेंस के प्रोजेक्टप्रॉक्सी कॉपी करें: हल्के और संपादन में तेज़; रेंडर लाइब्रेरी की मूल फ़ाइलों का उपयोग करते हैं
@@ -688,7 +687,6 @@
सर्वर पर आपका उपयोगकर्ता नामवीडियो एनकोडर जिनका सर्वर इस PC पर उपयोग कर सकता है: {0}इस नेटवर्क पर अभी कोई सर्वर नहीं मिला; उसका पता टाइप करें
- जब Windows इस कनेक्शन को मीटर्ड बताए तब अपलोड को विराम दें; मीटर्ड न रहने पर वे अपने आप फिर से शुरू हो जाते हैंआपके कोटा में से सर्वर पर आपके द्वारा उपयोग किया गया स्थाननिष्क्रिय होने पर सर्वर को इस PC पर रेंडर कार्य भेजने दें; आपके GPU एनकोडर का उपयोग करता हैव्यवस्थापक उपयोगकर्ताओं, संग्रह और सर्वर का प्रबंधन करते हैं
@@ -844,7 +842,6 @@
इस PC पर कोई डिकोडर इसके पिक्सेल नहीं पढ़ता; ऐसे फ़्रेम रेंडर से बाहर रखे जाते हैंउपयोग में संस्करणों और भाषाओं की दैनिक अनाम गणना भेजें; इसके अलावा कुछ नहीं, डिफ़ॉल्ट रूप से बंदअब से संपादन इस फ़ोल्डर का उपयोग करता है; कुछ भी स्थानांतरित या हटाया नहीं जाता
- वर्कस्पेस का फ़ोल्डर (तेज़ डिस्क सबसे अच्छी है); “बदलें” दूसरा फ़ोल्डर उपयोग करता है, इसे स्थानांतरित करना बाद के किसी अपडेट में आएगासहेजा गया हर संस्करण तुरंत लाइब्रेरी को भेजें, और लाइब्रेरी के नए संस्करण लेंहर खाते के लिए Program Files में इंस्टॉल करें · व्यवस्थापक अनुमोदन माँगता है{0} · यह Windows सेवा के रूप में चलता है, इसलिए Program Files में सभी उपयोगकर्ताओं के लिए इंस्टॉल होता है
diff --git a/i18n/hr/Server.hr.resx b/i18n/hr/Server.hr.resx
index a31a1ca9..4c43fa20 100644
--- a/i18n/hr/Server.hr.resx
+++ b/i18n/hr/Server.hr.resx
@@ -137,7 +137,6 @@
Prijavi sePrijavaKorisnik
- Pauziraj prijenose na ograničenoj vezi{0} od {1}Iskorišteno: {0}Ponudi ovo računalo za renderiranje
diff --git a/i18n/hr/Tooltips.hr.resx b/i18n/hr/Tooltips.hr.resx
index 09163734..24498b2f 100644
--- a/i18n/hr/Tooltips.hr.resx
+++ b/i18n/hr/Tooltips.hr.resx
@@ -236,7 +236,6 @@
Naziv novog projekta: od 1 do 60 znakova, svaki naziv jednom po sekvenciNovi projekt ove sekvence, polazeći od projekta GlavniKopira fotografije projekta u radni prostor, a zatim ga ondje otvara
- Kopiranje izvornika radi renderiranja na ovom računalu dolazi u jednom od sljedećih ažuriranjaProjekti sekvence u biblioteciProjekti sekvence na poslužiteljuKopira proxy kopije: lagane su i brze za uređivanje; renderi upotrebljavaju izvornike iz biblioteke
@@ -706,7 +705,6 @@
Vaše korisničko ime na poslužiteljuVideokoderi koje poslužitelj može upotrebljavati na ovom računalu: {0}U ovoj mreži još nije pronađen nijedan poslužitelj; upišite njegovu adresu
- Pauzira prijenose dok Windows ovu vezu prijavljuje kao ograničenu; nastavljaju se sami kada više nijeProstor koji upotrebljavate na poslužitelju u odnosu na vašu kvotuDopušta poslužitelju da šalje zadatke renderiranja ovom računalu kada je neaktivno; upotrebljava kodere vašeg GPU-aAdministratori upravljaju korisnicima, arhivom i poslužiteljem
@@ -865,7 +863,6 @@
Nijedan dekoder na ovom računalu ne čita njegove piksele; takvi se kadrovi izostavljaju iz renderaSvakodnevno šalje anonimni broj verzija i jezika u upotrebi; ništa drugo, zadano je isključenoUređivanje od sada upotrebljava ovu mapu; ništa se ne premješta ni ne briše
- Mapa radnog prostora (najbolje na brzom disku); „Promijeni” upotrebljava drugu, a premještanje dolazi u jednom od sljedećih ažuriranjaSvaku verziju koju spremite odmah šalje u biblioteku i preuzima nove verzije iz bibliotekeInstalira u Program Files za sve račune · traži administratorsko odobrenje{0} · izvodi se kao usluga sustava Windows pa se instalira za sve korisnike u Program Files
diff --git a/i18n/hu/Server.hu.resx b/i18n/hu/Server.hu.resx
index 051b859f..0689e8da 100644
--- a/i18n/hu/Server.hu.resx
+++ b/i18n/hu/Server.hu.resx
@@ -137,7 +137,6 @@
BejelentkezésBejelentkezésFelhasználó
- Szüneteltetés forgalomkorlátos kapcsolaton{0} / {1}{0} felhasználvaSzámítógép felajánlása renderelésre
diff --git a/i18n/hu/Tooltips.hu.resx b/i18n/hu/Tooltips.hu.resx
index 76cb92db..c4bbcf76 100644
--- a/i18n/hu/Tooltips.hu.resx
+++ b/i18n/hu/Tooltips.hu.resx
@@ -233,7 +233,6 @@
Az új projekt neve: 1–60 karakter, sorozatonként minden név csak egyszerA sorozat új projektje, a Fő projektből kiindulvaA munkaterületre másolja a projekt fotóit, majd ott megnyitja
- Az eredeti fájlok másolása az ezen a számítógépen történő rendereléshez egy későbbi frissítésben érkezikA sorozat projektjei a könyvtárbanA sorozat projektjei a szerverenA proxykat másolja: könnyűek és gyorsan szerkeszthetők; a renderelés a könyvtár eredeti fájljait használja
@@ -688,7 +687,6 @@
A felhasználóneve a szerverenA szerver által ezen a számítógépen használható videokódolók: {0}Ezen a hálózaton még nem található szerver; írja be a címét
- Szünetelteti a feltöltéseket, amíg a Windows forgalomkorlátosnak jelzi ezt a kapcsolatot; amikor már nem az, maguktól folytatódnakA szerveren használt tárhely a kvótájához viszonyítvaA szerver renderelési feladatokat küldhet erre a számítógépre, amikor tétlen; a GPU kódolóit használjaA rendszergazdák kezelik a felhasználókat, az archívumot és a szervert
@@ -844,7 +842,6 @@
Ezen a számítógépen egyik dekóder sem tudja olvasni a képpontjait; az ilyen képkockák kimaradnak a renderelésbőlNaponta névtelen statisztikát küld a használt verziókról és nyelvekről; semmi mást, és alapértelmezés szerint ki van kapcsolvaA Szerkesztés mostantól ezt a mappát használja; semmi sem kerül áthelyezésre vagy törlésre
- A munkaterület mappája (gyors lemez ajánlott); a Módosítás másikat használ, az áthelyezés egy későbbi frissítésben érkezikMinden mentett verziót azonnal a könyvtárba küld, és átveszi a könyvtár új verzióitTelepítés a Program Files mappába minden fiók számára · rendszergazdai jóváhagyást kér{0} · Windows-szolgáltatásként fut, ezért minden felhasználó számára, a Program Files mappába települ
diff --git a/i18n/id/Server.id.resx b/i18n/id/Server.id.resx
index 4a6efb1b..c1e72e8c 100644
--- a/i18n/id/Server.id.resx
+++ b/i18n/id/Server.id.resx
@@ -137,7 +137,6 @@
MasukMasukPengguna
- Jeda unggahan di koneksi terukur{0} dari {1}{0} terpakaiTawarkan PC ini sebagai node render
diff --git a/i18n/id/Tooltips.id.resx b/i18n/id/Tooltips.id.resx
index c8fc9ef4..c2f18dfe 100644
--- a/i18n/id/Tooltips.id.resx
+++ b/i18n/id/Tooltips.id.resx
@@ -233,7 +233,6 @@
Nama proyek baru: 1 hingga 60 karakter, setiap nama hanya sekali per sekuensProyek baru untuk sekuens ini, dimulai dari UtamaSalin foto proyek ke ruang kerja, lalu buka di sana
- Penyalinan file asli, untuk merender di PC ini, hadir di pembaruan mendatangProyek sekuens ini di pustakaProyek sekuens ini di serverSalin proksi: ringan dan cepat untuk diedit; render menggunakan file asli dari pustaka
@@ -688,7 +687,6 @@
Nama pengguna Anda di serverEncoder video yang dapat digunakan server di PC ini: {0}Belum ada server yang ditemukan di jaringan ini; ketik alamatnya
- Jeda unggahan saat Windows melaporkan koneksi ini sebagai terukur; unggahan berlanjut sendiri saat koneksi tidak lagi terukurRuang yang Anda gunakan di server dari kuota AndaIzinkan server mengirim tugas render ke PC ini saat PC sedang tidak digunakan; memakai encoder GPU AndaAdmin mengelola pengguna, arsip, dan server
@@ -844,7 +842,6 @@
Tidak ada dekoder di PC ini yang dapat membaca pikselnya; bingkai seperti ini tidak disertakan dalam renderKirim hitungan anonim harian tentang versi dan bahasa yang digunakan; tidak ada data lain, nonaktif secara defaultEdit menggunakan folder ini mulai sekarang; tidak ada yang dipindahkan atau dihapus
- Folder ruang kerja (sebaiknya disk cepat); Ubah menggunakan folder lain, pemindahannya hadir di pembaruan mendatangSegera kirim setiap versi yang Anda simpan ke pustaka, dan ambil versi baru dari pustakaInstal di Program Files untuk setiap akun · meminta persetujuan administrator{0} · berjalan sebagai layanan Windows, sehingga diinstal untuk semua pengguna di Program Files
diff --git a/i18n/it/Archive.it.resx b/i18n/it/Archive.it.resx
index 4c9d6081..a2a85160 100644
--- a/i18n/it/Archive.it.resx
+++ b/i18n/it/Archive.it.resx
@@ -435,4 +435,9 @@
Spazio di lavoro spostato in {0}: progetti: {1}, file: {2}Spostamento ripreso dal suo registro: {0}Spostato: {0}
+ In attesa finché la connessione è a consumo
+ {0}: l'origine ha rifatto la versione come versione {1}; il render va con essa
+ {0}: la versione del render non è all'origine; inviato solo col progetto
+ {0}: il server ha tenuto il render senza il suo progetto; aggiorna il server per tenerlo
+ Spostato; {0} contiene ancora {1} elementi che non è stato possibile eliminare
diff --git a/i18n/it/Editor.it.resx b/i18n/it/Editor.it.resx
index e4d92e72..6b899395 100644
--- a/i18n/it/Editor.it.resx
+++ b/i18n/it/Editor.it.resx
@@ -422,7 +422,6 @@
AnnullaAggiorna mediaAggiornamento media
- Originali: {0}Copia originali…Solo proxy…Solo proxy per {0}
@@ -437,15 +436,10 @@
Originali rimossiOriginali non rimossiSenza originale: {0}
- Proxy
- OriginaliQuale progetto aprire?{0} ha più progetti nello spazio di lavoro: scegli quello da aprire.Render in coda su questo PC
- Su questo PCRender inviato
- {0} è nella libreria
- {0} è sul serverNon inviatoRender non inviatoInvia di nuovo
diff --git a/i18n/it/Jobs.it.resx b/i18n/it/Jobs.it.resx
index 7f65977e..02b3424c 100644
--- a/i18n/it/Jobs.it.resx
+++ b/i18n/it/Jobs.it.resx
@@ -187,7 +187,7 @@
questo PCRendering localeInvio rendering
- Sposta spazio di lavoro
+ Spostamento spazio di lavoroPulizia spazio di lavoroMedia spazio di lavoroCestino spazio di lavoro
diff --git a/i18n/it/Server.it.resx b/i18n/it/Server.it.resx
index 5cfccb71..aa0c1f11 100644
--- a/i18n/it/Server.it.resx
+++ b/i18n/it/Server.it.resx
@@ -138,7 +138,6 @@
AccediAccediUtente
- Pausa su reti a consumo{0} di {1}{0} usatiUsa come nodo di rendering
diff --git a/i18n/it/Settings.it.resx b/i18n/it/Settings.it.resx
index ad86bc87..73bba445 100644
--- a/i18n/it/Settings.it.resx
+++ b/i18n/it/Settings.it.resx
@@ -209,14 +209,14 @@
Usa cartella{0} versione{0} versioni
- Svuotare il cestino?
+ Svuotare il cestino dello spazio di lavoro?Ciò che queste voci tenevano, comprese copie locali rimosse e originali messi da parte, viene eliminato per sempre; non si può annullare.Voci: {0}Dimensione: {0}{0} · {1} · {2}Scrivi il numero di voci, {0}, per confermareElimina per sempre
- Cestino svuotato
+ Cestino dello spazio di lavoro svuotatoCestino non svuotato{0} usatiMisura in corso…
@@ -247,14 +247,12 @@
Progetti: {0}File: {0}Dimensione: {0}
- Libero alla meta: {0}
+ Spazio libero a destinazione: {0}Stesso disco: cartelle rinominateAltro disco: file copiati e verificatiNon ancora inviati: {0}Sposta
- Spostamento non possibileSpostamento in corso
- Spazio di lavoro spostatoSpazio di lavoro non spostatoSpostamento non finitoUno spostamento dello spazio di lavoro in {0} si è fermato prima della fine; i progetti sono ancora in {1}.
diff --git a/i18n/it/Tooltips.it.resx b/i18n/it/Tooltips.it.resx
index 5382f4e7..46716672 100644
--- a/i18n/it/Tooltips.it.resx
+++ b/i18n/it/Tooltips.it.resx
@@ -233,7 +233,6 @@
Il nome del nuovo progetto: da 1 a 60 caratteri, ogni nome una sola volta per sequenzaUn nuovo progetto di questa sequenza, a partire da PrincipaleCopia le foto del progetto nello spazio di lavoro, poi aprilo lì
- La copia degli originali, per renderizzare su questo PC, arriverà in un aggiornamento successivoI progetti della sequenza nella libreriaI progetti della sequenza sul serverCopia i proxy: leggeri e veloci da modificare; i render usano gli originali della libreria
@@ -688,7 +687,6 @@
Il tuo nome utente sul serverEncoder video che il server può usare su questo PC: {0}Nessun server trovato ancora in questa rete; scrivi il suo indirizzo
- Mette in pausa i caricamenti mentre Windows segnala questa connessione come a consumo; riprendono da soli quando non lo èSpazio che usi sul server rispetto alla tua quotaPermette al server di inviare rendering a questo PC quando è inattivo; usa gli encoder della tua GPUGli amministratori gestiscono utenti, archivio e server
@@ -844,7 +842,6 @@
Nessun decodificatore su questo PC ne legge i pixel; questi fotogrammi restano fuori dai renderingInvia ogni giorno un conteggio anonimo di versioni e lingue in uso; nient'altro, disattivato per impostazione predefinitaModifica usa questa cartella da ora; nulla viene spostato o eliminato
- La cartella dello spazio di lavoro (meglio un disco veloce); Cambia ne usa un'altra, spostarla arriverà in un aggiornamento successivoInvia subito alla libreria ogni versione che salvi e prendi le nuove versioni della libreriaInstalla in Programmi per tutti gli account · chiede l'autorizzazione di amministratore{0} · è un servizio di Windows, quindi si installa per tutti gli utenti in Programmi
@@ -948,12 +945,7 @@
Originali che il server non ha più come sono qui: vanno nel cestino dello spazio di lavoro, non vengono eliminatiElimina dallo spazio di lavoro gli originali elencati; i proxy e il progetto restanoTieni gli originali nello spazio di lavoro
- La libreria non aveva l'originale di questi fotogrammi: qui restano proxy, e un render locale attende finché non vengono copiati
- Il server non aveva l'originale di questi fotogrammi (o il tuo account non può leggerli): qui restano proxy
- Lo spazio di lavoro contiene i proxy di questo progetto: i render avvengono dove sono gli originali
- Lo spazio di lavoro contiene i proxy e gli originali di questo progetto: i render avvengono su questo PCApri questo progetto della sequenza; Impostazioni › Spazio di lavoro › Apri progetto dice se Modifica lo chiede
- Renderizzato su questo PC dagli originali dello spazio di lavoro; il file è nella cartella exports del progettoRenderizzato su questo PC, non ancora nella libreria: viene inviato col prossimo invio; il file resta nello spazio di lavoroRenderizzato su questo PC, non ancora sul server: viene inviato col prossimo invio; il file resta nello spazio di lavoroInvia i render fatti qui che la libreria non ha ancora
@@ -972,13 +964,11 @@
Sposta la cartella dello spazio di lavoro con i suoi progetti in un'altra cartella, dopo un piano; ogni file è verificato prima di rimuovere l'origineOltre questa dimensione, i media dei progetti usati meno di recente vengono rimossi quando sono allineati con la loro origine; le versioni restanoLo spazio di lavoro cresce quanto serve; solo Pulisci dopo rimuove i media
- Cosa copia Apri nello spazio di lavoro, se lì non scegli altroCopia i proxy: leggeri e veloci da modificare; i render avvengono dove sono gli originaliCopia anche gli originali, per renderizzare su questo PC; occupa più spazioUn render salva prima le modifiche come versione (inviata subito con la sincronizzazione attiva), così il render indica la versione che mostraRimuove i media dei progetti non aperti da tanto, quando sono allineati con la loro origine; aprirne uno li ricopiaI media restano finché non li rimuovi tu o Limite dimensione
- Quale progetto apre Modifica per una sequenza con più progetti nello spazio di lavoroIl progetto che hai aperto per ultimo per la sequenzaIl progetto Principale della sequenza, che ne tiene le impostazioniElenca ogni volta i progetti della sequenza
@@ -989,4 +979,7 @@
Mette in coda lo spostamento: i progetti vengono spostati o copiati e verificati, poi Modifica usa la nuova cartellaLascia lo spazio di lavoro dov'èRimette in coda lo spostamento: riparte dal suo registro, niente viene copiato due volte
+ Uno spostamento si è fermato prima della fine: riprendilo prima
+ Gli originali sono già nello spazio di lavoro
+ Lo spazio di lavoro contiene già solo i proxy
diff --git a/i18n/ja/Server.ja.resx b/i18n/ja/Server.ja.resx
index 9cf1495b..1a3b842c 100644
--- a/i18n/ja/Server.ja.resx
+++ b/i18n/ja/Server.ja.resx
@@ -137,7 +137,6 @@
サインインサインインユーザー
- 従量制接続ではアップロードを一時停止{0} / {1}{0} 使用済みこの PC をレンダリングノードとして提供
diff --git a/i18n/ja/Tooltips.ja.resx b/i18n/ja/Tooltips.ja.resx
index 44826b76..1f0102e5 100644
--- a/i18n/ja/Tooltips.ja.resx
+++ b/i18n/ja/Tooltips.ja.resx
@@ -233,7 +233,6 @@
新しいプロジェクトの名前です。1~60 文字で、同じ名前はシーケンスごとに 1 回だけ使用できます。このシーケンスの新しいプロジェクトで、メインから始まります。プロジェクトの写真をワークスペースにコピーしてから、そこで開きます。
- この PC でレンダリングするためのオリジナルのコピーは、今後のアップデートで対応します。ライブラリにあるこのシーケンスのプロジェクトです。サーバーにあるこのシーケンスのプロジェクトです。プロキシをコピーします。軽量で編集が速く、レンダリングにはライブラリのオリジナルを使用します。
@@ -688,7 +687,6 @@
サーバーでのユーザー名です。この PC でサーバーが使用できる動画エンコーダー: {0}このネットワークではまだサーバーが見つかりません。アドレスを入力してください。
- Windows がこの接続を従量制課金接続として報告している間は、アップロードを一時停止します。従量制でなくなると自動的に再開します。クォータのうち、サーバー上で使用している容量です。この PC がアイドル状態のとき、サーバーからレンダリングジョブを受け取ります。GPU のエンコーダーを使用します。管理者はユーザー、アーカイブ、サーバーを管理します。
@@ -844,7 +842,6 @@
この PC にはピクセルを読み取れるデコーダーがありません。このようなフレームはレンダリングから除外されます。使用中のバージョンと言語の匿名の集計を 1 日 1 回送信します。それ以外は送信されません。既定ではオフです。今後、編集ではこのフォルダーを使用します。何も移動または削除されません。
- ワークスペースのフォルダーです (高速なディスクを推奨)。「変更」で別のフォルダーを使用できます。移動は今後のアップデートで対応します。保存した各バージョンをすぐにライブラリに送信し、ライブラリの新しいバージョンを取り込みます。すべてのアカウント用に Program Files にインストールします · 管理者の承認が必要です{0} · Windows サービスとして実行されるため、すべてのユーザー用に Program Files にインストールされます
diff --git a/i18n/ko/Server.ko.resx b/i18n/ko/Server.ko.resx
index c2b306cb..af9c4309 100644
--- a/i18n/ko/Server.ko.resx
+++ b/i18n/ko/Server.ko.resx
@@ -137,7 +137,6 @@
로그인로그인사용자
- 데이터 통신 연결 시 업로드 일시 중지{0} / {1}{0} 사용됨이 PC를 렌더링 노드로 제공
diff --git a/i18n/ko/Tooltips.ko.resx b/i18n/ko/Tooltips.ko.resx
index 9c589d5e..1684c3a8 100644
--- a/i18n/ko/Tooltips.ko.resx
+++ b/i18n/ko/Tooltips.ko.resx
@@ -233,7 +233,6 @@
새 프로젝트의 이름입니다. 1~60자이며 시퀀스마다 같은 이름은 한 번만 쓸 수 있습니다.‘기본’에서 시작하는 이 시퀀스의 새 프로젝트입니다.프로젝트의 사진을 작업 공간으로 복사한 후 그곳에서 엽니다.
- 이 PC에서 렌더링하기 위한 원본 복사는 이후 업데이트에서 제공됩니다.라이브러리에 있는 시퀀스의 프로젝트서버에 있는 시퀀스의 프로젝트프록시를 복사합니다. 가볍고 빠르게 편집할 수 있으며 렌더링에는 라이브러리의 원본을 사용합니다.
@@ -688,7 +687,6 @@
서버의 사용자 이름서버가 이 PC에서 사용할 수 있는 비디오 인코더: {0}이 네트워크에서 아직 서버를 찾지 못했습니다. 주소를 입력하십시오.
- Windows에서 이 연결을 데이터 통신 연결로 보고하는 동안 업로드를 일시 중지합니다. 데이터 통신 연결이 아니게 되면 자동으로 재개됩니다.할당량 중 서버에서 사용 중인 공간이 PC가 유휴 상태일 때 서버가 렌더링 작업을 보낼 수 있게 합니다. GPU 인코더를 사용합니다.관리자는 사용자, 아카이브, 서버를 관리합니다.
@@ -844,7 +842,6 @@
이 PC에는 픽셀을 읽을 수 있는 디코더가 없습니다. 이러한 프레임은 렌더링에서 제외됩니다.사용 중인 버전과 언어의 익명 통계를 하루 한 번 보냅니다. 그 외에는 아무것도 보내지 않으며 기본적으로 꺼져 있습니다.이제부터 편집에서 이 폴더를 사용합니다. 아무것도 이동하거나 삭제하지 않습니다.
- 작업 공간 폴더입니다(빠른 디스크 권장). ‘변경…’으로 다른 폴더를 사용할 수 있으며, 폴더 이동은 이후 업데이트에서 제공됩니다.저장하는 각 버전을 즉시 라이브러리로 보내고 라이브러리의 새 버전을 받습니다.모든 계정을 위해 Program Files에 설치합니다 · 관리자 승인 필요{0} · Windows 서비스로 실행되므로 Program Files에 모든 사용자용으로 설치됩니다
diff --git a/i18n/lt/Server.lt.resx b/i18n/lt/Server.lt.resx
index ebc9f730..22002f02 100644
--- a/i18n/lt/Server.lt.resx
+++ b/i18n/lt/Server.lt.resx
@@ -137,7 +137,6 @@
PrisijungtiPrisijungimasNaudotojas
- Pristabdyti įkėlimus matuojamu ryšiu{0} iš {1}{0} užimtaBūti atvaizdavimo mazgu
diff --git a/i18n/lt/Tooltips.lt.resx b/i18n/lt/Tooltips.lt.resx
index c2927b18..ce51acdb 100644
--- a/i18n/lt/Tooltips.lt.resx
+++ b/i18n/lt/Tooltips.lt.resx
@@ -236,7 +236,6 @@
Naujo projekto pavadinimas: nuo 1 iki 60 simbolių, kiekvienas pavadinimas sekoje tik kartąNaujas šios sekos projektas, pradedant nuo PagrindinioNukopijuoti projekto nuotraukas į darbo sritį ir ten jį atidaryti
- Originalų kopijavimas, kad būtų galima atvaizduoti šiame kompiuteryje, bus vėlesniame naujinimeSekos projektai bibliotekojeSekos projektai serveryjeKopijuoti tarpines kopijas: lengva ir greita redaguoti; atvaizduojant naudojami bibliotekos originalai
@@ -706,7 +705,6 @@
Jūsų naudotojo vardas serveryjeVaizdo koduotuvai, kuriuos serveris gali naudoti šiame kompiuteryje: {0}Šiame tinkle serverio dar nerasta; įveskite jo adresą
- Pristabdyti įkėlimus, kai Windows nurodo, kad šis ryšys matuojamas; jie tęsiami savaime, kai ryšys nebematuojamasKiek vietos serveryje naudojate iš savo kvotosLeisti serveriui siųsti atvaizdavimo užduotis šiam kompiuteriui, kai jis neužimtas; naudojami jūsų GPU koduotuvaiAdministratoriai tvarko naudotojus, archyvą ir serverį
@@ -865,7 +863,6 @@
Joks šio kompiuterio iškoduotuvas neskaito jo pikselių; tokie kadrai neįtraukiami į atvaizdavimąKasdien siųsti anoniminę naudojamų versijų ir kalbų statistiką; nieko daugiau, pagal numatytuosius parametrus išjungtaNuo šiol Redagavimas naudoja šį aplanką; niekas neperkeliama ir nenaikinama
- Darbo srities aplankas (geriausia greitas diskas); „Keisti“ naudoja kitą, perkėlimas bus vėlesniame naujinimeKiekvieną įrašytą versiją iškart išsiųsti į biblioteką ir perimti naujas bibliotekos versijasĮdiegti aplanke Program Files visoms paskyroms · reikia administratoriaus patvirtinimo{0} · veikia kaip Windows tarnyba, todėl diegiama visiems naudotojams aplanke Program Files
diff --git a/i18n/lv/Server.lv.resx b/i18n/lv/Server.lv.resx
index f6e14bdd..de9c1c58 100644
--- a/i18n/lv/Server.lv.resx
+++ b/i18n/lv/Server.lv.resx
@@ -137,7 +137,6 @@
PierakstītiesPierakstīšanāsLietotājs
- Pauzēt limitētā savienojumā{0} no {1}Izmantoti {0}Piedāvāt šo datoru kā renderēšanas mezglu
diff --git a/i18n/lv/Tooltips.lv.resx b/i18n/lv/Tooltips.lv.resx
index 18c31a8a..4c1b31be 100644
--- a/i18n/lv/Tooltips.lv.resx
+++ b/i18n/lv/Tooltips.lv.resx
@@ -236,7 +236,6 @@
Jaunā projekta nosaukums: no 1 līdz 60 rakstzīmēm, katrs nosaukums secībā tikai vienreizJauns šīs secības projekts, sākot no GalvenāNokopēt projekta fotoattēlus darbvietā un tad atvērt to tur
- Oriģinālu kopēšana, lai renderētu šajā datorā, būs kādā no nākamajiem atjauninājumiemSecības projekti bibliotēkāSecības projekti serverīKopēt proxy attēlus: viegli un ātri rediģējami; renderēšanai tiek izmantoti bibliotēkas oriģināli
@@ -706,7 +705,6 @@
Jūsu lietotājvārds serverīVideo kodētāji, ko serveris var izmantot šajā datorā: {0}Šajā tīklā vēl nav atrasts neviens serveris; ierakstiet tā adresi
- Pauzēt augšupielādes, kamēr Windows šo savienojumu uzskata par limitētu; tās atsākas pašas, kad tas vairs nav limitētsJūsu izmantotā vieta serverī no jūsu kvotasĻaut serverim sūtīt renderēšanas darbus uz šo datoru, kad tas ir dīkstāvē; tiek izmantoti jūsu GPU kodētājiAdministratori pārvalda lietotājus, arhīvu un serveri
@@ -865,7 +863,6 @@
Neviens šī datora dekodētājs nenolasa tā pikseļus; šādi kadri netiek iekļauti renderējumosSūtīt ikdienas anonīmu lietoto versiju un valodu skaitu; nekas cits, pēc noklusējuma izslēgtsNo šī brīža Rediģēšana izmanto šo mapi; nekas netiek pārvietots vai dzēsts
- Darbvietas mape (vislabāk ātrs disks); „Mainīt” izmanto citu, pārvietošana būs kādā no nākamajiem atjauninājumiemKatru saglabāto versiju uzreiz nosūtīt uz bibliotēku un paņemt bibliotēkas jaunās versijasInstalēt mapē Program Files visiem kontiem · nepieciešams administratora apstiprinājums{0} · darbojas kā Windows pakalpojums, tāpēc tiek instalēts visiem lietotājiem mapē Program Files
diff --git a/i18n/ms/Server.ms.resx b/i18n/ms/Server.ms.resx
index b4d2d10d..ba637098 100644
--- a/i18n/ms/Server.ms.resx
+++ b/i18n/ms/Server.ms.resx
@@ -137,7 +137,6 @@
Daftar masukDaftar masukPengguna
- Jeda muat naik bermeter{0} daripada {1}{0} digunakanTawarkan PC ini sebagai nod render
diff --git a/i18n/ms/Tooltips.ms.resx b/i18n/ms/Tooltips.ms.resx
index ea50f8d5..29b03851 100644
--- a/i18n/ms/Tooltips.ms.resx
+++ b/i18n/ms/Tooltips.ms.resx
@@ -233,7 +233,6 @@
Nama projek baharu: 1 hingga 60 aksara, setiap nama sekali sahaja bagi setiap jujukanProjek baharu bagi jujukan ini, bermula daripada UtamaSalin foto projek ke ruang kerja, kemudian bukanya di situ
- Penyalinan fail asal, untuk merender pada PC ini, akan datang dalam kemas kini kemudianProjek jujukan dalam PustakaProjek jujukan pada pelayanSalin proksi: ringan dan pantas untuk diedit; render menggunakan fail asal Pustaka
@@ -688,7 +687,6 @@
Nama pengguna anda pada pelayanPengekod video yang boleh digunakan oleh pelayan pada PC ini: {0}Belum ada pelayan ditemui pada rangkaian ini; taip alamatnya
- Jeda muat naik semasa Windows melaporkan sambungan ini sebagai bermeter; muat naik disambung semula dengan sendirinya apabila sambungan tidak lagi bermeterRuang yang anda gunakan pada pelayan daripada kuota andaBenarkan pelayan menghantar tugas render ke PC ini apabila ia melahu; menggunakan pengekod GPU andaPentadbir mengurus pengguna, arkib dan pelayan
@@ -844,7 +842,6 @@
Tiada penyahkod pada PC ini yang dapat membaca pikselnya; bingkai sebegini tidak disertakan dalam renderHantar kiraan harian tanpa nama bagi versi dan bahasa yang digunakan; tiada yang lain, dimatikan secara lalaiEdit menggunakan folder ini mulai sekarang; tiada apa-apa yang dipindahkan atau dipadam
- Folder ruang kerja (cakera pantas adalah terbaik); Tukar… menggunakan folder lain, pemindahannya akan datang dalam kemas kini kemudianHantar setiap versi yang anda simpan ke Pustaka serta-merta, dan ambil versi baharu PustakaPasang dalam Program Files untuk setiap akaun · meminta kelulusan pentadbir{0} · ia berjalan sebagai perkhidmatan Windows, jadi ia dipasang untuk semua pengguna dalam Program Files
diff --git a/i18n/nb/Server.nb.resx b/i18n/nb/Server.nb.resx
index 4269b2f1..f405d379 100644
--- a/i18n/nb/Server.nb.resx
+++ b/i18n/nb/Server.nb.resx
@@ -137,7 +137,6 @@
Logg påLogg påBruker
- Pause opplasting ved forbruksmålt tilkobling{0} av {1}{0} bruktTilby denne PC-en som renderingsnode
diff --git a/i18n/nb/Tooltips.nb.resx b/i18n/nb/Tooltips.nb.resx
index 25146630..f82e8f11 100644
--- a/i18n/nb/Tooltips.nb.resx
+++ b/i18n/nb/Tooltips.nb.resx
@@ -233,7 +233,6 @@
Navnet på det nye prosjektet: 1 til 60 tegn, hvert navn én gang per sekvensEt nytt prosjekt i denne sekvensen, med Hoved som utgangspunktKopier bildene i prosjektet til arbeidsområdet, og åpne det der
- Kopiering av originalene, for å rendre på denne PC-en, kommer i en senere oppdateringSekvensens prosjekter i biblioteketSekvensens prosjekter på serverenKopier proxyene: lette og raske å redigere; renderinger bruker bibliotekets originaler
@@ -688,7 +687,6 @@
Brukernavnet ditt på serverenVideokodere serveren kan bruke på denne PC-en: {0}Fant ingen server på dette nettverket ennå; skriv inn adressen
- Sett opplastinger på pause mens Windows rapporterer denne tilkoblingen som forbruksmålt; de fortsetter av seg selv når den ikke lenger er detPlassen du bruker på serveren, av kvoten dinLa serveren sende renderingsjobber til denne PC-en når den er ledig; bruker GPU-koderne dineAdministratorer administrerer brukere, arkivet og serveren
@@ -844,7 +842,6 @@
Ingen dekoder på denne PC-en kan lese pikslene i formatet; slike bilder utelates fra renderingerSend en daglig anonym telling av versjoner og språk i bruk; ingenting annet, av som standardRedigering bruker denne mappen fra nå av; ingenting flyttes eller slettes
- Mappen for arbeidsområdet (en rask disk er best); Endre bruker en annen, flytting kommer i en senere oppdateringSend hver versjon du lagrer til biblioteket med en gang, og hent bibliotekets nye versjonerInstaller i Program Files for alle kontoer · ber om administratorgodkjenning{0} · kjører som en Windows-tjeneste og installeres derfor for alle brukere i Program Files
diff --git a/i18n/nl/Server.nl.resx b/i18n/nl/Server.nl.resx
index 75f905b2..5e04b099 100644
--- a/i18n/nl/Server.nl.resx
+++ b/i18n/nl/Server.nl.resx
@@ -137,7 +137,6 @@
AanmeldenAanmeldenGebruiker
- Uploads onderbreken bij datalimiet{0} van {1}{0} gebruiktDeze pc als renderknooppunt aanbieden
diff --git a/i18n/nl/Tooltips.nl.resx b/i18n/nl/Tooltips.nl.resx
index 3c6dcc5d..efc9027b 100644
--- a/i18n/nl/Tooltips.nl.resx
+++ b/i18n/nl/Tooltips.nl.resx
@@ -233,7 +233,6 @@
De naam van het nieuwe project: 1 tot 60 tekens, elke naam één keer per reeksEen nieuw project van deze reeks, met Hoofd als uitgangspuntKopieer de foto's van het project naar de werkruimte en open het daar
- Het kopiëren van de originelen, om op deze pc te renderen, komt in een latere updateDe projecten van de reeks in de bibliotheekDe projecten van de reeks op de serverKopieer de proxy's: licht en snel om te bewerken; renders gebruiken de originelen van de bibliotheek
@@ -688,7 +687,6 @@
Je gebruikersnaam op de serverVideo-encoders die de server op deze pc kan gebruiken: {0}Nog geen server gevonden op dit netwerk; typ het adres ervan
- Onderbreek uploads zolang Windows deze verbinding als verbinding met een datalimiet aangeeft; ze worden vanzelf hervat zodra dat niet meer zo isRuimte die je op de server gebruikt ten opzichte van je quotumLaat de server rendertaken naar deze pc sturen wanneer die inactief is; gebruikt de encoders van je GPUBeheerders beheren gebruikers, het archief en de server
@@ -844,7 +842,6 @@
Geen enkele decoder op deze pc leest de pixels; zulke frames worden uit renders weggelatenStuur dagelijks een anonieme telling van de gebruikte versies en talen; verder niets, standaard uitBewerken gebruikt vanaf nu deze map; er wordt niets verplaatst of verwijderd
- De map van de werkruimte (een snelle schijf is het best); Wijzigen gebruikt een andere, verplaatsen komt in een latere updateVerzend elke versie die je opslaat meteen naar de bibliotheek, en neem de nieuwe versies van de bibliotheek overInstalleer in Program Files voor elk account · vraagt om goedkeuring als beheerder{0} · draait als Windows-service en wordt dus voor alle gebruikers in Program Files geïnstalleerd
diff --git a/i18n/pl/Server.pl.resx b/i18n/pl/Server.pl.resx
index 5ad71675..9c0e9c22 100644
--- a/i18n/pl/Server.pl.resx
+++ b/i18n/pl/Server.pl.resx
@@ -137,7 +137,6 @@
Zaloguj sięLogowanieUżytkownik
- Wstrzymuj na łączu taryfowym{0} z {1}Użyto {0}Udostępniaj jako węzeł renderowania
diff --git a/i18n/pl/Tooltips.pl.resx b/i18n/pl/Tooltips.pl.resx
index dffb7064..63593e0f 100644
--- a/i18n/pl/Tooltips.pl.resx
+++ b/i18n/pl/Tooltips.pl.resx
@@ -239,7 +239,6 @@
Nazwa nowego projektu: od 1 do 60 znaków, każda nazwa raz w sekwencjiNowy projekt tej sekwencji, oparty na projekcie GłównySkopiuj zdjęcia projektu do obszaru roboczego, a następnie otwórz go tam
- Kopiowanie oryginałów, aby renderować na tym komputerze, pojawi się w późniejszej aktualizacjiProjekty sekwencji w biblioteceProjekty sekwencji na serwerzeSkopiuj pliki proxy: lekkie i szybkie w edycji; renderowanie używa oryginałów z biblioteki
@@ -724,7 +723,6 @@
Twoja nazwa użytkownika na serwerzeEnkodery wideo, których serwer może używać na tym komputerze: {0}Nie znaleziono jeszcze serwera w tej sieci; wpisz jego adres
- Wstrzymuj przesyłanie, gdy system Windows zgłasza to połączenie jako taryfowe; przesyłanie wznowi się samo, gdy przestanie nim byćMiejsce zajęte na serwerze w ramach Twojego przydziałuPozwól serwerowi wysyłać zadania renderowania do tego komputera, gdy jest bezczynny; używa Twoich enkoderów GPUAdministratorzy zarządzają użytkownikami, archiwum i serwerem
@@ -886,7 +884,6 @@
Żaden dekoder na tym komputerze nie odczytuje jego pikseli; takie klatki są pomijane w renderachWysyłaj codziennie anonimową liczbę używanych wersji i języków; nic więcej, domyślnie wyłączoneEdycja używa od teraz tego folderu; nic nie jest przenoszone ani usuwane
- Folder obszaru roboczego (najlepiej szybki dysk); Zmień wybiera inny, przenoszenie pojawi się w późniejszej aktualizacjiOd razu wysyłaj do biblioteki każdą zapisaną wersję i pobieraj nowe wersje z bibliotekiZainstaluj w folderze Program Files dla wszystkich kont · wymaga zgody administratora{0} · działa jako usługa systemu Windows, więc instaluje się dla wszystkich użytkowników w folderze Program Files
diff --git a/i18n/pt-BR/Server.pt-BR.resx b/i18n/pt-BR/Server.pt-BR.resx
index ee35d51c..6152fc9e 100644
--- a/i18n/pt-BR/Server.pt-BR.resx
+++ b/i18n/pt-BR/Server.pt-BR.resx
@@ -137,7 +137,6 @@
EntrarEntrarUsuário
- Pausar envios em conexão limitada{0} de {1}{0} usadosOferecer este PC como nó de renderização
diff --git a/i18n/pt-BR/Tooltips.pt-BR.resx b/i18n/pt-BR/Tooltips.pt-BR.resx
index 2b45b892..02249198 100644
--- a/i18n/pt-BR/Tooltips.pt-BR.resx
+++ b/i18n/pt-BR/Tooltips.pt-BR.resx
@@ -233,7 +233,6 @@
O nome do novo projeto: de 1 a 60 caracteres, cada nome uma vez por sequênciaUm novo projeto desta sequência, a partir de PrincipalCopia as fotos do projeto para o espaço de trabalho e o abre lá
- A cópia dos originais, para renderizar neste PC, virá em uma atualização futuraOs projetos da sequência na bibliotecaOs projetos da sequência no servidorCopia os proxies: leves e rápidos de editar; as renderizações usam os originais da biblioteca
@@ -688,7 +687,6 @@
Seu nome de usuário no servidorCodificadores de vídeo que o servidor pode usar neste PC: {0}Nenhum servidor encontrado nesta rede ainda; digite o endereço dele
- Pausa os envios enquanto o Windows indicar que esta conexão é limitada; eles são retomados sozinhos quando ela deixar de serEspaço que você usa no servidor em relação à sua cotaPermite que o servidor envie tarefas de renderização a este PC quando ele estiver ocioso; usa os codificadores da sua GPUAdministradores gerenciam usuários, o acervo e o servidor
@@ -844,7 +842,6 @@
Nenhum decodificador neste PC lê os pixels; esses quadros ficam fora das renderizaçõesEnvia uma contagem anônima diária das versões e idiomas em uso; nada mais, desativado por padrãoEdição usa esta pasta a partir de agora; nada é movido ou excluído
- A pasta do espaço de trabalho (um disco rápido é o ideal); Alterar usa outra, movê-la virá em uma atualização futuraEnvia à biblioteca na hora cada versão que você salva e recebe as novas versões da bibliotecaInstala em Arquivos de Programas para todas as contas · pede aprovação de administrador{0} · é executado como serviço do Windows, então é instalado para todos os usuários em Arquivos de Programas
diff --git a/i18n/pt-PT/Server.pt-PT.resx b/i18n/pt-PT/Server.pt-PT.resx
index c2b4f5e3..0bdbabfc 100644
--- a/i18n/pt-PT/Server.pt-PT.resx
+++ b/i18n/pt-PT/Server.pt-PT.resx
@@ -137,7 +137,6 @@
Iniciar sessãoIniciar sessãoUtilizador
- Pausar com tráfego limitado{0} de {1}{0} utilizadosUsar este PC como nó de renderização
diff --git a/i18n/pt-PT/Tooltips.pt-PT.resx b/i18n/pt-PT/Tooltips.pt-PT.resx
index e63ed0f7..5d015433 100644
--- a/i18n/pt-PT/Tooltips.pt-PT.resx
+++ b/i18n/pt-PT/Tooltips.pt-PT.resx
@@ -233,7 +233,6 @@
O nome do novo projeto: de 1 a 60 caracteres, cada nome uma só vez por sequênciaUm novo projeto desta sequência, a partir de PrincipalCopiar as fotografias do projeto para o espaço de trabalho e depois abri-lo aí
- A cópia dos originais, para renderizar neste PC, chega numa atualização posteriorOs projetos da sequência na bibliotecaOs projetos da sequência no servidorCopiar os proxies: leves e rápidos de editar; as renderizações usam os originais da biblioteca
@@ -688,7 +687,6 @@
O seu nome de utilizador no servidorCodificadores de vídeo que o servidor pode utilizar neste PC: {0}Ainda não foi encontrado nenhum servidor nesta rede; escreva o respetivo endereço
- Pausar os carregamentos enquanto o Windows indicar que esta ligação tem tráfego limitado; são retomados automaticamente quando deixar de terEspaço que utiliza no servidor face à sua quotaPermitir que o servidor envie tarefas de renderização para este PC quando estiver inativo; utiliza os codificadores da sua GPUOs administradores gerem os utilizadores, o arquivo e o servidor
@@ -844,7 +842,6 @@
Nenhum descodificador neste PC lê os respetivos píxeis; esses fotogramas ficam de fora das renderizaçõesEnviar diariamente uma contagem anónima das versões e idiomas em uso; nada mais, desativado por predefiniçãoA Edição usa esta pasta a partir de agora; nada é movido nem eliminado
- A pasta do espaço de trabalho (de preferência num disco rápido); Alterar usa outra, movê-la chega numa atualização posteriorEnviar logo para a biblioteca cada versão que guardar e receber as novas versões da bibliotecaInstalar em Program Files para todas as contas · pede aprovação de administrador{0} · é executado como serviço do Windows, pelo que é instalado para todos os utilizadores em Program Files
diff --git a/i18n/ro/Server.ro.resx b/i18n/ro/Server.ro.resx
index f7fc725e..d17c9471 100644
--- a/i18n/ro/Server.ro.resx
+++ b/i18n/ro/Server.ro.resx
@@ -137,7 +137,6 @@
AutentificareAutentificareUtilizator
- Pauză la conexiuni contorizate{0} din {1}{0} folosițiAcest PC ca nod de randare
diff --git a/i18n/ro/Tooltips.ro.resx b/i18n/ro/Tooltips.ro.resx
index 138e393f..e5b42dd7 100644
--- a/i18n/ro/Tooltips.ro.resx
+++ b/i18n/ro/Tooltips.ro.resx
@@ -236,7 +236,6 @@
Numele noului proiect: între 1 și 60 de caractere, fiecare nume o singură dată per secvențăUn proiect nou al acestei secvențe, pornind de la PrincipalCopiați fotografiile proiectului în spațiul de lucru, apoi deschideți-l acolo
- Copierea originalelor, pentru randare pe acest PC, vine într-o actualizare ulterioarăProiectele secvenței din bibliotecăProiectele secvenței de pe serverCopiați proxy-urile: ușoare și rapide de editat; randările folosesc originalele bibliotecii
@@ -706,7 +705,6 @@
Numele dumneavoastră de utilizator pe serverCodificatoarele video pe care serverul le poate folosi pe acest PC: {0}Niciun server găsit încă în această rețea; tastați adresa lui
- Întrerupeți încărcările cât timp Windows raportează această conexiune ca fiind contorizată; se reiau singure când nu mai esteSpațiul pe care îl folosiți pe server din cota dumneavoastrăPermiteți serverului să trimită lucrări de randare către acest PC când este inactiv; folosește codificatoarele GPUAdministratorii gestionează utilizatorii, arhiva și serverul
@@ -865,7 +863,6 @@
Niciun decodificator de pe acest PC nu îi citește pixelii; astfel de cadre sunt excluse din randăriTrimiteți zilnic o statistică anonimă a versiunilor și limbilor folosite; nimic altceva, dezactivat implicitEditare folosește acest folder de acum; nu se mută și nu se șterge nimic
- Folderul spațiului de lucru (ideal pe un disc rapid); Modificare folosește altul, mutarea lui vine într-o actualizare ulterioarăTrimiteți imediat în bibliotecă fiecare versiune pe care o salvați și preluați versiunile noi ale biblioteciiInstalați în Program Files pentru toate conturile · necesită aprobarea administratorului{0} · rulează ca serviciu Windows, deci se instalează pentru toți utilizatorii în Program Files
diff --git a/i18n/ru/Server.ru.resx b/i18n/ru/Server.ru.resx
index ce837caa..1e55e0d0 100644
--- a/i18n/ru/Server.ru.resx
+++ b/i18n/ru/Server.ru.resx
@@ -137,7 +137,6 @@
ВойтиВходПользователь
- Не загружать при лимитном подключении{0} из {1}Занято {0}Сделать этот ПК узлом рендеринга
diff --git a/i18n/ru/Tooltips.ru.resx b/i18n/ru/Tooltips.ru.resx
index a1035749..f0c9a1eb 100644
--- a/i18n/ru/Tooltips.ru.resx
+++ b/i18n/ru/Tooltips.ru.resx
@@ -239,7 +239,6 @@
Название нового проекта: от 1 до 60 символов, каждое название один раз в серииНовый проект этой серии на основе проекта «Основной»Скопировать фото проекта в рабочую область, затем открыть его там
- Копирование оригиналов для рендеринга на этом ПК появится в одном из следующих обновленийПроекты серии в библиотекеПроекты серии на сервереСкопировать прокси: лёгкие и быстрые для редактирования; рендеры используют оригиналы из библиотеки
@@ -724,7 +723,6 @@
Ваше имя пользователя на сервереВидеокодировщики, которые сервер может использовать на этом ПК: {0}В этой сети пока не найдено серверов; введите адрес
- Приостанавливать загрузки, пока Windows считает это подключение лимитным; они возобновятся сами, когда это изменитсяСколько места вы используете на сервере из своей квотыРазрешить серверу отправлять задания рендеринга на этот ПК, когда он простаивает; используются ваши GPU-кодировщикиАдминистраторы управляют пользователями, архивом и сервером
@@ -886,7 +884,6 @@
Ни один декодер на этом ПК не читает пиксели этого формата; такие кадры не попадают в рендерыРаз в день отправлять анонимную статистику используемых версий и языков; больше ничего, по умолчанию выключено«Редактирование» отныне использует эту папку; ничего не перемещается и не удаляется
- Папка рабочей области (лучше на быстром диске); «Изменить» выбирает другую, перемещение появится в одном из следующих обновленийСразу отправлять в библиотеку каждую сохранённую версию и получать новые версии из библиотекиУстановить в Program Files для всех учётных записей · потребуются права администратора{0} · работает как служба Windows, поэтому устанавливается для всех пользователей в Program Files
diff --git a/i18n/sk/Server.sk.resx b/i18n/sk/Server.sk.resx
index 80cc5159..29a461f8 100644
--- a/i18n/sk/Server.sk.resx
+++ b/i18n/sk/Server.sk.resx
@@ -137,7 +137,6 @@
Prihlásiť saPrihláseniePoužívateľ
- Pozastaviť pri meranom pripojení{0} z {1}{0} využitýchPonúknuť počítač ako renderovací uzol
diff --git a/i18n/sk/Tooltips.sk.resx b/i18n/sk/Tooltips.sk.resx
index ea2f8e4b..2611c96b 100644
--- a/i18n/sk/Tooltips.sk.resx
+++ b/i18n/sk/Tooltips.sk.resx
@@ -236,7 +236,6 @@
Názov nového projektu: 1 až 60 znakov, každý názov raz v sekvenciiNový projekt tejto sekvencie vychádzajúci z projektu HlavnýSkopíruje fotografie projektu do pracovného priestoru a potom ho tam otvorí
- Kopírovanie originálov na renderovanie v tomto počítači príde v neskoršej aktualizáciiProjekty sekvencie v knižniciProjekty sekvencie na serveriSkopíruje proxy: ľahké a rýchle na úpravy; rendery používajú originály z knižnice
@@ -706,7 +705,6 @@
Vaše používateľské meno na serveriKodéry videa, ktoré môže server na tomto počítači používať: {0}V tejto sieti sa zatiaľ nenašiel žiadny server; zadajte jeho adresu
- Pozastaví nahrávanie, kým Windows hlási toto pripojenie ako pripojenie s meraním údajov; keď to tak už nie je, nahrávanie samo pokračujeMiesto, ktoré na serveri využívate, z vašej kvótyServer môže tomuto počítaču posielať renderovacie úlohy, keď je nečinný; využijú sa vaše kodéry GPUSprávcovia spravujú používateľov, archív a server
@@ -865,7 +863,6 @@
Žiadny dekodér na tomto počítači nedokáže čítať jeho pixely; takéto snímky sa z renderov vynechajúRaz denne odošle anonymný počet používaných verzií a jazykov; nič iné, predvolene vypnutéÚpravy odteraz používajú tento priečinok; nič sa nepresúva ani neodstraňuje
- Priečinok pracovného priestoru (najlepšie na rýchlom disku); Zmeniť použije iný, presunutie príde v neskoršej aktualizáciiHneď odošle do knižnice každú verziu, ktorú uložíte, a prevezme nové verzie knižniceNainštaluje do priečinka Program Files pre všetky účty · vyžaduje súhlas správcu{0} · beží ako služba systému Windows, preto sa inštaluje pre všetkých používateľov do priečinka Program Files
diff --git a/i18n/sl/Server.sl.resx b/i18n/sl/Server.sl.resx
index 36ec6157..a0700a8b 100644
--- a/i18n/sl/Server.sl.resx
+++ b/i18n/sl/Server.sl.resx
@@ -137,7 +137,6 @@
VpisVpisUporabnik
- Ne nalagaj prek omejene povezave{0} od {1}{0} porabljenoPonudi ta računalnik za upodabljanje
diff --git a/i18n/sl/Tooltips.sl.resx b/i18n/sl/Tooltips.sl.resx
index cb5f212c..a64d777d 100644
--- a/i18n/sl/Tooltips.sl.resx
+++ b/i18n/sl/Tooltips.sl.resx
@@ -236,7 +236,6 @@
Ime novega projekta: od 1 do 60 znakov, vsako ime enkrat na sekvencoNov projekt te sekvence, ki izhaja iz projekta GlavniKopiraj fotografije projekta v delovni prostor in ga nato tam odpri
- Kopiranje izvirnikov za upodabljanje v tem računalniku bo na voljo v poznejši posodobitviProjekti sekvence v knjižniciProjekti sekvence na strežnikuKopiraj proxyje: lahki in hitri za urejanje; upodobitve uporabijo izvirnike iz knjižnice
@@ -706,7 +705,6 @@
Vaše uporabniško ime na strežnikuVideo kodirniki, ki jih strežnik lahko uporablja v tem računalniku: {0}V tem omrežju še ni bil najden noben strežnik; vnesite njegov naslov
- Začasno ustavi nalaganje, ko Windows to povezavo označi kot omejeno; ko ni več omejena, se nalaganje samo nadaljujeProstor, ki ga uporabljate na strežniku, glede na vašo kvotoDovoli strežniku, da temu računalniku pošilja opravila upodabljanja, ko je nedejaven; uporablja vaše kodirnike GPUSkrbniki upravljajo uporabnike, arhiv in strežnik
@@ -865,7 +863,6 @@
Noben dekodirnik v tem računalniku ne prebere njegovih slikovnih pik; take sličice so izpuščene iz upodobitevEnkrat na dan pošlji anonimno število uporabljenih različic in jezikov; nič drugega, privzeto izklopljenoUrejanje odslej uporablja to mapo; nič se ne premakne ali izbriše
- Mapa delovnega prostora (najbolje na hitrem disku); Spremeni uporabi drugo, premikanje bo na voljo v poznejši posodobitviVsako shranjeno različico takoj pošlji v knjižnico in prevzemi nove različice iz knjižniceNamesti v Program Files za vse račune · zahteva odobritev skrbnika{0} · izvaja se kot storitev sistema Windows, zato se namesti za vse uporabnike v Program Files
diff --git a/i18n/sv/Server.sv.resx b/i18n/sv/Server.sv.resx
index 67ad16ae..2f10d4ef 100644
--- a/i18n/sv/Server.sv.resx
+++ b/i18n/sv/Server.sv.resx
@@ -137,7 +137,6 @@
Logga inLogga inAnvändare
- Pausa vid datapriser{0} av {1}{0} använtErbjud datorn som renderingsnod
diff --git a/i18n/sv/Tooltips.sv.resx b/i18n/sv/Tooltips.sv.resx
index 637f9362..63e005a7 100644
--- a/i18n/sv/Tooltips.sv.resx
+++ b/i18n/sv/Tooltips.sv.resx
@@ -233,7 +233,6 @@
Det nya projektets namn: 1 till 60 tecken, varje namn en gång per sekvensEtt nytt projekt i sekvensen, med Huvudprojekt som utgångspunktKopiera projektets foton till arbetsytan och öppna det sedan där
- Kopiering av original, för rendering på den här datorn, kommer i en senare uppdateringSekvensens projekt i biblioteketSekvensens projekt på servernKopiera proxyerna: lätta och snabba att redigera; renderingar använder bibliotekets original
@@ -688,7 +687,6 @@
Ditt användarnamn på servernVideokodare som servern kan använda på den här datorn: {0}Ingen server hittades i det här nätverket än; skriv dess adress
- Pausa uppladdningar medan Windows anger att anslutningen har datapriser; de återupptas av sig själva när den inte längre har detUtrymme du använder på servern av din kvotLåt servern skicka renderingsjobb till den här datorn när den är inaktiv; använder dina GPU-kodareAdministratörer hanterar användare, arkivet och servern
@@ -844,7 +842,6 @@
Ingen avkodare på den här datorn kan läsa pixlarna; sådana bildrutor utesluts från renderingarSkicka en daglig anonym räkning av versioner och språk som används; inget annat, av som standardRedigering använder den här mappen från och med nu; inget flyttas eller raderas
- Arbetsytans mapp (en snabb disk är bäst); Ändra använder en annan, flytt kommer i en senare uppdateringSkicka varje version du sparar till biblioteket direkt och hämta bibliotekets nya versionerInstallera i Program Files för alla konton · kräver administratörsgodkännande{0} · den körs som en Windows-tjänst, så den installeras för alla användare i Program Files
diff --git a/i18n/th/Server.th.resx b/i18n/th/Server.th.resx
index 5556b617..28f78b68 100644
--- a/i18n/th/Server.th.resx
+++ b/i18n/th/Server.th.resx
@@ -137,7 +137,6 @@
ลงชื่อเข้าใช้ลงชื่อเข้าใช้ผู้ใช้
- หยุดอัปโหลดบนการเชื่อมต่อแบบวัดปริมาณ{0} จาก {1}ใช้ไป {0}ให้พีซีเครื่องนี้เป็นโหนดเรนเดอร์
diff --git a/i18n/th/Tooltips.th.resx b/i18n/th/Tooltips.th.resx
index 8ba79559..9ee54f2c 100644
--- a/i18n/th/Tooltips.th.resx
+++ b/i18n/th/Tooltips.th.resx
@@ -233,7 +233,6 @@
ชื่อของโปรเจกต์ใหม่: 1 ถึง 60 อักขระ แต่ละชื่อใช้ได้ครั้งเดียวต่อซีเควนซ์โปรเจกต์ใหม่ของซีเควนซ์นี้ โดยเริ่มจากโปรเจกต์หลักคัดลอกภาพถ่ายของโปรเจกต์ไปยังพื้นที่ทำงาน แล้วเปิดที่นั่น
- การคัดลอกต้นฉบับเพื่อเรนเดอร์บนพีซีเครื่องนี้จะมาในการอัปเดตครั้งถัดไปโปรเจกต์ของซีเควนซ์ในไลบรารีโปรเจกต์ของซีเควนซ์บนเซิร์ฟเวอร์คัดลอกพร็อกซี: เบาและแก้ไขได้เร็ว การเรนเดอร์ใช้ต้นฉบับของไลบรารี
@@ -688,7 +687,6 @@
ชื่อผู้ใช้ของคุณบนเซิร์ฟเวอร์ตัวเข้ารหัสวิดีโอที่เซิร์ฟเวอร์ใช้บนพีซีเครื่องนี้ได้: {0}ยังไม่พบเซิร์ฟเวอร์บนเครือข่ายนี้ โปรดพิมพ์ที่อยู่
- หยุดการอัปโหลดชั่วคราวขณะที่ Windows ระบุว่าการเชื่อมต่อนี้เป็นแบบวัดปริมาณข้อมูล และจะดำเนินการต่อเองเมื่อไม่ใช่พื้นที่ที่คุณใช้บนเซิร์ฟเวอร์เทียบกับโควตาของคุณให้เซิร์ฟเวอร์ส่งงานเรนเดอร์มายังพีซีเครื่องนี้เมื่อว่าง โดยใช้ตัวเข้ารหัส GPU ของคุณผู้ดูแลระบบจัดการผู้ใช้ คลังภาพ และเซิร์ฟเวอร์
@@ -844,7 +842,6 @@
ไม่มีตัวถอดรหัสบนพีซีเครื่องนี้ที่อ่านพิกเซลของรูปแบบนี้ได้ เฟรมเหล่านั้นจะไม่ถูกรวมในการเรนเดอร์ส่งสถิติรายวันแบบไม่ระบุตัวตนเกี่ยวกับเวอร์ชันและภาษาที่ใช้งาน ไม่มีข้อมูลอื่น และปิดไว้เป็นค่าเริ่มต้นนับจากนี้หน้าแก้ไขจะใช้โฟลเดอร์นี้ ไม่มีการย้ายหรือลบสิ่งใด
- โฟลเดอร์ของพื้นที่ทำงาน (ดิสก์ที่เร็วจะดีที่สุด) เปลี่ยนจะใช้โฟลเดอร์อื่น การย้ายโฟลเดอร์จะมาในการอัปเดตครั้งถัดไปส่งทุกเวอร์ชันที่คุณบันทึกไปยังไลบรารีทันที และรับเวอร์ชันใหม่ของไลบรารีติดตั้งใน Program Files สำหรับทุกบัญชี · ต้องได้รับการอนุมัติจากผู้ดูแลระบบ{0} · ทำงานเป็นบริการ Windows จึงติดตั้งสำหรับผู้ใช้ทั้งหมดใน Program Files
diff --git a/i18n/tr/Server.tr.resx b/i18n/tr/Server.tr.resx
index 4604d2bc..3705388a 100644
--- a/i18n/tr/Server.tr.resx
+++ b/i18n/tr/Server.tr.resx
@@ -137,7 +137,6 @@
Oturum açOturum açKullanıcı
- Tarifeli bağlantıda yüklemeleri duraklat{0} / {1}{0} kullanımdaBu bilgisayarı işleme düğümü olarak sun
diff --git a/i18n/tr/Tooltips.tr.resx b/i18n/tr/Tooltips.tr.resx
index dbfeb2d8..140a2b36 100644
--- a/i18n/tr/Tooltips.tr.resx
+++ b/i18n/tr/Tooltips.tr.resx
@@ -233,7 +233,6 @@
Yeni projenin adı: 1 ile 60 karakter arası, her ad bir sekansta yalnızca bir kezBu sekansın Ana projeden başlayan yeni bir projesiProjenin fotoğraflarını çalışma alanına kopyalar, ardından projeyi orada açar
- Orijinalleri bu bilgisayarda işlemek üzere kopyalama sonraki bir güncellemede gelecekSekansın kitaplıktaki projeleriSekansın sunucudaki projeleriProxy'leri kopyalar: hafiftir ve hızlı düzenlenir; işlemeler kitaplığın orijinallerini kullanır
@@ -688,7 +687,6 @@
Sunucudaki kullanıcı adınızSunucunun bu bilgisayarda kullanabileceği video kodlayıcıları: {0}Bu ağda henüz sunucu bulunamadı; adresini yazın
- Windows bu bağlantıyı tarifeli olarak bildirdiği sürece karşıya yüklemeleri duraklatır; bağlantı tarifeli olmadığında yüklemeler kendiliğinden sürerSunucuda kotanızdan kullandığınız alanBu bilgisayar boştayken sunucunun buraya işleme görevleri göndermesine izin verir; GPU kodlayıcılarınızı kullanırYöneticiler kullanıcıları, arşivi ve sunucuyu yönetir
@@ -844,7 +842,6 @@
Bu bilgisayardaki hiçbir kod çözücü piksellerini okuyamaz; bu tür kareler işleme çıktılarına dahil edilmezKullanılan sürüm ve dillerin günlük anonim sayısını gönderir; başka hiçbir şey göndermez, varsayılan olarak kapalıdırDüzenleme bundan sonra bu klasörü kullanır; hiçbir şey taşınmaz veya silinmez
- Çalışma alanının klasörü (hızlı bir disk en iyisidir); Değiştir başka bir klasör kullanır, taşıma sonraki bir güncellemede gelecekKaydettiğiniz her sürümü hemen kitaplığa gönderir ve kitaplığın yeni sürümlerini alırHer hesap için Program Files klasörüne kurar · yönetici onayı ister{0} · Windows hizmeti olarak çalıştığından Program Files klasörüne tüm kullanıcılar için kurulur
diff --git a/i18n/uk/Server.uk.resx b/i18n/uk/Server.uk.resx
index 4985aabb..013a77cc 100644
--- a/i18n/uk/Server.uk.resx
+++ b/i18n/uk/Server.uk.resx
@@ -137,7 +137,6 @@
УвійтиВхідКористувач
- Призупиняти вивантаження в лімітних мережах{0} з {1}Використано {0}Надати цей ПК як вузол рендерингу
diff --git a/i18n/uk/Tooltips.uk.resx b/i18n/uk/Tooltips.uk.resx
index e79d444e..2f478d6e 100644
--- a/i18n/uk/Tooltips.uk.resx
+++ b/i18n/uk/Tooltips.uk.resx
@@ -239,7 +239,6 @@
Назва нового проєкту: від 1 до 60 символів, кожна назва — один раз на послідовністьНовий проєкт цієї послідовності на основі «Основного»Скопіювати фото проєкту до робочого простору й відкрити його там
- Копіювання оригіналів для рендерингу на цьому ПК з’явиться в наступному оновленніПроєкти послідовності в бібліотеціПроєкти послідовності на серверіСкопіювати проксі: легкі й швидкі для редагування; рендеринг використовує оригінали з бібліотеки
@@ -724,7 +723,6 @@
Ваше ім’я користувача на серверіВідеокодувальники цього ПК, які може використовувати сервер: {0}У цій мережі ще не знайдено жодного сервера; введіть його адресу
- Призупиняти вивантаження, поки Windows позначає це підключення як лімітне; вони відновляться самі, коли воно перестане бути лімітнимМісце, яке ви використовуєте на сервері, із вашої квотиДозволити серверу надсилати завдання рендерингу на цей ПК, коли він простоює; використовує ваші GPU-кодувальникиАдміністратори керують користувачами, архівом і сервером
@@ -886,7 +884,6 @@
Жоден декодер на цьому ПК не читає його пікселі; такі кадри не потрапляють у рендериЩодня надсилати анонімну статистику версій і мов, що використовуються; нічого більше, за замовчуванням вимкнено«Редагування» відтепер використовує цю папку; нічого не переміщується й не видаляється
- Папка робочого простору (найкраще на швидкому диску); «Змінити» вибирає іншу, переміщення з’явиться в наступному оновленніОдразу надсилати до бібліотеки кожну збережену версію та отримувати нові версії з бібліотекиІнсталювати в Program Files для всіх облікових записів · потрібне підтвердження адміністратора{0} · працює як служба Windows, тому інсталюється для всіх користувачів у Program Files
diff --git a/i18n/vi/Server.vi.resx b/i18n/vi/Server.vi.resx
index 46c421d7..0f2d6a07 100644
--- a/i18n/vi/Server.vi.resx
+++ b/i18n/vi/Server.vi.resx
@@ -137,7 +137,6 @@
Đăng nhậpĐăng nhậpNgười dùng
- Tạm dừng tải lên khi kết nối có đo lượng dữ liệu{0} trên {1}Đã dùng {0}Dùng máy tính này làm nút kết xuất
diff --git a/i18n/vi/Tooltips.vi.resx b/i18n/vi/Tooltips.vi.resx
index aabd9d71..6342baca 100644
--- a/i18n/vi/Tooltips.vi.resx
+++ b/i18n/vi/Tooltips.vi.resx
@@ -233,7 +233,6 @@
Tên của dự án mới: từ 1 đến 60 ký tự, mỗi tên chỉ dùng một lần cho mỗi chuỗi ảnhMột dự án mới của chuỗi ảnh này, bắt đầu từ ChínhSao chép ảnh của dự án vào không gian làm việc, rồi mở dự án ở đó
- Việc sao chép bản gốc, để kết xuất trên máy tính này, sẽ có trong một bản cập nhật sauCác dự án của chuỗi ảnh trong thư việnCác dự án của chuỗi ảnh trên máy chủSao chép proxy: nhẹ và nhanh khi chỉnh sửa; bản kết xuất dùng bản gốc của thư viện
@@ -688,7 +687,6 @@
Tên người dùng của bạn trên máy chủBộ mã hóa video mà máy chủ có thể dùng trên máy tính này: {0}Chưa tìm thấy máy chủ nào trên mạng này; hãy nhập địa chỉ của máy chủ
- Tạm dừng tải lên khi Windows báo kết nối này là kết nối có đo lượng dữ liệu; việc tải lên tự tiếp tục khi không còn như vậyDung lượng bạn đã dùng trên máy chủ so với hạn mứcCho phép máy chủ gửi tác vụ kết xuất đến máy tính này khi máy rảnh; dùng bộ mã hóa GPU của bạnQuản trị viên quản lý người dùng, kho lưu trữ và máy chủ
@@ -844,7 +842,6 @@
Không có bộ giải mã nào trên máy tính này đọc được điểm ảnh; các khung hình như vậy bị loại khỏi bản kết xuấtGửi hằng ngày số liệu ẩn danh về phiên bản và ngôn ngữ đang dùng; không gì khác, mặc định tắtChỉnh sửa sẽ dùng thư mục này từ nay; không có gì bị di chuyển hay xóa
- Thư mục của không gian làm việc (tốt nhất là ổ đĩa nhanh); Thay đổi để dùng thư mục khác, việc di chuyển sẽ có trong một bản cập nhật sauGửi ngay mỗi phiên bản bạn lưu lên thư viện, và lấy các phiên bản mới của thư việnCài đặt vào Program Files cho mọi tài khoản · cần quản trị viên phê duyệt{0} · chạy dưới dạng dịch vụ Windows nên được cài đặt cho mọi người dùng trong Program Files
diff --git a/i18n/zh-Hans/Server.zh-Hans.resx b/i18n/zh-Hans/Server.zh-Hans.resx
index f7d0eb28..89178842 100644
--- a/i18n/zh-Hans/Server.zh-Hans.resx
+++ b/i18n/zh-Hans/Server.zh-Hans.resx
@@ -137,7 +137,6 @@
登录登录用户
- 按流量计费时暂停上传{0} / {1}已用 {0}将此电脑用作渲染节点
diff --git a/i18n/zh-Hans/Tooltips.zh-Hans.resx b/i18n/zh-Hans/Tooltips.zh-Hans.resx
index 537019fa..1b5f746d 100644
--- a/i18n/zh-Hans/Tooltips.zh-Hans.resx
+++ b/i18n/zh-Hans/Tooltips.zh-Hans.resx
@@ -233,7 +233,6 @@
新项目的名称:1 到 60 个字符,同一序列中名称不能重复此序列的新项目,以主项目为起点将项目的照片复制到工作区,然后在那里打开
- 复制原始文件以便在此电脑上渲染的功能将在后续更新中提供图库中此序列的项目服务器上此序列的项目复制代理:轻量且编辑快速;渲染使用图库中的原始文件
@@ -688,7 +687,6 @@
你在服务器上的用户名服务器可在此电脑上使用的视频编码器:{0}尚未在此网络上发现服务器;请输入其地址
- 当 Windows 将此连接报告为按流量计费时暂停上传;连接不再按流量计费时会自动继续你在服务器上已用的空间 / 你的配额允许服务器在此电脑空闲时向其发送渲染任务;将使用你的 GPU 编码器管理员负责管理用户、档案库和服务器
@@ -844,7 +842,6 @@
此电脑上没有可读取其像素的解码器;此类帧不会参与渲染每天发送一次所用版本和语言的匿名统计;不发送其他内容,默认关闭从现在起“编辑”使用此文件夹;不会移动或删除任何内容
- 工作区的文件夹(最好位于快速磁盘上);“更改”可改用其他文件夹,移动功能将在后续更新中提供将你保存的每个版本立即发送到图库,并获取图库的新版本安装到 Program Files,供所有账户使用 · 需要管理员批准{0} · 它作为 Windows 服务运行,因此会为所有用户安装到 Program Files
diff --git a/i18n/zh-Hant/Server.zh-Hant.resx b/i18n/zh-Hant/Server.zh-Hant.resx
index 6a220a68..ef362bc2 100644
--- a/i18n/zh-Hant/Server.zh-Hant.resx
+++ b/i18n/zh-Hant/Server.zh-Hant.resx
@@ -137,7 +137,6 @@
登入登入使用者
- 計量付費連線時暫停上傳{0} / {1}已使用 {0}提供此電腦作為算圖節點
diff --git a/i18n/zh-Hant/Tooltips.zh-Hant.resx b/i18n/zh-Hant/Tooltips.zh-Hant.resx
index 2129d3bd..bf59879f 100644
--- a/i18n/zh-Hant/Tooltips.zh-Hant.resx
+++ b/i18n/zh-Hant/Tooltips.zh-Hant.resx
@@ -233,7 +233,6 @@
新專案的名稱:1 到 60 個字元,同一序列中名稱不可重複此序列的新專案,以主要專案為起點將專案的相片複製到工作區,然後在該處開啟
- 複製原始檔以便在此電腦上算圖的功能,將於後續更新提供圖庫中此序列的專案伺服器上此序列的專案複製代理檔:輕量且編輯快速;算圖會使用圖庫的原始檔
@@ -688,7 +687,6 @@
您在伺服器上的使用者名稱伺服器可在此電腦上使用的影片編碼器:{0}尚未在此網路上找到伺服器;請輸入其位址
- 當 Windows 將此連線回報為計量付費連線時暫停上傳;不再計量付費時會自動繼續您在伺服器上已使用的空間與配額讓伺服器在此電腦閒置時傳送算圖工作;會使用您的 GPU 編碼器管理員可管理使用者、典藏庫與伺服器
@@ -844,7 +842,6 @@
此電腦上沒有解碼器能讀取其像素;此類影格會從算圖中排除每天傳送一次使用中版本與語言的匿名統計;不含其他資料,預設為關閉從現在起「編輯」會使用此資料夾;不會移動或刪除任何內容
- 工作區的資料夾(最好位於快速磁碟);「變更」可改用其他資料夾,移動功能將於後續更新提供將您儲存的每個版本立即傳送至圖庫,並取得圖庫的新版本為所有帳戶安裝到 Program Files · 需要系統管理員核准{0} · 此程式以 Windows 服務執行,因此會為所有使用者安裝到 Program Files
diff --git a/src/Chronos.App/Editor/EditorPanels.xaml b/src/Chronos.App/Editor/EditorPanels.xaml
index 5ed7dd15..6bab5ad6 100644
--- a/src/Chronos.App/Editor/EditorPanels.xaml
+++ b/src/Chronos.App/Editor/EditorPanels.xaml
@@ -327,6 +327,9 @@
ToolTip="{l:Loc Tooltips.Editor.Export.History}" Margin="6,0,0,0" Visibility="{Binding CanOpenHistory, Converter={StaticResource BoolToVisibility}}" />
+
diff --git a/src/Chronos.App/Editor/EditorViewModel.cs b/src/Chronos.App/Editor/EditorViewModel.cs
index 1f46a73f..64e68aec 100644
--- a/src/Chronos.App/Editor/EditorViewModel.cs
+++ b/src/Chronos.App/Editor/EditorViewModel.cs
@@ -241,8 +241,8 @@ public sealed class EditorViewModel : LocalizedViewModel, IAsyncDisposable
/// The Export "Sync" option: available, or why not.
public ExportSyncGate SyncGate { get => _syncGate; private set => Set(ref _syncGate, value); }
- /// The server job the header shows ().
- private Job? ServerJob => IsRemote ? _jobs.Shown : null;
+ /// The server job the header shows (): never a workspace project's render on this PC or its send.
+ private Job? ServerJob => IsRemote ? _jobs.ShownAtHome : null;
///
/// "3,600 frames · Canon EOS R5 · 2 s interval · 2 h 00 m · 3 warnings"; on the Export tab what the video will be:
diff --git a/src/Chronos.App/Editor/ExportTab.cs b/src/Chronos.App/Editor/ExportTab.cs
index 1cc5b943..ff8a457a 100644
--- a/src/Chronos.App/Editor/ExportTab.cs
+++ b/src/Chronos.App/Editor/ExportTab.cs
@@ -3,12 +3,16 @@ using System.IO;
using System.Windows.Input;
using Chronos.App.Infrastructure;
using Chronos.App.Settings;
+using Chronos.App.Shell;
+using Chronos.App.Workspace;
using Chronos.Core.Advice;
+using Chronos.Core.Diagnostics;
using Chronos.Core.Export;
using Chronos.Core.Localization;
using Chronos.Core.Model;
using Chronos.Core.Project;
using Chronos.Core.Video;
+using Chronos.Data;
using Chronos.Data.Processing;
using Chronos.Ui.Controls;
using Chronos.Ui.Mvvm;
@@ -406,6 +410,34 @@ public sealed class ExportTab : EditorTab
/// A workspace project's renders made on this PC that are not at its home yet (phase 5c): "Not sent".
public bool HasUnsent => Editor.Session.Source is WorkspaceSequenceSource { UnsentRenders: > 0 };
+ /// Send again: queues the sending home of every render made here not sent yet; disabled while one is queued from here.
+ public ICommand SendAgainCommand => _sendAgain ??= new AsyncRelayCommand(SendAgainAsync, () => HasUnsent && !_sendQueued);
+
+ private AsyncRelayCommand? _sendAgain;
+
+ /// A send was queued from here and the ledger was not read again since.
+ private bool _sendQueued;
+
+ /// What Send again does, worded for the project's home.
+ public string SendAgainToolTip => WorkspaceText.ForHome("Tooltips.Editor.Render.SendAgain", Editor.Session.Source is WorkspaceSequenceSource { IsServerHome: true });
+
+ private async Task SendAgainAsync()
+ {
+ if (Editor.Session.Source is not WorkspaceSequenceSource source) return;
+ try
+ {
+ _sendQueued = await Editor.Shell.Services.Workspace.SendRendersAsync(source.ProjectId);
+ _sendAgain?.RaiseCanExecuteChanged();
+ if (_sendQueued)
+ Editor.Shell.Notify(Loc.L("Editor.Render.Sending"), Editor.Title, Loc.L("Shell.Nav.Jobs"), Loc.L("Tooltips.Nav.Jobs"), () => Editor.Shell.Navigate(SectionKey.Jobs));
+ }
+ catch (Exception ex) when (ex is WorkspaceException or IOException or InvalidDataException or UnauthorizedAccessException or DatabaseException)
+ {
+ Log.Warning("editor", $"The renders of workspace project {source.ProjectId} could not be queued to be sent", ex);
+ Editor.Shell.Notify(Loc.L("Editor.Render.SendFailed"), ex is WorkspaceException ? ex.Message : ErrorText.For(ex), isError: true);
+ }
+ }
+
/// Why the renders are not in the library (or on the server) yet, and that their files stay in the workspace.
public string? UnsentToolTip => Editor.Session.Source is WorkspaceSequenceSource { UnsentRenders: > 0 } source
? Loc.L(source.IsServerHome ? "Tooltips.Editor.Render.NotSent.Server" : "Tooltips.Editor.Render.NotSent")
@@ -484,6 +516,9 @@ public sealed class ExportTab : EditorTab
public override void OnContentChanged()
{
+ // The ledger was read again: Send again goes by what it holds now.
+ _sendQueued = false;
+ _sendAgain?.RaiseCanExecuteChanged();
LoadCards();
if (SelectedCopy is null || !SavedCopies.Contains(SelectedCopy)) SelectedCopy = SavedCopies.FirstOrDefault();
base.OnContentChanged();
diff --git a/src/Chronos.App/Editor/SequenceJobs.cs b/src/Chronos.App/Editor/SequenceJobs.cs
index 3f44250b..b7ab02e9 100644
--- a/src/Chronos.App/Editor/SequenceJobs.cs
+++ b/src/Chronos.App/Editor/SequenceJobs.cs
@@ -20,6 +20,16 @@ public sealed class SequenceJobs(Guid sequenceId)
/// The job to show: one running, else one paused, else the oldest waiting; null when there is none.
public Job? Shown => First(_active.Values);
+ ///
+ /// The job a server sequence's header shows, chosen as is among the jobs that run at its home: a
+ /// workspace project's render on this PC and its send home are this PC's jobs (the Jobs screen and the Export tab say
+ /// them), never the server's.
+ ///
+ public Job? ShownAtHome => First(_active.Values.Where(j => !IsLocalKind(j.Kind)));
+
+ /// A workspace project's render on this PC or its send home (phase 5c): this PC's job whatever the home.
+ public static bool IsLocalKind(JobKind kind) => kind is JobKind.WorkspaceRender or JobKind.WorkspaceSend;
+
/// The job of to show, chosen as is (the Edit path's steps).
public Job? Active(JobKind kind) => First(_active.Values.Where(j => j.Kind == kind));
diff --git a/src/Chronos.App/Infrastructure/AppServices.cs b/src/Chronos.App/Infrastructure/AppServices.cs
index 82084c27..28291ca3 100644
--- a/src/Chronos.App/Infrastructure/AppServices.cs
+++ b/src/Chronos.App/Infrastructure/AppServices.cs
@@ -192,12 +192,14 @@ public sealed class AppServices : IAsyncDisposable
///
/// The workspace jobs' share of the desktop (phase 5c): its processing options for local renders, the metered hold of
- /// Settings › Server over transfers with a server, and the workspace that follows a moved folder.
+ /// Settings › Server over transfers with a server, the workspace that follows a moved folder, and the folder in use
+ /// (a job queued before a move finds its project there).
///
private static WorkspaceJobOptions WorkspaceOptions(AppServices services, ArchiveService archives) =>
new(services.Processing?.Options ?? WorkspaceJobOptions.For(archives).Processing,
() => services.Settings.PauseUploadsOnMetered && MeteredNetwork.IsMetered(),
- services.Workspace.MovedAsync);
+ services.Workspace.MovedAsync,
+ () => services.Workspace.Root);
///
/// Queues a scan of unless one is already waiting or running; the sequences it indexes get
diff --git a/src/Chronos.App/Infrastructure/AppSettings.cs b/src/Chronos.App/Infrastructure/AppSettings.cs
index 3780f173..1a385bad 100644
--- a/src/Chronos.App/Infrastructure/AppSettings.cs
+++ b/src/Chronos.App/Infrastructure/AppSettings.cs
@@ -211,6 +211,18 @@ public sealed class AppSettings
/// Which project Edit opens for a sequence with several in the workspace.
public WorkspaceOpenPolicy WorkspaceOpenProject { get; set; } = WorkspaceOpenPolicy.LastUsed;
+ ///
+ /// as everything applies it: the originals for any case of "originals", else the
+ /// proxies (a value set elsewhere reads as the proxies). Settings › Workspace shows the same.
+ ///
+ [System.Text.Json.Serialization.JsonIgnore]
+ public string EffectiveDefaultMedia =>
+ string.Equals(WorkspaceDefaultMedia, BundleMedia.Originals, StringComparison.OrdinalIgnoreCase) ? BundleMedia.Originals : BundleMedia.Proxies;
+
+ /// as everything applies it: a value this Chronos does not know reads as the last used. Settings › Workspace shows the same.
+ [System.Text.Json.Serialization.JsonIgnore]
+ public WorkspaceOpenPolicy EffectiveOpenPolicy => Enum.IsDefined(WorkspaceOpenProject) ? WorkspaceOpenProject : WorkspaceOpenPolicy.LastUsed;
+
///
/// When each workspace project was last opened in Edit (project id → time), which the clean-up goes by (else the time
/// its working state was saved). This PC's, like .
@@ -236,7 +248,7 @@ public sealed class AppSettings
/// Send and take project settings changed on one side without asking (Server.html).
public bool SyncSettingsAutomatically { get; set; } = true;
- /// Pause transfers with a server (uploads, workspace copies and renders sent) while Windows reports the connection as metered (Server.html).
+ /// Pause transfers with a server (uploads, sync downloads, workspace copies and renders sent) while Windows reports the connection as metered (Server.html).
public bool PauseUploadsOnMetered { get; set; }
// ---- Jobs ----
diff --git a/src/Chronos.App/Sections/SequenceViewModel.cs b/src/Chronos.App/Sections/SequenceViewModel.cs
index 568222dd..088c4535 100644
--- a/src/Chronos.App/Sections/SequenceViewModel.cs
+++ b/src/Chronos.App/Sections/SequenceViewModel.cs
@@ -871,8 +871,7 @@ public sealed class SequenceViewModel : SectionViewModel
}
/// The media a checkout copies unless "Open in workspace" chose: Settings › Workspace › Media.
- private static string DefaultMedia(AppServices services) =>
- services.Settings.WorkspaceDefaultMedia == BundleMedia.Originals ? BundleMedia.Originals : BundleMedia.Proxies;
+ private static string DefaultMedia(AppServices services) => services.Settings.EffectiveDefaultMedia;
///
/// The project of the sequence Edit opens when none was asked for (phase 5c, Settings › Workspace › Open project): the
@@ -883,7 +882,7 @@ public sealed class SequenceViewModel : SectionViewModel
Func fits)
{
var last = await workspace.LastUsedAsync(sequenceId) is { } used && fits(used) ? used : null;
- var policy = services.Settings.WorkspaceOpenProject;
+ var policy = services.Settings.EffectiveOpenPolicy;
if (policy == WorkspaceOpenPolicy.LastUsed) return (false, last);
var here = (await workspace.ProjectsOfAsync(sequenceId)).Where(p => fits(p) && p.IsReadable).ToList();
if (policy == WorkspaceOpenPolicy.Main) return (false, here.FirstOrDefault(p => p.IsMain) ?? last);
@@ -1121,6 +1120,8 @@ public sealed class SequenceViewModel : SectionViewModel
if (section.Shell.Services.Database is not { } db || await db.Sequences.GetAsync(sequenceId) is not { } row) return;
if (section.Shell.Library.Items.FirstOrDefault(i => i.Id == row.Id) is { } item) item.Update(row);
}
+
+ public void ShowJobs() => section.Shell.Navigate(SectionKey.Jobs);
}
}
diff --git a/src/Chronos.App/Sections/SettingsView.xaml b/src/Chronos.App/Sections/SettingsView.xaml
index 1f4641f6..bdc4980f 100644
--- a/src/Chronos.App/Sections/SettingsView.xaml
+++ b/src/Chronos.App/Sections/SettingsView.xaml
@@ -532,17 +532,21 @@
+
+
diff --git a/src/Chronos.App/Sections/SettingsViewModel.cs b/src/Chronos.App/Sections/SettingsViewModel.cs
index cb6899a6..b086f64a 100644
--- a/src/Chronos.App/Sections/SettingsViewModel.cs
+++ b/src/Chronos.App/Sections/SettingsViewModel.cs
@@ -173,7 +173,7 @@ public sealed class SettingsViewModel : SectionViewModel
// ---- Workspace ----
WorkspaceRows = new WorkspaceSettingsRows(_s, Save, () => AppEnvironment.Shown(Shell.Services.Workspace.Root), OpenWorkspaceFolder, ChangeWorkspaceFolderAsync,
WorkspaceSettingsServices.For(Shell.Services.Workspace, Shell.Services.Dialogs, (title, message, isError) => Shell.Notify(title, message, isError: isError),
- MoveWorkspaceFolderAsync));
+ MoveWorkspaceFolderAsync, () => WorkspaceFolderChange.ResumeUnfinishedAsync(Shell)));
// ---- Storage ----
// A capture shows its folders under a sample data folder; what is typed is taken back to the folder it stands for.
@@ -991,6 +991,8 @@ public sealed class SettingsViewModel : SectionViewModel
UpdateArchiveFree();
ArchiveReload = LoadArchiveAsync();
if (_page == SettingsPage.Advanced) LoadBackups();
+ // What the workspace takes and holds in its trash may have changed elsewhere (a local copy removed in Edit).
+ if (_page == SettingsPage.Workspace) _ = WorkspaceRows.MeasureAsync();
}
///
diff --git a/src/Chronos.App/Server/UploadHold.cs b/src/Chronos.App/Server/UploadHold.cs
index 8bfd77ed..823c9402 100644
--- a/src/Chronos.App/Server/UploadHold.cs
+++ b/src/Chronos.App/Server/UploadHold.cs
@@ -11,8 +11,8 @@ namespace Chronos.App.Server;
///
/// "Pause metered transfers" (Server.html): while is on and Windows reports
/// the connection as metered, the transfers with a server are paused (a running one stops after its current chunk or file
-/// and keeps its checkpoint): upload jobs, and since phase 5c the workspace's copies from a server and its renders sent to
-/// one (); a copy from or a send to this PC's archive is never held. They are resumed when the connection
+/// and keeps its checkpoint): upload jobs, the sync's downloads, and since phase 5c the workspace's copies from a server and
+/// its renders sent to one (); a copy from or a send to this PC's archive is never held. They are resumed when the connection
/// is no longer metered or the option goes off. Only the jobs it paused are resumed. Checked when the network or one of
/// those jobs changes, and every minute.
///
@@ -65,18 +65,19 @@ public sealed class UploadHold : IDisposable
}
/// The kinds of job a metered connection may hold ( says which of them).
- internal static IReadOnlyList Kinds { get; } = [JobKind.UploadCommit, JobKind.WorkspaceCopy, JobKind.WorkspaceSend];
+ internal static IReadOnlyList Kinds { get; } = [JobKind.UploadCommit, JobKind.Download, JobKind.WorkspaceCopy, JobKind.WorkspaceSend];
///
- /// Whether a metered connection holds : an upload, or a workspace copy or send whose home is a server
- /// (its parameters name one). One whose parameters cannot be read is not held: it fails with its reason.
+ /// Whether a metered connection holds : an upload, a sync download (every one is from a server), or a
+ /// workspace copy or send whose home is a server (its parameters name one). One whose parameters cannot be read is not
+ /// held: it fails with its reason.
///
internal static bool Holds(Job job)
{
ArgumentNullException.ThrowIfNull(job);
return job.Kind switch
{
- JobKind.UploadCommit => true,
+ JobKind.UploadCommit or JobKind.Download => true,
JobKind.WorkspaceCopy => WorkspaceJobs.CopyParameters(job)?.Server is { Length: > 0 },
JobKind.WorkspaceSend => WorkspaceJobs.SendParameters(job)?.Server is { Length: > 0 },
_ => false,
diff --git a/src/Chronos.App/Settings/WorkspaceSettingsRows.cs b/src/Chronos.App/Settings/WorkspaceSettingsRows.cs
index 52b83d4e..103c06e3 100644
--- a/src/Chronos.App/Settings/WorkspaceSettingsRows.cs
+++ b/src/Chronos.App/Settings/WorkspaceSettingsRows.cs
@@ -36,11 +36,17 @@ public sealed class WorkspaceSettingsServices
/// Picks a folder, shows the move's plan and queues it (); null where the folder cannot move.
public Func? Move { get; init; }
- /// A move of the workspace folder is queued or running ().
+ /// A move of the workspace folder is queued or running, or stopped with its journal (; reads the disk).
public Func IsMoving { get; init; } = () => false;
+ /// A move stopped before it ended, no job taking it up (); null where none is looked for.
+ public Func>? HasUnfinishedMove { get; init; }
+
+ /// Queues again the move that stopped (); null where it cannot.
+ public Func? ResumeMove { get; init; }
+
/// The workspace's own operations, with the shell's and toasts ().
- public static WorkspaceSettingsServices For(WorkspaceHost host, IAppDialogs dialogs, Action notify, Func? move)
+ public static WorkspaceSettingsServices For(WorkspaceHost host, IAppDialogs dialogs, Action notify, Func? move, Func? resume = null)
{
ArgumentNullException.ThrowIfNull(host);
ArgumentNullException.ThrowIfNull(dialogs);
@@ -54,6 +60,8 @@ public sealed class WorkspaceSettingsServices
Notify = notify,
Move = move,
IsMoving = () => host.IsMoving,
+ HasUnfinishedMove = async token => await host.UnfinishedMoveAsync(token) is not null,
+ ResumeMove = resume,
};
}
}
@@ -83,6 +91,12 @@ public sealed class WorkspaceSettingsRows(AppSettings settings, Action save, Fun
private bool _isMeasuring;
private CancellationTokenSource? _measure;
+ /// Whether the workspace is held for a move, as read last (the disk is read once per refresh, never at each requery).
+ private bool? _moving;
+
+ /// A move stopped before it ended, as the last measure found (Resume shows).
+ private bool _unfinished;
+
// ---------------- Folder ----------------
/// The workspace folder in use.
@@ -92,17 +106,35 @@ public sealed class WorkspaceSettingsRows(AppSettings settings, Action save, Fun
public RelayCommand OpenCommand { get; } = new(open);
/// Uses another folder, after its plan (WorkspaceFolderChange); none where the folder cannot change, nor while it moves.
- public AsyncRelayCommand ChangeCommand { get; } = new(change ?? (() => Task.CompletedTask), () => change is not null && !(services?.IsMoving() ?? false));
+ public AsyncRelayCommand ChangeCommand => _change ??= new AsyncRelayCommand(() => ThenReadMoveAsync(change), () => change is not null && !IsMoving);
+
+ private AsyncRelayCommand? _change;
public bool CanChange => change is not null;
+ /// Change…'s tooltip: what it does, or why it waits (a move under way, or one stopped that Resume takes up).
+ public string ChangeToolTip => MoveState ?? Loc.L("Tooltips.Settings.ChangeWorkspace");
+
/// Moves the folder with its projects, after its plan (WorkspaceFolderChange.MoveAsync); none where it cannot move, nor while it moves.
- public AsyncRelayCommand MoveCommand { get; } = new(services?.Move ?? (() => Task.CompletedTask), () => services?.Move is not null && !services.IsMoving());
+ public AsyncRelayCommand MoveCommand => _move ??= new AsyncRelayCommand(() => ThenReadMoveAsync(services?.Move), () => services?.Move is not null && !IsMoving);
+
+ private AsyncRelayCommand? _move;
public bool CanMove => services?.Move is not null;
- /// The move button's tooltip: what it does, or that a move is under way.
- public string MoveToolTip => IsMoving ? Loc.L("Errors.Workspace.Moving") : Loc.L("Tooltips.Settings.Workspace.Move");
+ /// The move button's tooltip: what it does, or why it waits (a move under way, or one stopped that Resume takes up).
+ public string MoveToolTip => MoveState ?? Loc.L("Tooltips.Settings.Workspace.Move");
+
+ /// A move of the folder stopped before it ended and no job takes it up: Resume shows.
+ public bool CanResumeMove => _unfinished && services?.ResumeMove is not null;
+
+ /// Queues again the move that stopped, from its journal; the page is measured again after.
+ public AsyncRelayCommand ResumeMoveCommand => _resume ??= new AsyncRelayCommand(ResumeMoveAsync, () => CanResumeMove);
+
+ private AsyncRelayCommand? _resume;
+
+ /// Why Change… and Move… wait; null when they do not.
+ private string? MoveState => _unfinished ? Loc.L("Tooltips.Settings.Workspace.MoveUnfinished") : IsMoving ? Loc.L("Errors.Workspace.Moving") : null;
/// "12.4 GB used" (the whole folder, its trash included); "Measuring…" meanwhile; null before the first measure or when it failed.
public string? UsageText =>
@@ -223,7 +255,7 @@ public sealed class WorkspaceSettingsRows(AppSettings settings, Action save, Fun
public bool IsOpenLastUsed
{
- get => settings.WorkspaceOpenProject == WorkspaceOpenPolicy.LastUsed || !Enum.IsDefined(settings.WorkspaceOpenProject);
+ get => settings.EffectiveOpenPolicy == WorkspaceOpenPolicy.LastUsed;
set
{
if (value) SetOpenProject(WorkspaceOpenPolicy.LastUsed);
@@ -232,7 +264,7 @@ public sealed class WorkspaceSettingsRows(AppSettings settings, Action save, Fun
public bool IsOpenMain
{
- get => settings.WorkspaceOpenProject == WorkspaceOpenPolicy.Main;
+ get => settings.EffectiveOpenPolicy == WorkspaceOpenPolicy.Main;
set
{
if (value) SetOpenProject(WorkspaceOpenPolicy.Main);
@@ -241,7 +273,7 @@ public sealed class WorkspaceSettingsRows(AppSettings settings, Action save, Fun
public bool IsOpenAsk
{
- get => settings.WorkspaceOpenProject == WorkspaceOpenPolicy.Ask;
+ get => settings.EffectiveOpenPolicy == WorkspaceOpenPolicy.Ask;
set
{
if (value) SetOpenProject(WorkspaceOpenPolicy.Ask);
@@ -265,8 +297,8 @@ public sealed class WorkspaceSettingsRows(AppSettings settings, Action save, Fun
private AsyncRelayCommand? _emptyTrash;
- /// Empty…'s tooltip: what it does, or that there is nothing to erase.
- public string EmptyTrashToolTip => Loc.L(HasTrash ? "Tooltips.Settings.Workspace.EmptyTrash" : "Tooltips.Settings.Workspace.EmptyTrash.Disabled");
+ /// Empty…'s tooltip: what it does, or that there is nothing to erase (only once a measure said so).
+ public string EmptyTrashToolTip => Loc.L(HasTrash || _usage is null ? "Tooltips.Settings.Workspace.EmptyTrash" : "Tooltips.Settings.Workspace.EmptyTrash.Disabled");
///
/// Measures what the workspace takes of its drive and what its trash holds (the page shown, after Empty…, Change and Move);
@@ -281,14 +313,18 @@ public sealed class WorkspaceSettingsRows(AppSettings settings, Action save, Fun
SetMeasuring(true);
try
{
- var usage = await services.Usage(measure.Token);
+ var measuring = services.Usage(measure.Token);
+ // Meanwhile, whether a move holds the workspace, or stopped and waits to be taken up, read off the UI thread.
+ var (moving, unfinished) = await ReadMoveStateAsync(measure.Token);
+ if (_measure == measure) SetMoveState(moving, unfinished);
+ var usage = await measuring;
if (_measure == measure) _usage = usage;
}
catch (OperationCanceledException) when (measure.IsCancellationRequested)
{
// A newer measure took over.
}
- catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or Data.DatabaseException)
{
Log.Warning("workspace", "The workspace folder could not be measured", ex);
if (_measure == measure) _usage = null;
@@ -383,10 +419,71 @@ public sealed class WorkspaceSettingsRows(AppSettings settings, Action save, Fun
Refresh();
}
- /// Labels in the current language, values as the settings have them now.
- internal void Refresh() => OnAllPropertiesChanged();
+ /// Labels in the current language, values as the settings have them now (whether a move holds the workspace read again once).
+ internal void Refresh()
+ {
+ _moving = null;
+ OnAllPropertiesChanged();
+ RaiseMoveCommands();
+ }
- private bool IsMoving => services?.IsMoving() ?? false;
+ /// A move holds the workspace, as read last (read once when not known since the last refresh).
+ private bool IsMoving => _moving ??= services?.IsMoving() ?? false;
+
+ private async Task ResumeMoveAsync()
+ {
+ if (services?.ResumeMove is not { } resume) return;
+ await resume();
+ Refresh();
+ await MeasureAsync();
+ }
+
+ private void SetMoveState(bool moving, bool unfinished)
+ {
+ (_moving, _unfinished) = (moving, unfinished);
+ Raise(nameof(MoveToolTip), nameof(ChangeToolTip), nameof(CanResumeMove));
+ RaiseMoveCommands();
+ }
+
+ /// Whether a move holds the workspace, and whether one stopped waits to be taken up; neither when the index cannot say (logged).
+ private async Task<(bool Moving, bool Unfinished)> ReadMoveStateAsync(CancellationToken cancellationToken)
+ {
+ if (services is null) return (false, false);
+ try
+ {
+ var moving = await Task.Run(services.IsMoving, cancellationToken);
+ var unfinished = services.HasUnfinishedMove is { } look && await look(cancellationToken);
+ return (moving, unfinished);
+ }
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or InvalidDataException or Data.DatabaseException)
+ {
+ Log.Warning("workspace", "Whether the workspace folder is being moved could not be read", ex);
+ return (false, false);
+ }
+ }
+
+ /// Runs Change… or Move…, then reads again whether a move holds the folder (the one just queued, say).
+ private async Task ThenReadMoveAsync(Func? action)
+ {
+ if (action is null) return;
+ try
+ {
+ await action();
+ }
+ finally
+ {
+ _moving = null;
+ Raise(nameof(MoveToolTip), nameof(ChangeToolTip));
+ RaiseMoveCommands();
+ }
+ }
+
+ private void RaiseMoveCommands()
+ {
+ _change?.RaiseCanExecuteChanged();
+ _move?.RaiseCanExecuteChanged();
+ _resume?.RaiseCanExecuteChanged();
+ }
/// The value the workspace applies: at least one version.
private int Kept => Math.Max(1, settings.WorkspaceKeptVersions);
@@ -398,7 +495,7 @@ public sealed class WorkspaceSettingsRows(AppSettings settings, Action save, Fun
private int CleanAfter => Math.Max(0, settings.WorkspaceCleanAfterDays);
/// Open in workspace copies the originals; any other value stored reads as the proxies, as the open dialog takes it.
- private bool IsOriginalsDefault => string.Equals(settings.WorkspaceDefaultMedia, BundleMedia.Originals, StringComparison.OrdinalIgnoreCase);
+ private bool IsOriginalsDefault => settings.EffectiveDefaultMedia == BundleMedia.Originals;
private void SetDefaultMedia(string media)
{
diff --git a/src/Chronos.App/Workspace/ProjectMenuViewModel.cs b/src/Chronos.App/Workspace/ProjectMenuViewModel.cs
index ab34e285..cf835c23 100644
--- a/src/Chronos.App/Workspace/ProjectMenuViewModel.cs
+++ b/src/Chronos.App/Workspace/ProjectMenuViewModel.cs
@@ -45,6 +45,11 @@ public interface IWorkspaceUi
/// The home's sequence changed (a version of Main sent: its settings and hero frame): what shows it reads it again.
Task SequenceChangedAsync(Guid sequenceId);
+
+ /// Shows the Jobs screen (a toast's Jobs action); nothing where there is none.
+ void ShowJobs()
+ {
+ }
}
///
@@ -212,10 +217,14 @@ public sealed class ProjectMenuViewModel : LocalizedViewModel
/// Proxies only… (phase 5c): the originals copied here deleted once the home is checked to hold each one.
public ICommand ProxiesOnlyCommand { get; }
+ /// What Copy originals… does, or why it is disabled (the media busy, or the originals here already).
public string CopyOriginalsToolTip => IsMediaBusy ? Loc.L("Tooltips.Editor.Project.MediaBusy")
+ : HoldsOriginals ? Loc.L("Tooltips.Editor.Project.HasOriginals")
: WorkspaceText.ForHome("Tooltips.Editor.Project.CopyOriginals", IsServerHome);
+ /// What Proxies only… does, or why it is disabled (the media busy, or proxies only here already).
public string ProxiesOnlyToolTip => IsMediaBusy ? Loc.L("Tooltips.Editor.Project.MediaBusy")
+ : !HoldsOriginals ? Loc.L("Tooltips.Editor.Project.ProxiesAlready")
: WorkspaceText.ForHome("Tooltips.Editor.Project.ProxiesOnly", IsServerHome);
/// Reads where the project stands (against its home) and whether the home's frames moved.
@@ -729,7 +738,7 @@ public sealed class ProjectMenuViewModel : LocalizedViewModel
_copyJob = job.Id;
_copyingOriginals = true;
RaiseState();
- _ui.Notify(Loc.L("Editor.Workspace.CopyingOriginals"), _session.Content.Sequence.DisplayTitle, Loc.L("Shell.Nav.Jobs"), Loc.L("Tooltips.Nav.Jobs"));
+ _ui.Notify(Loc.L("Editor.Workspace.CopyingOriginals"), _session.Content.Sequence.DisplayTitle, Loc.L("Shell.Nav.Jobs"), Loc.L("Tooltips.Nav.Jobs"), _ui.ShowJobs);
}
catch (Exception ex) when (ex is not OutOfMemoryException)
{
diff --git a/src/Chronos.App/Workspace/WorkspaceDialogs.cs b/src/Chronos.App/Workspace/WorkspaceDialogs.cs
index 66290463..a596a8da 100644
--- a/src/Chronos.App/Workspace/WorkspaceDialogs.cs
+++ b/src/Chronos.App/Workspace/WorkspaceDialogs.cs
@@ -84,7 +84,7 @@ public sealed class OpenInWorkspaceDialogViewModel : ArchiveDialogViewModel
? [new DialogFact(Loc.L("Editor.OpenWorkspace.Originals"), Formatting.Bytes(originals), Reason: Loc.L("Tooltips.Editor.OpenWorkspace.OriginalsSize"))]
: Array.Empty(),
];
- _isOriginals = defaultMedia == BundleMedia.Originals && CanCopyOriginals;
+ _isOriginals = string.Equals(defaultMedia, BundleMedia.Originals, StringComparison.OrdinalIgnoreCase) && CanCopyOriginals;
Projects = [.. projects.OrderByDescending(p => p.IsMain).Select(p => new ProjectOption(p, unreadable?.GetValueOrDefault(p.Id)))];
_selected = Projects.FirstOrDefault(p => p.IsAvailable);
_isNew = !HasProjects;
diff --git a/src/Chronos.App/Workspace/WorkspaceFolderChange.cs b/src/Chronos.App/Workspace/WorkspaceFolderChange.cs
index 388a9c3c..e1a1ffc2 100644
--- a/src/Chronos.App/Workspace/WorkspaceFolderChange.cs
+++ b/src/Chronos.App/Workspace/WorkspaceFolderChange.cs
@@ -148,6 +148,24 @@ public static class WorkspaceFolderChange
}
}
+ ///
+ /// Settings › Workspace › Resume: the move that stopped before it ended ()
+ /// queued again from its journal; nothing when there is none any more.
+ ///
+ public static async Task ResumeUnfinishedAsync(ShellViewModel shell)
+ {
+ ArgumentNullException.ThrowIfNull(shell);
+ try
+ {
+ if (await shell.Services.Workspace.UnfinishedMoveAsync() is { } journal) await ResumeAsync(shell, journal);
+ }
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or DatabaseException)
+ {
+ Log.Warning("workspace", "An unfinished move of the workspace could not be looked for", ex);
+ shell.Notify(Loc.L("Settings.Workspace.NotMoved"), ErrorText.For(ex), isError: true);
+ }
+ }
+
///
/// The move's plan as a confirmation: where the projects go, how many and how big, the free bytes at the target, whether
/// folders are renamed or files copied and checked, and how many projects hold work not at their home (they move with it).
diff --git a/src/Chronos.App/Workspace/WorkspaceHost.Cleanup.cs b/src/Chronos.App/Workspace/WorkspaceHost.Cleanup.cs
index c1cb9ffb..3bd71f68 100644
--- a/src/Chronos.App/Workspace/WorkspaceHost.Cleanup.cs
+++ b/src/Chronos.App/Workspace/WorkspaceHost.Cleanup.cs
@@ -190,7 +190,7 @@ public sealed partial class WorkspaceHost
{
ArgumentNullException.ThrowIfNull(project);
var unsent = WorkspaceCleaner.UnsentRenders(project);
- var last = (await LastOriginalsOfAsync(project, cancellationToken).ConfigureAwait(false)).Count;
+ var last = await LastOriginalsOfAsync(project, cancellationToken).ConfigureAwait(false);
return (unsent, last);
}
@@ -216,13 +216,17 @@ public sealed partial class WorkspaceHost
}
///
- /// Before a removed copy's media are deleted, under the project's lease: the originals the home no longer holds with the
- /// same SHA-256 moved into (the copy's trash entry), never deleted.
+ /// Before a removed copy's media are deleted, under the project's lease: every file of its folder of originals, named by
+ /// the media index or not (an index that cannot be read names none), hashed now and deleted only when the home's frames,
+ /// read now, hold a photo of that SHA-256; every other one moved into (the copy's trash entry),
+ /// never deleted, and every one when the home cannot be asked ().
///
- private async Task KeepLastOriginalsAsync(WorkspaceProject project, string aside, CancellationToken cancellationToken)
+ /// The originals that could be neither deleted nor moved: they stay in the folder of originals.
+ private async Task ClearOriginalsAsync(WorkspaceProject project, string aside, CancellationToken cancellationToken)
{
ArgumentNullException.ThrowIfNull(project);
ArgumentException.ThrowIfNullOrEmpty(aside);
+ if (!WorkspaceCleaner.HoldsOriginalFiles(project)) return 0;
// The working state went into the entry first: the home is read from there.
BundleHome? home = null;
try
@@ -233,19 +237,39 @@ public sealed partial class WorkspaceHost
{
Log.Info("workspace", $"The home of removed project {project.ProjectId} is not known: every original it holds is kept ({ex.Message})");
}
- var last = await LastOriginalsOfAsync(project, cancellationToken, home, known: true).ConfigureAwait(false);
- if (last.Count == 0) return;
- var moved = WorkspaceCleaner.SetOriginalsAside(project, last, aside);
- Log.Info("workspace", $"{moved} original(s) of project {project.ProjectId} its home no longer holds kept in {aside}");
+ var held = home is null ? null : await HomeFramesAsync(project, home, cancellationToken).ConfigureAwait(false);
+ var (deleted, trashed, _, left) = WorkspaceOriginals.ClearOriginals(project, held?.Frames, aside);
+ Log.Info("workspace", $"Originals of removed project {project.ProjectId}: {deleted} deleted (the home holds them), {trashed} kept in {aside}"
+ + (left > 0 ? $", {left} left where they are (held open)" : string.Empty));
+ return left;
+ }
+
+ /// The frames of as it holds them now; null (logged) when it cannot be asked.
+ private async Task HomeFramesAsync(WorkspaceProject project, BundleHome home, CancellationToken cancellationToken)
+ {
+ try
+ {
+ return HomeOf(home) is { } reached ? await reached.FramesAsync(cancellationToken).ConfigureAwait(false) : null;
+ }
+ catch (Exception ex) when (ex is HomeUnavailableException or ProjectException or DatabaseException or IOException or InvalidDataException)
+ {
+ // Not known: every original counts as the last one, and goes to the trash.
+ Log.Info("workspace", $"The home of project {project.ProjectId} could not be asked for its frames: {ex.Message}");
+ return null;
+ }
}
///
- /// The frames whose original the workspace holds and the home no longer holds as it is (every one while the home cannot
- /// be asked); the home is the working state's, else () .
+ /// What a removal plan counts of the originals that go to the trash rather than away: the files of the folder of
+ /// originals the media index does not name (every one when the index cannot be read), plus the frames whose recorded
+ /// original the home no longer holds as it is (every one while the home cannot be asked). The removal hashes each file
+ /// itself; this count is what the plan says, never what decides.
///
- private async Task> LastOriginalsOfAsync(WorkspaceProject project, CancellationToken cancellationToken, BundleHome? named = null,
- bool known = false)
+ private async Task LastOriginalsOfAsync(WorkspaceProject project, CancellationToken cancellationToken)
{
+ if (!WorkspaceCleaner.HoldsOriginalFiles(project)) return 0;
+ var files = Directory.EnumerateFiles(project.OriginalsDirectory)
+ .Where(f => !f.EndsWith(".part", StringComparison.OrdinalIgnoreCase)).Select(Path.GetFileName).OfType().ToList();
WorkspaceMedia? media;
try
{
@@ -253,22 +277,49 @@ public sealed partial class WorkspaceHost
}
catch (InvalidDataException ex)
{
- Log.Info("workspace", $"The media index of project {project.ProjectId} cannot be read: no original is counted from it ({ex.Message})");
- return [];
+ Log.Info("workspace", $"The media index of project {project.ProjectId} cannot be read: every original counts as one to keep ({ex.Message})");
+ return files.Count;
}
- if (media is null || !media.Frames.Any(f => f.HasOriginal)) return [];
+ var named = media?.Frames.Where(f => f.Original is not null).Select(f => Path.GetFileName(f.Original!)).ToHashSet(StringComparer.OrdinalIgnoreCase) ?? [];
+ var unnamed = files.Count(f => !named.Contains(f));
+ if (media is null || named.Count == 0) return unnamed;
HomeFrames? held = null;
try
{
- var homeOf = known ? named : project.ReadBundle().Workspace!.Home;
- if (homeOf is not null && HomeOf(homeOf) is { } home) held = await home.FramesAsync(cancellationToken).ConfigureAwait(false);
+ held = await HomeFramesAsync(project, project.ReadBundle().Workspace!.Home, cancellationToken).ConfigureAwait(false);
}
- catch (Exception ex) when (ex is HomeUnavailableException or ProjectException or DatabaseException or IOException or InvalidDataException)
+ catch (Exception ex) when (ex is IOException or InvalidDataException or UnauthorizedAccessException)
{
- // Not known: every original counts as the last one, and goes to the trash.
- Log.Info("workspace", $"The home of project {project.ProjectId} could not be asked for its frames: {ex.Message}");
+ Log.Info("workspace", $"The home of project {project.ProjectId} is not known: {ex.Message}");
}
- return WorkspaceCleaner.LastOriginals(media, held);
+ return unnamed + WorkspaceCleaner.LastOriginals(media, held).Count(f => files.Contains(Path.GetFileName(f.Original!), StringComparer.OrdinalIgnoreCase));
+ }
+
+ ///
+ /// Edit › Export › Send again: queues the sending home of every render of the project not sent yet
+ /// (), unless one is queued, running or paused already.
+ ///
+ /// True when a send is queued or waits already; false when nothing waits to be sent.
+ /// The workspace is being moved, or the index or the engine is not open.
+ public Task SendRendersAsync(Guid projectId, CancellationToken cancellationToken = default) => Task.Run(async () =>
+ {
+ EnsureNotMoving();
+ if (_engine() is null || _db() is null) throw new WorkspaceException(Loc.L("Editor.Error.NoEngine"));
+ var project = Existing(projectId);
+ if (WorkspaceCleaner.UnsentRenders(project) == 0) return false;
+ await QueueRenderSendAsync(project, project.ReadBundle().Workspace!, cancellationToken).ConfigureAwait(false);
+ return true;
+ }, cancellationToken);
+
+ /// A send of the project's renders is queued, running or paused (Send again waits for it).
+ public async Task RenderSendPendingAsync(Guid projectId, Guid sequenceId, CancellationToken cancellationToken = default)
+ {
+ if (_db() is not { } db) return false;
+ foreach (var pending in await db.Jobs.ListPendingAsync(JobKind.WorkspaceSend, sequenceId, cancellationToken).ConfigureAwait(false))
+ {
+ if (WorkspaceJobs.SendParameters(pending)?.ProjectId == projectId) return true;
+ }
+ return false;
}
/// Queues the sending of the project's renders not sent yet (), unless one is queued or running.
diff --git a/src/Chronos.App/Workspace/WorkspaceHost.Move.cs b/src/Chronos.App/Workspace/WorkspaceHost.Move.cs
index 1f7cdbf2..a1477008 100644
--- a/src/Chronos.App/Workspace/WorkspaceHost.Move.cs
+++ b/src/Chronos.App/Workspace/WorkspaceHost.Move.cs
@@ -80,10 +80,20 @@ public sealed partial class WorkspaceHost
///
public event Action? MoveEnded;
+ /// A move job followed here waits, runs or is paused (no disk is read).
+ public bool IsMoveQueued
+ {
+ get
+ {
+ lock (_gate) return _moveJob != Guid.Empty;
+ }
+ }
+
///
- /// A move stopped before it ended: the folder in use holds its journal and no move job waits, runs or is paused. Null
- /// when there is none (a move under way is no move to take up). A move job waiting at start is followed from now on,
- /// so the workspace waits for it ().
+ /// A move stopped before it ended: the folder in use holds its journal and no move job waits, runs or is paused; or a
+ /// move switched to the folder in use and left part of the folder it came from (its journal there names what is left
+ /// to clear). Null when there is none (a move under way is no move to take up). A move job waiting at start is followed
+ /// from now on, so the workspace waits for it ().
///
public Task UnfinishedMoveAsync(CancellationToken cancellationToken = default) => Task.Run(async () =>
{
@@ -96,7 +106,20 @@ public sealed partial class WorkspaceHost
return null;
}
}
- return WorkspaceMover.HasJournal(Root) ? WorkspaceMover.ReadJournal(Root) : null;
+ if (WorkspaceMover.HasJournal(Root)) return WorkspaceMover.ReadJournal(Root);
+ // The folder in use is a move's target: the folder it left may hold what could not be cleared after the switch.
+ var root = Path.TrimEndingDirectorySeparator(Path.GetFullPath(Root));
+ foreach (var state in new[] { JobState.Done, JobState.Failed, JobState.Cancelled })
+ {
+ foreach (var job in (await db.Jobs.ListAsync(state, JobKind.WorkspaceMove, 5, cancellationToken: cancellationToken).ConfigureAwait(false)).Items)
+ {
+ if (WorkspaceJobs.MoveParameters(job) is not { From.Length: > 0 } moved || !WorkspaceMover.HasJournal(moved.From)) continue;
+ if (WorkspaceMover.ReadJournal(moved.From) is { Stage: WorkspaceMoveStage.Switched } left
+ && string.Equals(Path.TrimEndingDirectorySeparator(Path.GetFullPath(left.To)), root, StringComparison.OrdinalIgnoreCase))
+ return left;
+ }
+ }
+ return null;
}, cancellationToken);
///
diff --git a/src/Chronos.App/Workspace/WorkspaceHost.cs b/src/Chronos.App/Workspace/WorkspaceHost.cs
index 875904f8..08dcfb17 100644
--- a/src/Chronos.App/Workspace/WorkspaceHost.cs
+++ b/src/Chronos.App/Workspace/WorkspaceHost.cs
@@ -296,7 +296,9 @@ public sealed partial class WorkspaceHost
{
try
{
- if (HomeOf(home) is { } reached) await Sync.FollowNameAsync(change.ProjectId, reached).ConfigureAwait(false);
+ // Nothing is written into a folder being moved: the next status read takes the name.
+ if (IsMoving) Log.Info("workspace", $"The new name of project {change.ProjectId} on {server} waits for the workspace's move");
+ else if (HomeOf(home) is { } reached) await Sync.FollowNameAsync(change.ProjectId, reached).ConfigureAwait(false);
}
catch (Exception ex) when (ex is not OutOfMemoryException)
{
@@ -944,10 +946,11 @@ public sealed partial class WorkspaceHost
if (copy != Guid.Empty && _engine() is { } engine && _db() is { } db && await db.Jobs.GetAsync(copy, cancellationToken).ConfigureAwait(false) is
{ State: JobState.Queued or JobState.Running or JobState.Paused })
await engine.CancelAsync(copy, cancellationToken).ConfigureAwait(false);
- var aside = Path.Combine(Store.Root, TrashFolder, project.ProjectId.ToString("N") + "-" + DateTime.UtcNow.Ticks.ToString(System.Globalization.CultureInfo.InvariantCulture));
+ // Filled under a staging name Empty… never lists, and named once whole.
+ using var trash = WorkspaceTrash.Begin(Store.Root, project.ProjectId, DateTime.UtcNow);
+ var aside = trash.Path;
using (await project.LockAsync(LockWait, cancellationToken).ConfigureAwait(false))
{
- Directory.CreateDirectory(aside);
var moved = new List<(string From, string To)>();
try
{
@@ -987,9 +990,21 @@ public sealed partial class WorkspaceHost
}
throw;
}
- // Originals the home no longer holds go aside with the rest; only what the home can make again is deleted.
- await KeepLastOriginalsAsync(project, aside, cancellationToken).ConfigureAwait(false);
- if (Directory.Exists(project.MediaDirectory)) Directory.Delete(project.MediaDirectory, recursive: true);
+ // Every original is hashed and goes aside unless the home holds the same bytes; only what the home can make again
+ // is deleted. One that can be neither deleted nor moved stays where it is, and the media folder with it.
+ if (await ClearOriginalsAsync(project, aside, cancellationToken).ConfigureAwait(false) == 0)
+ {
+ if (Directory.Exists(project.MediaDirectory)) Directory.Delete(project.MediaDirectory, recursive: true);
+ }
+ else
+ {
+ foreach (var entry in Directory.EnumerateFileSystemEntries(project.MediaDirectory).ToList())
+ {
+ if (string.Equals(Path.GetFileName(entry), WorkspaceProject.OriginalsFolder, StringComparison.OrdinalIgnoreCase)) continue;
+ if (Directory.Exists(entry)) Directory.Delete(entry, recursive: true);
+ else File.Delete(entry);
+ }
+ }
void Move(string from, string to)
{
diff --git a/src/Chronos.Core/Project/ProjectBundle.cs b/src/Chronos.Core/Project/ProjectBundle.cs
index 6f520ec0..86921be2 100644
--- a/src/Chronos.Core/Project/ProjectBundle.cs
+++ b/src/Chronos.Core/Project/ProjectBundle.cs
@@ -67,8 +67,14 @@ public sealed record ProjectBundle(BundleArchive Archive, BundleSequence Sequenc
public const string Extension = ".chronos";
public const string FormatName = "chronos-project";
- /// The newest format this Chronos reads and writes (2: with a workspace section).
- public const int CurrentFormatVersion = 2;
+ ///
+ /// The newest format this Chronos reads and writes (3: a workspace section whose media hold originals, phase 5c). A
+ /// Chronos before phase 5c refuses such a working copy as newer, so it never removes originals it cannot weigh.
+ ///
+ public const int CurrentFormatVersion = 3;
+
+ /// The format of a file with a workspace section whose media are proxies only (2), which phase 5b reads too.
+ public const int WorkspaceFormatVersion = 2;
/// The format of a file without a workspace section.
public const int PlainFormatVersion = 1;
@@ -95,7 +101,9 @@ public sealed record ProjectBundle(BundleArchive Archive, BundleSequence Sequenc
{
w.WriteStartObject();
w.WriteString("format", FormatName);
- w.WriteNumber("formatVersion", Workspace is null ? PlainFormatVersion : CurrentFormatVersion);
+ w.WriteNumber("formatVersion", Workspace is null ? PlainFormatVersion
+ : Workspace.Media.Kind == BundleMedia.Originals ? CurrentFormatVersion
+ : WorkspaceFormatVersion);
w.WriteString("saved", Saved);
w.WriteStartObject("archive");
w.WriteString("id", Archive.Id);
diff --git a/src/Chronos.Data/Workspaces/WorkspaceCleaner.cs b/src/Chronos.Data/Workspaces/WorkspaceCleaner.cs
index ce339f5d..dc36204e 100644
--- a/src/Chronos.Data/Workspaces/WorkspaceCleaner.cs
+++ b/src/Chronos.Data/Workspaces/WorkspaceCleaner.cs
@@ -178,30 +178,6 @@ public sealed class WorkspaceCleaner
&& string.Equals(there.Sha256, sha, StringComparison.OrdinalIgnoreCase);
}
- ///
- /// Moves the originals of the project holds into 's originals
- /// folder (a workspace trash entry, made when needed); the caller holds the project's lease. Returns how many moved.
- ///
- /// An original could not be moved; those moved before it stay in the trash.
- public static int SetOriginalsAside(WorkspaceProject project, IEnumerable frames, string aside)
- {
- ArgumentNullException.ThrowIfNull(project);
- ArgumentNullException.ThrowIfNull(frames);
- ArgumentException.ThrowIfNullOrEmpty(aside);
- var moved = 0;
- foreach (var frame in frames)
- {
- if (frame.Original is not { } relative) continue;
- var source = project.MediaFile(relative);
- if (!File.Exists(source)) continue;
- var folder = Path.Combine(aside, WorkspaceProject.OriginalsFolder);
- Directory.CreateDirectory(folder);
- File.Move(source, Path.Combine(folder, Path.GetFileName(source)));
- moved++;
- }
- return moved;
- }
-
///
/// The local renders of the project its home does not have yet (its ledger's unsent entries); a ledger that cannot be
/// read counts the files of exports/ besides it, at least one: whether they went home is not known.
@@ -284,9 +260,10 @@ public sealed class WorkspaceCleaner
}
if (status.Offline && status.State != WorkspaceState.Gone) return (WorkspaceKeep.Offline, 0, 0);
if (status.State != WorkspaceState.InSync) return (WorkspaceKeep.NotInSync, 0, 0);
- // The home's frames, asked now: an original goes only when the home holds the same one.
+ // The home's frames, asked now: an original goes only when the home holds the same bytes. Every file of the folder of
+ // originals counts, named by the media index or not (one a removal could not move aside stays unnamed there).
HomeFrames? held = null;
- if (candidate.Media!.Frames.Any(f => f.HasOriginal))
+ if (HoldsOriginalFiles(project))
{
try
{
@@ -331,23 +308,15 @@ public sealed class WorkspaceCleaner
}
///
- /// Removes the project's media and its sent renders, under its lease: the originals the home lost into the trash first,
- /// then the media index rewritten with no file (so nothing ever names a file that is gone), then the sent renders, then
- /// the folders of proxies and originals. A file that cannot be deleted (held open) stays, and is logged.
+ /// Removes the project's media and its sent renders, under its lease: the media index rewritten with no file first (so
+ /// nothing ever names a file that is gone), then the sent renders (only files inside exports/), then the
+ /// originals, each hashed now and deleted only when the home holds the same bytes, else moved to the trash
+ /// (), and last the proxies. A file that cannot be deleted or moved (held
+ /// open) stays, and is logged.
///
private static (long Freed, int Trashed) Clear(WorkspaceProject project, WorkspaceMedia media, WorkspaceRenders renders, HomeFrames? held, DateTimeOffset now)
{
var before = Cleanable(project, renders);
- var lost = LastOriginals(media, held);
- var trashed = 0;
- var trashedBytes = 0L;
- if (lost.Count > 0)
- {
- trashedBytes = lost.Where(f => File.Exists(project.MediaFile(f.Original!))).Sum(f => new FileInfo(project.MediaFile(f.Original!)).Length);
- var aside = WorkspaceTrash.NewEntry(project.Store.Root, project.ProjectId, now.UtcDateTime);
- trashed = SetOriginalsAside(project, lost, aside);
- Log.Info("workspace", $"{trashed} original(s) of project {project.ProjectId} its home no longer holds kept in {aside}");
- }
project.WriteMedia(media with
{
Frames = [.. media.Frames.Select(f => f with { File = null, FileSha256 = null, FileBytes = 0, FileKind = null, Original = null, OriginalSha256 = null, OriginalBytes = 0 })],
@@ -356,7 +325,11 @@ public sealed class WorkspaceCleaner
var ledger = renders;
foreach (var entry in renders.Entries.Where(e => e.IsSent))
{
- var path = project.ExportFile(entry.File);
+ if (project.ContainedExportFile(entry.File) is not { } path)
+ {
+ Log.Warning("workspace", $"The ledger of project {project.ProjectId} names '{entry.File}' for render {entry.RenderId}, not a file of its exports: nothing is removed for it");
+ continue;
+ }
try
{
if (Directory.Exists(path)) Directory.Delete(path, recursive: true);
@@ -369,28 +342,50 @@ public sealed class WorkspaceCleaner
}
}
if (!ReferenceEquals(ledger, renders)) project.WriteRenders(ledger);
- foreach (var folder in new[] { project.ProxiesDirectory, project.OriginalsDirectory })
+ var (trashed, trashedBytes) = (0, 0L);
+ if (Directory.Exists(project.OriginalsDirectory))
{
- try
- {
- if (Directory.Exists(folder)) Directory.Delete(folder, recursive: true);
- }
- catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
- {
- Log.Warning("workspace", $"{folder} could not be removed whole; what is left stays", ex);
- }
+ using var trash = WorkspaceTrash.Begin(project.Store.Root, project.ProjectId, now.UtcDateTime);
+ var cleared = WorkspaceOriginals.ClearOriginals(project, held?.Frames, trash.Path);
+ (trashed, trashedBytes) = (cleared.Trashed, cleared.TrashedBytes);
+ if (trash.Finish() is { } aside) Log.Info("workspace", $"{trashed} original(s) of project {project.ProjectId} its home does not hold as they are kept in {aside}");
+ if (cleared.Left > 0) Log.Warning("workspace", $"{cleared.Left} original(s) of project {project.ProjectId} could be neither deleted nor set aside; they stay");
+ }
+ try
+ {
+ if (Directory.Exists(project.ProxiesDirectory)) Directory.Delete(project.ProxiesDirectory, recursive: true);
+ }
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+ {
+ Log.Warning("workspace", $"{project.ProxiesDirectory} could not be removed whole; what is left stays", ex);
}
var after = Cleanable(project, ledger);
return (Math.Max(0, before - after - trashedBytes), trashed);
}
+ /// The project's folder of originals holds a file (an original, named by the media index or not, or a part of one).
+ public static bool HoldsOriginalFiles(WorkspaceProject project)
+ {
+ ArgumentNullException.ThrowIfNull(project);
+ try
+ {
+ return Directory.Exists(project.OriginalsDirectory) && Directory.EnumerateFiles(project.OriginalsDirectory, "*", SearchOption.AllDirectories).Any();
+ }
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+ {
+ // Not known: counted as holding some, so the home is asked.
+ return true;
+ }
+ }
+
/// What a clean-up may remove of the project: its proxies, its originals and the renders its home took.
private static long Cleanable(WorkspaceProject project, WorkspaceRenders renders) =>
Measure(project.ProxiesDirectory).Bytes + Measure(project.OriginalsDirectory).Bytes + SentBytes(project, renders);
/// The bytes of the renders of the home took that are still in exports/ (an image sequence's folder counts its files).
private static long SentBytes(WorkspaceProject project, WorkspaceRenders renders) =>
- renders.Entries.Where(e => e.IsSent).Select(e => project.ExportFile(e.File)).Sum(path => File.Exists(path) ? new FileInfo(path).Length : Measure(path).Bytes);
+ renders.Entries.Where(e => e.IsSent).Select(e => project.ContainedExportFile(e.File)).OfType()
+ .Sum(path => File.Exists(path) ? new FileInfo(path).Length : Measure(path).Bytes);
/// The project's ledger; null (logged) when it cannot be read.
private static WorkspaceRenders? ReadLedger(WorkspaceProject project)
diff --git a/src/Chronos.Data/Workspaces/WorkspaceCopyJobHandler.cs b/src/Chronos.Data/Workspaces/WorkspaceCopyJobHandler.cs
index efa1b139..81a40fea 100644
--- a/src/Chronos.Data/Workspaces/WorkspaceCopyJobHandler.cs
+++ b/src/Chronos.Data/Workspaces/WorkspaceCopyJobHandler.cs
@@ -53,10 +53,19 @@ namespace Chronos.Data.Workspaces;
/// arrives and checked against the file written, four at a time; then the server's deep report. A file the editor's media
/// or this run hold of the same photo is hashed again and kept; the editor's file is never written over, as above. The
/// space, the passes, the checkpoint and a cancelled first copy go as for a copy from this PC's archive (the server's
-/// folder of the sequence in the checkpoint). Like the sync's downloads it is not held on a metered connection.
+/// folder of the sequence in the checkpoint). On a metered connection it waits before it downloads anything while
+/// says so (the desktop pauses it meanwhile).
+/// A copy queued before the workspace moved works where the workspace is now, and none runs while the workspace is being
+/// moved (). A copy of originals the user cancelled over media a copy finished before
+/// removes the originals it wrote that the media do not name, each deleted only when the home holds its bytes
+/// ().
///
-internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService archives, ISyncConnector? servers = null) : ICancelledJobHandler
+internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService archives, ISyncConnector? servers = null, WorkspaceJobOptions? options = null)
+ : ICancelledJobHandler
{
+ /// How often a copy held on a metered connection looks again.
+ internal static TimeSpan HoldPoll { get; set; } = TimeSpan.FromSeconds(2);
+
private const int PageSize = 1000;
private const int Passes = 3;
@@ -101,7 +110,13 @@ internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService
// R8), and a workspace inside one would put its copies among that library's own files.
if (await InsideALibraryAsync(parameters.WorkspaceRoot, ct).ConfigureAwait(false))
throw new InvalidOperationException(Loc.L("Errors.Workspace.InsideLibrary"));
- var store = new WorkspaceStore(parameters.WorkspaceRoot);
+ // Where the project is now (a workspace moved since the job was queued), never while it is being moved; nothing is
+ // made where it is not.
+ var root = WorkspaceJobRoots.Resolve(parameters.WorkspaceRoot, parameters.ProjectId, options?.CurrentRoot, "Errors.Workspace.NotCheckedOut");
+ if (!PathsEqual(root, parameters.WorkspaceRoot) && await InsideALibraryAsync(root, ct).ConfigureAwait(false))
+ throw new InvalidOperationException(Loc.L("Errors.Workspace.InsideLibrary"));
+ parameters = parameters with { WorkspaceRoot = root };
+ var store = new WorkspaceStore(root);
var project = store.Find(parameters.ProjectId) ?? throw new InvalidOperationException(Loc.L("Errors.Workspace.NotCheckedOut"));
if (project.ReadBundle().Workspace is not { Home: { IsArchive: true } home } || home.SequenceId != sequenceId)
throw new InvalidOperationException(Loc.L("Errors.Workspace.OtherHome"));
@@ -114,6 +129,7 @@ internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService
{
// Stopped writing: what a first copy the user cancelled wrote goes (a pause or a shutdown resumes it).
await RemovePartialMediaAsync(context.Job, project).ConfigureAwait(false);
+ await RemoveCancelledOriginalsAsync(context.Job, project, parameters).ConfigureAwait(false);
throw;
}
}
@@ -135,13 +151,27 @@ internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService
{
return Task.CompletedTask;
}
- // Opening a store makes its folder: one gone stays gone.
- if (!Directory.Exists(Path.Combine(parameters.WorkspaceRoot, parameters.ProjectId.ToString("N")))) return Task.CompletedTask;
+ string root;
+ try
+ {
+ // Where the project is now; opening a store makes its folder, so one gone stays gone. A workspace being moved is
+ // left as it is: the next copy checks every file it finds.
+ root = WorkspaceJobRoots.Resolve(parameters.WorkspaceRoot, parameters.ProjectId, options?.CurrentRoot, "Errors.Workspace.NotCheckedOut");
+ }
+ catch (InvalidOperationException ex)
+ {
+ Log.Info("workspace", $"The media of cancelled copy {job.Id} are left as they are: {ex.Message}");
+ return Task.CompletedTask;
+ }
_ = Task.Run(async () =>
{
try
{
- if (new WorkspaceStore(parameters.WorkspaceRoot).Find(parameters.ProjectId) is { } project) await RemovePartialMediaAsync(job, project).ConfigureAwait(false);
+ if (new WorkspaceStore(root).Find(parameters.ProjectId) is { } project)
+ {
+ await RemovePartialMediaAsync(job, project).ConfigureAwait(false);
+ await RemoveCancelledOriginalsAsync(job, project, parameters).ConfigureAwait(false);
+ }
}
catch (Exception ex) when (ex is not OutOfMemoryException)
{
@@ -193,6 +223,83 @@ internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService
static bool Clearable(WorkspaceProject project) => project.Exists && !File.Exists(project.MediaIndexPath) && Directory.Exists(project.MediaDirectory);
}
+ /// Waits while transfers with a server are held (a metered connection), saying so once.
+ private async Task WhileHeldAsync(JobContext context)
+ {
+ if (options?.HoldTransfers is not { } held || !held()) return;
+ context.Log(Loc.L("Archive.Log.WorkspaceCopyHeld"));
+ while (held()) await Task.Delay(HoldPoll, context.Cancellation).ConfigureAwait(false);
+ }
+
+ ///
+ /// A copy of originals the user cancelled over media a copy finished before (media.json there, so
+ /// keeps them): the originals it wrote that those media do not name go, under the
+ /// project's lease, unless another copy of the project goes on with them; each is hashed and deleted only when the home's
+ /// frames, read now, hold its bytes, else kept in the workspace's trash. What a download left half done goes. A home that
+ /// cannot be asked leaves the whole files where they are (the next copy reuses them, a clean-up hashes them).
+ ///
+ private async Task RemoveCancelledOriginalsAsync(Job job, WorkspaceProject project, WorkspaceCopyParameters parameters)
+ {
+ if (parameters.Media != BundleMedia.Originals) return;
+ try
+ {
+ if (!project.Exists || !File.Exists(project.MediaIndexPath) || !Directory.Exists(project.OriginalsDirectory)) return;
+ if (!await StillToClearAsync(job, project).ConfigureAwait(false)) return;
+ var home = await HomeFramesOrNullAsync(job, parameters).ConfigureAwait(false);
+ using (await project.LockExistingAsync(LockWait, CancellationToken.None).ConfigureAwait(false))
+ {
+ if (!await StillToClearAsync(job, project).ConfigureAwait(false)) return;
+ lock (WritersGate)
+ {
+ // A copy of this program that started since the jobs were read: its files stay.
+ if (Writers.ContainsKey(project.Folder)) return;
+ }
+ if (TryReadMedia(project) is not { } media || !Directory.Exists(project.OriginalsDirectory)) return;
+ var named = media.Frames.Where(f => f.Original is not null).Select(f => Path.GetFileName(f.Original!)).ToHashSet(StringComparer.OrdinalIgnoreCase);
+ var staging = Path.Combine(project.OriginalsDirectory, OriginalsStaging);
+ if (Directory.Exists(staging)) Directory.Delete(staging, recursive: true);
+ var written = Directory.EnumerateFiles(project.OriginalsDirectory).Where(f => !named.Contains(Path.GetFileName(f))).ToList();
+ foreach (var part in written.Where(IsPart)) TryDelete(part);
+ var whole = written.Where(f => !IsPart(f)).ToList();
+ if (home is null)
+ {
+ if (whole.Count > 0) Log.Info("workspace", $"The home of project {project.ProjectId} could not be asked: the {whole.Count} original(s) cancelled copy {job.Id} wrote stay");
+ return;
+ }
+ var trashed = WorkspaceOriginals.DeleteOrTrash(project, whole, home);
+ if (!Directory.EnumerateFileSystemEntries(project.OriginalsDirectory).Any()) Directory.Delete(project.OriginalsDirectory);
+ if (whole.Count > 0) Log.Info("workspace", $"The {whole.Count} original(s) cancelled copy {job.Id} of project {project.ProjectId} wrote were removed ({trashed} kept in the trash)");
+ }
+ }
+ catch (DirectoryNotFoundException)
+ {
+ // The project's folder went meanwhile (its removal): nothing is left to clear.
+ }
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or DatabaseException or LeaseUnavailableException)
+ {
+ Log.Warning("workspace", $"The originals of a cancelled copy of project {project.ProjectId} could not be removed", ex);
+ }
+ }
+
+ /// The frames of the copy's home as they are now (this PC's index, or the server's); null when they cannot be read.
+ private async Task?> HomeFramesOrNullAsync(Job job, WorkspaceCopyParameters parameters)
+ {
+ if (job.TargetIds is not [var sequenceId]) return null;
+ try
+ {
+ if (parameters.Server is not { Length: > 0 } server) return (await FramesAsync(sequenceId, CancellationToken.None).ConfigureAwait(false)).Frames;
+ if (servers is null) return null;
+ using var remote = await servers.ConnectAsync(server, CancellationToken.None).ConfigureAwait(false);
+ if (remote is null) return null;
+ return (await ServerFramesAsync(remote, sequenceId, CancellationToken.None).ConfigureAwait(false)).Frames;
+ }
+ catch (Exception ex) when (ex is not OutOfMemoryException)
+ {
+ Log.Info("workspace", $"The home of cancelled copy {job.Id} could not be asked for its frames: {ex.Message}");
+ return null;
+ }
+ }
+
/// The cancelled copy still reads so, and no other copy of the project into this workspace waits, runs or is paused.
private async Task StillToClearAsync(Job job, WorkspaceProject project)
{
@@ -378,13 +485,19 @@ internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService
if (context.Job.TargetIds is not [var sequenceId]) throw new InvalidDataException(Loc.L("Errors.Workspace.Parameters"));
// Asked before the store is opened, which makes its folder (as for a copy from this PC's archive).
if (await InsideALibraryAsync(parameters.WorkspaceRoot, ct).ConfigureAwait(false)) throw new InvalidOperationException(Loc.L("Errors.Workspace.InsideLibrary"));
- var store = new WorkspaceStore(parameters.WorkspaceRoot);
+ var root = WorkspaceJobRoots.Resolve(parameters.WorkspaceRoot, parameters.ProjectId, options?.CurrentRoot, "Errors.Workspace.NotCheckedOut");
+ if (!PathsEqual(root, parameters.WorkspaceRoot) && await InsideALibraryAsync(root, ct).ConfigureAwait(false))
+ throw new InvalidOperationException(Loc.L("Errors.Workspace.InsideLibrary"));
+ parameters = parameters with { WorkspaceRoot = root };
+ var store = new WorkspaceStore(root);
var project = store.Find(parameters.ProjectId) ?? throw new InvalidOperationException(Loc.L("Errors.Workspace.NotCheckedOut"));
if (project.ReadBundle().Workspace is not { Home: { Kind: BundleHome.ServerKind } home } || home.SequenceId != sequenceId
|| !string.Equals(home.Server, server, StringComparison.OrdinalIgnoreCase))
throw new InvalidOperationException(Loc.L("Errors.Workspace.OtherHome"));
try
{
+ // Nothing is downloaded while transfers with a server are held (a metered connection).
+ await WhileHeldAsync(context).ConfigureAwait(false);
using (WritingMedia(project))
{
using var remote = (servers is null ? null : await servers.ConnectAsync(server, ct).ConfigureAwait(false))
@@ -396,6 +509,7 @@ internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService
{
// Stopped writing: what a first copy the user cancelled wrote goes (a pause or a shutdown resumes it).
await RemovePartialMediaAsync(context.Job, project).ConfigureAwait(false);
+ await RemoveCancelledOriginalsAsync(context.Job, project, parameters).ConfigureAwait(false);
throw;
}
}
@@ -844,6 +958,9 @@ internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService
}
/// Whether is an archive's root of this index or lies inside one.
+ private static bool PathsEqual(string a, string b) =>
+ string.Equals(Path.TrimEndingDirectorySeparator(Path.GetFullPath(a)), Path.TrimEndingDirectorySeparator(Path.GetFullPath(b)), OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal);
+
private async Task InsideALibraryAsync(string folder, CancellationToken cancellationToken)
{
var path = Plain(Path.GetFullPath(folder));
diff --git a/src/Chronos.Data/Workspaces/WorkspaceJobs.cs b/src/Chronos.Data/Workspaces/WorkspaceJobs.cs
index b3435793..9f19fb31 100644
--- a/src/Chronos.Data/Workspaces/WorkspaceJobs.cs
+++ b/src/Chronos.Data/Workspaces/WorkspaceJobs.cs
@@ -1,4 +1,6 @@
using System.Text.Json;
+using Chronos.Core.Diagnostics;
+using Chronos.Core.Localization;
using Chronos.Core.Model;
using Chronos.Core.Project;
using Chronos.Data.Archiving;
@@ -18,14 +20,19 @@ namespace Chronos.Data.Workspaces;
///
///
/// True while transfers with a server are held (Settings › Server › Pause metered transfers on a metered connection): a
-/// or naming a server is not started then. Never
-/// holds a copy from or a send to this PC's archive.
+/// or naming a server waits before it downloads or
+/// uploads anything then. Never holds a copy from or a send to this PC's archive.
///
///
/// Told once a verified every file at its target (from, to): the desktop names the new
/// folder in Settings › Workspace and refreshes the workspace; null where nothing follows the folder.
///
-public sealed record WorkspaceJobOptions(ProcessingOptions Processing, Func HoldTransfers, Func? Moved = null)
+///
+/// The workspace folder in use now (the desktop's Settings › Workspace): a copy, render or send queued before the workspace
+/// moved finds its project there when the folder its parameters name no longer holds it; null where only that one counts.
+///
+public sealed record WorkspaceJobOptions(ProcessingOptions Processing, Func HoldTransfers, Func? Moved = null,
+ Func? CurrentRoot = null)
{
/// The options of an engine without a processing service of its own: the archive engine's decoders, nothing held, no move followed.
public static WorkspaceJobOptions For(ArchiveService archives)
@@ -146,7 +153,7 @@ public static class WorkspaceJobs
ArgumentNullException.ThrowIfNull(options);
return
[
- new WorkspaceCopyJobHandler(db, archives, servers),
+ new WorkspaceCopyJobHandler(db, archives, servers, options),
new WorkspaceRenderJobHandler(db, archives, options),
new WorkspaceSendJobHandler(db, archives, servers, options),
new WorkspaceMoveJobHandler(db, options),
@@ -181,3 +188,55 @@ public static class WorkspaceJobs
}
}
}
+
+///
+/// Where a copy, render or send of a workspace project works (phase 5c): the folder its parameters name, or the one the
+/// workspace moved to since. Nothing of the workspace is written while it is being moved, and nothing is made where the
+/// project is not (opening a store makes its folder).
+///
+internal static class WorkspaceJobRoots
+{
+ ///
+ /// The workspace folder that holds for a job queued with : that folder
+ /// when it holds the project; else the target of a move of it past its switch, or the folder in use now
+ /// (), when either holds it. Refused while a move of either folder has not switched yet
+ /// (Errors.Workspace.Moving: the job fails and can be retried once the move ends); (a
+ /// resource key) when no folder holds the project.
+ ///
+ /// The workspace is being moved, or no folder holds the project.
+ public static string Resolve(string named, Guid projectId, Func? current, string missing)
+ {
+ ArgumentException.ThrowIfNullOrWhiteSpace(named);
+ var candidates = new List();
+ string? currentRoot = null;
+ try
+ {
+ currentRoot = current?.Invoke() is { Length: > 0 } root ? WorkspaceStore.FullRoot(root) : null;
+ }
+ catch (Exception ex) when (ex is ArgumentException or IOException or NotSupportedException)
+ {
+ Log.Debug("workspace", $"The workspace folder in use cannot be read: {ex.Message}");
+ }
+ foreach (var root in new[] { WorkspaceStore.FullRoot(named), currentRoot })
+ {
+ if (root is null) continue;
+ if (WorkspaceMover.HasJournal(root))
+ {
+ // Past its switch the move's target is the workspace, and what is left here is a source still to clear.
+ if (WorkspaceMover.ReadJournal(root) is not { Stage: WorkspaceMoveStage.Switched } journal) throw new InvalidOperationException(Loc.L("Errors.Workspace.Moving"));
+ candidates.Add(WorkspaceStore.FullRoot(journal.To));
+ continue;
+ }
+ candidates.Add(root);
+ }
+ foreach (var root in candidates.Distinct(StringComparer.OrdinalIgnoreCase))
+ {
+ if (!File.Exists(Path.Combine(root, projectId.ToString("N"), WorkspaceProject.BundleFile))) continue;
+ if (WorkspaceMover.HasJournal(root)) throw new InvalidOperationException(Loc.L("Errors.Workspace.Moving"));
+ if (!string.Equals(root, WorkspaceStore.FullRoot(named), StringComparison.OrdinalIgnoreCase))
+ Log.Info("workspace", $"Project {projectId} is no longer in {named}: the job works in {root}, where the workspace is now");
+ return root;
+ }
+ throw new InvalidOperationException(Loc.L(missing));
+ }
+}
diff --git a/src/Chronos.Data/Workspaces/WorkspaceMedia.cs b/src/Chronos.Data/Workspaces/WorkspaceMedia.cs
index 850b4ded..53366fe2 100644
--- a/src/Chronos.Data/Workspaces/WorkspaceMedia.cs
+++ b/src/Chronos.Data/Workspaces/WorkspaceMedia.cs
@@ -128,7 +128,9 @@ public sealed record WorkspaceFrame(
/// (, or from phase 5c : the proxies plus each frame's
/// original, ), the sequence and its frames version at the home when they were
/// copied, and every frame in index order. Written last by a copy, so a copy cut short leaves the previous index. An index
-/// of phase 5b has no original fields: it reads as proxies only.
+/// of phase 5b has no original fields: it reads as proxies only. One that holds originals or was cleaned is written as
+/// format 2 (), which a Chronos before phase 5c refuses as newer and reads as media
+/// removed (copied again) rather than as proxies whose files are all missing; proxies alone stay format 1, which it reads.
///
/// The encodings of the sequence's photos a conversion joined at the home (R7, its tombstones of reason
/// "replaced") when the media were copied: a version parked on a photo before its file was converted still finds its frame.
@@ -141,7 +143,16 @@ public sealed record WorkspaceMedia(string Format, int FormatVersion, string Kin
DateTimeOffset Copied, string? AnalysisSha256 = null, IReadOnlyList? Aliases = null, DateTimeOffset? Cleaned = null)
{
public const string FormatName = "chronos-workspace-media";
- public const int CurrentFormatVersion = 1;
+
+ /// The newest format this Chronos reads (2: media with originals, or cleaned).
+ public const int CurrentFormatVersion = 2;
+
+ /// The format of media of proxies only that a copy wrote, which a Chronos before phase 5c reads too.
+ public const int ProxiesFormatVersion = 1;
+
+ /// The format these media are written in: 2 when they hold originals (or name one) or were cleaned, else 1.
+ [JsonIgnore]
+ public int WrittenFormatVersion => HoldsOriginals || IsCleaned || Frames.Any(f => f.HasOriginal) ? CurrentFormatVersion : ProxiesFormatVersion;
/// The frames' photos in index order, as project positions name them, with the encodings conversions joined.
[JsonIgnore]
diff --git a/src/Chronos.Data/Workspaces/WorkspaceMover.cs b/src/Chronos.Data/Workspaces/WorkspaceMover.cs
index 578130f0..53317149 100644
--- a/src/Chronos.Data/Workspaces/WorkspaceMover.cs
+++ b/src/Chronos.Data/Workspaces/WorkspaceMover.cs
@@ -88,7 +88,11 @@ internal sealed partial class WorkspaceMoveJson : JsonSerializerContext;
/// written in the source before the first step and at every entry: a move stopped (paused, the program closed, the PC
/// down) goes on from it, trusting the files at their final names and the entries it records as verified; a move that
/// fails before the switch is undone (): renamed entries go back, copies at the target are removed,
-/// the journal goes.
+/// the journal goes. After the switch a source entry goes only when each of its files still matches its copy at the target
+/// (name, size and time, as verified); one that changed since is kept and logged, and one that cannot be removed (a file held
+/// open) stays with the journal, so the move taken up later clears it: neither fails a move whose target is the workspace.
+/// A rename refused because the folders lie on two volumes after all (a volume mounted in a folder) turns the move into a
+/// copy before anything was renamed.
///
public sealed class WorkspaceMover
{
@@ -127,7 +131,7 @@ public sealed class WorkspaceMover
///
/// Called at named steps with the path concerned (tests: a crash, a file damaged on its way): verify (a copy's
/// .part, written and about to be read back), copied (a file at its final name), moved (an entry
- /// renamed into the target), switched (the desktop told).
+ /// renamed into the target), rename (an entry about to be renamed into the target), switched (the desktop told).
///
internal Action? Cut { get; init; }
@@ -264,9 +268,27 @@ public sealed class WorkspaceMover
{
try
{
- journal = journal.SameVolume
- ? await RenameAsync(journal, progress, log, cancellationToken).ConfigureAwait(false)
- : await CopyAsync(journal, survey, progress, log, cancellationToken).ConfigureAwait(false);
+ if (journal.SameVolume)
+ {
+ try
+ {
+ journal = await RenameAsync(journal, progress, log, cancellationToken).ConfigureAwait(false);
+ }
+ catch (IOException ex) when (IsCrossVolume(ex) && NothingRenamed(journal))
+ {
+ // Two volumes under one drive letter (a volume mounted in a folder): the files are copied and verified.
+ Log.Info("workspace", $"{From} and {To} lie on two volumes after all: the move copies and verifies the files ({ex.Message})");
+ if (FreeBytes(To) is { } room && room < survey.Bytes + Reserve)
+ throw new InvalidOperationException(Loc.L("Errors.Workspace.MoveNoRoom", ((survey.Bytes + Reserve - room) / 1e9).ToString("0.0", Loc.Culture)), ex);
+ journal = journal with { SameVolume = false };
+ WriteJournal(journal);
+ journal = await CopyAsync(journal, survey, progress, log, cancellationToken).ConfigureAwait(false);
+ }
+ }
+ else
+ {
+ journal = await CopyAsync(journal, survey, progress, log, cancellationToken).ConfigureAwait(false);
+ }
}
catch (Exception ex) when (ex is not OperationCanceledException || !cancellationToken.IsCancellationRequested)
{
@@ -280,12 +302,19 @@ public sealed class WorkspaceMover
// From here on the target is the workspace: told again when a run taken up after the switch did not see its answer.
if (switched is not null) await switched(From, To).ConfigureAwait(false);
Cut?.Invoke("switched", To);
- Clean(journal);
+ var left = Clean(journal);
log?.Invoke(Loc.L("Archive.Log.WorkspaceMoved", To, journal.Entries.Count(e => Guid.TryParseExact(e, "N", out _)), survey.Files));
- Log.Info("workspace", $"The workspace moved from {From} to {To}");
+ if (left > 0) log?.Invoke(Loc.L("Archive.Log.WorkspaceMoveLeft", From, left));
+ Log.Info("workspace", $"The workspace moved from {From} to {To}" + (left > 0 ? $"; {left} entr(ies) of the old folder stay there" : string.Empty));
return (survey, resumed);
}
+ /// A move or rename refused because source and target lie on two volumes (Windows ERROR_NOT_SAME_DEVICE, Unix EXDEV).
+ private static bool IsCrossVolume(IOException ex) => (ex.HResult & 0xFFFF) == (OperatingSystem.IsWindows() ? 0x11 : 18);
+
+ /// No entry of the journal was renamed into the target yet.
+ private bool NothingRenamed(WorkspaceMoveJournal journal) => journal.Entries.All(e => !Exists(Path.Combine(To, e)));
+
///
/// Undoes a move its journal records as not switched yet, so the source stays the workspace: on one volume the entries
/// renamed into the target go back; across volumes the copies it made at the target are removed (what cannot be removed
@@ -351,6 +380,7 @@ public sealed class WorkspaceMover
if (Exists(source))
{
if (Exists(target)) throw new IOException(Loc.L("Errors.Workspace.MoveTargetNotEmpty", To));
+ Cut?.Invoke("rename", source);
Rename(source, target);
Cut?.Invoke("moved", target);
if (Guid.TryParseExact(entry, "N", out _)) log?.Invoke(Loc.L("Archive.Log.WorkspaceMoveProject", Name(target)));
@@ -460,17 +490,29 @@ public sealed class WorkspaceMover
}
///
- /// After the switch: across volumes every entry of the source goes (each one verified at the target), folders first, the
- /// manifest last; then the journal, and the source folder when nothing else is left in it.
+ /// After the switch: across volumes every entry of the source goes, folders first, the manifest last, each only while
+ /// every file of it still matches its copy at the target (): one that changed since it was
+ /// verified is kept, and logged, never deleted. Then the journal, and the source folder when nothing else is left in it.
+ /// An entry that cannot be removed (a file held open past a few attempts) stays, and the journal with it naming only
+ /// such entries, so the move taken up clears them.
///
- /// An entry of the source could not be removed; the journal stays, and the move taken up removes it.
- private void Clean(WorkspaceMoveJournal journal)
+ /// The entries of the source left where they are.
+ private int Clean(WorkspaceMoveJournal journal)
{
+ var stuck = new List();
+ var kept = 0;
if (!journal.SameVolume)
{
foreach (var entry in journal.Entries.OrderBy(e => e == WorkspaceStore.ManifestFile ? 1 : 0))
{
var source = Path.Combine(From, entry);
+ if (!Exists(source)) continue;
+ if (!StillAsCopied(source, Path.Combine(To, entry)))
+ {
+ kept++;
+ Log.Warning("workspace", $"{source} changed after it was copied to {To}: it is kept where it is, never deleted");
+ continue;
+ }
for (var attempt = 1; ; attempt++)
{
try
@@ -479,16 +521,53 @@ public sealed class WorkspaceMover
else if (File.Exists(source)) File.Delete(source);
break;
}
- catch (Exception ex) when (ex is IOException or UnauthorizedAccessException && attempt < DeleteAttempts)
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
{
+ if (attempt >= DeleteAttempts)
+ {
+ Log.Warning("workspace", $"{source} could not be removed after the move: it stays, and the move taken up removes it", ex);
+ stuck.Add(entry);
+ break;
+ }
// An indexer or an antivirus reading a file a moment: tried again shortly.
Thread.Sleep(100 * attempt);
}
}
}
}
+ if (stuck.Count > 0)
+ {
+ WriteJournal(journal with { Entries = stuck, Verified = [.. journal.Verified.Where(stuck.Contains)] });
+ return stuck.Count + kept;
+ }
File.Delete(JournalPath);
TryDeleteEmpty(From);
+ return kept;
+ }
+
+ /// Clock steps a target's file system may round a file's time to (FAT keeps two seconds).
+ private static readonly TimeSpan TimeSlack = TimeSpan.FromSeconds(2);
+
+ ///
+ /// Every file of the source entry (a file, or a folder's files, leases left out) is at the target with the same relative
+ /// name and size and the time the copy gave it (the source's, within the target's rounding): nothing came or changed in
+ /// the source since it was verified.
+ ///
+ private static bool StillAsCopied(string source, string target)
+ {
+ try
+ {
+ if (File.Exists(source)) return Matches(new FileInfo(source), new FileInfo(target));
+ return Listed(source).All(relative => Matches(new FileInfo(Path.Combine(source, relative)), new FileInfo(Path.Combine(target, relative))));
+ }
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+ {
+ Log.Debug("workspace", $"{source} could not be compared with {target}: {ex.Message}");
+ return false;
+ }
+
+ static bool Matches(FileInfo from, FileInfo to) =>
+ to.Exists && from.Length == to.Length && (from.LastWriteTimeUtc - to.LastWriteTimeUtc).Duration() <= TimeSlack;
}
/// A folder's files relative to it, in ordinal order, the leases left out (they belong to whoever holds the project there).
diff --git a/src/Chronos.Data/Workspaces/WorkspaceOriginals.cs b/src/Chronos.Data/Workspaces/WorkspaceOriginals.cs
index 61c557a1..ea0826a6 100644
--- a/src/Chronos.Data/Workspaces/WorkspaceOriginals.cs
+++ b/src/Chronos.Data/Workspaces/WorkspaceOriginals.cs
@@ -101,7 +101,7 @@ public static class WorkspaceOriginals
if (bundle.Workspace is { } workspace && workspace.Media.Kind != BundleMedia.Proxies)
project.WriteBundle(bundle with { Workspace = workspace with { Media = workspace.Media with { Kind = BundleMedia.Proxies } } });
var trashed = DeleteOrTrash(project, files, home.Frames);
- var staging = Path.Combine(project.OriginalsDirectory, ".staging");
+ var staging = Path.Combine(project.OriginalsDirectory, StagingFolder);
if (Directory.Exists(staging)) TryDeleteFolder(staging);
if (Directory.Exists(project.OriginalsDirectory) && !Directory.EnumerateFileSystemEntries(project.OriginalsDirectory).Any()) TryDeleteFolder(project.OriginalsDirectory);
Log.Info("workspace", $"Originals of project {project.ProjectId} removed: {plan.Originals} deleted, {trashed} kept in {TrashFolder}");
@@ -111,37 +111,114 @@ public static class WorkspaceOriginals
///
/// Deletes each of (originals of ) whose SHA-256, read now, is that of a
- /// photo holds, not flagged missing or damaged; moves the others to the workspace's trash.
+ /// photo holds, not flagged missing or damaged; moves the others to the workspace's trash (one
+ /// entry, filled under its staging name and named once whole). A file that can be neither deleted nor moved (held open)
+ /// stays where it is, and is logged.
///
/// The files moved to the trash.
internal static int DeleteOrTrash(WorkspaceProject project, IReadOnlyList files, IReadOnlyList home)
{
if (files.Count == 0) return 0;
+ using var trash = WorkspaceTrash.Begin(project.Store.Root, project.ProjectId, DateTime.UtcNow);
+ return DeleteOrTrash(project, files, home, Path.Combine(trash.Path, WorkspaceProject.OriginalsFolder)).Trashed;
+ }
+
+ ///
+ /// Clears the project's folder of originals for good: every file in it, whether the media index names it or not, hashed
+ /// now and deleted only when (the home's frames as just read; null when they are not known) holds
+ /// a photo of that SHA-256 not flagged missing or damaged, else moved into 's
+ /// originals folder (made when needed). The parts a copy left (.part, .staging: downloads not
+ /// finished) are deleted, and the folder goes once nothing is left in it. The caller holds the project's lease.
+ ///
+ ///
+ /// The files deleted, those moved to the trash with their bytes, and those that stay where they are (neither deleted nor
+ /// moved: held open), which the folder keeps.
+ ///
+ public static (int Deleted, int Trashed, long TrashedBytes, int Left) ClearOriginals(WorkspaceProject project, IReadOnlyList? home, string trashEntry)
+ {
+ ArgumentNullException.ThrowIfNull(project);
+ ArgumentException.ThrowIfNullOrEmpty(trashEntry);
+ var folder = project.OriginalsDirectory;
+ if (!Directory.Exists(folder)) return (0, 0, 0, 0);
+ var staging = Path.Combine(folder, StagingFolder);
+ var files = new List();
+ var parts = new List();
+ foreach (var file in Directory.EnumerateFiles(folder, "*", SearchOption.AllDirectories))
+ {
+ if (Inside(staging, file)) continue;
+ (file.EndsWith(".part", StringComparison.OrdinalIgnoreCase) ? parts : files).Add(file);
+ }
+ var (deleted, trashed, trashedBytes, left) = DeleteOrTrash(project, files, home ?? [], Path.Combine(trashEntry, WorkspaceProject.OriginalsFolder));
+ foreach (var part in parts)
+ {
+ try
+ {
+ File.Delete(part);
+ }
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+ {
+ Log.Warning("workspace", $"{part} could not be removed", ex);
+ }
+ }
+ if (Directory.Exists(staging)) TryDeleteFolder(staging);
+ RemoveEmptyFolders(folder);
+ return (deleted, trashed, trashedBytes, left);
+ }
+
+ /// The folder of originals a copy from a server downloads into until a file is whole.
+ internal const string StagingFolder = ".staging";
+
+ private static (int Deleted, int Trashed, long TrashedBytes, int Left) DeleteOrTrash(WorkspaceProject project, IReadOnlyList files, IReadOnlyList home,
+ string trash)
+ {
var held = HeldAtHome(home);
- string? trash = null;
- var trashed = 0;
+ int deleted = 0, trashed = 0, left = 0;
+ long trashedBytes = 0;
foreach (var file in files)
{
try
{
- var (sha, _) = Hash(file);
+ var (sha, bytes) = Hash(file);
if (sha is not null && held.Contains(sha))
{
File.Delete(file);
+ deleted++;
continue;
}
- trash ??= Path.Combine(project.Store.Root, TrashFolder,
- project.ProjectId.ToString("N") + "-" + DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture), WorkspaceProject.OriginalsFolder);
- Directory.CreateDirectory(trash);
- File.Move(file, Path.Combine(trash, Path.GetFileName(file)), overwrite: true);
+ var target = Path.Combine(trash, Path.GetRelativePath(project.OriginalsDirectory, file));
+ Directory.CreateDirectory(Path.GetDirectoryName(target)!);
+ // Never over another file of the entry: one that cannot go there stays where it is.
+ File.Move(file, target, overwrite: false);
trashed++;
+ trashedBytes += bytes;
}
catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
{
- Log.Warning("workspace", $"{file} could not be removed", ex);
+ left++;
+ Log.Warning("workspace", $"{file} could not be removed; it stays where it is", ex);
}
}
- return trashed;
+ return (deleted, trashed, trashedBytes, left);
+ }
+
+ private static bool Inside(string folder, string path) =>
+ path.StartsWith(Path.TrimEndingDirectorySeparator(folder) + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase);
+
+ /// Removes the empty folders under , and itself when it is left empty.
+ private static void RemoveEmptyFolders(string folder)
+ {
+ try
+ {
+ foreach (var sub in Directory.EnumerateDirectories(folder, "*", SearchOption.AllDirectories).OrderByDescending(d => d.Length).ToList())
+ {
+ if (!Directory.EnumerateFileSystemEntries(sub).Any()) Directory.Delete(sub);
+ }
+ if (!Directory.EnumerateFileSystemEntries(folder).Any()) Directory.Delete(folder);
+ }
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+ {
+ Log.Debug("workspace", $"{folder} stays: {ex.Message}");
+ }
}
/// The original files in the project's folder of originals (never a part a copy writes, nor its staging folder).
diff --git a/src/Chronos.Data/Workspaces/WorkspaceRenderJobHandler.cs b/src/Chronos.Data/Workspaces/WorkspaceRenderJobHandler.cs
index 9dfe11cd..ec11e9f5 100644
--- a/src/Chronos.Data/Workspaces/WorkspaceRenderJobHandler.cs
+++ b/src/Chronos.Data/Workspaces/WorkspaceRenderJobHandler.cs
@@ -21,7 +21,10 @@ namespace Chronos.Data.Workspaces;
/// PC from the originals its media hold, as renders an archive's sequence,
/// into the project's exports/ (each output written by the encoder under a hidden temporary name, then renamed), each
/// output hashed and recorded in the project's ledger (, its id
-/// RenderJobHandler.RenderId(jobId, index)), then a queued with the new ids.
+/// RenderJobHandler.RenderId(jobId, index)), then a queued of every render of the
+/// project not sent yet (this run's, an earlier run's of this job, and those whose send failed before), whenever this job
+/// ever recorded one that is not sent: a resumed or retried run queues it too. A render queued before the workspace moved
+/// works where the workspace is now, and none runs while it is being moved ().
/// Media without an original for every placed frame are refused. The project's lease is held while the inputs are read
/// and while each ledger entry is written, not for the whole render: the editor keeps saving its working state meanwhile.
/// The settings rendered are the ones the job embeds (the editor's portable settings), else the version it names from
@@ -43,7 +46,11 @@ internal sealed class WorkspaceRenderJobHandler(ChronosDatabase db, ArchiveServi
var cancellation = context.Cancellation;
var parameters = WorkspaceJobs.RenderParameters(context.Job) ?? throw new InvalidDataException(Loc.L("Errors.Workspace.JobParameters"));
var (render, export) = ProcessingJobs.ReadRender(parameters.RenderJson);
- var store = new WorkspaceStore(parameters.WorkspaceRoot);
+ // Where the project is now (a workspace moved since the job was queued), never while it is being moved; nothing is
+ // made where it is not.
+ var root = WorkspaceJobRoots.Resolve(parameters.WorkspaceRoot, parameters.ProjectId, options.CurrentRoot, "Errors.Workspace.RenderProject");
+ parameters = parameters with { WorkspaceRoot = root };
+ var store = new WorkspaceStore(root);
var project = store.Find(parameters.ProjectId) ?? throw new InvalidOperationException(Loc.L("Errors.Workspace.RenderProject"));
var inputs = await ReadInputsAsync(project, parameters, render, cancellation).ConfigureAwait(false);
var (sequence, frames, settings, versionId) = (inputs.Sequence, inputs.Frames, inputs.Settings, inputs.VersionId);
@@ -69,7 +76,13 @@ internal sealed class WorkspaceRenderJobHandler(ChronosDatabase db, ArchiveServi
names.Release(chosen);
}
var targets = all.Select((t, i) => (i, t)).Where(t => !done.Contains(t.i)).ToList();
- var recorded = new List();
+ // What an earlier run of this job recorded and did not send (it stopped before queueing the send, or that failed).
+ var recorded = ledger.Entries.Where(e => e.JobId == context.Job.Id && e.IsUnsent).Select(e => e.RenderId).ToList();
+ if (targets.Count == 0)
+ {
+ await QueueSendAsync(context, parameters, sequence, recorded).ConfigureAwait(false);
+ return;
+ }
if (targets.Count > 0)
{
string? writing = null;
@@ -97,7 +110,7 @@ internal sealed class WorkspaceRenderJobHandler(ChronosDatabase db, ArchiveServi
project.WriteRenders(ledger);
}
done.Add(index);
- recorded.Add(id);
+ if (!recorded.Contains(id)) recorded.Add(id);
writing = null;
await context.CheckpointAsync(new RenderCheckpoint(done, null, null).ToJson(), context.Done, context.Total).ConfigureAwait(false);
context.Log(Loc.L("Export.Log.Rendered", target.PresetName, Path.GetFileName(result.OutputPath)));
@@ -242,12 +255,15 @@ internal sealed class WorkspaceRenderJobHandler(ChronosDatabase db, ArchiveServi
return Convert.ToHexStringLower(SHA256.HashData(Encoding.UTF8.GetBytes(listing.ToString())));
}
- /// Queues the send home of the renders this run recorded, whatever stops the job now (they are done).
+ ///
+ /// Queues the send home of every render of the project not sent yet (an empty list of ids: the send reads the ledger when
+ /// it runs), whatever stops the job now, once this job recorded one that is not sent (they are done).
+ ///
private static async Task QueueSendAsync(JobContext context, WorkspaceRenderParameters parameters, Sequence sequence, List recorded)
{
if (recorded.Count == 0) return;
- var send = WorkspaceJobs.Send(sequence.Id, sequence.DisplayTitle, parameters.WorkspaceRoot, parameters.ProjectId, [.. recorded],
- parameters.Server, context.Job.Priority);
+ var send = WorkspaceJobs.Send(sequence.Id, sequence.DisplayTitle, parameters.WorkspaceRoot, parameters.ProjectId, [], parameters.Server,
+ context.Job.Priority);
await context.EnqueueFollowUpAsync(send.Kind, send.Targets, send.Label, send.ParametersJson, send.Priority, CancellationToken.None).ConfigureAwait(false);
}
diff --git a/src/Chronos.Data/Workspaces/WorkspaceSendJobHandler.cs b/src/Chronos.Data/Workspaces/WorkspaceSendJobHandler.cs
index d4b4bac1..d31bedb3 100644
--- a/src/Chronos.Data/Workspaces/WorkspaceSendJobHandler.cs
+++ b/src/Chronos.Data/Workspaces/WorkspaceSendJobHandler.cs
@@ -18,7 +18,9 @@ namespace Chronos.Data.Workspaces;
/// sent home with their project and version, per unsent ledger entry (; the ids the job names,
/// or every unsent one): the file hashed again (one missing or changed since it was rendered is refused, marked failed in the
/// ledger and left where it is), the version it names pushed first when the home lacks it (a push that fails fails the job,
-/// the entry left as it was), then filed in this PC's archive (copied into the archive's staging folder, read back against
+/// the entry left as it was; a version the push replayed under a new id, after the home moved on, is found again by the
+/// content hash of what rendered, else the render goes with its project alone, and the entry says so from then on), then
+/// filed in this PC's archive (copied into the archive's staging folder, read back against
/// its SHA-256, and filed under the sequence's lease as the sync files a server's exports,
/// , after checking the project and version are the sequence's) or uploaded to its
/// server ( with ProjectId and ProjectVersionId, which the server checks the
@@ -27,7 +29,9 @@ namespace Chronos.Data.Workspaces;
/// render id the home files under another sequence is refused. The ledger is read and written under the project's lease,
/// each entry read again before it is written, so a render finished meanwhile is kept.
/// A send to a server is held while says so (a metered connection): it waits
-/// before each upload, and the desktop pauses it meanwhile. A send to this PC's archive is never held.
+/// before each upload, and the desktop pauses it meanwhile. A send to this PC's archive is never held. A server from before
+/// phase 5c files the render without its project and version: the job's log says so. A send queued before the workspace
+/// moved works where the workspace is now, and none runs while it is being moved ().
///
internal sealed class WorkspaceSendJobHandler(ChronosDatabase db, ArchiveService archives, ISyncConnector? servers, WorkspaceJobOptions options) : IJobHandler
{
@@ -46,7 +50,10 @@ internal sealed class WorkspaceSendJobHandler(ChronosDatabase db, ArchiveService
if (context.Job.TargetIds is not [var sequenceId] || string.IsNullOrWhiteSpace(parameters.WorkspaceRoot))
throw new InvalidDataException(Loc.L("Errors.Workspace.JobParameters"));
var server = parameters.Server is { Length: > 0 } named ? named : null;
- var project = new WorkspaceStore(parameters.WorkspaceRoot).Find(parameters.ProjectId)
+ // Where the project is now (a workspace moved since the job was queued), never while it is being moved; nothing is
+ // made where it is not.
+ var root = WorkspaceJobRoots.Resolve(parameters.WorkspaceRoot, parameters.ProjectId, options.CurrentRoot, "Errors.Workspace.NotCheckedOut");
+ var project = new WorkspaceStore(root).Find(parameters.ProjectId)
?? throw new InvalidOperationException(Loc.L("Errors.Workspace.NotCheckedOut"));
var workspace = project.ReadBundle().Workspace ?? throw new InvalidOperationException(Loc.L("Errors.Workspace.NotCheckedOut"));
var home = workspace.Home;
@@ -77,7 +84,7 @@ internal sealed class WorkspaceSendJobHandler(ChronosDatabase db, ArchiveService
?? throw new InvalidOperationException(Loc.L("Errors.Sync.NotConnected"));
await SendAsync(context, project, workspace, entries,
() => servers!.ProjectHome(home) ?? throw new InvalidOperationException(Loc.L("Errors.Sync.NotConnected")), held: true,
- (entry, file, token) => UploadAsync(remote, sequenceId, entry, file, token)).ConfigureAwait(false);
+ (entry, file, token) => UploadAsync(context, remote, sequenceId, entry, file, token)).ConfigureAwait(false);
}
///
@@ -101,25 +108,35 @@ internal sealed class WorkspaceSendJobHandler(ChronosDatabase db, ArchiveService
{
var ct = context.Cancellation;
var (sent, there, refused) = (0, 0, 0);
- // The versions this run found at the home, or sent there first.
- var versions = new HashSet();
+ // The versions this run found at the home, or sent there first, with the id the home holds each by (a replay gives another).
+ var versions = new Dictionary();
for (var i = 0; i < entries.Count; i++)
{
ct.ThrowIfCancellationRequested();
if (held) await WhileHeldAsync(context).ConfigureAwait(false);
var entry = entries[i];
- var file = project.ExportFile(entry.File);
- var refusal = await CheckAsync(project, entry, file, folders: !held, ct).ConfigureAwait(false);
+ var file = project.ContainedExportFile(entry.File);
+ var refusal = file is null ? Loc.L("Errors.Workspace.SendMissing", Path.GetFileName(entry.File ?? string.Empty)) : await CheckAsync(entry, file, folders: !held, ct).ConfigureAwait(false);
if (refusal is null)
{
- if (entry.ProjectVersionId is { } versionId && !versions.Contains(versionId))
+ if (entry.ProjectVersionId is { } versionId)
{
- await EnsureVersionAsync(context, project, workspace, home(), entry.ProjectId, versionId, ct).ConfigureAwait(false);
- versions.Add(versionId);
+ if (!versions.TryGetValue(versionId, out var atHome))
+ {
+ atHome = await EnsureVersionAsync(context, project, workspace, home(), entry, versionId, ct).ConfigureAwait(false);
+ versions[versionId] = atHome;
+ }
+ if (atHome != versionId)
+ {
+ // The ledger says from now on what the home holds: later sends agree with this one.
+ entry = entry with { ProjectVersionId = atHome };
+ var mapped = atHome;
+ await UpdateAsync(project, entry.RenderId, e => e with { ProjectVersionId = mapped }).ConfigureAwait(false);
+ }
}
try
{
- if (await deliver(entry, file, ct).ConfigureAwait(false)) sent++;
+ if (await deliver(entry, file!, ct).ConfigureAwait(false)) sent++;
else there++;
// The home holds it: recorded whatever stops the job now.
await UpdateAsync(project, entry.RenderId, e => e.AsSent(DateTimeOffset.UtcNow)).ConfigureAwait(false);
@@ -147,12 +164,10 @@ internal sealed class WorkspaceSendJobHandler(ChronosDatabase db, ArchiveService
/// when : this PC's archive files folders as its own renders do) is checked by its total size
/// and the hash of its listing, as the render recorded it ().
///
- private static async Task CheckAsync(WorkspaceProject project, WorkspaceRenderEntry entry, string file, bool folders, CancellationToken ct)
+ /// A ledger names files inside the exports only (): one pointing elsewhere is never read.
+ private static async Task CheckAsync(WorkspaceRenderEntry entry, string file, bool folders, CancellationToken ct)
{
var name = Path.GetFileName(entry.File);
- var exports = Path.TrimEndingDirectorySeparator(Path.GetFullPath(project.ExportsDirectory)) + Path.DirectorySeparatorChar;
- // A ledger names files inside the exports only; one pointing elsewhere is never read.
- if (!Path.GetFullPath(file).StartsWith(exports, StringComparison.OrdinalIgnoreCase)) return Loc.L("Errors.Workspace.SendMissing", name);
if (Directory.Exists(file))
{
if (!folders) return Loc.L("Errors.Workspace.SendSequence", name);
@@ -168,14 +183,21 @@ internal sealed class WorkspaceSendJobHandler(ChronosDatabase db, ArchiveService
return null;
}
+ /// How many of the home's newest versions are read for one of the same content, when a replay gave a rendered version another id.
+ private const int ReplayedLookBack = 100;
+
///
- /// Version of the project at the home: pushed there first (every local version, in order, as a
- /// sync pushes them) when the home lacks it. A push that does not bring it there fails the job.
+ /// Version of the project at the home, as the id the home holds it by: pushed there first
+ /// (every local version, in order, as a sync pushes them) when the home lacks it. A push that replays it on a home that
+ /// moved on gives it another id (and one that changes nothing is not sent at all): the home's version of the content
+ /// hash that rendered () stands for it, else none (null: the render goes
+ /// with its project alone, as a render of a version the home never had). A push that fails fails the job.
///
- private static async Task EnsureVersionAsync(JobContext context, WorkspaceProject project, BundleWorkspace workspace, IProjectHome home, Guid projectId,
- Guid versionId, CancellationToken ct)
+ private static async Task EnsureVersionAsync(JobContext context, WorkspaceProject project, BundleWorkspace workspace, IProjectHome home,
+ WorkspaceRenderEntry entry, Guid versionId, CancellationToken ct)
{
- if (await home.GetVersionAsync(projectId, versionId, ct).ConfigureAwait(false) is not null) return;
+ var projectId = entry.ProjectId;
+ if (await home.GetVersionAsync(projectId, versionId, ct).ConfigureAwait(false) is not null) return versionId;
try
{
await new WorkspaceSync(project.Store, Environment.MachineName) { LockWait = LockWait }.PushAsync(projectId, home, ct).ConfigureAwait(false);
@@ -186,9 +208,26 @@ internal sealed class WorkspaceSendJobHandler(ChronosDatabase db, ArchiveService
context.Log(ex.Message);
throw new InvalidOperationException(Loc.L("Errors.Workspace.SendVersion"), ex);
}
- var pushed = await home.GetVersionAsync(projectId, versionId, ct).ConfigureAwait(false)
- ?? throw new InvalidOperationException(Loc.L("Errors.Workspace.SendVersion"));
- context.Log(Loc.L("Archive.Log.WorkspaceVersionPushed", workspace.Name, pushed.Number));
+ if (await home.GetVersionAsync(projectId, versionId, ct).ConfigureAwait(false) is { } pushed)
+ {
+ context.Log(Loc.L("Archive.Log.WorkspaceVersionPushed", workspace.Name, pushed.Number));
+ return versionId;
+ }
+ ProjectVersion? same = null;
+ if (entry.SettingsHash is { Length: > 0 } hash)
+ {
+ var history = await home.HistoryAsync(projectId, null, ReplayedLookBack, ct).ConfigureAwait(false);
+ same = history.FirstOrDefault(v => string.Equals(v.ContentHash, hash, StringComparison.OrdinalIgnoreCase));
+ }
+ if (same is not null)
+ {
+ Log.Info("workspace", $"Version {versionId} of project {projectId} reached the home as version {same.Id} (a replay): render {entry.RenderId} names that one");
+ context.Log(Loc.L("Archive.Log.WorkspaceVersionReplayed", workspace.Name, same.Number));
+ return same.Id;
+ }
+ Log.Info("workspace", $"Version {versionId} of project {projectId} is not at the home after the push, nor one of the same content: render {entry.RenderId} goes with its project alone");
+ context.Log(Loc.L("Archive.Log.WorkspaceVersionNotHome", workspace.Name));
+ return null;
}
///
@@ -283,14 +322,21 @@ internal sealed class WorkspaceSendJobHandler(ChronosDatabase db, ArchiveService
/// project for another sequence's, the id for another sequence's render, the file for too large or not the one hashed):
/// marked failed; anything else (the server out of reach, busy, the sign-in expired) fails the job, the entry left as it was.
///
- private async Task UploadAsync(ISyncRemote remote, Guid sequenceId, WorkspaceRenderEntry entry, string file, CancellationToken ct)
+ private async Task UploadAsync(JobContext context, ISyncRemote remote, Guid sequenceId, WorkspaceRenderEntry entry, string file, CancellationToken ct)
{
var name = SyncTransfers.SafeFileName(Path.GetFileName(entry.File)) ?? entry.RenderId.ToString("N");
var request = new RenderUploadRequest(entry.RenderId, name, entry.Size, entry.Sha256.ToLowerInvariant(), entry.PresetName, entry.Codec, entry.Width, entry.Height,
entry.Fps, entry.DurationSeconds, options.Processing.ProducedBy, entry.ProjectId, entry.ProjectVersionId);
try
{
- return await remote.UploadRenderAsync(sequenceId, file, request, ct).ConfigureAwait(false) is not null;
+ if (await remote.UploadRenderAsync(sequenceId, file, request, ct).ConfigureAwait(false) is not { } filed) return false;
+ // A server from before phase 5c ignores the project and version: the render is there, without them.
+ if (filed.ProjectId != entry.ProjectId || filed.ProjectVersionId != entry.ProjectVersionId)
+ {
+ Log.Warning("workspace", $"The server filed render {entry.RenderId} without its project {entry.ProjectId} and version {entry.ProjectVersionId} (a server before phase 5c)");
+ context.Log(Loc.L("Archive.Log.WorkspaceSendNoProvenance", name));
+ }
+ return true;
}
catch (ChronosApiException ex) when (ex.Status is HttpStatusCode.BadRequest or HttpStatusCode.Conflict or HttpStatusCode.RequestEntityTooLarge
or HttpStatusCode.UnprocessableEntity)
diff --git a/src/Chronos.Data/Workspaces/WorkspaceStore.cs b/src/Chronos.Data/Workspaces/WorkspaceStore.cs
index 78df8d9f..ce74bc6f 100644
--- a/src/Chronos.Data/Workspaces/WorkspaceStore.cs
+++ b/src/Chronos.Data/Workspaces/WorkspaceStore.cs
@@ -451,6 +451,33 @@ public sealed class WorkspaceProject
/// The absolute path of a local render named relative to ().
public string ExportFile(string relative) => LongPath.FromPortableRelative(ExportsDirectory, relative);
+ ///
+ /// The absolute path of a local render named relative to , only when it lies strictly inside
+ /// that folder and is not its ledger; null for a name that is empty, rooted, climbs out (..), names the folder
+ /// itself (.) or the ledger. What reads, sends or deletes a ledger's file goes through this, so a damaged or
+ /// hand-edited ledger never points it at anything else.
+ ///
+ public string? ContainedExportFile(string? relative)
+ {
+ if (string.IsNullOrWhiteSpace(relative)) return null;
+ var portable = relative.Replace('\\', '/');
+ if (Path.IsPathRooted(relative) || portable.StartsWith('/') || portable.Contains(':', StringComparison.Ordinal)
+ || portable.Split('/').Any(part => part is "" or "." or "..")) return null;
+ string full, folder;
+ try
+ {
+ full = Path.GetFullPath(ExportFile(relative));
+ folder = Path.TrimEndingDirectorySeparator(Path.GetFullPath(ExportsDirectory)) + Path.DirectorySeparatorChar;
+ }
+ catch (Exception ex) when (ex is ArgumentException or NotSupportedException or PathTooLongException)
+ {
+ return null;
+ }
+ var comparison = OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
+ if (!full.StartsWith(folder, comparison) || full.Length <= folder.Length) return null;
+ return string.Equals(full, Path.GetFullPath(RendersPath), comparison) ? null : full;
+ }
+
/// Holds the project for one writer (this program's sync, a copy job) until disposed.
/// Another writer kept it for longer than .
public async Task LockAsync(TimeSpan wait, CancellationToken cancellationToken = default)
@@ -509,7 +536,7 @@ public sealed class WorkspaceProject
internal void WriteMedia(WorkspaceMedia media)
{
Directory.CreateDirectory(MediaDirectory);
- AtomicFile.WriteAllText(MediaIndexPath, JsonSerializer.Serialize(media, WorkspaceJson.Default.WorkspaceMedia));
+ AtomicFile.WriteAllText(MediaIndexPath, JsonSerializer.Serialize(media with { FormatVersion = media.WrittenFormatVersion }, WorkspaceJson.Default.WorkspaceMedia));
}
///
diff --git a/src/Chronos.Data/Workspaces/WorkspaceTrash.cs b/src/Chronos.Data/Workspaces/WorkspaceTrash.cs
index 86c383fa..2821ccb0 100644
--- a/src/Chronos.Data/Workspaces/WorkspaceTrash.cs
+++ b/src/Chronos.Data/Workspaces/WorkspaceTrash.cs
@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
using System.Globalization;
using System.Security.Cryptography;
using System.Text;
@@ -24,7 +25,9 @@ public sealed class WorkspaceTrashChangedException(string message) : IOException
///
/// The trash of a workspace (<workspace>/.trash, phase 5c): what a removed local copy kept of its work
/// (<project id>-<ticks>), and the originals a clean-up found the home no longer holds
-/// (<project id>-<ticks>/originals). Nothing in Chronos writes into an entry once it is made, and only the
+/// (<project id>-<ticks>/originals). An entry is filled under a staging name the listing leaves out
+/// (.incoming-<project id>-<ticks>, ) and takes its own name in one rename once it is
+/// whole, so nothing writes into an entry a plan lists; one a crash left half filled lists as an entry of its own. Only the
/// user's Empty… erases them: the plan lists them (), and erases exactly those, only
/// while the fingerprint of the plan still matches. Schedules and the size limit never empty it.
///
@@ -33,6 +36,12 @@ public static class WorkspaceTrash
/// The trash's folder name in the workspace (the store lists only folders named by a project id).
public const string FolderName = ".trash";
+ /// The name an entry has while it is filled ().
+ internal const string IncomingPrefix = ".incoming-";
+
+ /// The staging folders being filled now in this program (by name: a project id and ticks): the listing leaves them out.
+ private static readonly ConcurrentDictionary Filling = new(StringComparer.OrdinalIgnoreCase);
+
/// The trash folder of the workspace at .
public static string FolderOf(string workspaceRoot)
{
@@ -54,6 +63,59 @@ public static class WorkspaceTrash
}
}
+ ///
+ /// A new entry of the trash for , filled under a staging name the listing leaves out; it takes
+ /// its own name () when the builder is disposed, or goes when nothing came into it. The staging
+ /// folder is made when the builder is.
+ ///
+ public static WorkspaceTrashBuilder Begin(string workspaceRoot, Guid projectId, DateTime nowUtc)
+ {
+ var folder = FolderOf(workspaceRoot);
+ for (var ticks = nowUtc.Ticks; ; ticks++)
+ {
+ var path = Path.Combine(folder, IncomingPrefix + projectId.ToString("N") + "-" + ticks.ToString(CultureInfo.InvariantCulture));
+ // Named as being filled before it is made: a listing never sees it half made.
+ if (Directory.Exists(path) || File.Exists(path) || !Filling.TryAdd(Path.GetFileName(path), 0)) continue;
+ try
+ {
+ Directory.CreateDirectory(path);
+ }
+ catch
+ {
+ Filling.TryRemove(Path.GetFileName(path), out _);
+ throw;
+ }
+ return new WorkspaceTrashBuilder(workspaceRoot, projectId, path);
+ }
+ }
+
+ /// The staging folder made an entry of its own (its own name), or removed when empty; no longer left out of the listing.
+ internal static string? Finish(string workspaceRoot, Guid projectId, string staging)
+ {
+ try
+ {
+ if (!Directory.Exists(staging)) return null;
+ if (!Directory.EnumerateFileSystemEntries(staging).Any())
+ {
+ Directory.Delete(staging);
+ return null;
+ }
+ var entry = NewEntry(workspaceRoot, projectId, DateTime.UtcNow);
+ Directory.Move(staging, entry);
+ return entry;
+ }
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+ {
+ // Listed from now on under its staging name: what it holds stays in the trash, and Empty… can erase it.
+ Log.Warning("workspace", $"The trash entry {staging} could not take its own name; it stays as it is", ex);
+ return Directory.Exists(staging) ? staging : null;
+ }
+ finally
+ {
+ Filling.TryRemove(Path.GetFileName(staging), out _);
+ }
+ }
+
/// The entries of the workspace's trash at , with their fingerprint; empty when there is no trash.
/// The trash cannot be read.
public static WorkspaceTrashListing List(string workspaceRoot, CancellationToken cancellationToken = default)
@@ -66,6 +128,8 @@ public static class WorkspaceTrash
foreach (var entry in new DirectoryInfo(folder).EnumerateFileSystemInfos())
{
cancellationToken.ThrowIfCancellationRequested();
+ // An entry being filled now is no entry yet: a plan never lists it, so Empty… never erases it.
+ if (entry is DirectoryInfo && Filling.ContainsKey(entry.Name)) continue;
var (files, bytes) = (0, 0L);
if (entry is DirectoryInfo directory)
{
@@ -162,3 +226,34 @@ public static class WorkspaceTrash
Directory.Delete(path, recursive: true);
}
}
+
+///
+/// A trash entry being filled (): is its staging folder, left out of every
+/// listing; disposing it gives the entry its own name (), or removes it when nothing came into it.
+///
+public sealed class WorkspaceTrashBuilder : IDisposable
+{
+ private readonly string _root;
+ private readonly Guid _projectId;
+ private int _done;
+
+ internal WorkspaceTrashBuilder(string root, Guid projectId, string path)
+ {
+ (_root, _projectId, Path) = (root, projectId, path);
+ }
+
+ /// The staging folder to fill.
+ public string Path { get; }
+
+ /// The entry once finished; null before, or when nothing came into it.
+ public string? Entry { get; private set; }
+
+ /// Gives the entry its own name (or removes it when empty); later calls do nothing.
+ public string? Finish()
+ {
+ if (Interlocked.Exchange(ref _done, 1) == 0) Entry = WorkspaceTrash.Finish(_root, _projectId, Path);
+ return Entry;
+ }
+
+ public void Dispose() => Finish();
+}
diff --git a/tests/Chronos.App.Tests/Editor/SequenceJobsTests.cs b/tests/Chronos.App.Tests/Editor/SequenceJobsTests.cs
index 0685fd6e..9c4225f1 100644
--- a/tests/Chronos.App.Tests/Editor/SequenceJobsTests.cs
+++ b/tests/Chronos.App.Tests/Editor/SequenceJobsTests.cs
@@ -91,6 +91,24 @@ public sealed class SequenceJobsTests
Assert.Null(jobs.Active(JobKind.LightAnalyse));
}
+ [Test]
+ public void TheServerHeaderNeverShowsAWorkspaceRenderOrSendOfThisPc()
+ {
+ var jobs = new SequenceJobs(Sunset);
+ var now = DateTimeOffset.UtcNow;
+ var local = Job(JobKind.WorkspaceRender, JobState.Running) with { Started = now };
+ var send = Job(JobKind.WorkspaceSend, JobState.Queued);
+ jobs.Track(local);
+ jobs.Track(send);
+ Assert.Equal(local.Id, jobs.Shown!.Id, "the editor follows it");
+ Assert.Null(jobs.ShownAtHome, "the server header and its Cancel do not");
+ var atHome = Job(JobKind.DeepAnalyse, JobState.Queued) with { Created = now.AddMinutes(-3) };
+ jobs.Track(atHome);
+ Assert.Equal(atHome.Id, jobs.ShownAtHome!.Id, "a job at the home waits behind the local render, and is the one shown");
+ Assert.True(SequenceJobs.IsLocalKind(JobKind.WorkspaceSend));
+ Assert.False(SequenceJobs.IsLocalKind(JobKind.Render));
+ }
+
private static Job Job(JobKind kind, JobState state, Guid? target = null) => new()
{
Id = Guid.CreateVersion7(),
diff --git a/tests/Chronos.App.Tests/Server/UploadHoldTests.cs b/tests/Chronos.App.Tests/Server/UploadHoldTests.cs
index e2d9844e..424779c9 100644
--- a/tests/Chronos.App.Tests/Server/UploadHoldTests.cs
+++ b/tests/Chronos.App.Tests/Server/UploadHoldTests.cs
@@ -7,7 +7,7 @@ using Chronos.Testing;
namespace Chronos.App.Tests.Server;
///
-/// Which jobs "Pause metered transfers" holds (Server.html, phase 5c): uploads, and the workspace's copies from and renders
+/// Which jobs "Pause metered transfers" holds (Server.html, phase 5c): uploads, the sync's downloads, and the workspace's copies from and renders
/// sent to a server; never a copy from or a send to this PC's archive.
///
public sealed class UploadHoldTests
@@ -42,9 +42,11 @@ public sealed class UploadHoldTests
public void TransfersWithAServerAreHeld()
{
Assert.True(UploadHold.Holds(Of(JobKind.UploadCommit)));
+ // The sync's downloads too: the option's tooltip says "uploads and downloads".
+ Assert.True(UploadHold.Holds(Of(JobKind.Download)));
Assert.True(UploadHold.Holds(Of(WorkspaceJobs.CopyFromServer(SequenceId, "Harbour", Server, Root, ProjectId))));
Assert.True(UploadHold.Holds(Of(WorkspaceJobs.Send(SequenceId, "Harbour", Root, ProjectId, [], Server))));
- Assert.SequenceEqual([JobKind.UploadCommit, JobKind.WorkspaceCopy, JobKind.WorkspaceSend], UploadHold.Kinds);
+ Assert.SequenceEqual([JobKind.UploadCommit, JobKind.Download, JobKind.WorkspaceCopy, JobKind.WorkspaceSend], UploadHold.Kinds);
}
[Test]
@@ -53,7 +55,6 @@ public sealed class UploadHoldTests
var sequence = new Sequence { Id = SequenceId, ArchiveId = Guid.CreateVersion7(), Title = "Harbour", Folder = "2026/harbour" };
Assert.False(UploadHold.Holds(Of(WorkspaceJobs.Copy(sequence, Root, ProjectId))));
Assert.False(UploadHold.Holds(Of(WorkspaceJobs.Send(SequenceId, "Harbour", Root, ProjectId, []))));
- Assert.False(UploadHold.Holds(Of(JobKind.Download)));
Assert.False(UploadHold.Holds(Of(JobKind.Render)));
// Parameters that cannot be read are not held: the job fails with its reason.
Assert.False(UploadHold.Holds(Of(JobKind.WorkspaceSend, "{not json")));
diff --git a/tests/Chronos.App.Tests/Settings/SettingsLogicTests.cs b/tests/Chronos.App.Tests/Settings/SettingsLogicTests.cs
index 174567ff..654a5ecb 100644
--- a/tests/Chronos.App.Tests/Settings/SettingsLogicTests.cs
+++ b/tests/Chronos.App.Tests/Settings/SettingsLogicTests.cs
@@ -693,13 +693,61 @@ public sealed class SettingsLogicTests
Assert.True(rows.CanMove);
}
+ [Test]
+ public async Task AMoveStoppedBeforeItEndedIsOfferedAgainAndHoldsChangeAndMove()
+ {
+ var stopped = true;
+ var resumed = 0;
+ var (_, rows, _) = WorkspaceRows(new FakeWorkspace(), move: () => Task.CompletedTask, isMoving: () => stopped, unfinished: () => stopped, resume: () =>
+ {
+ resumed++;
+ stopped = false;
+ return Task.CompletedTask;
+ });
+ await rows.MeasureAsync();
+
+ // Change and Move say why they wait; Resume takes the move up.
+ Assert.True(rows.CanResumeMove);
+ Assert.Equal((Loc.L("Tooltips.Settings.Workspace.MoveUnfinished"), Loc.L("Tooltips.Settings.Workspace.MoveUnfinished")), (rows.ChangeToolTip, rows.MoveToolTip));
+ Assert.False(rows.ChangeCommand.CanExecute(null));
+ Assert.False(rows.MoveCommand.CanExecute(null));
+ Assert.True(rows.ResumeMoveCommand.CanExecute(null));
+
+ rows.ResumeMoveCommand.Execute(null);
+ await Chronos.App.Tests.Workspace.WorkspaceTestBed.UntilAsync(() => !rows.ResumeMoveCommand.IsRunning, "the move taken up");
+ Assert.Equal(1, resumed);
+ Assert.False(rows.CanResumeMove);
+ Assert.Equal((Loc.L("Tooltips.Settings.ChangeWorkspace"), Loc.L("Tooltips.Settings.Workspace.Move")), (rows.ChangeToolTip, rows.MoveToolTip));
+ Assert.True(rows.ChangeCommand.CanExecute(null));
+ Assert.True(rows.MoveCommand.CanExecute(null));
+ }
+
+ [Test]
+ public void ADefaultMediaOrOpenPolicySetElsewhereReadsAsEverythingAppliesIt()
+ {
+ var (settings, rows, _) = WorkspaceRows();
+ settings.WorkspaceDefaultMedia = "ORIGINALS";
+ Assert.Equal(Chronos.Core.Project.BundleMedia.Originals, settings.EffectiveDefaultMedia);
+ Assert.True(rows.IsDefaultOriginals);
+ settings.WorkspaceDefaultMedia = "raw files";
+ Assert.Equal(BundleMediaProxies, settings.EffectiveDefaultMedia);
+ Assert.True(rows.IsDefaultProxies);
+
+ settings.WorkspaceOpenProject = (WorkspaceOpenPolicy)42;
+ Assert.Equal(WorkspaceOpenPolicy.LastUsed, settings.EffectiveOpenPolicy);
+ Assert.True(rows.IsOpenLastUsed);
+ settings.WorkspaceOpenProject = WorkspaceOpenPolicy.Ask;
+ Assert.Equal(WorkspaceOpenPolicy.Ask, settings.EffectiveOpenPolicy);
+ Assert.False(rows.IsOpenLastUsed);
+ }
+
private const int DeletePlansListed = Chronos.App.Archiving.DeletePlans.ListedLines;
private const string BundleMediaProxies = Chronos.Core.Project.BundleMedia.Proxies;
private static ConfirmRequest? SettingsTrashRequest(WorkspaceTrashPlan plan) => WorkspaceSettingsRows.TrashRequest(plan);
private static (AppSettings Settings, WorkspaceSettingsRows Rows, Func Saves) WorkspaceRows(FakeWorkspace? workspace = null, Func? move = null,
- Func? isMoving = null)
+ Func? isMoving = null, Func? unfinished = null, Func? resume = null)
{
var settings = new AppSettings();
var saves = 0;
@@ -721,6 +769,8 @@ public sealed class SettingsLogicTests
Notify = (title, message, isError) => workspace.Notices.Add((title, message, isError)),
Move = move,
IsMoving = isMoving ?? (() => false),
+ HasUnfinishedMove = unfinished is null ? null : _ => Task.FromResult(unfinished()),
+ ResumeMove = resume,
};
var rows = new WorkspaceSettingsRows(settings, () => saves++, () => @"C:\Users\me\AppData\Local\Chronos\workspace", () => { }, () => Task.CompletedTask, services);
return (settings, rows, () => saves);
diff --git a/tests/Chronos.App.Tests/Workspace/WorkspaceLocalRenderTests.cs b/tests/Chronos.App.Tests/Workspace/WorkspaceLocalRenderTests.cs
index 8acb9bb9..33e9d519 100644
--- a/tests/Chronos.App.Tests/Workspace/WorkspaceLocalRenderTests.cs
+++ b/tests/Chronos.App.Tests/Workspace/WorkspaceLocalRenderTests.cs
@@ -12,6 +12,7 @@ using Chronos.Data.Processing;
using Chronos.Data.Workspaces;
using Chronos.Protocol.Client;
using Chronos.Testing;
+using Chronos.Ui.Mvvm;
namespace Chronos.App.Tests.Workspace;
@@ -84,6 +85,81 @@ public sealed class WorkspaceLocalRenderTests(TestContext context)
}
}
+ [Test]
+ public async Task ProxiesOnlyAsksWithItsPlanAndRemovesNothingUntilConfirmed()
+ {
+ await using var bed = await WorkspaceTestBed.CreateAsync(context, frames: 4);
+ var host = bed.Host(new AppSettings { WorkspaceAutoSync = false });
+ var checkout = await host.CheckoutAsync(bed.SequenceId, null, null, BundleMedia.Originals, cancellationToken: bed.Ct);
+ await bed.WaitForJobAsync(checkout.Copy.Id);
+ var projectId = checkout.Project.Id;
+ var folder = host.Store.Find(projectId)!;
+ var (source, session) = await bed.OpenAsync(host, projectId);
+ var ui = new RecordingUi { ConfirmAnswer = false };
+ await using (session)
+ using (var menu = new ProjectMenuViewModel(host, source, session, ui))
+ {
+ await menu.RefreshAsync();
+ Assert.True(menu.HoldsOriginals);
+ Assert.False(menu.CopyOriginalsCommand.CanExecute(null));
+ Assert.Equal(Loc.L("Tooltips.Editor.Project.HasOriginals"), menu.CopyOriginalsToolTip, "says why it is disabled");
+ Assert.Equal(Loc.L("Tooltips.Editor.Project.ProxiesOnly"), menu.ProxiesOnlyToolTip);
+ var originals = Directory.GetFiles(folder.OriginalsDirectory).Length;
+ Assert.Equal(4, originals);
+ var plan = await host.PlanProxiesOnlyAsync(projectId, bed.Ct);
+ Assert.Equal(4, plan.Originals + plan.ToTrash);
+
+ // Asked first, with the plan: kept on Keep.
+ var command = (AsyncRelayCommand)menu.ProxiesOnlyCommand;
+ command.Execute(null);
+ await WorkspaceTestBed.UntilAsync(() => ui.Confirmations.Count == 1 && !command.IsRunning, "the question");
+ var asked = ui.Confirmations[0];
+ Assert.Equal(Loc.L("Editor.ProxiesOnly.Title", menu.Name), asked.Heading);
+ Assert.True(asked.IsDestructive);
+ Assert.Contains(Loc.L("Editor.ProxiesOnly.Originals", Formatting.Count(plan.Originals)), asked.Detail!);
+ if (plan.ToTrash > 0) Assert.Contains(Loc.L("Editor.ProxiesOnly.ToTrash", Formatting.Count(plan.ToTrash)), asked.Detail!);
+ Assert.Equal(originals, Directory.GetFiles(folder.OriginalsDirectory).Length, "nothing removed on Keep");
+ Assert.True(menu.HoldsOriginals);
+
+ // Confirmed: every original the library holds goes, any other to the trash; the proxies stay.
+ ui.ConfirmAnswer = true;
+ command.Execute(null);
+ await WorkspaceTestBed.UntilAsync(() => ui.Confirmations.Count == 2 && !command.IsRunning, "the removal");
+ Assert.False(Directory.Exists(folder.OriginalsDirectory));
+ Assert.Equal(Loc.L("Editor.Workspace.OriginalsRemoved"), ui.Toasts[^1].Title);
+ Assert.False(menu.HoldsOriginals);
+ Assert.False(menu.ProxiesOnlyCommand.CanExecute(null));
+ Assert.Equal(Loc.L("Tooltips.Editor.Project.ProxiesAlready"), menu.ProxiesOnlyToolTip, "says why it is disabled");
+ Assert.True(folder.ReadMedia()!.Frames.All(f => f.File is not null && File.Exists(folder.MediaFile(f.File))));
+ }
+ }
+
+ [Test]
+ public async Task SendAgainQueuesTheRendersNotSentAndOnlyThose()
+ {
+ await using var bed = await WorkspaceTestBed.CreateAsync(context, frames: 2);
+ var host = bed.Host(new AppSettings { WorkspaceAutoSync = false });
+ var projectId = await bed.CheckoutAsync(host);
+ var folder = host.Store.Find(projectId)!;
+ Assert.False(await host.SendRendersAsync(projectId, bed.Ct), "nothing waits to be sent");
+ Assert.False(await host.RenderSendPendingAsync(projectId, bed.SequenceId, bed.Ct));
+
+ Directory.CreateDirectory(folder.ExportsDirectory);
+ await File.WriteAllBytesAsync(Path.Combine(folder.ExportsDirectory, "clip.avi"), [1, 2, 3], bed.Ct);
+ var entry = new WorkspaceRenderEntry(Guid.CreateVersion7(), Guid.CreateVersion7(), "clip.avi", new string('0', 64), 3, "Custom", "Mjpeg", 96, 64, 25, 0.16,
+ projectId, null, null, DateTimeOffset.UtcNow);
+ using (await folder.LockAsync(TimeSpan.FromSeconds(TestTiming.Budget(10)), bed.Ct)) folder.WriteRenders(WorkspaceRenders.Empty.With(entry.AsFailed("cut")));
+
+ // A send that failed leaves its render unsent: Send again queues one send of every such render.
+ Assert.Equal(1, WorkspaceCleaner.UnsentRenders(folder));
+ Assert.True(await host.SendRendersAsync(projectId, bed.Ct));
+ var sends = (await bed.Db.Jobs.ListAsync(null, 50, null, bed.Ct)).Items.Where(j => j.Kind == JobKind.WorkspaceSend).ToList();
+ Assert.Equal(1, sends.Count);
+ var parameters = Assert.NotNull(WorkspaceJobs.SendParameters(sends[0]));
+ Assert.Equal((projectId, host.Store.Root), (parameters.ProjectId, parameters.WorkspaceRoot));
+ Assert.Empty(parameters.RenderIds);
+ }
+
[Test]
public async Task VersionOnRenderSavesAChangedProjectFirst()
{
diff --git a/tests/Chronos.Core.Tests/Project/ProjectBundleTests.cs b/tests/Chronos.Core.Tests/Project/ProjectBundleTests.cs
index 711b9123..a0d5fcf2 100644
--- a/tests/Chronos.Core.Tests/Project/ProjectBundleTests.cs
+++ b/tests/Chronos.Core.Tests/Project/ProjectBundleTests.cs
@@ -38,7 +38,7 @@ public sealed class ProjectBundleTests(TestContext context)
// The archive's own meta files are JSON too, but not project files.
Assert.Throws(() => ProjectBundle.Parse("""{ "schemaVersion": 1, "id": "0192a4c1-7b3e-7cc0-8a51-2f9d0e6b1a01" }"""));
var json = Sample().ToJson();
- Assert.Throws(() => ProjectBundle.Parse(json.Replace("\"formatVersion\": 1", "\"formatVersion\": 3", StringComparison.Ordinal)));
+ Assert.Throws(() => ProjectBundle.Parse(json.Replace("\"formatVersion\": 1", $"\"formatVersion\": {ProjectBundle.CurrentFormatVersion + 1}", StringComparison.Ordinal)));
Assert.Throws(() => ProjectBundle.Parse(json.Replace(SequenceId.ToString(), "not-a-guid", StringComparison.Ordinal)));
Assert.Throws(() => ProjectBundle.Parse(json.Replace("\"version\": 1", "\"version\": 99", StringComparison.Ordinal)));
Assert.Throws(() => ProjectBundle.Parse(json.Replace("\"folder\"", "\"place\"", StringComparison.Ordinal)));
@@ -62,6 +62,12 @@ public sealed class ProjectBundleTests(TestContext context)
Assert.Equal(bundle.Project.ToJson(), back.Project.ToJson());
Assert.False(back.IsReadOnly);
+ // Holding the originals: format 3, which a Chronos before phase 5c refuses as newer rather than reading as proxies.
+ var originals = bundle with { Workspace = workspace with { Media = new BundleMedia(BundleMedia.Originals, 12) } };
+ Assert.Contains("\"formatVersion\": 3", originals.ToJson());
+ Assert.Equal(BundleMedia.Originals, ProjectBundle.Parse(originals.ToJson()).Workspace!.Media.Kind);
+ Assert.Equal(3, ProjectBundle.CurrentFormatVersion);
+
// A server home names its server; a project not pulled yet has no base.
var remote = workspace with { Home = new BundleHome(BundleHome.ServerKind, SequenceId, Server: "https://nas:8443"), Base = null, IsMain = true };
Assert.Equal(remote, ProjectBundle.Parse((bundle with { Workspace = remote }).ToJson()).Workspace);
diff --git a/tests/Chronos.Data.Tests/Workspaces/WorkspaceCleanupTests.cs b/tests/Chronos.Data.Tests/Workspaces/WorkspaceCleanupTests.cs
index 422e5a71..665b2e03 100644
--- a/tests/Chronos.Data.Tests/Workspaces/WorkspaceCleanupTests.cs
+++ b/tests/Chronos.Data.Tests/Workspaces/WorkspaceCleanupTests.cs
@@ -159,34 +159,46 @@ public abstract class WorkspaceCleanupTests(TestContext context) : DatabaseTest(
var fx = await FixtureAsync();
var (store, sync) = fx.Workspace();
var project = await fx.CheckoutAsync(sync);
- // Originals of two frames: the first as the home holds it, the second of bytes the home no longer has.
+ // Originals of three frames: the first as the home holds it; the second of bytes the home no longer has; the third
+ // recorded with the home's hash, its bytes changed since (the index is no proof). And a file the index never named.
var media = project.ReadMedia()!;
var held = WorkspaceProject.OriginalName(media.Frames[0].Id, fx.Frames[0].Sha256!, ".jpg");
var lost = WorkspaceProject.OriginalName(media.Frames[1].Id, new string('f', 64), ".jpg");
+ var changed = WorkspaceProject.OriginalName(media.Frames[2].Id, fx.Frames[2].Sha256!, ".jpg");
Directory.CreateDirectory(project.OriginalsDirectory);
- File.WriteAllText(project.MediaFile(held), "held original");
+ var heldBytes = File.ReadAllBytes(fx.Archive.Paths.FromRelative(fx.Frames[0].RelativePath));
+ File.WriteAllBytes(project.MediaFile(held), heldBytes);
File.WriteAllText(project.MediaFile(lost), "last original");
+ File.WriteAllText(project.MediaFile(changed), "edited since");
+ File.WriteAllText(Path.Combine(project.OriginalsDirectory, "stray.jpg"), "named by no index");
project.WriteMedia(media with
{
Kind = BundleMedia.Originals,
Frames =
[
- media.Frames[0] with { Original = held, OriginalSha256 = fx.Frames[0].Sha256, OriginalBytes = 13 },
+ media.Frames[0] with { Original = held, OriginalSha256 = fx.Frames[0].Sha256, OriginalBytes = heldBytes.Length },
media.Frames[1] with { Original = lost, OriginalSha256 = new string('f', 64), OriginalBytes = 13 },
- .. media.Frames.Skip(2),
+ media.Frames[2] with { Original = changed, OriginalSha256 = fx.Frames[2].Sha256, OriginalBytes = 12 },
+ .. media.Frames.Skip(3),
],
});
+ // The index alone names only the second as the last one.
Assert.SequenceEqual([media.Frames[1].Id], WorkspaceCleaner.LastOriginals(project.ReadMedia(), await fx.Home.FramesAsync(fx.Ct)).Select(f => f.Id));
var report = await Cleaner(fx, sync).CleanAsync(Aged(project.ProjectId), fx.Ct);
- Assert.Equal(1, One(report.Cleaned).Trashed);
+ // Each file hashed now: only the one the home holds byte for byte went away.
+ Assert.Equal(3, One(report.Cleaned).Trashed);
Assert.False(Directory.Exists(project.OriginalsDirectory), "the originals folder went");
var trash = WorkspaceTrash.List(store.Root, fx.Ct);
var entry = One(trash.Entries);
Assert.True(entry.Name.StartsWith(project.ProjectId.ToString("N") + "-", StringComparison.Ordinal), entry.Name);
- Assert.Equal("last original", File.ReadAllText(Path.Combine(trash.Folder, entry.Name, WorkspaceProject.OriginalsFolder, Path.GetFileName(lost))));
- Assert.Equal((1, "last original".Length), (entry.Files, entry.Bytes));
+ var kept = Path.Combine(trash.Folder, entry.Name, WorkspaceProject.OriginalsFolder);
+ Assert.Equal("last original", File.ReadAllText(Path.Combine(kept, Path.GetFileName(lost))));
+ Assert.Equal("edited since", File.ReadAllText(Path.Combine(kept, Path.GetFileName(changed))));
+ Assert.Equal("named by no index", File.ReadAllText(Path.Combine(kept, "stray.jpg")));
+ Assert.False(File.Exists(Path.Combine(kept, Path.GetFileName(held))), "the home holds that one");
+ Assert.Equal((3, (long)("last original".Length + "edited since".Length + "named by no index".Length)), (entry.Files, entry.Bytes));
}
[Test]
@@ -214,7 +226,9 @@ public abstract class WorkspaceCleanupTests(TestContext context) : DatabaseTest(
// Once copied again: the oldest goes first, and one is enough this time.
await fx.CopyAsync(sync.Store, b.ProjectId);
await fx.CopyAsync(sync.Store, c.ProjectId);
- report = await Cleaner(fx, sync).CleanAsync(new WorkspaceCleanOptions { SizeLimitBytes = total - 1, Opened = opened, Now = now }, fx.Ct);
+ // Measured again: a copy's timestamps may be a byte shorter or longer than the first copy's.
+ var again = new[] { main, b, c }.Sum(p => WorkspaceCleaner.Measure(p.Folder).Bytes);
+ report = await Cleaner(fx, sync).CleanAsync(new WorkspaceCleanOptions { SizeLimitBytes = again - 1, Opened = opened, Now = now }, fx.Ct);
Assert.SequenceEqual([main.ProjectId], report.Cleaned.Select(p => p.ProjectId));
Assert.Empty(report.Kept);
Assert.True(Directory.Exists(b.ProxiesDirectory) && Directory.Exists(c.ProxiesDirectory), "the others stay");
diff --git a/tests/Chronos.Data.Tests/Workspaces/WorkspaceFixture.cs b/tests/Chronos.Data.Tests/Workspaces/WorkspaceFixture.cs
index 5c8175a5..738ba24c 100644
--- a/tests/Chronos.Data.Tests/Workspaces/WorkspaceFixture.cs
+++ b/tests/Chronos.Data.Tests/Workspaces/WorkspaceFixture.cs
@@ -84,10 +84,10 @@ internal sealed class WorkspaceFixture : IAsyncDisposable
}
/// Queues a workspace copy job and returns at once, while it runs.
- public async Task StartCopyAsync(WorkspaceStore store, Guid projectId)
+ public async Task StartCopyAsync(WorkspaceStore store, Guid projectId, string media = "proxies")
{
var engine = await EngineAsync();
- return await engine.EnqueueAsync(WorkspaceJobs.Copy(Sequence, store.Root, projectId), cancellationToken: Ct);
+ return await engine.EnqueueAsync(WorkspaceJobs.Copy(Sequence, store.Root, projectId, media), cancellationToken: Ct);
}
/// Cancels a job, as the user does from the jobs list.
diff --git a/tests/Chronos.Data.Tests/Workspaces/WorkspaceFoundationTests.cs b/tests/Chronos.Data.Tests/Workspaces/WorkspaceFoundationTests.cs
index ec9907f2..735ad52e 100644
--- a/tests/Chronos.Data.Tests/Workspaces/WorkspaceFoundationTests.cs
+++ b/tests/Chronos.Data.Tests/Workspaces/WorkspaceFoundationTests.cs
@@ -98,6 +98,76 @@ public sealed class WorkspaceFoundationTests(TestContext context)
Assert.Equal(Path.Combine(project.ExportsDirectory, "Roof 4K.mp4"), project.ExportFile("Roof 4K.mp4"));
}
+ [Test]
+ public void AMediaIndexHoldingOriginalsIsWrittenInAFormatAPhase5bChronosRefuses()
+ {
+ var store = new WorkspaceStore(Path.Combine(context.CreateTempDirectory("ws"), "workspace"));
+ var project = store.Project(Guid.CreateVersion7());
+ var sequenceId = Guid.CreateVersion7();
+ int Written() => JsonNode.Parse(File.ReadAllText(project.MediaIndexPath))!["formatVersion"]!.GetValue();
+
+ // Proxies only: as phase 5b wrote it, which it reads.
+ project.WriteMedia(Media(sequenceId, BundleMedia.Proxies, Frame(sequenceId, 0)));
+ Assert.Equal(WorkspaceMedia.ProxiesFormatVersion, Written());
+ // Originals, or a frame holding one, or media the clean-up removed: format 2, which phase 5b refuses as newer
+ // rather than reading the frames' files as its proxies.
+ project.WriteMedia(Media(sequenceId, BundleMedia.Originals, Frame(sequenceId, 0)));
+ Assert.Equal(WorkspaceMedia.CurrentFormatVersion, Written());
+ var held = Frame(sequenceId, 0);
+ held = held with { Original = WorkspaceProject.OriginalName(held.Id, new string('c', 64), ".jpg"), OriginalSha256 = new string('c', 64), OriginalBytes = 9 };
+ project.WriteMedia(Media(sequenceId, BundleMedia.Proxies, held));
+ Assert.Equal(WorkspaceMedia.CurrentFormatVersion, Written());
+ project.WriteMedia(Media(sequenceId, BundleMedia.Proxies, Frame(sequenceId, 0)) with { Cleaned = T0 });
+ Assert.Equal(WorkspaceMedia.CurrentFormatVersion, Written());
+ Assert.True(Assert.NotNull(project.ReadMedia()).IsCleaned, "this Chronos reads its own format back");
+ Assert.Equal(2, WorkspaceMedia.CurrentFormatVersion);
+ }
+
+ [Test]
+ public void ALedgerNamesOnlyFilesInsideTheExports()
+ {
+ var store = new WorkspaceStore(Path.Combine(context.CreateTempDirectory("ws"), "workspace"));
+ var project = store.Project(Guid.CreateVersion7());
+ Assert.Equal(Path.GetFullPath(project.ExportFile("Roof 4K.mp4")), project.ContainedExportFile("Roof 4K.mp4"));
+ Assert.Equal(Path.GetFullPath(project.ExportFile(Path.Combine("Roof frames", "0001.tif"))), project.ContainedExportFile("Roof frames/0001.tif"));
+ foreach (var refused in new[]
+ {
+ null, "", " ", ".", "..", "../project.chronos", @"..\media.json", "a/../../x.mp4", "a//b.mp4", "./a.mp4", "/etc/passwd",
+ @"C:\Windows\win.ini", "C:x.mp4", @"\\server\share\x.mp4", WorkspaceProject.RendersFileName,
+ })
+ Assert.Null(project.ContainedExportFile(refused), refused ?? "null");
+ }
+
+ [Test]
+ public void ATrashEntryBeingFilledIsNeverListedAndTakesItsNameWhenWhole()
+ {
+ var root = Path.Combine(context.CreateTempDirectory("ws"), "workspace");
+ var projectId = Guid.CreateVersion7();
+ string staging;
+ using (var trash = WorkspaceTrash.Begin(root, projectId, T0.UtcDateTime))
+ {
+ staging = trash.Path;
+ Assert.True(Directory.Exists(staging));
+ File.WriteAllText(Path.Combine(staging, "half.jpg"), "half");
+ // Listed while it is being filled, an Empty… could erase what a removal is still moving there.
+ var listing = WorkspaceTrash.List(root);
+ Assert.True(listing.IsEmpty, string.Join(", ", listing.Entries.Select(e => e.Name)));
+ Assert.Equal((0, 0L), WorkspaceTrash.Empty(root, listing));
+ Assert.FileExists(Path.Combine(staging, "half.jpg"));
+ }
+ Assert.False(Directory.Exists(staging));
+ var entries = WorkspaceTrash.List(root).Entries;
+ Assert.Equal(1, entries.Count);
+ var entry = entries[0];
+ Assert.True(entry.Name.StartsWith(projectId.ToString("N") + "-", StringComparison.Ordinal), entry.Name);
+ Assert.Equal((1, 4L), (entry.Files, entry.Bytes));
+
+ // One that nothing came into leaves no entry.
+ using (var empty = WorkspaceTrash.Begin(root, projectId, T0.UtcDateTime))
+ Assert.True(Directory.Exists(empty.Path));
+ Assert.Equal(1, WorkspaceTrash.List(root).Entries.Count);
+ }
+
private static WorkspaceRenderEntry Entry(Guid projectId, string file) =>
new(Guid.CreateVersion7(), Guid.CreateVersion7(), file, new string('b', 64), 12_345, "4K HEVC", "hevc", 3840, 2160, 30, 10, projectId,
Guid.CreateVersion7(), "hash", T0);
diff --git a/tests/Chronos.Data.Tests/Workspaces/WorkspaceMoveTests.cs b/tests/Chronos.Data.Tests/Workspaces/WorkspaceMoveTests.cs
index e3af0e07..fc2d3dcc 100644
--- a/tests/Chronos.Data.Tests/Workspaces/WorkspaceMoveTests.cs
+++ b/tests/Chronos.Data.Tests/Workspaces/WorkspaceMoveTests.cs
@@ -334,6 +334,175 @@ public sealed class WorkspaceMoveTests(TestContext context)
Assert.False(Directory.Exists(to));
}
+ [Test]
+ public async Task TwoVolumesUnderOneFolderAreCopiedWhenTheFirstRenameIsRefused()
+ {
+ var (from, _) = Workspace(projects: 2);
+ var before = Contents(from);
+ var to = Path.Combine(context.CreateTempDirectory("target"), "moved");
+ var renames = 0;
+ var copied = 0;
+ var mover = new WorkspaceMover(from, to)
+ {
+ // Both under one drive letter, the target a volume mounted in a folder: the system refuses the rename.
+ SameVolume = true,
+ Cut = (step, _) =>
+ {
+ if (step == "rename" && ++renames == 1)
+ throw new IOException("The system cannot move the file to a different disk drive.", OperatingSystem.IsWindows() ? unchecked((int)0x80070011) : 18);
+ if (step == "copied") copied++;
+ },
+ };
+ var (survey, resumed) = await mover.MoveAsync(mover.Survey().Fingerprint, cancellationToken: context.Cancellation);
+
+ Assert.False(resumed);
+ Assert.True(survey.SameVolume, "planned as one volume");
+ Assert.Equal(1, renames);
+ Assert.Equal(before.Keys.Count(k => !IsLease(k)), copied, "every file copied and verified instead");
+ var after = Contents(to);
+ foreach (var (name, sha) in before.Where(b => !IsLease(b.Key))) Assert.Equal(sha, after.GetValueOrDefault(name), name);
+ Assert.False(Directory.Exists(from));
+ }
+
+ [Test]
+ public async Task AnEntryThatChangedAfterItsCopyIsKeptAndTheMoveEndsWell()
+ {
+ var (from, ids) = Workspace(projects: 2);
+ var to = Path.Combine(context.CreateTempDirectory("target"), "moved");
+ var changed = Path.Combine(from, ids[0].ToString("N"), "versions", "0001.json");
+ var mover = new WorkspaceMover(from, to)
+ {
+ SameVolume = false,
+ Cut = (step, _) =>
+ {
+ // Written after its copy was verified, before the source is cleared.
+ if (step == "switched") File.AppendAllText(changed, " ");
+ },
+ };
+ var log = new List();
+ var survey = mover.Survey();
+ await mover.MoveAsync(survey.Fingerprint, log: log.Add, cancellationToken: context.Cancellation);
+
+ Assert.Equal("{} ", File.ReadAllText(changed), "never deleted");
+ Assert.False(Directory.Exists(Path.Combine(from, ids[1].ToString("N"))), "the other project went");
+ Assert.Contains(Loc.L("Archive.Log.WorkspaceMoveLeft", mover.From, 1), log);
+ Assert.Contains(Loc.L("Archive.Log.WorkspaceMoved", mover.To, 2, survey.Files), log);
+ Assert.Equal(2, new WorkspaceStore(to).List().Count);
+ }
+
+ [Test]
+ [WindowsOnly]
+ public async Task AnEntryHeldOpenAfterTheSwitchStaysInTheJournalAndIsClearedWhenTakenUp()
+ {
+ var (from, ids) = Workspace(projects: 2);
+ var to = Path.Combine(context.CreateTempDirectory("target"), "moved");
+ var heldFile = Path.Combine(from, ids[1].ToString("N"), WorkspaceProject.BundleFile);
+ FileStream? held = null;
+ var mover = new WorkspaceMover(from, to)
+ {
+ SameVolume = false,
+ Cut = (step, _) =>
+ {
+ // An editor elsewhere holds a file of the old folder open: it cannot be deleted.
+ if (step == "switched") held = new FileStream(heldFile, FileMode.Open, FileAccess.Read, FileShare.Read);
+ },
+ };
+ var log = new List();
+ try
+ {
+ // The move ends well: the target is the workspace, the left entry is a notice.
+ await mover.MoveAsync(mover.Survey().Fingerprint, log: log.Add, cancellationToken: context.Cancellation);
+ }
+ finally
+ {
+ held?.Dispose();
+ }
+ Assert.Contains(Loc.L("Archive.Log.WorkspaceMoveLeft", mover.From, 1), log);
+ var journal = Assert.NotNull(WorkspaceMover.ReadJournal(from));
+ Assert.Equal(WorkspaceMoveStage.Switched, journal.Stage);
+ Assert.SequenceEqual([ids[1].ToString("N")], journal.Entries);
+ Assert.Equal(2, new WorkspaceStore(to).List().Count);
+
+ // Taken up once let go: told again, the entry cleared, the journal and the old folder gone.
+ var told = 0;
+ var (_, resumed) = await new WorkspaceMover(from, to) { SameVolume = false }.MoveAsync("whatever", (_, _) =>
+ {
+ told++;
+ return Task.CompletedTask;
+ }, cancellationToken: context.Cancellation);
+ Assert.True(resumed);
+ Assert.Equal(1, told);
+ Assert.False(Directory.Exists(from));
+ Assert.Equal(2, new WorkspaceStore(to).List().Count);
+ }
+
+ [Test]
+ public async Task AMoveCutInsideAnEntryLeavingAPartFinishesWithEveryFileWhole()
+ {
+ var (from, ids) = Workspace(projects: 2);
+ var before = Contents(from);
+ var to = Path.Combine(context.CreateTempDirectory("target"), "moved");
+ using var stop = CancellationTokenSource.CreateLinkedTokenSource(context.Cancellation);
+ var copied = 0;
+ var first = new WorkspaceMover(from, to)
+ {
+ SameVolume = false,
+ Cut = (step, _) =>
+ {
+ // The second file of an entry reached the target: the entry is not verified yet.
+ if (step == "copied" && ++copied == 2) stop.Cancel();
+ },
+ };
+ var fingerprint = first.Survey().Fingerprint;
+ await Assert.ThrowsAsync(() => first.MoveAsync(fingerprint, cancellationToken: stop.Token));
+ Assert.Empty(WorkspaceMover.ReadJournal(from)!.Verified);
+ // The program was killed while it wrote the next file: half of it is left as a part beside its name.
+ var proxies = Path.Combine(to, ids.Select(i => i.ToString("N")).Order(StringComparer.Ordinal).First(), "media", "proxies");
+ Directory.CreateDirectory(proxies);
+ File.WriteAllBytes(Path.Combine(proxies, "2.jpg" + WorkspaceMover.PartSuffix), new byte[100]);
+
+ var (_, resumed) = await new WorkspaceMover(from, to) { SameVolume = false }.MoveAsync("whatever", cancellationToken: context.Cancellation);
+
+ Assert.True(resumed);
+ var after = Contents(to);
+ foreach (var (name, sha) in before.Where(b => !IsLease(b.Key))) Assert.Equal(sha, after.GetValueOrDefault(name), name);
+ Assert.Empty(Directory.EnumerateFiles(to, "*" + WorkspaceMover.PartSuffix, SearchOption.AllDirectories));
+ Assert.False(Directory.Exists(from));
+ }
+
+ [Test]
+ public async Task AJobFindsItsProjectWhereTheWorkspaceIsNowAndWaitsWhileItIsMoved()
+ {
+ var (from, ids) = Workspace(projects: 1);
+ var id = ids[0];
+ const string missing = "Errors.Workspace.NotCheckedOut";
+ Assert.Equal(WorkspaceStore.FullRoot(from), WorkspaceJobRoots.Resolve(from, id, null, missing));
+ var other = Assert.Throws(() => WorkspaceJobRoots.Resolve(from, Guid.CreateVersion7(), null, missing));
+ Assert.Equal(Loc.L(missing), other.Message);
+
+ // A move under way (before its switch): every job of either folder waits for it.
+ var to = Path.Combine(context.CreateTempDirectory("target"), "moved");
+ using (var stop = CancellationTokenSource.CreateLinkedTokenSource(context.Cancellation))
+ {
+ var moving = new WorkspaceMover(from, to) { SameVolume = false, Cut = (step, _) => { if (step == "copied") stop.Cancel(); } };
+ await Assert.ThrowsAsync(() => moving.MoveAsync(moving.Survey().Fingerprint, cancellationToken: stop.Token));
+ }
+ Assert.Equal(Loc.L("Errors.Workspace.Moving"), Assert.Throws(() => WorkspaceJobRoots.Resolve(from, id, null, missing)).Message);
+ Assert.Equal(Loc.L("Errors.Workspace.Moving"), Assert.Throws(() => WorkspaceJobRoots.Resolve(to, id, () => from, missing)).Message);
+
+ // Past its switch, the source not cleared yet: a job queued for the old folder works in the new one.
+ var switched = new WorkspaceMover(from, to) { SameVolume = false, Cut = (step, _) => { if (step == "switched") throw new IOException("closed at the switch"); } };
+ await Assert.ThrowsAsync(() => switched.MoveAsync("whatever", cancellationToken: context.Cancellation));
+ Assert.Equal(WorkspaceMoveStage.Switched, WorkspaceMover.ReadJournal(from)!.Stage);
+ Assert.Equal(WorkspaceStore.FullRoot(to), WorkspaceJobRoots.Resolve(from, id, null, missing));
+
+ // Once ended: the old folder holds nothing; the folder in use does.
+ await new WorkspaceMover(from, to) { SameVolume = false }.MoveAsync("whatever", cancellationToken: context.Cancellation);
+ Assert.False(Directory.Exists(from));
+ Assert.Equal(WorkspaceStore.FullRoot(to), WorkspaceJobRoots.Resolve(from, id, () => to, missing));
+ Assert.Equal(Loc.L(missing), Assert.Throws(() => WorkspaceJobRoots.Resolve(from, id, null, missing)).Message);
+ }
+
///
/// A workspace with projects (a working state, media with an empty folder, versions, the
/// lease), its manifest and a trash entry.
diff --git a/tests/Chronos.Data.Tests/Workspaces/WorkspaceOriginalsTests.cs b/tests/Chronos.Data.Tests/Workspaces/WorkspaceOriginalsTests.cs
index fe729fa9..6cbe80b5 100644
--- a/tests/Chronos.Data.Tests/Workspaces/WorkspaceOriginalsTests.cs
+++ b/tests/Chronos.Data.Tests/Workspaces/WorkspaceOriginalsTests.cs
@@ -151,6 +151,51 @@ public abstract class WorkspaceOriginalsTests(TestContext context) : DatabaseTes
Assert.Equal(media.Frames[1].OriginalSha256, Sha(inTrash[0]));
}
+ [Test]
+ public async Task ACancelledCopyOfTheOriginalsRemovesWhatItWroteAndTrashesWhatTheHomeLacks()
+ {
+ var fx = await FixtureAsync();
+ var (store, sync) = fx.Workspace();
+ var project = await fx.CheckoutAsync(sync);
+ Assert.False(project.ReadMedia()!.HoldsOriginals);
+ var until = DateTime.UtcNow + TimeSpan.FromSeconds(TestTiming.Budget(30));
+
+ // Held so that the copy writes its originals and waits to record them; cancelled there.
+ var lease = await project.LockAsync(TimeSpan.FromSeconds(10), fx.Ct);
+ Job job;
+ try
+ {
+ job = await fx.StartCopyAsync(store, project.ProjectId, BundleMedia.Originals);
+ while (!(Directory.Exists(project.OriginalsDirectory)
+ && Directory.GetFiles(project.OriginalsDirectory).Count(f => !f.EndsWith(".part", StringComparison.Ordinal)) == fx.Frames.Count))
+ {
+ if (DateTime.UtcNow > until) Assert.Fail("the copy's originals were not written");
+ await Task.Delay(20, fx.Ct);
+ }
+ // A file of bytes the home does not hold, and a download cut short.
+ File.WriteAllText(Path.Combine(project.OriginalsDirectory, "edited.jpg"), "not the home's photo");
+ File.WriteAllText(Path.Combine(project.OriginalsDirectory, Guid.NewGuid().ToString("N") + ".part"), "half");
+ await fx.CancelAsync(job.Id);
+ }
+ finally
+ {
+ lease.Dispose();
+ }
+ await fx.Archive.WaitForAsync(job.Id, JobState.Cancelled, (int)TestTiming.Budget(30));
+ while (Directory.Exists(project.OriginalsDirectory))
+ {
+ if (DateTime.UtcNow > until) Assert.Fail("the cancelled copy's originals stayed: " + string.Join(", ", Directory.GetFiles(project.OriginalsDirectory).Select(Path.GetFileName)));
+ await Task.Delay(20, fx.Ct);
+ }
+
+ // The media a copy finished before stay; the one file the home lacks is in the trash, never away.
+ var media = project.ReadMedia()!;
+ Assert.False(media.HoldsOriginals);
+ foreach (var frame in media.Frames) Assert.FileExists(project.MediaFile(frame.File!));
+ var inTrash = Directory.GetFiles(Path.Combine(store.Root, WorkspaceOriginals.TrashFolder), "*", SearchOption.AllDirectories);
+ Assert.SequenceEqual(["edited.jpg"], inTrash.Select(Path.GetFileName));
+ }
+
[Test]
public async Task ProxiesOnlyRefusesAPlanTheFilesChangedSince()
{
diff --git a/tests/Chronos.Data.Tests/Workspaces/WorkspaceRenderTests.cs b/tests/Chronos.Data.Tests/Workspaces/WorkspaceRenderTests.cs
index bc9788b8..48508819 100644
--- a/tests/Chronos.Data.Tests/Workspaces/WorkspaceRenderTests.cs
+++ b/tests/Chronos.Data.Tests/Workspaces/WorkspaceRenderTests.cs
@@ -94,7 +94,8 @@ public sealed class WorkspaceRenderTests(TestContext context)
// The send home follows with the new render, and files it in the archive with its project.
var send = (await fx.Db.Jobs.ListAsync(null, 50, null, fx.Ct)).Items.Single(j => j.Kind == JobKind.WorkspaceSend);
var sent = Assert.NotNull(WorkspaceJobs.SendParameters(send));
- Assert.SequenceEqual([entry.RenderId], sent.RenderIds);
+ // Every render not sent yet, this one among them: one a send failed earlier goes with it.
+ Assert.Empty(sent.RenderIds);
Assert.Equal((bed.Project.ProjectId, bed.Store.Root), (sent.ProjectId, sent.WorkspaceRoot));
await fx.WaitForAsync(send.Id, JobState.Done);
var filed = Assert.NotNull(await fx.Db.Renders.GetAsync(entry.RenderId, fx.Ct));
diff --git a/tests/Chronos.Data.Tests/Workspaces/WorkspaceSendTests.cs b/tests/Chronos.Data.Tests/Workspaces/WorkspaceSendTests.cs
index 38f33588..f97f8c03 100644
--- a/tests/Chronos.Data.Tests/Workspaces/WorkspaceSendTests.cs
+++ b/tests/Chronos.Data.Tests/Workspaces/WorkspaceSendTests.cs
@@ -47,14 +47,14 @@ public abstract class WorkspaceSendTests(TestContext context) : DatabaseTest(con
}
/// An output in the project's exports with its ledger entry, as a local render leaves them.
- private static WorkspaceRenderEntry Render(WorkspaceProject project, Guid? versionId, string name, int seed)
+ private static WorkspaceRenderEntry Render(WorkspaceProject project, Guid? versionId, string name, int seed, string? settingsHash = null)
{
Directory.CreateDirectory(project.ExportsDirectory);
var bytes = new byte[150_000 + seed];
new Random(seed).NextBytes(bytes);
File.WriteAllBytes(Path.Combine(project.ExportsDirectory, name), bytes);
var entry = new WorkspaceRenderEntry(Guid.CreateVersion7(), Guid.CreateVersion7(), name, Convert.ToHexStringLower(SHA256.HashData(bytes)), bytes.Length,
- "1080p H.264", "h264", 1920, 1080, 24, 2.5, project.ProjectId, versionId, null, Rendered);
+ "1080p H.264", "h264", 1920, 1080, 24, 2.5, project.ProjectId, versionId, settingsHash, Rendered);
project.WriteRenders(project.ReadRenders().With(entry));
return entry;
}
@@ -221,12 +221,53 @@ public abstract class WorkspaceSendTests(TestContext context) : DatabaseTest(con
var foreign = (await fx.Home.HeadAsync(other.Id, fx.Ct)).Id;
var entry = Render(project, foreign, "Foreign.mp4", 7);
+ var job = await SendAsync(fx, engine, store, project.ProjectId, JobState.Done);
+
+ // The project's home holds no such version of this project: the render goes with its project alone.
+ Assert.Contains(Loc.L("Archive.Log.WorkspaceVersionNotHome", project.ReadBundle().Workspace!.Name), job.LogTail!);
+ var row = Assert.NotNull(await fx.Db.Renders.GetAsync(entry.RenderId, fx.Ct));
+ Assert.Equal(((Guid?)project.ProjectId, (Guid?)null), (row.ProjectId, row.ProjectVersionId));
+ Assert.True(project.ReadRenders().Find(entry.RenderId)!.IsSent);
+ Assert.Null(project.ReadRenders().Find(entry.RenderId)!.ProjectVersionId);
+ }
+
+ [Test]
+ public async Task AVersionTheHomeHoldsByAnotherIdIsFiledByThatId()
+ {
+ var fx = await FixtureAsync();
+ var engine = await EngineAsync(fx);
+ var (store, _, project) = await CheckoutAsync(fx);
+ // A version a push replayed on a home that moved on: the home holds its content under another id.
+ var head = await fx.Home.HeadAsync(project.ProjectId, fx.Ct);
+ var entry = Render(project, Guid.CreateVersion7(), "Replayed.mp4", 11, head.ContentHash);
+
+ var job = await SendAsync(fx, engine, store, project.ProjectId, JobState.Done);
+
+ Assert.Contains(Loc.L("Archive.Log.WorkspaceVersionReplayed", project.ReadBundle().Workspace!.Name, head.Number), job.LogTail!);
+ var row = Assert.NotNull(await fx.Db.Renders.GetAsync(entry.RenderId, fx.Ct));
+ Assert.Equal(((Guid?)project.ProjectId, (Guid?)head.Id), (row.ProjectId, row.ProjectVersionId));
+ // The ledger names the home's id from now on.
+ var sent = Assert.NotNull(project.ReadRenders().Find(entry.RenderId));
+ Assert.Equal(((Guid?)head.Id, true), (sent.ProjectVersionId, sent.IsSent));
+ }
+
+ [Test]
+ public async Task ALedgerNamingAFileOutsideTheExportsIsRefused()
+ {
+ var fx = await FixtureAsync();
+ var engine = await EngineAsync(fx);
+ var (store, _, project) = await CheckoutAsync(fx);
+ // A ledger edited by hand (or a newer Chronos's) naming the working state: never read, never sent.
+ var entry = Render(project, null, "Outside.mp4", 12) with { File = Path.Combine("..", WorkspaceProject.BundleFile) };
+ project.WriteRenders(project.ReadRenders().Without(entry.RenderId).With(entry));
+
var failed = await SendAsync(fx, engine, store, project.ProjectId, JobState.Failed);
- Assert.Equal(Loc.L("Errors.Workspace.SendVersion"), failed.Error);
+ Assert.Equal(Loc.L("Errors.Workspace.SendFailed", 1, 1), failed.Error);
Assert.Null(await fx.Db.Renders.GetAsync(entry.RenderId, fx.Ct));
- // Not the render's fault: it waits, unsent, for the next send.
- Assert.Equal(WorkspaceRenderEntry.Pending, project.ReadRenders().Find(entry.RenderId)!.State);
+ Assert.Equal((WorkspaceRenderEntry.Failed, Loc.L("Errors.Workspace.SendMissing", WorkspaceProject.BundleFile)),
+ (project.ReadRenders().Find(entry.RenderId)!.State, project.ReadRenders().Find(entry.RenderId)!.Error));
+ Assert.FileExists(project.BundlePath);
}
[Test]
diff --git a/tests/Chronos.Server.Tests/Workspaces/ServerWorkspaceTests.cs b/tests/Chronos.Server.Tests/Workspaces/ServerWorkspaceTests.cs
index a2b8dd27..18220552 100644
--- a/tests/Chronos.Server.Tests/Workspaces/ServerWorkspaceTests.cs
+++ b/tests/Chronos.Server.Tests/Workspaces/ServerWorkspaceTests.cs
@@ -184,6 +184,36 @@ public sealed class ServerWorkspaceTests(TestContext context)
static int Downloaded(WorkspaceMedia media, Range frames) => media.Frames.Take(frames).Count(f => f.FileKind == "proxy");
}
+ [Test]
+ public async Task ACopyFromTheServerWaitsWhileTheConnectionIsMetered()
+ {
+ await using var server = await TestServer.StartAsync(context, services: ArchiveModule.Register);
+ var (_, _, token) = await server.UserAsync("alberto", "editor");
+ var sid = await SequenceAsync(server, token, 2);
+ var metered = true;
+ var asked = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ await using var a = await WorkspaceClient.StartAsync(context, server, token, "PC-A", hold: () =>
+ {
+ var held = Volatile.Read(ref metered);
+ if (held) asked.TrySetResult();
+ return held;
+ });
+ var home = a.Home(sid);
+ var main = (await home.ListAsync(context.Cancellation)).Single();
+ var project = await a.Sync.CheckoutAsync(home, main.Id, cancellationToken: context.Cancellation);
+
+ // Held before anything is downloaded.
+ var job = await a.EnqueueAsync(WorkspaceJobs.CopyFromServer(sid, Title, a.Server, a.Store.Root, main.Id));
+ await asked.Task.WaitAsync(Wait, context.Cancellation);
+ Assert.Equal(JobState.Running, (await a.Db.Jobs.GetAsync(job.Id, context.Cancellation))!.State);
+ Assert.False(Directory.Exists(project.ProxiesDirectory) && Directory.EnumerateFiles(project.ProxiesDirectory).Any(), "nothing downloaded while metered");
+
+ Volatile.Write(ref metered, false);
+ var done = await a.WaitAsync(job.Id, JobState.Done);
+ Assert.Contains(Loc.L("Archive.Log.WorkspaceCopyHeld"), done.LogTail!);
+ Assert.Equal(2, Assert.NotNull(project.ReadMedia()).Frames.Count);
+ }
+
[Test]
public async Task ACopyIsRefusedForAnotherHomeOrWithoutTheServer()
{
@@ -529,7 +559,8 @@ public sealed class ServerWorkspaceTests(TestContext context)
/// Whether the copy job finds this PC signed in to the server.
public bool Connected { get; set; } = true;
- public static async Task StartAsync(TestContext context, TestServer server, string token, string name, HttpMessageHandler? handler = null)
+ public static async Task StartAsync(TestContext context, TestServer server, string token, string name, HttpMessageHandler? handler = null,
+ Func? hold = null)
{
var db = await ChronosDatabase.OpenAsync(DatabaseOptions.Sqlite(Path.Combine(context.CreateTempDirectory(name + "-db"), "chronos.db")), context.Cancellation);
var archives = new ArchiveService(db, new ArchiveServiceOptions { Owner = name });
@@ -537,7 +568,8 @@ public sealed class ServerWorkspaceTests(TestContext context)
var archive = await archives.CreateAsync(context.CreateTempDirectory(name + "-archive"), "Local", cancellationToken: context.Cancellation);
var client = new ChronosClient(server.HttpBase, new CertificatePinning([]), name, handler) { Token = token };
WorkspaceClient? created = null;
- var engine = new JobEngine(db, WorkspaceJobs.CreateHandlers(db, archives, new Connector(client, () => created?.Connected ?? true)),
+ var options = hold is null ? WorkspaceJobOptions.For(archives) : WorkspaceJobOptions.For(archives) with { HoldTransfers = hold };
+ var engine = new JobEngine(db, WorkspaceJobs.CreateHandlers(db, archives, new Connector(client, () => created?.Connected ?? true), options),
new JobEngineOptions { Workers = 1, WorkerId = name, PollInterval = TimeSpan.FromMilliseconds(50), CheckpointInterval = TimeSpan.FromMilliseconds(50) });
await engine.StartAsync(context.Cancellation);
var store = new WorkspaceStore(Path.Combine(context.CreateTempDirectory(name + "-ws"), "workspace"));
diff --git a/tests/Chronos.Server.Tests/Workspaces/WorkspaceSendServerTests.cs b/tests/Chronos.Server.Tests/Workspaces/WorkspaceSendServerTests.cs
index adaa1692..db36c7ea 100644
--- a/tests/Chronos.Server.Tests/Workspaces/WorkspaceSendServerTests.cs
+++ b/tests/Chronos.Server.Tests/Workspaces/WorkspaceSendServerTests.cs
@@ -104,7 +104,17 @@ public sealed class WorkspaceSendServerTests(TestContext context)
await using var db = await ChronosDatabase.OpenAsync(DatabaseOptions.Sqlite(Path.Combine(context.CreateTempDirectory("pc-db"), "chronos.db")), context.Cancellation);
var archives = new ArchiveService(db, new ArchiveServiceOptions { Owner = "PC-A" });
var metered = true;
- var options = WorkspaceJobOptions.For(archives) with { HoldTransfers = () => Volatile.Read(ref metered) };
+ // Signalled once the send asks: from then on it waits, and nothing it holds went out.
+ var asked = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var options = WorkspaceJobOptions.For(archives) with
+ {
+ HoldTransfers = () =>
+ {
+ var held = Volatile.Read(ref metered);
+ if (held) asked.TrySetResult();
+ return held;
+ },
+ };
await using var engine = new JobEngine(db, WorkspaceJobs.CreateHandlers(db, archives, new Connector(client), options),
new JobEngineOptions { Workers = 1, WorkerId = "PC-A", PollInterval = TimeSpan.FromMilliseconds(50), CheckpointInterval = TimeSpan.FromMilliseconds(50) });
await engine.StartAsync(context.Cancellation);
@@ -124,7 +134,7 @@ public sealed class WorkspaceSendServerTests(TestContext context)
// Held while the connection is metered: nothing goes out.
var job = await engine.EnqueueAsync(WorkspaceJobs.Send(sid, Title, store.Root, main.Id, [entry.RenderId], serverKey), cancellationToken: context.Cancellation);
- await Task.Delay(TimeSpan.FromSeconds(1), context.Cancellation);
+ await asked.Task.WaitAsync(Wait, context.Cancellation);
Assert.Equal(JobState.Running, (await db.Jobs.GetAsync(job.Id, context.Cancellation))!.State);
Assert.Null(await server.Database.Renders.GetAsync(entry.RenderId));
Assert.True(project.ReadRenders().Find(entry.RenderId)!.IsUnsent);
@@ -141,6 +151,43 @@ public sealed class WorkspaceSendServerTests(TestContext context)
Assert.Empty(await db.Renders.ListBySequenceAsync(sid, context.Cancellation));
}
+ [Test]
+ public async Task AnImageSequenceRenderedHereStaysInTheWorkspaceForAServerHome()
+ {
+ await using var server = await TestServer.StartAsync(context, services: ArchiveModule.Register);
+ var (http, _, token) = await server.UserAsync("alberto", "editor");
+ var sid = (await Uploads.UploadAsync(http, Photo(1), "IMG_0001.JPG", sessionKey: "roof")).SequenceId;
+ using var client = new ChronosClient(server.HttpBase, new CertificatePinning([]), "PC-A") { Token = token };
+ await using var db = await ChronosDatabase.OpenAsync(DatabaseOptions.Sqlite(Path.Combine(context.CreateTempDirectory("pc-db"), "chronos.db")), context.Cancellation);
+ var archives = new ArchiveService(db, new ArchiveServiceOptions { Owner = "PC-A" });
+ await using var engine = new JobEngine(db, WorkspaceJobs.CreateHandlers(db, archives, new Connector(client), WorkspaceJobOptions.For(archives)),
+ new JobEngineOptions { Workers = 1, WorkerId = "PC-A", PollInterval = TimeSpan.FromMilliseconds(50), CheckpointInterval = TimeSpan.FromMilliseconds(50) });
+ await engine.StartAsync(context.Cancellation);
+ var store = new WorkspaceStore(Path.Combine(context.CreateTempDirectory("pc-ws"), "workspace"));
+ var sync = new WorkspaceSync(store, "Chronos on PC-A") { LockWait = TimeSpan.FromSeconds(TestTiming.Budget(10)) };
+ var home = new ServerProjectHome(client, sid, "Test server");
+ var main = (await home.ListAsync(context.Cancellation)).Single();
+ var project = await sync.CheckoutAsync(home, main.Id, cancellationToken: context.Cancellation);
+
+ // A TIFF sequence: a folder of frames, which a server's render (one file each) cannot take.
+ var folder = Path.Combine(project.ExportsDirectory, "Roof frames");
+ Directory.CreateDirectory(folder);
+ for (var i = 1; i <= 3; i++) File.WriteAllBytes(Path.Combine(folder, $"{i:0000}.tif"), RandomNumberGenerator.GetBytes(4000));
+ var entry = new WorkspaceRenderEntry(Guid.CreateVersion7(), Guid.CreateVersion7(), "Roof frames", new string('a', 64), 12_000, "TIFF sequence", "tiff",
+ 1920, 1080, 24, 0.125, main.Id, null, null, DateTimeOffset.UtcNow);
+ project.WriteRenders(WorkspaceRenders.Empty.With(entry));
+
+ var job = await engine.EnqueueAsync(WorkspaceJobs.Send(sid, Title, store.Root, main.Id, [], SyncService.ServerKey(client.BaseAddress)),
+ cancellationToken: context.Cancellation);
+ var failed = await WaitAsync(db, job.Id, JobState.Failed);
+
+ Assert.Equal(Loc.L("Errors.Workspace.SendFailed", 1, 1), failed.Error);
+ var kept = Assert.NotNull(project.ReadRenders().Find(entry.RenderId));
+ Assert.Equal((WorkspaceRenderEntry.Failed, Loc.L("Errors.Workspace.SendSequence", "Roof frames")), (kept.State, kept.Error));
+ Assert.Null(await server.Database.Renders.GetAsync(entry.RenderId));
+ Assert.Equal(3, Directory.GetFiles(folder).Length);
+ }
+
/// A render's file on this PC and the offer of it, naming no project.
private (string Path, RenderUploadRequest Request) Output(int seed)
{