From 73133b0abf2e87ffb46622f94180b2f70f101c4f Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Thu, 12 Oct 2023 08:31:55 +0200 Subject: [PATCH] Amelioration du parser de statblock --- module.json | 4 +- modules/import-stat-2.js | 66 ++++++++++++++---- .../{000285.log => 000300.log} | 0 packs/aides-de-jeu-fr/CURRENT | 2 +- packs/aides-de-jeu-fr/LOG | 11 ++- packs/aides-de-jeu-fr/LOG.old | 16 ++--- packs/aides-de-jeu-fr/MANIFEST-000284 | Bin 126 -> 0 bytes packs/aides-de-jeu-fr/MANIFEST-000298 | Bin 0 -> 143 bytes .../{000286.log => 000301.log} | 0 packs/antidotes-and-remedes/CURRENT | 2 +- packs/antidotes-and-remedes/LOG | 11 ++- packs/antidotes-and-remedes/LOG.old | 16 ++--- .../{MANIFEST-000285 => MANIFEST-000299} | Bin 160 -> 178 bytes packs/apothicarium/{000285.log => 000300.log} | 0 packs/apothicarium/CURRENT | 2 +- packs/apothicarium/LOG | 11 ++- packs/apothicarium/LOG.old | 16 ++--- packs/apothicarium/MANIFEST-000284 | Bin 126 -> 0 bytes packs/apothicarium/MANIFEST-000298 | Bin 0 -> 143 bytes packs/dons-de-rhya/{000285.log => 000300.log} | 0 packs/dons-de-rhya/CURRENT | 2 +- packs/dons-de-rhya/LOG | 11 ++- packs/dons-de-rhya/LOG.old | 16 ++--- packs/dons-de-rhya/MANIFEST-000284 | Bin 126 -> 0 bytes packs/dons-de-rhya/MANIFEST-000298 | Bin 0 -> 143 bytes .../{000285.log => 000300.log} | 0 packs/plats-dauberges/CURRENT | 2 +- packs/plats-dauberges/LOG | 11 ++- packs/plats-dauberges/LOG.old | 16 ++--- .../{MANIFEST-000284 => MANIFEST-000298} | Bin 150 -> 168 bytes .../{000285.log => 000300.log} | 0 packs/tables-des-traductions/CURRENT | 2 +- packs/tables-des-traductions/LOG | 11 ++- packs/tables-des-traductions/LOG.old | 16 ++--- packs/tables-des-traductions/MANIFEST-000284 | Bin 126 -> 0 bytes packs/tables-des-traductions/MANIFEST-000298 | Bin 0 -> 143 bytes 36 files changed, 158 insertions(+), 86 deletions(-) rename packs/aides-de-jeu-fr/{000285.log => 000300.log} (100%) delete mode 100644 packs/aides-de-jeu-fr/MANIFEST-000284 create mode 100644 packs/aides-de-jeu-fr/MANIFEST-000298 rename packs/antidotes-and-remedes/{000286.log => 000301.log} (100%) rename packs/antidotes-and-remedes/{MANIFEST-000285 => MANIFEST-000299} (71%) rename packs/apothicarium/{000285.log => 000300.log} (100%) delete mode 100644 packs/apothicarium/MANIFEST-000284 create mode 100644 packs/apothicarium/MANIFEST-000298 rename packs/dons-de-rhya/{000285.log => 000300.log} (100%) delete mode 100644 packs/dons-de-rhya/MANIFEST-000284 create mode 100644 packs/dons-de-rhya/MANIFEST-000298 rename packs/plats-dauberges/{000285.log => 000300.log} (100%) rename packs/plats-dauberges/{MANIFEST-000284 => MANIFEST-000298} (76%) rename packs/tables-des-traductions/{000285.log => 000300.log} (100%) delete mode 100644 packs/tables-des-traductions/MANIFEST-000284 create mode 100644 packs/tables-des-traductions/MANIFEST-000298 diff --git a/module.json b/module.json index 20756dc..e6e383d 100644 --- a/module.json +++ b/module.json @@ -8,7 +8,7 @@ } ], "url": "https://www.uberwald.me/gitea/public/foundryvtt-wh4-lang-fr-fr", - "version": "7.0.14", + "version": "7.0.15", "esmodules": [ "babele-register.js", "addon-register.js", @@ -115,7 +115,7 @@ } ], "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-wh4-lang-fr-fr/raw/v10/module.json", - "download": "https://www.uberwald.me/gitea/public/foundryvtt-wh4-lang-fr-fr/archive/foundryvtt-wh4-lang-fr-7.0.14.zip", + "download": "https://www.uberwald.me/gitea/public/foundryvtt-wh4-lang-fr-fr/archive/foundryvtt-wh4-lang-fr-7.0.15.zip", "id": "wh4-fr-translation", "compatibility": { "minimum": "10", diff --git a/modules/import-stat-2.js b/modules/import-stat-2.js index 1ae0f04..7bb0c53 100644 --- a/modules/import-stat-2.js +++ b/modules/import-stat-2.js @@ -56,9 +56,9 @@ const name_val = '(?[a-zA-Z\\s\\-,]*)[\\s\\r\\na-zA-Z]*(?.*|[\\(\\) let sectionDataFR = [ { name: "trait", toFind: "Traits\\s*:", secondParse: '(?[a-zöàéè\\s]*)[\\s\\+]*(?.*|[\\+0-9]+)', index: -1 }, { name: "skill", toFind: "Compétences\\s*:", secondParse: '(?[a-zàéè\\s\\(\\)]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, - { name: "talent", toFind: "Talents\\s*:", secondParse: '(?[a-zöàéè\\-\\(\\)\\s\\/\'’]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, + { name: "talent", toFind: "Talents\\s*:", secondParse: '(?[a-zöàéè\\-\\!\\(\\)\\s\\/\'’]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, { name: "mutation", toFind: "Mutations\\s*:", secondParse: '(?[a-zöàéè\\s]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, - { name: "trapping", toFind: "Equipement\\s*:", secondParse: '(?[a-zöàéè0-9\\s]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, + { name: "trapping", toFind: "Equipement\\s*:", secondParse: '(?[a-zöàéè0-9\\s(\\)\\-]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, { name: "spell", toFind: "Sorts\\s*\\([a-z\\s]*\\)*:", secondParse: '(?[a-zöàéè\\s]*)', index: -1 }, { name: "spellpetty", toFind: "Spells\\s*\\(Magie Mineure\\)*:", secondParse: '(?[a-zö\\-\\s]*)', index: -1 }, { name: "spellarcane", toFind: "Spells\\s*\\(Arcane[a-z\\s]*\\)*:", secondParse: '(?[a-zö\\-\\s]*)', index: -1 }, @@ -67,13 +67,17 @@ let sectionDataFR = [ let sectionDataUS = [ { name: "trait", toFind: "Traits\\s*:", secondParse: '(?[a-z\\s]*)[\\s\\+]*(?.*|[\\+0-9]+)', index: -1 }, { name: "skill", toFind: "Skills\\s*:", secondParse: '(?[a-z\\s\\(\\)]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, - { name: "talent", toFind: "Talents\\s*:", secondParse: '(?[a-z\\-\\s\\(\\)\\/\'’]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, + { name: "talent", toFind: "Talents\\s*:", secondParse: '(?[a-z\\-\\s\\!\\(\\)\\/\'’]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, { name: "mutation", toFind: "Mutations\\s*:", secondParse: '(?[a-zö\\s]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, - { name: "trapping", toFind: "Trappings\\s*:", secondParse: '(?[a-zö0-9\\s]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, + { name: "trapping", toFind: "Trappings\\s*:", secondParse: '(?[a-zö0-9\\s\\(\\)\\-]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, { name: "spellpetty", toFind: "Spells\\s*\\(Petty\\s*[a-z\\s]*\\)*:", secondParse: '(?[a-zö\\-\\s]*)', index: -1 }, { name: "spellarcane", toFind: "Spells\\s*\\(Arcane\\s*[a-z\\s]*\\)*:", secondParse: '(?[a-zö\\-\\s]*)', index: -1 }, { name: "spelllore", toFind: "Spells\\s*\\(Lore\\s*of\\s*(?[a-z\\s]*)\\)*:", secondParse: '(?[a-zö\\-\\s]*)', index: -1 } ] +let moneyUS = [ {name:" gold crown", key: "gc"}, {name: " gc", key: "gc"}, + {name:" silver shilling", key:"ss"}, {name:" ss", key: "ss"}, {name:"/-", key: "ss"}, {name:" brass penny", key: "bp"}, {name:" bp", key: "bp"} ] +let moneyFR = [ {name:" couronnes d", key: "gc"}, {name: " co", key: "gc"}, + {name:" pistoles ", key:"ss"}, {name:" pa", key: "ss"}, {name:"/-", key: "ss"}, {name:" sous de cuivre", key: "bp"}, {name:" sc", key: "bp"} ] let regSep = XRegExp('\\s*,\\s*', 'gi'); // Term separator, with auto trim let regLine1 = XRegExp('[\\r\\n\\.]', 'gi'); // Term separator, with auto trim let regName = XRegExp(name_val, 'gi'); @@ -178,7 +182,7 @@ async function __findSkill(skillName, value = undefined) { /************************************************************************************/ async function __findTalent(talentName) { - let parseStr = '(?[a-z\\s\\/\']*)[\\s\\+]*(?[a-z\\s\\(\\)\'’]*)'; + let parseStr = '(?[a-z\\s\\!\\/\']*)[\\s\\+]*(?[a-z\\s\\(\\)\'’]*)'; let talentSplit = XRegExp.exec(talentName, XRegExp(parseStr, 'gi')); let toSearch = talentSplit.name.toLowerCase().trim(); @@ -246,16 +250,19 @@ export default async function statParserFR(statString, type = "npc") { // Patch wront/strange carac value before processing statString = statString.replace(/ –/g, " 0") + let moneys = { gc: 0, ss: 0, bp: 0 } let statNameReg = us_carac - let sectionData = sectionDataUS + let sectionData = duplicate(sectionDataUS) let skillGrouping = __SkillGroupsUS + let moneyLang = moneyUS // Detect French stat block if (statString.includes('CC') && statString.includes('CT') && statString.includes('FM')) { //ui.notifications.warn("Le parsing de stablock en Français n'est pas encore prêt") statNameReg = fr_carac - sectionData = sectionDataFR + sectionData = duplicate(sectionDataFR) skillGrouping = __SkillGroupsFR + moneyLang = moneyFR } let reg1 = XRegExp(statNameReg, 'gi') @@ -405,6 +412,7 @@ export default async function statParserFR(statString, type = "npc") { if (!itemFound) { ui.notifications.error("Talent non trouvé, à ajouter manuellement : " + name, { permanent: true }) } + } else if (def.name == 'trapping') { itemFound = await __findItem(name, "trapping"); if (!itemFound) { @@ -415,7 +423,7 @@ export default async function statParserFR(statString, type = "npc") { } if (!itemFound && name) { if (name.toLowerCase().includes("armor") || name.toLowerCase().includes("armure") || name.toLowerCase().includes("armour")) { - itemFound = new ItemWfrp4e({ img: "systems/wfrp4e/icons/blank.png", name: name, type: "armor", system: game.system.model.Item.armor }) + itemFound = new ItemWfrp4e({ img: "systems/wfrp4e/icons/blank.png", name: name, type: "armour", system: game.system.model.Item.armor }) } else if (name.toLowerCase().includes("weapon") || name.toLowerCase().includes("arme")) { itemFound = new ItemWfrp4e({ img: "systems/wfrp4e/icons/blank.png", name: name, type: "weapon", system: game.system.model.Item.weapon }) } else { @@ -427,13 +435,22 @@ export default async function statParserFR(statString, type = "npc") { } itemFound = itemFound.toObject() } + // Searching money stuff + for (let mondeyDef of moneyLang) { + if (name.toLowerCase().includes(mondeyDef.name)) { + let regMoney = XRegExp("(\\d+)\\s+" + mondeyDef.name.trim(), 'gi') + let moneyParsed = XRegExp.exec(name.toLowerCase(), regMoney) + console.log("Parsing money", name, moneyParsed) + moneys[mondeyDef.key] += (moneyParsed && moneyParsed[1]) ? Number(moneyParsed[1]) : 0 + } + } } else if (def.name.includes('spell')) { console.log("Found spells section!!!!", name, def, def.lore || "NO LORE") // Lore management, firs pass - if ( def.lore ) { + if (def.lore) { let newName = name + " (" + def.lore + ")" itemFound = await __findItem(newName, "spell"); - console.log("Trying to find ", newName, itemFound) + //console.log("Trying to find ", newName, itemFound) } if (!itemFound) { // If not found with Lore, try without the lore itemFound = await __findItem(name, "spell"); @@ -455,14 +472,39 @@ export default async function statParserFR(statString, type = "npc") { } let moneyItems = await game.wfrp4e.utility.allMoneyItems() || []; moneyItems = moneyItems.sort((a, b) => (a.system.coinValue.value > b.system.coinValue.value) ? -1 : 1); - moneyItems.forEach(m => m.system.quantity.value = 0) + for (let m of moneyItems) { + m.system.quantity.value = 0 + if (m.system.coinValue.value == 1) { + m.system.quantity.value += moneys.bp + } + if (m.system.coinValue.value == 240) { + m.system.quantity.value += moneys.gc + } + if (m.system.coinValue.value == 12) { + m.system.quantity.value += moneys.ss + } + } globalItemList = globalItemList.concat(moneyItems); - //console.log("My liste :", globalItemList); + //DEBUG : console.log("My liste :", moneyItems, moneys); let name = pnjName; let effects = globalItemList.reduce((total, globItem) => total.concat(globItem.effects), []) effects = effects.filter(e => !!e) effects = effects.filter(e => e.transfer) + for (let e of effects) { + for (let c of e.changes) { + // Charac management stuff + if (c.key?.includes("characteristics")) { + let cKey = c.key.split(".")[2] + model.characteristics[cKey].initial -= Number(c.value) + } + // Move management + if (c.key?.includes("move")) { + model.details.move.value -= Number(c.value) + } + } + } + //DEBUG : console.log("EFFECTS", effects) return { name, type, data: model, items: globalItemList, effects } } diff --git a/packs/aides-de-jeu-fr/000285.log b/packs/aides-de-jeu-fr/000300.log similarity index 100% rename from packs/aides-de-jeu-fr/000285.log rename to packs/aides-de-jeu-fr/000300.log diff --git a/packs/aides-de-jeu-fr/CURRENT b/packs/aides-de-jeu-fr/CURRENT index 0041f5d..7604222 100644 --- a/packs/aides-de-jeu-fr/CURRENT +++ b/packs/aides-de-jeu-fr/CURRENT @@ -1 +1 @@ -MANIFEST-000284 +MANIFEST-000298 diff --git a/packs/aides-de-jeu-fr/LOG b/packs/aides-de-jeu-fr/LOG index 254020b..e7b9b4c 100644 --- a/packs/aides-de-jeu-fr/LOG +++ b/packs/aides-de-jeu-fr/LOG @@ -1,3 +1,8 @@ -2023/10/03-07:03:02.743995 7f9ff2ffd6c0 Recovering log #282 -2023/10/03-07:03:02.753386 7f9ff2ffd6c0 Delete type=3 #280 -2023/10/03-07:03:02.753446 7f9ff2ffd6c0 Delete type=0 #282 +2023/10/11-22:55:17.297188 7ffafdffa6c0 Recovering log #296 +2023/10/11-22:55:17.307975 7ffafdffa6c0 Delete type=3 #294 +2023/10/11-22:55:17.308100 7ffafdffa6c0 Delete type=0 #296 +2023/10/11-23:48:48.301384 7ff865e026c0 Level-0 table #301: started +2023/10/11-23:48:48.301411 7ff865e026c0 Level-0 table #301: 0 bytes OK +2023/10/11-23:48:48.307533 7ff865e026c0 Delete type=0 #299 +2023/10/11-23:48:48.322262 7ff865e026c0 Manual compaction at level-0 from '!journal!3IgmiprzLB6Lwenc' @ 72057594037927935 : 1 .. '!journal!suuYN87Al1ZZWtQQ' @ 0 : 0; will stop at (end) +2023/10/11-23:48:48.322291 7ff865e026c0 Manual compaction at level-1 from '!journal!3IgmiprzLB6Lwenc' @ 72057594037927935 : 1 .. '!journal!suuYN87Al1ZZWtQQ' @ 0 : 0; will stop at (end) diff --git a/packs/aides-de-jeu-fr/LOG.old b/packs/aides-de-jeu-fr/LOG.old index f1c91ba..688d3e7 100644 --- a/packs/aides-de-jeu-fr/LOG.old +++ b/packs/aides-de-jeu-fr/LOG.old @@ -1,8 +1,8 @@ -2023/10/01-21:10:38.974988 7f58077fe6c0 Recovering log #278 -2023/10/01-21:10:38.985805 7f58077fe6c0 Delete type=3 #276 -2023/10/01-21:10:38.985946 7f58077fe6c0 Delete type=0 #278 -2023/10/01-21:13:13.383766 7f58067fc6c0 Level-0 table #283: started -2023/10/01-21:13:13.383822 7f58067fc6c0 Level-0 table #283: 0 bytes OK -2023/10/01-21:13:13.390830 7f58067fc6c0 Delete type=0 #281 -2023/10/01-21:13:13.405858 7f58067fc6c0 Manual compaction at level-0 from '!journal!3IgmiprzLB6Lwenc' @ 72057594037927935 : 1 .. '!journal!suuYN87Al1ZZWtQQ' @ 0 : 0; will stop at (end) -2023/10/01-21:13:13.405935 7f58067fc6c0 Manual compaction at level-1 from '!journal!3IgmiprzLB6Lwenc' @ 72057594037927935 : 1 .. '!journal!suuYN87Al1ZZWtQQ' @ 0 : 0; will stop at (end) +2023/10/11-21:14:58.121926 7ff867fff6c0 Recovering log #292 +2023/10/11-21:14:58.133721 7ff867fff6c0 Delete type=3 #290 +2023/10/11-21:14:58.133830 7ff867fff6c0 Delete type=0 #292 +2023/10/11-21:31:23.896143 7ff865e026c0 Level-0 table #297: started +2023/10/11-21:31:23.896186 7ff865e026c0 Level-0 table #297: 0 bytes OK +2023/10/11-21:31:23.931933 7ff865e026c0 Delete type=0 #295 +2023/10/11-21:31:24.006990 7ff865e026c0 Manual compaction at level-0 from '!journal!3IgmiprzLB6Lwenc' @ 72057594037927935 : 1 .. '!journal!suuYN87Al1ZZWtQQ' @ 0 : 0; will stop at (end) +2023/10/11-21:31:24.007070 7ff865e026c0 Manual compaction at level-1 from '!journal!3IgmiprzLB6Lwenc' @ 72057594037927935 : 1 .. '!journal!suuYN87Al1ZZWtQQ' @ 0 : 0; will stop at (end) diff --git a/packs/aides-de-jeu-fr/MANIFEST-000284 b/packs/aides-de-jeu-fr/MANIFEST-000284 deleted file mode 100644 index d9c59523e12d54b1928c207c47e266dea59c622a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmezKDV{Nnfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQbyp*^qGDElX;EHc zj-s(=dTwSxQI(IAnNN9YUNR#i0~jDw6qlAp`dOGe<`_mrg_i^dGO|KcIC&gd!^ObJ OG?$5!fq5Pi3o8I3q$BVE diff --git a/packs/aides-de-jeu-fr/MANIFEST-000298 b/packs/aides-de-jeu-fr/MANIFEST-000298 new file mode 100644 index 0000000000000000000000000000000000000000..97afd02f5372313834f67bc636b2ebf5c6447c8e GIT binary patch literal 143 zcmezKDV{Nnfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQbyp*^qGDElX;EHc zj-s(=dTwSxQI(IAnNN9YUNR#i0~jDw6qlAp`dOGe<`_mrg_i^dGO|KcRDC+lz{SAG aw3>;Nfq4xR3v25mCJm6l8j!#`pa1~0!zWq* literal 0 HcmV?d00001 diff --git a/packs/antidotes-and-remedes/000286.log b/packs/antidotes-and-remedes/000301.log similarity index 100% rename from packs/antidotes-and-remedes/000286.log rename to packs/antidotes-and-remedes/000301.log diff --git a/packs/antidotes-and-remedes/CURRENT b/packs/antidotes-and-remedes/CURRENT index 0ae338f..d461311 100644 --- a/packs/antidotes-and-remedes/CURRENT +++ b/packs/antidotes-and-remedes/CURRENT @@ -1 +1 @@ -MANIFEST-000285 +MANIFEST-000299 diff --git a/packs/antidotes-and-remedes/LOG b/packs/antidotes-and-remedes/LOG index 6ad2ac2..ec9f776 100644 --- a/packs/antidotes-and-remedes/LOG +++ b/packs/antidotes-and-remedes/LOG @@ -1,3 +1,8 @@ -2023/10/03-07:03:02.756816 7f9ff3fff6c0 Recovering log #283 -2023/10/03-07:03:02.768055 7f9ff3fff6c0 Delete type=3 #281 -2023/10/03-07:03:02.768112 7f9ff3fff6c0 Delete type=0 #283 +2023/10/11-22:55:17.310381 7ffafd7f96c0 Recovering log #297 +2023/10/11-22:55:17.320551 7ffafd7f96c0 Delete type=3 #295 +2023/10/11-22:55:17.320609 7ffafd7f96c0 Delete type=0 #297 +2023/10/11-23:48:48.287205 7ff865e026c0 Level-0 table #302: started +2023/10/11-23:48:48.287236 7ff865e026c0 Level-0 table #302: 0 bytes OK +2023/10/11-23:48:48.294393 7ff865e026c0 Delete type=0 #300 +2023/10/11-23:48:48.301256 7ff865e026c0 Manual compaction at level-0 from '!folders!3uquYH73ttCdoH0I' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end) +2023/10/11-23:48:48.301301 7ff865e026c0 Manual compaction at level-1 from '!folders!3uquYH73ttCdoH0I' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end) diff --git a/packs/antidotes-and-remedes/LOG.old b/packs/antidotes-and-remedes/LOG.old index d84c422..6a299fc 100644 --- a/packs/antidotes-and-remedes/LOG.old +++ b/packs/antidotes-and-remedes/LOG.old @@ -1,8 +1,8 @@ -2023/10/01-21:10:38.988544 7f5a9cdff6c0 Recovering log #279 -2023/10/01-21:10:38.998072 7f5a9cdff6c0 Delete type=3 #277 -2023/10/01-21:10:38.998191 7f5a9cdff6c0 Delete type=0 #279 -2023/10/01-21:13:13.376689 7f58067fc6c0 Level-0 table #284: started -2023/10/01-21:13:13.376746 7f58067fc6c0 Level-0 table #284: 0 bytes OK -2023/10/01-21:13:13.383338 7f58067fc6c0 Delete type=0 #282 -2023/10/01-21:13:13.383578 7f58067fc6c0 Manual compaction at level-0 from '!folders!3uquYH73ttCdoH0I' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end) -2023/10/01-21:13:13.383644 7f58067fc6c0 Manual compaction at level-1 from '!folders!3uquYH73ttCdoH0I' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end) +2023/10/11-21:14:58.138350 7ffafd7f96c0 Recovering log #293 +2023/10/11-21:14:58.148369 7ffafd7f96c0 Delete type=3 #291 +2023/10/11-21:14:58.148659 7ffafd7f96c0 Delete type=0 #293 +2023/10/11-21:31:23.853759 7ff865e026c0 Level-0 table #298: started +2023/10/11-21:31:23.853829 7ff865e026c0 Level-0 table #298: 0 bytes OK +2023/10/11-21:31:23.895978 7ff865e026c0 Delete type=0 #296 +2023/10/11-21:31:24.006958 7ff865e026c0 Manual compaction at level-0 from '!folders!3uquYH73ttCdoH0I' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end) +2023/10/11-21:31:24.007094 7ff865e026c0 Manual compaction at level-1 from '!folders!3uquYH73ttCdoH0I' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end) diff --git a/packs/antidotes-and-remedes/MANIFEST-000285 b/packs/antidotes-and-remedes/MANIFEST-000299 similarity index 71% rename from packs/antidotes-and-remedes/MANIFEST-000285 rename to packs/antidotes-and-remedes/MANIFEST-000299 index d829acf6b2846cf86629986b186ad21bd788a679..0412eda1e65bb940b23aeed0d3771ddc1c0089cb 100644 GIT binary patch delta 43 tcmZ3$xQTH>pUQPRJw|Q@My54PoD9rsnOM#-zT>~V6C|=0B(feP0ssOB3i|*6 delta 25 hcmdnQxPWm&pO8{(;5TjtMy7d8oD9tKnOM#-0svzg2B81| diff --git a/packs/apothicarium/000285.log b/packs/apothicarium/000300.log similarity index 100% rename from packs/apothicarium/000285.log rename to packs/apothicarium/000300.log diff --git a/packs/apothicarium/CURRENT b/packs/apothicarium/CURRENT index 0041f5d..7604222 100644 --- a/packs/apothicarium/CURRENT +++ b/packs/apothicarium/CURRENT @@ -1 +1 @@ -MANIFEST-000284 +MANIFEST-000298 diff --git a/packs/apothicarium/LOG b/packs/apothicarium/LOG index 4776737..4e54a5c 100644 --- a/packs/apothicarium/LOG +++ b/packs/apothicarium/LOG @@ -1,3 +1,8 @@ -2023/10/03-07:03:02.785355 7f9ff37fe6c0 Recovering log #282 -2023/10/03-07:03:02.795364 7f9ff37fe6c0 Delete type=3 #280 -2023/10/03-07:03:02.795447 7f9ff37fe6c0 Delete type=0 #282 +2023/10/11-22:55:17.334971 7ff867fff6c0 Recovering log #296 +2023/10/11-22:55:17.346776 7ff867fff6c0 Delete type=3 #294 +2023/10/11-22:55:17.346859 7ff867fff6c0 Delete type=0 #296 +2023/10/11-23:48:48.307650 7ff865e026c0 Level-0 table #301: started +2023/10/11-23:48:48.307681 7ff865e026c0 Level-0 table #301: 0 bytes OK +2023/10/11-23:48:48.315242 7ff865e026c0 Delete type=0 #299 +2023/10/11-23:48:48.322273 7ff865e026c0 Manual compaction at level-0 from '!journal!cZtNgayIw2QFhC9u' @ 72057594037927935 : 1 .. '!journal!cZtNgayIw2QFhC9u' @ 0 : 0; will stop at (end) +2023/10/11-23:48:48.322783 7ff865e026c0 Manual compaction at level-1 from '!journal!cZtNgayIw2QFhC9u' @ 72057594037927935 : 1 .. '!journal!cZtNgayIw2QFhC9u' @ 0 : 0; will stop at (end) diff --git a/packs/apothicarium/LOG.old b/packs/apothicarium/LOG.old index 182ef8c..3d5caf4 100644 --- a/packs/apothicarium/LOG.old +++ b/packs/apothicarium/LOG.old @@ -1,8 +1,8 @@ -2023/10/01-21:10:39.014833 7f5806ffd6c0 Recovering log #278 -2023/10/01-21:10:39.025762 7f5806ffd6c0 Delete type=3 #276 -2023/10/01-21:10:39.025839 7f5806ffd6c0 Delete type=0 #278 -2023/10/01-21:13:13.397373 7f58067fc6c0 Level-0 table #283: started -2023/10/01-21:13:13.397569 7f58067fc6c0 Level-0 table #283: 0 bytes OK -2023/10/01-21:13:13.405604 7f58067fc6c0 Delete type=0 #281 -2023/10/01-21:13:13.405915 7f58067fc6c0 Manual compaction at level-0 from '!journal!cZtNgayIw2QFhC9u' @ 72057594037927935 : 1 .. '!journal!cZtNgayIw2QFhC9u' @ 0 : 0; will stop at (end) -2023/10/01-21:13:13.405972 7f58067fc6c0 Manual compaction at level-1 from '!journal!cZtNgayIw2QFhC9u' @ 72057594037927935 : 1 .. '!journal!cZtNgayIw2QFhC9u' @ 0 : 0; will stop at (end) +2023/10/11-21:14:58.169861 7ffafcff86c0 Recovering log #292 +2023/10/11-21:14:58.181832 7ffafcff86c0 Delete type=3 #290 +2023/10/11-21:14:58.182015 7ffafcff86c0 Delete type=0 #292 +2023/10/11-21:31:23.932150 7ff865e026c0 Level-0 table #297: started +2023/10/11-21:31:23.932216 7ff865e026c0 Level-0 table #297: 0 bytes OK +2023/10/11-21:31:23.968965 7ff865e026c0 Delete type=0 #295 +2023/10/11-21:31:24.007017 7ff865e026c0 Manual compaction at level-0 from '!journal!cZtNgayIw2QFhC9u' @ 72057594037927935 : 1 .. '!journal!cZtNgayIw2QFhC9u' @ 0 : 0; will stop at (end) +2023/10/11-21:31:24.007149 7ff865e026c0 Manual compaction at level-1 from '!journal!cZtNgayIw2QFhC9u' @ 72057594037927935 : 1 .. '!journal!cZtNgayIw2QFhC9u' @ 0 : 0; will stop at (end) diff --git a/packs/apothicarium/MANIFEST-000284 b/packs/apothicarium/MANIFEST-000284 deleted file mode 100644 index 3ddc445287785782cf284936a66c8902237ce7d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmb=OIA>}a10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAei1tp>+6Y(ii%nJrA2v( vIf}_qC4T9Nm7e8Bfo>VjmZgl03}8T5h525_<6I1kOmmqy8JOoWu`mJvC{82V diff --git a/packs/apothicarium/MANIFEST-000298 b/packs/apothicarium/MANIFEST-000298 new file mode 100644 index 0000000000000000000000000000000000000000..47a510ffe2e2552ecd41d9beba21c017400271f4 GIT binary patch literal 143 zcmb=OIA>}a10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAei1tp>+6Y(ii%nJrA2v( zIf}_qC4T9Nm7e8Bfo>VjmZgl03}8T5MSk&5Aua|+rqxWG49shoSQrbE5Bq`y)_?@o G0R;fMh$n^s literal 0 HcmV?d00001 diff --git a/packs/dons-de-rhya/000285.log b/packs/dons-de-rhya/000300.log similarity index 100% rename from packs/dons-de-rhya/000285.log rename to packs/dons-de-rhya/000300.log diff --git a/packs/dons-de-rhya/CURRENT b/packs/dons-de-rhya/CURRENT index 0041f5d..7604222 100644 --- a/packs/dons-de-rhya/CURRENT +++ b/packs/dons-de-rhya/CURRENT @@ -1 +1 @@ -MANIFEST-000284 +MANIFEST-000298 diff --git a/packs/dons-de-rhya/LOG b/packs/dons-de-rhya/LOG index 45d763b..3dcb39d 100644 --- a/packs/dons-de-rhya/LOG +++ b/packs/dons-de-rhya/LOG @@ -1,3 +1,8 @@ -2023/10/03-07:03:02.730668 7f9ff37fe6c0 Recovering log #282 -2023/10/03-07:03:02.741008 7f9ff37fe6c0 Delete type=3 #280 -2023/10/03-07:03:02.741141 7f9ff37fe6c0 Delete type=0 #282 +2023/10/11-22:55:17.284908 7ff867fff6c0 Recovering log #296 +2023/10/11-22:55:17.294836 7ff867fff6c0 Delete type=3 #294 +2023/10/11-22:55:17.294902 7ff867fff6c0 Delete type=0 #296 +2023/10/11-23:48:48.294503 7ff865e026c0 Level-0 table #301: started +2023/10/11-23:48:48.294529 7ff865e026c0 Level-0 table #301: 0 bytes OK +2023/10/11-23:48:48.301042 7ff865e026c0 Delete type=0 #299 +2023/10/11-23:48:48.301267 7ff865e026c0 Manual compaction at level-0 from '!journal!50u8VAjdmovyr0hx' @ 72057594037927935 : 1 .. '!journal!yzw9I0r3hCK7PJnz' @ 0 : 0; will stop at (end) +2023/10/11-23:48:48.301291 7ff865e026c0 Manual compaction at level-1 from '!journal!50u8VAjdmovyr0hx' @ 72057594037927935 : 1 .. '!journal!yzw9I0r3hCK7PJnz' @ 0 : 0; will stop at (end) diff --git a/packs/dons-de-rhya/LOG.old b/packs/dons-de-rhya/LOG.old index 17637e4..b6b0a0b 100644 --- a/packs/dons-de-rhya/LOG.old +++ b/packs/dons-de-rhya/LOG.old @@ -1,8 +1,8 @@ -2023/10/01-21:10:38.961794 7f5806ffd6c0 Recovering log #278 -2023/10/01-21:10:38.972606 7f5806ffd6c0 Delete type=3 #276 -2023/10/01-21:10:38.972680 7f5806ffd6c0 Delete type=0 #278 -2023/10/01-21:13:13.368981 7f58067fc6c0 Level-0 table #283: started -2023/10/01-21:13:13.369042 7f58067fc6c0 Level-0 table #283: 0 bytes OK -2023/10/01-21:13:13.376475 7f58067fc6c0 Delete type=0 #281 -2023/10/01-21:13:13.383557 7f58067fc6c0 Manual compaction at level-0 from '!journal!50u8VAjdmovyr0hx' @ 72057594037927935 : 1 .. '!journal!yzw9I0r3hCK7PJnz' @ 0 : 0; will stop at (end) -2023/10/01-21:13:13.383626 7f58067fc6c0 Manual compaction at level-1 from '!journal!50u8VAjdmovyr0hx' @ 72057594037927935 : 1 .. '!journal!yzw9I0r3hCK7PJnz' @ 0 : 0; will stop at (end) +2023/10/11-21:14:58.107089 7ffafcff86c0 Recovering log #292 +2023/10/11-21:14:58.117778 7ffafcff86c0 Delete type=3 #290 +2023/10/11-21:14:58.117905 7ffafcff86c0 Delete type=0 #292 +2023/10/11-21:31:23.815068 7ff865e026c0 Level-0 table #297: started +2023/10/11-21:31:23.815093 7ff865e026c0 Level-0 table #297: 0 bytes OK +2023/10/11-21:31:23.853158 7ff865e026c0 Delete type=0 #295 +2023/10/11-21:31:23.853470 7ff865e026c0 Manual compaction at level-0 from '!journal!50u8VAjdmovyr0hx' @ 72057594037927935 : 1 .. '!journal!yzw9I0r3hCK7PJnz' @ 0 : 0; will stop at (end) +2023/10/11-21:31:23.853564 7ff865e026c0 Manual compaction at level-1 from '!journal!50u8VAjdmovyr0hx' @ 72057594037927935 : 1 .. '!journal!yzw9I0r3hCK7PJnz' @ 0 : 0; will stop at (end) diff --git a/packs/dons-de-rhya/MANIFEST-000284 b/packs/dons-de-rhya/MANIFEST-000284 deleted file mode 100644 index 48e6ee8c9b886297a99d4f93e85239ee564182a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmZq7pV^bfz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDx@`%wqGDElX;EHc zj-shSsYRG$R!VMuS!IzyMg=1y0~jDwR92N+dKwfNXE=MC2YBUGF^WS}RId8W&c(pU OG?$5!fq5Pii#PxcnIsJW diff --git a/packs/dons-de-rhya/MANIFEST-000298 b/packs/dons-de-rhya/MANIFEST-000298 new file mode 100644 index 0000000000000000000000000000000000000000..1486be0de8571c9f50b675ad179f1e110d146069 GIT binary patch literal 143 zcmZq7pV^bfz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDx@`%wqGDElX;EHc zj-shSsYRG$R!VMuS!IzyMg=1y0~jDwR92N+dKwfNXE=MC2YBUGF^WS}I9~XDnTvsu aX*Clk1M?at7I8av*-x|tOjGx9)GJf9Ymz{SAG OG?$5!fq5Pi3l9L+mm?hj diff --git a/packs/tables-des-traductions/MANIFEST-000298 b/packs/tables-des-traductions/MANIFEST-000298 new file mode 100644 index 0000000000000000000000000000000000000000..46802460544ac3ec9fe5d18d4c6c06d150f9fded GIT binary patch literal 143 zcmZSk8?q;jfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQwe2gjqGDElX;EHc zj-r97nWvARUy)B{K%udFrZFQU0~jDwRHj8$v*-x|tOjGx9)G%zqft!^ObJ aw3>;Nfq4xR3(ta&nO8vqYd`|)fC2z$3@5e# literal 0 HcmV?d00001