fix(archive): stable Reorganize folders, settle trash restores first, retranslate Reorganize
Integrating owner review 2 phase 4a (R7) onto the reviewed phase 3 code. - RenamePlanner: a sequence already at its expanded folder, or at the " (n)" of it that filing or an earlier Reorganize gave it, keeps that folder (in the template's case, unless another sequence holds that exact name). The planner seeded its claimed folders with the sequence's own, so "2026-09-28 (2)" was planned to "(3)" and back to "(2)" by the next run; a second Reorganize with the same templates now plans nothing. - MassRenamer: each step settles what a crash or a busy trash entry left in its sequences (SequenceWriter.ReadLocked) and waits, as a sequence deletion does, while a restore from the trash is not settled (FrameTrash.EnsureSettled), before its folder or any file name changes: that restore's journal names files by the names they had. Trash records keep restoring after a Reorganize: into the sequence where it is now, under the record's own name made free (_2) with its companion following. - Jobs.Kind.Move and Admin.Job.Kind.Move now mean "Reorganize": their old "Move archive" translations are removed from the 36 other cultures so they are translated again. - Tests: a second run plans nothing (planner and archive), companions found alike by the trash and Reorganize whatever their case, a photo deleted before a Reorganize comes back beside the new names, a Reorganize waits for a busy restore and settles it first. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
ad72501f11
commit
950524929c
78 files changed
+183
-75
No files matched your search
@@ -40,7 +40,7 @@ Dependencies point one way: `Core` ← `Core.Windows`, `Data`, `Protocol` ← `S
|
||||
| `Render` | Render plan (timing modes), preparation pass, geometry, `RenderPipeline`, self-test suite |
|
||||
| `Export` | Preset resolution, encoder selection with fallbacks, output naming |
|
||||
| `Video` (+ `Mp4`, `Avi`, `Bitstream`, `Yuv`, `Managed`) | `IVideoEncoderProvider`, MP4 muxer and inspector, AVI-MJPEG, NV12/P010, managed encoders (MJPEG-AVI, GIF, APNG, image sequences) |
|
||||
| `Archiving` | Archive layout and paths, sidecars (`sequence.json`, `project.json`), scanner, index snapshot, leases, thumbnail packs, verify, adopt, rename plans (`RenamePlanner`: folder, title and file templates, `RenameTemplates`, the plan's fingerprint; `FileRenames`: a sequence's new file names; `FileRenameJournal`: two-phase renames through temporary names, `.chronos/rename-files.json`; `FrameCompanions`: the XMP files that follow a photo) |
|
||||
| `Archiving` | Archive layout and paths, sidecars (`sequence.json`, `project.json`), scanner, index snapshot, leases, thumbnail packs, verify, adopt, rename plans (`RenamePlanner`: folder, title and file templates, `RenameTemplates`, the plan's fingerprint; `FileRenames`: a sequence's new file names; `FileRenameJournal`: two-phase renames through temporary names, `.chronos/rename-files.json`; `FrameCompanions`: the XMP files that follow a photo, one rule for the trash and Reorganize, matched whatever their case and each folder listed once by `FrameCompanions.Index`) |
|
||||
| `Import` | Card scan, session detection, import plan, hash-verified copy, card eraser (re-hash before delete) |
|
||||
| `Naming` | Folder/file templates and tokens; `FrameNaming` (the naming context and unique file name of a frame, shared by import, upload and Reorganize) |
|
||||
| `Model` | Domain entities and enums (§5) shared by Data, Server and clients |
|
||||
|
||||
@@ -146,7 +146,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>استيراد</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>تحليل سريع</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>صيانة</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>نقل</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>ملفات يتيمة</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>نسخ وكيلة</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>إعادة البناء</value></data>
|
||||
|
||||
@@ -77,7 +77,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>استيراد</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>تحليل سريع</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>صيانة</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>نقل الأرشيف</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>ملفات يتيمة</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>نسخ وكيلة</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>إعادة بناء الفهرس</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Импортиране</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Бърз анализ</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Поддръжка</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Преместване</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Осиротели файлове</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Прокси</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Преизграждане</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Импортиране</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Бърз анализ</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Поддръжка</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Преместване на архива</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Осиротели файлове</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Прокси</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Преизграждане на индекса</value></data>
|
||||
|
||||
@@ -137,7 +137,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Rychlá analýza</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Údržba</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Přesun</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Osiřelé soubory</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxy</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Sestavení indexu</value></data>
|
||||
|
||||
@@ -76,7 +76,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Rychlá analýza</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Údržba</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Přesun archivu</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Osiřelé soubory</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxy</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Sestavení indexu</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Hurtig analyse</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Vedligeholdelse</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Flytning</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Forældreløse filer</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxyer</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Genopbygning</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Hurtig analyse</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Vedligeholdelse</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Arkivflytning</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Forældreløse filer</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxyer</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Indeksgenopbygning</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Schnellanalyse</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Wartung</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Verschieben</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Verwaiste Dateien</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxys</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Neuaufbau</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Schnellanalyse</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Wartung</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Archiv verschieben</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Verwaiste Dateien</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxys</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Index neu aufbauen</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Εισαγωγή</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Γρήγορη ανάλυση</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Συντήρηση</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Μετακίνηση</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Ορφανά αρχεία</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxy</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Αναδόμηση</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Εισαγωγή</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Γρήγορη ανάλυση</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Συντήρηση</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Μετακίνηση αρχειοθήκης</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Ορφανά αρχεία</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxy</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Αναδόμηση ευρετηρίου</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Importación</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Análisis rápido</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Mantenimiento</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Traslado</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Huérfanos</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxies</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Reconstrucción</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Importación</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Análisis rápido</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Mantenimiento</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Traslado de fototeca</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Huérfanos</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxies</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Reconstrucción del índice</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Importimine</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Kiiranalüüs</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Hooldus</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Teisaldamine</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Orbfailid</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proksid</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Taasloomine</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Importimine</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Kiiranalüüs</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Hooldus</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Arhiivi teisaldamine</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Orbfailid</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proksid</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Indeksi taasloomine</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Tuonti</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Pika-analyysi</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Ylläpito</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Siirto</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Orvot tiedostot</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxyt</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Uudelleenluonti</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Tuonti</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Pika-analyysi</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Ylläpito</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Arkiston siirto</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Orvot tiedostot</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxyt</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Indeksin uudelleenluonti</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Importation</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Analyse rapide</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Maintenance</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Déplacement</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Orphelins</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxys</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Reconstruction</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Importation</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Analyse rapide</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Maintenance</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Déplacement d'archive</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Orphelins</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxys</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Reconstruction d'index</value></data>
|
||||
|
||||
@@ -137,7 +137,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>ייבוא</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>ניתוח מהיר</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>תחזוקה</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>העברה</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>קבצים יתומים</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>פרוקסי</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>בנייה מחדש</value></data>
|
||||
|
||||
@@ -76,7 +76,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>ייבוא</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>ניתוח מהיר</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>תחזוקה</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>העברת ארכיון</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>קבצים יתומים</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>פרוקסי</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>בנייה מחדש של האינדקס</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>आयात</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>त्वरित विश्लेषण</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>रखरखाव</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>स्थानांतरण</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>अनाथ फ़ाइलें</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>प्रॉक्सी</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>पुनर्निर्माण</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>आयात</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>त्वरित विश्लेषण</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>रखरखाव</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>संग्रह स्थानांतरण</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>अनाथ फ़ाइलें</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>प्रॉक्सी</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>इंडेक्स पुनर्निर्माण</value></data>
|
||||
|
||||
@@ -137,7 +137,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Uvoz</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Brza analiza</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Održavanje</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Premještanje</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Nepovezane datoteke</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxy kopije</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Ponovna izgradnja</value></data>
|
||||
|
||||
@@ -76,7 +76,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Uvoz</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Brza analiza</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Održavanje</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Premještanje arhive</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Nepovezane datoteke</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxy kopije</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Ponovna izgradnja indeksa</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Importálás</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Gyorselemzés</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Karbantartás</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Áthelyezés</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Árva fájlok</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxyk</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Újraépítés</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Importálás</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Gyorselemzés</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Karbantartás</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Archívum áthelyezése</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Árva fájlok</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxyk</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Index újraépítése</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Impor</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Analisis cepat</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Pemeliharaan</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Pemindahan</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>File yatim</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proksi</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Bangun ulang</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Impor</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Analisis cepat</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Pemeliharaan</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Pindahkan arsip</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>File yatim</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proksi</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Bangun ulang indeks</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>インポート</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>簡易分析</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>メンテナンス</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>移動</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>孤立ファイル</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>プロキシ</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>再構築</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>インポート</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>簡易分析</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>メンテナンス</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>アーカイブの移動</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>孤立ファイル</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>プロキシ</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>インデックスの再構築</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>가져오기</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>빠른 분석</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>유지 관리</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>이동</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>고아 파일</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>프록시</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>재구성</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>가져오기</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>빠른 분석</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>유지 관리</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>아카이브 이동</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>고아 파일</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>프록시</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>인덱스 재구성</value></data>
|
||||
|
||||
@@ -137,7 +137,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Importavimas</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Greitoji analizė</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Priežiūra</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Perkėlimas</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Našlaičiai</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Tarpinės kopijos</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Perkūrimas</value></data>
|
||||
|
||||
@@ -76,7 +76,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Importavimas</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Greitoji analizė</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Priežiūra</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Archyvo perkėlimas</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Našlaičiai</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Tarpinės kopijos</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Indekso perkūrimas</value></data>
|
||||
|
||||
@@ -137,7 +137,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Importēšana</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Ātrā analīze</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Apkope</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Pārvietošana</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Bāreņfaili</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxy attēli</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Pārbūve</value></data>
|
||||
|
||||
@@ -76,7 +76,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Importēšana</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Ātrā analīze</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Apkope</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Arhīva pārvietošana</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Bāreņfaili</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxy attēli</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Indeksa pārbūve</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Analisis pantas</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Penyelenggaraan</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Pindah</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Fail yatim</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proksi</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Bina semula</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Analisis pantas</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Penyelenggaraan</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Pindah arkib</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Fail yatim</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proksi</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Bina semula indeks</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Hurtiganalyse</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Vedlikehold</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Flytting</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Foreldreløse filer</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxyer</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Gjenoppbygging</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Hurtiganalyse</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Vedlikehold</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Flytting av arkiv</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Foreldreløse filer</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxyer</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Gjenoppbygging av indeks</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Snelle analyse</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Onderhoud</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Verplaatsen</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Verweesde bestanden</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxy's</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Opnieuw opbouwen</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Snelle analyse</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Onderhoud</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Archief verplaatsen</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Verweesde bestanden</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxy's</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Index opnieuw opbouwen</value></data>
|
||||
|
||||
@@ -146,7 +146,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Szybka analiza</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Konserwacja</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Przenoszenie</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Pliki osierocone</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxy</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Odbudowa</value></data>
|
||||
|
||||
@@ -77,7 +77,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Szybka analiza</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Konserwacja</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Przenoszenie archiwum</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Pliki osierocone</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxy</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Odbudowa indeksu</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Importação</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Análise rápida</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Manutenção</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Movimentação</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Órfãos</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxies</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Reconstrução</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Importação</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Análise rápida</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Manutenção</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Movimentação do acervo</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Arquivos órfãos</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxies</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Reconstrução do índice</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Importação</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Análise rápida</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Manutenção</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Mover</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Órfãos</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxies</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Reconstrução</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Importação</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Análise rápida</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Manutenção</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Mover arquivo</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Órfãos</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxies</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Reconstrução do índice</value></data>
|
||||
|
||||
@@ -137,7 +137,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Analiză rapidă</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Întreținere</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Mutare</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Fișiere orfane</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxy-uri</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Reconstruire</value></data>
|
||||
|
||||
@@ -76,7 +76,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Analiză rapidă</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Întreținere</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Mutare arhivă</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Fișiere orfane</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxy-uri</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Reconstruire index</value></data>
|
||||
|
||||
@@ -146,7 +146,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Импорт</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Быстрый анализ</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Обслуживание</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Перемещение</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Неучтённые файлы</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Прокси</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Перестроение</value></data>
|
||||
|
||||
@@ -77,7 +77,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Импорт</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Быстрый анализ</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Обслуживание</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Перемещение архива</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Неучтённые файлы</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Прокси</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Перестроение индекса</value></data>
|
||||
|
||||
@@ -137,7 +137,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Rýchla analýza</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Údržba</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Presun</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Osirotené súbory</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxy</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Zostavenie indexu</value></data>
|
||||
|
||||
@@ -76,7 +76,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Rýchla analýza</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Údržba</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Presun archívu</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Osirotené súbory</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxy</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Zostavenie indexu</value></data>
|
||||
|
||||
@@ -137,7 +137,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Uvoz</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Hitra analiza</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Vzdrževanje</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Premik</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Osirotele datoteke</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxyji</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Ponovna izgradnja</value></data>
|
||||
|
||||
@@ -76,7 +76,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Uvoz</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Hitra analiza</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Vzdrževanje</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Premik arhiva</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Osirotele datoteke</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxyji</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Ponovna izgradnja indeksa</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Snabbanalys</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Underhåll</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Flytt</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Överblivna filer</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxyer</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Återskapande</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Import</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Snabbanalys</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Underhåll</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Arkivflytt</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Överblivna filer</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxyer</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Återskapande av index</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>นำเข้า</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>การวิเคราะห์แบบเร็ว</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>การบำรุงรักษา</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>ย้าย</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>ไฟล์กำพร้า</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>พร็อกซี</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>สร้างใหม่</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>นำเข้า</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>การวิเคราะห์แบบเร็ว</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>การบำรุงรักษา</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>ย้ายคลังภาพ</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>ไฟล์กำพร้า</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>พร็อกซี</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>สร้างดัชนีใหม่</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>İçe aktarma</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Hızlı analiz</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Bakım</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Taşıma</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Sahipsiz dosyalar</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxy'ler</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Yeniden oluşturma</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>İçe aktarma</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Hızlı analiz</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Bakım</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Arşivi taşıma</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Sahipsiz dosyalar</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxy'ler</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Dizini yeniden oluşturma</value></data>
|
||||
|
||||
@@ -146,7 +146,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Імпорт</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Швидкий аналіз</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Обслуговування</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Переміщення</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Файли-сироти</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Проксі</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Перебудова</value></data>
|
||||
|
||||
@@ -77,7 +77,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Імпорт</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Швидкий аналіз</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Обслуговування</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Переміщення архіву</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Файли-сироти</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Проксі</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Перебудова індексу</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>Nhập</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>Phân tích nhanh</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>Bảo trì</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>Di chuyển</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>Tệp mồ côi</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>Proxy</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>Dựng lại</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>Nhập</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>Phân tích nhanh</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>Bảo trì</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>Di chuyển kho lưu trữ</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>Tệp mồ côi</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>Proxy</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>Dựng lại chỉ mục</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>导入</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>快速分析</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>维护</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>移动</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>孤立文件</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>代理</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>重建</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>导入</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>快速分析</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>维护</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>移动档案库</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>孤立文件</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>代理</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>重建索引</value></data>
|
||||
|
||||
@@ -128,7 +128,6 @@
|
||||
<data name="Admin.Job.Kind.Import" xml:space="preserve"><value>匯入</value></data>
|
||||
<data name="Admin.Job.Kind.LightAnalyse" xml:space="preserve"><value>快速分析</value></data>
|
||||
<data name="Admin.Job.Kind.Maintenance" xml:space="preserve"><value>維護</value></data>
|
||||
<data name="Admin.Job.Kind.Move" xml:space="preserve"><value>移動</value></data>
|
||||
<data name="Admin.Job.Kind.Orphans" xml:space="preserve"><value>孤立檔案</value></data>
|
||||
<data name="Admin.Job.Kind.Proxies" xml:space="preserve"><value>代理檔</value></data>
|
||||
<data name="Admin.Job.Kind.Rebuild" xml:space="preserve"><value>重建</value></data>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
<data name="Jobs.Kind.Import" xml:space="preserve"><value>匯入</value></data>
|
||||
<data name="Jobs.Kind.LightAnalyse" xml:space="preserve"><value>快速分析</value></data>
|
||||
<data name="Jobs.Kind.Maintenance" xml:space="preserve"><value>維護</value></data>
|
||||
<data name="Jobs.Kind.Move" xml:space="preserve"><value>移動典藏庫</value></data>
|
||||
<data name="Jobs.Kind.Orphans" xml:space="preserve"><value>孤立檔案</value></data>
|
||||
<data name="Jobs.Kind.Proxies" xml:space="preserve"><value>代理檔</value></data>
|
||||
<data name="Jobs.Kind.Rebuild" xml:space="preserve"><value>重建索引</value></data>
|
||||
|
||||
@@ -212,7 +212,7 @@ public static class RenamePlanner
|
||||
if (folder is not null && s.Folder.Length > 0 && Blank(folder.ExpandFolder(context with { Title = newTitle })) is { } expanded
|
||||
&& !expanded.Equals(s.Folder, StringComparison.Ordinal))
|
||||
{
|
||||
newFolder = expanded.Equals(s.Folder, StringComparison.OrdinalIgnoreCase) ? expanded : Unique(expanded, claimed, existsOnDisk);
|
||||
newFolder = Kept(s.Folder, expanded, taken) ?? Unique(expanded, claimed, existsOnDisk);
|
||||
claimed.Add(newFolder);
|
||||
}
|
||||
var step = new RenameStep(s.SequenceId, s.Folder, newFolder, s.Title, newTitle);
|
||||
@@ -299,6 +299,26 @@ public static class RenamePlanner
|
||||
|
||||
private static string? Blank(string value) => string.IsNullOrWhiteSpace(value) ? null : value;
|
||||
|
||||
/// <summary>
|
||||
/// The folder a sequence keeps (in the template's case) when it already is <paramref name="expanded"/>, or the
|
||||
/// <c>" (n)"</c> of it that filing or an earlier Reorganize gave it beside another sequence of that name; null when it is
|
||||
/// neither, or when another sequence holds that name exactly (a case-sensitive file system). Without it a sequence at
|
||||
/// <c>2026-09-28 (2)</c> would be planned to <c>(3)</c>, its own folder being taken, and back to <c>(2)</c> by the
|
||||
/// next Reorganize.
|
||||
/// </summary>
|
||||
private static string? Kept(string current, string expanded, IReadOnlyList<string> occupied)
|
||||
{
|
||||
string? same = null;
|
||||
if (current.Equals(expanded, StringComparison.OrdinalIgnoreCase)) same = expanded;
|
||||
else if (current.Length > expanded.Length + 3 && current.StartsWith(expanded + " (", StringComparison.OrdinalIgnoreCase) && current[^1] == ')'
|
||||
&& int.TryParse(current.AsSpan(expanded.Length + 2, current.Length - expanded.Length - 3), NumberStyles.None, CultureInfo.InvariantCulture,
|
||||
out var n) && n >= 2)
|
||||
same = string.Create(CultureInfo.InvariantCulture, $"{expanded} ({n})");
|
||||
// "(02)" is not a number Unique gives: that folder moves to a name of its own.
|
||||
if (same is null || !same.Equals(current, StringComparison.OrdinalIgnoreCase)) return null;
|
||||
return same.Equals(current, StringComparison.Ordinal) || !occupied.Any(o => o.Equals(same, StringComparison.Ordinal)) ? same : null;
|
||||
}
|
||||
|
||||
private static string Unique(string folder, HashSet<string> claimed, Func<string, bool> existsOnDisk)
|
||||
{
|
||||
var candidate = folder;
|
||||
|
||||
@@ -113,7 +113,9 @@ public sealed class MassRenamer
|
||||
/// a sequence the plan does not take along, or the photos of a sequence whose files it renames changed; nothing of that
|
||||
/// step was changed (a step found stale only once its folder moved keeps its folder and title, and its journal has the
|
||||
/// next open complete the rest).</exception>
|
||||
/// <exception cref="IOException">A file could not be renamed (open elsewhere); the step's files went back to their names.</exception>
|
||||
/// <exception cref="IOException">A file could not be renamed (open elsewhere); the step's files went back to their names. Or
|
||||
/// (<see cref="LeaseUnavailableException"/>) a sequence is busy, or holds a restore from the trash whose entry is busy and
|
||||
/// not settled yet; nothing of that step changed.</exception>
|
||||
public Task<RenameResult> ApplyAsync(Archive archive, RenamePlan plan, IProgress<int>? progress = null, CancellationToken cancellationToken = default) =>
|
||||
ApplyAsync(archive, plan, null, progress is null ? null : n =>
|
||||
{
|
||||
@@ -296,6 +298,7 @@ public sealed class MassRenamer
|
||||
result.Dropped.AddRange(follow.Select(c => c.SequenceId));
|
||||
return;
|
||||
}
|
||||
foreach (var s in follow.Prepend(step)) Settle(paths, s);
|
||||
RenamePlanner.MoveFolder(paths, step);
|
||||
// Moved with their carrier: only their sidecars and index rows follow, and the names of their files.
|
||||
foreach (var s in follow.Prepend(step))
|
||||
@@ -312,6 +315,23 @@ public sealed class MassRenamer
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Settles, under the step's leases and before anything of it moves, what a crash or a busy trash entry left in the
|
||||
/// sequence, as every writer does (<see cref="SequenceWriter.ReadLocked"/>): an interrupted rename of its files, photo
|
||||
/// deletion, restore from the trash or ingest. A restore whose trash entry is busy is not settled yet, and the step
|
||||
/// waits for it (<see cref="FrameTrash.EnsureSettled"/>) as a deletion of the sequence does: its journal names the
|
||||
/// files it moved by the names they had, so neither the folder nor those names change under it.
|
||||
/// </summary>
|
||||
/// <exception cref="LeaseUnavailableException">A restore from the trash into the sequence is not settled; nothing of the step changed.</exception>
|
||||
private static void Settle(ArchivePaths paths, RenameStep step)
|
||||
{
|
||||
// Where the sequence is now: its folder moves first, so a resumed step may find it at its new place already.
|
||||
var sequence = paths.Sequence(step.FromFolder);
|
||||
if (step.MovesFolder && !File.Exists(sequence.ManifestPath)) sequence = paths.Sequence(step.ToFolder);
|
||||
SequenceWriter.ReadLocked(sequence, step.SequenceId);
|
||||
FrameTrash.EnsureSettled(sequence);
|
||||
}
|
||||
|
||||
/// <summary>The index still has the step's sequence where the plan says (or where it already took it); otherwise stale.</summary>
|
||||
/// <exception cref="StaleRenamePlanException">Not resuming, and the sequence moved or vanished since the plan was made.</exception>
|
||||
private async Task<bool> StandsAsync(RenameStep step, bool resuming, CancellationToken cancellationToken)
|
||||
|
||||
@@ -82,6 +82,22 @@ public sealed class ReorganizeTests(TestContext context)
|
||||
Assert.Count(2, plan.Samples);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TheTrashAndReorganizeFindTheSameCompanionsWhateverTheirCase()
|
||||
{
|
||||
var sequence = Folder(out _);
|
||||
var manifest = Sequence("originals/A.CR2", "originals/B.CR2");
|
||||
foreach (var file in new[] { "originals/A.CR2", "originals/B.CR2", "originals/a.XMP", "originals/b.cr2.Xmp", "originals/c.xmp" }) Write(sequence, file, file);
|
||||
var present = FileRenames.ListPresent(sequence, manifest);
|
||||
var plan = FileRenames.Plan(manifest, null, PathTemplate.Parse("{n:0000}"), present);
|
||||
Assert.SequenceEqual(["originals/A.CR2>originals/0001.CR2", "originals/a.XMP>originals/0001.XMP", "originals/B.CR2>originals/0002.CR2",
|
||||
"originals/b.cr2.Xmp>originals/0002.cr2.Xmp"], plan.Moves.Select(m => $"{m.From}>{m.To}"));
|
||||
var index = new FrameCompanions.Index(sequence);
|
||||
Assert.SequenceEqual(["originals/a.XMP"], index.Of("originals/A.CR2"));
|
||||
Assert.SequenceEqual(["originals/b.cr2.Xmp"], index.Of("originals/B.CR2"));
|
||||
Assert.SequenceEqual(plan.Moves.Where(m => m.Companion).Select(m => m.From), manifest.Frames.SelectMany(f => FrameCompanions.Of(sequence, f.File)));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void NamesGivenOnceStayAsTheyAre()
|
||||
{
|
||||
@@ -124,6 +140,28 @@ public sealed class ReorganizeTests(TestContext context)
|
||||
Assert.False(keptOnly.Steps.Single().Changes);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void FoldersTheTemplateGaveAlreadyStayAndASecondRunPlansNothing()
|
||||
{
|
||||
// Two sequences of one day filed by the template, the second beside the first; a third elsewhere, a fourth whose
|
||||
// folder differs only in case, a fifth with a number filing never gives.
|
||||
const string Template = "{year}/{date} {title}";
|
||||
RenameSubject At(string folder) => new(Guid.NewGuid(), folder, "Sunset", Start, null, null, null);
|
||||
RenameSubject[] subjects = [At("2026/2026-09-28 Sunset"), At("2026/2026-09-28 Sunset (2)"), At("inbox/c"), At("2026/2026-09-28 sunset (4)"),
|
||||
At("2026/2026-09-28 Sunset (03)")];
|
||||
var plan = RenamePlanner.Plan(Guid.NewGuid(), subjects, Template, null, subjects.Select(s => s.Folder), _ => false);
|
||||
Assert.SequenceEqual([(subjects[2].SequenceId, "2026/2026-09-28 Sunset (3)"), (subjects[3].SequenceId, "2026/2026-09-28 Sunset (4)"),
|
||||
(subjects[4].SequenceId, "2026/2026-09-28 Sunset (5)")], plan.Steps.Select(s => (s.SequenceId, s.ToFolder)));
|
||||
|
||||
// Where the plan put them, the same template changes nothing.
|
||||
var moved = plan.Steps.ToDictionary(s => s.SequenceId, s => s.ToFolder);
|
||||
RenameSubject[] after = [.. subjects.Select(s => moved.TryGetValue(s.SequenceId, out var to) ? s with { Folder = to } : s)];
|
||||
var onDisk = after.Select(s => s.Folder).ToHashSet(StringComparer.OrdinalIgnoreCase);
|
||||
Assert.Empty(RenamePlanner.Plan(Guid.NewGuid(), after, Template, null, onDisk, onDisk.Contains).Steps);
|
||||
// Nor in another order.
|
||||
Assert.Empty(RenamePlanner.Plan(Guid.NewGuid(), [.. after.Reverse()], Template, null, onDisk, onDisk.Contains).Steps);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TheFingerprintFollowsWhatThePlanChanges()
|
||||
{
|
||||
|
||||
@@ -1127,6 +1127,90 @@ public abstract class FrameTrashTests(TestContext context) : DatabaseTest(contex
|
||||
Assert.SequenceEqual(frames.Select(f => f.Id), (await fx.Db.Frames.ListBySequenceAsync(sequence.Id)).Select(f => f.Id));
|
||||
}
|
||||
|
||||
/// <summary>The files of a sequence as its sidecar names them, after checking that the index names the same ones and that each holds its photo.</summary>
|
||||
private static async Task<List<string>> FilesAsync(ArchiveFixture fx, Guid id)
|
||||
{
|
||||
var sequence = Assert.NotNull(await fx.Db.Sequences.GetAsync(id));
|
||||
var folder = fx.Paths.Sequence(sequence.Folder);
|
||||
var sidecar = ManifestStore.ReadSequence(folder.ManifestPath);
|
||||
var rows = await fx.Db.Frames.ListBySequenceAsync(id);
|
||||
Assert.SequenceEqual(sidecar.Frames.Select(f => (f.Id, folder.ArchiveRelative(f.File))), rows.Select(r => (r.Id, r.RelativePath)));
|
||||
foreach (var frame in sidecar.Frames) Assert.Equal(frame.Sha256, Sha(folder.File(frame.File)));
|
||||
return [.. sidecar.Frames.Select(f => f.File)];
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task PhotosDeletedBeforeAReorganizeComeBackBesideTheNamesItGave()
|
||||
{
|
||||
var fx = await FixtureAsync();
|
||||
var (sequence, frames) = await UploadedAsync(fx, 4);
|
||||
var numbered = new RenameTemplates(File: "{n:000}");
|
||||
await fx.Service.ApplyRenameAsync(await fx.Service.PlanReorganizeAsync(fx.Archive.Id, [sequence.Id], numbered, fx.Ct), null, fx.Ct);
|
||||
var folder = fx.Paths.Sequence(sequence.Folder);
|
||||
File.WriteAllText(folder.File("originals/002.xmp"), "second");
|
||||
await fx.ScanAsync();
|
||||
// The record keeps the names the photo and its companion had: 002.JPG and 002.xmp.
|
||||
var deleted = await DeleteAsync(fx, (await fx.Db.Sequences.GetAsync(sequence.Id))!, frames[1]);
|
||||
Assert.SequenceEqual(["originals/002.JPG", "originals/002.xmp"], FrameTrash.ReadEntry(fx.Paths, deleted.Entry.Name)!.Photos.Single().Files.Select(f => f.From));
|
||||
|
||||
// Moved and renamed since: the photos that stay take 001-003, the deleted photo's name included.
|
||||
var moved = new RenameTemplates(Folder: "moved/{date}", File: "{n:000}");
|
||||
await fx.Service.ApplyRenameAsync(await fx.Service.PlanReorganizeAsync(fx.Archive.Id, [sequence.Id], moved, fx.Ct), null, fx.Ct);
|
||||
Assert.SequenceEqual(["originals/001.JPG", "originals/002.JPG", "originals/003.JPG"], await FilesAsync(fx, sequence.Id));
|
||||
|
||||
// Restored into the sequence where it is now, under its own name made free: its companion follows that name.
|
||||
var restored = await fx.Service.RestoreEntryAsync(fx.Archive.Id, deleted.Entry.Name, null, fx.Ct);
|
||||
Assert.Equal(1, restored.Photos);
|
||||
var row = (await fx.Db.Sequences.GetAsync(sequence.Id))!;
|
||||
Assert.Equal("moved/2026-09-28", row.Folder);
|
||||
Assert.SequenceEqual(["originals/001.JPG", "originals/002_2.JPG", "originals/002.JPG", "originals/003.JPG"], await FilesAsync(fx, sequence.Id));
|
||||
var now = fx.Paths.Sequence(row.Folder);
|
||||
Assert.Equal(frames[1].Sha256, Sha(now.File("originals/002_2.JPG")));
|
||||
Assert.Equal("second", File.ReadAllText(now.File("originals/002_2.xmp")));
|
||||
Assert.SequenceEqual(frames.Select(f => f.Id), (await fx.Db.Frames.ListBySequenceAsync(sequence.Id)).Select(f => f.Id));
|
||||
Assert.DoesNotContain(TrashKind.Photos, (await fx.Service.ListTrashAsync(fx.Archive.Id, fx.Ct)).Select(e => e.Kind));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task AReorganizeWaitsForARestoreItsEntryHoldsThenSettlesItFirst()
|
||||
{
|
||||
var fx = await FixtureAsync();
|
||||
var (sequence, frames) = await UploadedAsync(fx, 3);
|
||||
var folder = fx.Paths.Sequence(sequence.Folder);
|
||||
var deleted = await DeleteAsync(fx, sequence, frames[1]);
|
||||
// A restore died after moving the original back, before the sidecar; the entry is being emptied meanwhile.
|
||||
var journal = RestoreJournal(fx, deleted.Entry);
|
||||
journal.Write(folder);
|
||||
var back = journal.Photos[0].Moves[0];
|
||||
File.Move(fx.Paths.FromRelative(back.To), folder.File(back.From));
|
||||
var templates = new RenameTemplates(Folder: "moved/{date}", File: "{n:000}");
|
||||
var plan = await fx.Service.PlanReorganizeAsync(fx.Archive.Id, [sequence.Id], templates, fx.Ct);
|
||||
Assert.Equal(2, plan.Steps.Single().FileChanges);
|
||||
var before = await FilesAsync(fx, sequence.Id);
|
||||
|
||||
using (Assert.NotNull(LeaseFile.TryAcquire(fx.Paths.LocksDirectory, SequenceTrash.EntryLease(deleted.Entry.Name), "other")))
|
||||
{
|
||||
// Neither the folder nor a file name changes under that restore.
|
||||
await Assert.ThrowsAsync<LeaseUnavailableException>(() => fx.Service.ApplyRenameAsync(plan, null, fx.Ct));
|
||||
Assert.Equal(sequence.Folder, (await fx.Db.Sequences.GetAsync(sequence.Id))!.Folder);
|
||||
Assert.SequenceEqual(before, await FilesAsync(fx, sequence.Id));
|
||||
Assert.FileExists(folder.RestoreJournalPath);
|
||||
Assert.FileExists(folder.File(back.From));
|
||||
}
|
||||
|
||||
// Once the entry is free the rename resumes: the restore is settled first (the original goes back into its entry),
|
||||
// then the folder moves and the files are renamed; the photo then comes back beside them.
|
||||
Assert.Equal(1, await fx.Service.Renamer.ResumePendingAsync(fx.Archive, fx.Ct));
|
||||
Assert.Equal(frames[1].Sha256, Sha(fx.Paths.FromRelative(back.To)));
|
||||
var row = (await fx.Db.Sequences.GetAsync(sequence.Id))!;
|
||||
Assert.Equal("moved/2026-09-28", row.Folder);
|
||||
Assert.FileMissing(fx.Paths.Sequence(row.Folder).RestoreJournalPath);
|
||||
Assert.SequenceEqual(["originals/001.JPG", "originals/002.JPG"], await FilesAsync(fx, sequence.Id));
|
||||
Assert.Equal(1, (await fx.Service.RestoreEntryAsync(fx.Archive.Id, deleted.Entry.Name, null, fx.Ct)).Photos);
|
||||
Assert.SequenceEqual(frames.Select(f => f.Id), (await fx.Db.Frames.ListBySequenceAsync(sequence.Id)).Select(f => f.Id));
|
||||
Assert.Count(3, await FilesAsync(fx, sequence.Id));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task ARestoreIntoANewSequenceStoppedBetweenPhotosKeepsItsRecordTrue()
|
||||
{
|
||||
|
||||
@@ -97,6 +97,24 @@ public sealed class ReorganizeTests(TestContext context)
|
||||
Assert.False((await fx.Service.PlanReorganizeAsync(fx.Archive.Id, [id], templates, fx.Ct)).Steps.Any(s => s.Changes));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task ASecondReorganizeWithTheSameTemplatesPlansNothing()
|
||||
{
|
||||
await using var fx = await CreateAsync(context);
|
||||
var first = await UploadAsync(fx, 2);
|
||||
var second = await UploadAsync(fx, 2, firstSeed: 20, firstSecond: 3600, key: "upload-2");
|
||||
// One day for both: the second sequence's folder gets " (2)".
|
||||
var templates = new RenameTemplates(Folder: "days/{date}", File: "{date}_{n:000}");
|
||||
await fx.Service.ApplyRenameAsync(await fx.Service.PlanReorganizeAsync(fx.Archive.Id, null, templates, fx.Ct), null, fx.Ct);
|
||||
var folders = new List<string>();
|
||||
foreach (var id in new[] { first, second }) folders.Add((await fx.Db.Sequences.GetAsync(id))!.Folder);
|
||||
Assert.SequenceEqual(["days/2026-09-28", "days/2026-09-28 (2)"], folders.Order(StringComparer.Ordinal));
|
||||
|
||||
var again = await fx.Service.PlanReorganizeAsync(fx.Archive.Id, null, templates, fx.Ct);
|
||||
Assert.Count(2, again.Subjects);
|
||||
Assert.False(again.Steps.Any(s => s.Changes), string.Join(", ", again.Steps.Select(s => $"{s.FromFolder}>{s.ToFolder}")));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task UploadsAndImportsAreNamedAsReorganizeNamesThem()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user