From 541e2836ca13c5f9ad18cab2cc4eda45322b2b27 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Thu, 12 Oct 2023 20:10:13 +0200 Subject: [PATCH] Amelioration du parser de statblock --- module.json | 4 ++-- modules/import-stat-2.js | 8 ++++---- .../aides-de-jeu-fr/{000300.log => 000308.log} | 0 packs/aides-de-jeu-fr/CURRENT | 2 +- packs/aides-de-jeu-fr/LOG | 16 ++++++++-------- packs/aides-de-jeu-fr/LOG.old | 16 ++++++++-------- packs/aides-de-jeu-fr/MANIFEST-000298 | Bin 143 -> 0 bytes packs/aides-de-jeu-fr/MANIFEST-000306 | Bin 0 -> 143 bytes .../{000301.log => 000309.log} | 0 packs/antidotes-and-remedes/CURRENT | 2 +- packs/antidotes-and-remedes/LOG | 16 ++++++++-------- packs/antidotes-and-remedes/LOG.old | 16 ++++++++-------- .../{MANIFEST-000299 => MANIFEST-000307} | Bin 178 -> 178 bytes packs/apothicarium/{000300.log => 000308.log} | 0 packs/apothicarium/CURRENT | 2 +- packs/apothicarium/LOG | 16 ++++++++-------- packs/apothicarium/LOG.old | 16 ++++++++-------- packs/apothicarium/MANIFEST-000298 | Bin 143 -> 0 bytes packs/apothicarium/MANIFEST-000306 | Bin 0 -> 143 bytes packs/dons-de-rhya/{000300.log => 000308.log} | 0 packs/dons-de-rhya/CURRENT | 2 +- packs/dons-de-rhya/LOG | 16 ++++++++-------- packs/dons-de-rhya/LOG.old | 16 ++++++++-------- packs/dons-de-rhya/MANIFEST-000298 | Bin 143 -> 0 bytes packs/dons-de-rhya/MANIFEST-000306 | Bin 0 -> 143 bytes .../plats-dauberges/{000300.log => 000308.log} | 0 packs/plats-dauberges/CURRENT | 2 +- packs/plats-dauberges/LOG | 16 ++++++++-------- packs/plats-dauberges/LOG.old | 16 ++++++++-------- .../{MANIFEST-000298 => MANIFEST-000306} | Bin 168 -> 168 bytes .../{000300.log => 000308.log} | 0 packs/tables-des-traductions/CURRENT | 2 +- packs/tables-des-traductions/LOG | 16 ++++++++-------- packs/tables-des-traductions/LOG.old | 16 ++++++++-------- packs/tables-des-traductions/MANIFEST-000298 | Bin 143 -> 0 bytes packs/tables-des-traductions/MANIFEST-000306 | Bin 0 -> 143 bytes 36 files changed, 108 insertions(+), 108 deletions(-) rename packs/aides-de-jeu-fr/{000300.log => 000308.log} (100%) delete mode 100644 packs/aides-de-jeu-fr/MANIFEST-000298 create mode 100644 packs/aides-de-jeu-fr/MANIFEST-000306 rename packs/antidotes-and-remedes/{000301.log => 000309.log} (100%) rename packs/antidotes-and-remedes/{MANIFEST-000299 => MANIFEST-000307} (71%) rename packs/apothicarium/{000300.log => 000308.log} (100%) delete mode 100644 packs/apothicarium/MANIFEST-000298 create mode 100644 packs/apothicarium/MANIFEST-000306 rename packs/dons-de-rhya/{000300.log => 000308.log} (100%) delete mode 100644 packs/dons-de-rhya/MANIFEST-000298 create mode 100644 packs/dons-de-rhya/MANIFEST-000306 rename packs/plats-dauberges/{000300.log => 000308.log} (100%) rename packs/plats-dauberges/{MANIFEST-000298 => MANIFEST-000306} (76%) rename packs/tables-des-traductions/{000300.log => 000308.log} (100%) delete mode 100644 packs/tables-des-traductions/MANIFEST-000298 create mode 100644 packs/tables-des-traductions/MANIFEST-000306 diff --git a/module.json b/module.json index e6e383d..397afc5 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.15", + "version": "7.0.16", "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.15.zip", + "download": "https://www.uberwald.me/gitea/public/foundryvtt-wh4-lang-fr-fr/archive/foundryvtt-wh4-lang-fr-7.0.16.zip", "id": "wh4-fr-translation", "compatibility": { "minimum": "10", diff --git a/modules/import-stat-2.js b/modules/import-stat-2.js index 7bb0c53..f77e5fd 100644 --- a/modules/import-stat-2.js +++ b/modules/import-stat-2.js @@ -52,7 +52,7 @@ import "./xregexp-all.js"; const us_carac = 'm\\s+ws\\s+bs\\s+s\\s+t\\s+i\\s+agi?\\s+dex\\s+int\\s+\\wp\\s+fel\\s+w'; const fr_carac = 'm\\s+cc\\s+ct\\s+f\\s+e\\s+i\\s+agi?\\s+dex\\s+int\\s+fm\\s+soc\\s+b'; const carac_val = '(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-\*]+)'; -const name_val = '(?[a-zA-Z\\s\\-,]*)[\\s\\r\\na-zA-Z]*(?.*|[\\(\\)a-z0-9]+)'; +const name_val = '(?[a-zA-Z\\s\\-,\']*)[\\s\\r\\na-zA-Z]*(?.*|[\\(\\)a-z0-9]+)'; 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 }, @@ -75,7 +75,7 @@ let sectionDataUS = [ { 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"} ] + {name:" silver shilling", key:"ss"}, {name:" ss", key: "ss"}, {name:"/-", key: "ss"}, {name:" brass penn", 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 @@ -375,7 +375,7 @@ export default async function statParserFR(statString, type = "npc") { } else { itemFound.system.specification.value = game.i18n.localize(value) } - itemFound.name += "(" + value + ")" + //itemFound.name += "(" + value + ")" } if (!itemFound) ui.notifications.error("Trait non trouvé, à ajouter manuellement : " + name, { permanent: true }) @@ -438,7 +438,7 @@ export default async function statParserFR(statString, type = "npc") { // Searching money stuff for (let mondeyDef of moneyLang) { if (name.toLowerCase().includes(mondeyDef.name)) { - let regMoney = XRegExp("(\\d+)\\s+" + mondeyDef.name.trim(), 'gi') + 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 diff --git a/packs/aides-de-jeu-fr/000300.log b/packs/aides-de-jeu-fr/000308.log similarity index 100% rename from packs/aides-de-jeu-fr/000300.log rename to packs/aides-de-jeu-fr/000308.log diff --git a/packs/aides-de-jeu-fr/CURRENT b/packs/aides-de-jeu-fr/CURRENT index 7604222..759a159 100644 --- a/packs/aides-de-jeu-fr/CURRENT +++ b/packs/aides-de-jeu-fr/CURRENT @@ -1 +1 @@ -MANIFEST-000298 +MANIFEST-000306 diff --git a/packs/aides-de-jeu-fr/LOG b/packs/aides-de-jeu-fr/LOG index e7b9b4c..3b55465 100644 --- a/packs/aides-de-jeu-fr/LOG +++ b/packs/aides-de-jeu-fr/LOG @@ -1,8 +1,8 @@ -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) +2023/10/12-12:52:21.429107 7ff867fff6c0 Recovering log #304 +2023/10/12-12:52:21.438983 7ff867fff6c0 Delete type=3 #302 +2023/10/12-12:52:21.439028 7ff867fff6c0 Delete type=0 #304 +2023/10/12-14:21:05.515562 7ff865e026c0 Level-0 table #309: started +2023/10/12-14:21:05.515585 7ff865e026c0 Level-0 table #309: 0 bytes OK +2023/10/12-14:21:05.522208 7ff865e026c0 Delete type=0 #307 +2023/10/12-14:21:05.529094 7ff865e026c0 Manual compaction at level-0 from '!journal!3IgmiprzLB6Lwenc' @ 72057594037927935 : 1 .. '!journal!suuYN87Al1ZZWtQQ' @ 0 : 0; will stop at (end) +2023/10/12-14:21:05.529124 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 688d3e7..c8d69b0 100644 --- a/packs/aides-de-jeu-fr/LOG.old +++ b/packs/aides-de-jeu-fr/LOG.old @@ -1,8 +1,8 @@ -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) +2023/10/12-08:42:23.281809 7ffafdffa6c0 Recovering log #300 +2023/10/12-08:42:23.293900 7ffafdffa6c0 Delete type=3 #298 +2023/10/12-08:42:23.294048 7ffafdffa6c0 Delete type=0 #300 +2023/10/12-09:07:20.297268 7ff865e026c0 Level-0 table #305: started +2023/10/12-09:07:20.297313 7ff865e026c0 Level-0 table #305: 0 bytes OK +2023/10/12-09:07:20.303738 7ff865e026c0 Delete type=0 #303 +2023/10/12-09:07:20.303980 7ff865e026c0 Manual compaction at level-0 from '!journal!3IgmiprzLB6Lwenc' @ 72057594037927935 : 1 .. '!journal!suuYN87Al1ZZWtQQ' @ 0 : 0; will stop at (end) +2023/10/12-09:07:20.304031 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-000298 b/packs/aides-de-jeu-fr/MANIFEST-000298 deleted file mode 100644 index 97afd02f5372313834f67bc636b2ebf5c6447c8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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* diff --git a/packs/aides-de-jeu-fr/MANIFEST-000306 b/packs/aides-de-jeu-fr/MANIFEST-000306 new file mode 100644 index 0000000000000000000000000000000000000000..190f65fb601e0f31b408e2cac749b82f36d4adba 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|Kcyzc#Yn~Q;w aX)_Zi1M?Op7S=Dew_890TR;NafC2#KvnhrE literal 0 HcmV?d00001 diff --git a/packs/antidotes-and-remedes/000301.log b/packs/antidotes-and-remedes/000309.log similarity index 100% rename from packs/antidotes-and-remedes/000301.log rename to packs/antidotes-and-remedes/000309.log diff --git a/packs/antidotes-and-remedes/CURRENT b/packs/antidotes-and-remedes/CURRENT index d461311..b0ac6fc 100644 --- a/packs/antidotes-and-remedes/CURRENT +++ b/packs/antidotes-and-remedes/CURRENT @@ -1 +1 @@ -MANIFEST-000299 +MANIFEST-000307 diff --git a/packs/antidotes-and-remedes/LOG b/packs/antidotes-and-remedes/LOG index ec9f776..de6dc61 100644 --- a/packs/antidotes-and-remedes/LOG +++ b/packs/antidotes-and-remedes/LOG @@ -1,8 +1,8 @@ -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) +2023/10/12-12:52:21.442257 7ffafcff86c0 Recovering log #305 +2023/10/12-12:52:21.453596 7ffafcff86c0 Delete type=3 #303 +2023/10/12-12:52:21.453695 7ffafcff86c0 Delete type=0 #305 +2023/10/12-14:21:05.549093 7ff865e026c0 Level-0 table #310: started +2023/10/12-14:21:05.549145 7ff865e026c0 Level-0 table #310: 0 bytes OK +2023/10/12-14:21:05.556493 7ff865e026c0 Delete type=0 #308 +2023/10/12-14:21:05.556633 7ff865e026c0 Manual compaction at level-0 from '!folders!3uquYH73ttCdoH0I' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end) +2023/10/12-14:21:05.556659 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 6a299fc..1cc0e58 100644 --- a/packs/antidotes-and-remedes/LOG.old +++ b/packs/antidotes-and-remedes/LOG.old @@ -1,8 +1,8 @@ -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) +2023/10/12-08:42:23.297463 7ff867fff6c0 Recovering log #301 +2023/10/12-08:42:23.309413 7ff867fff6c0 Delete type=3 #299 +2023/10/12-08:42:23.309623 7ff867fff6c0 Delete type=0 #301 +2023/10/12-09:07:20.283204 7ff865e026c0 Level-0 table #306: started +2023/10/12-09:07:20.283248 7ff865e026c0 Level-0 table #306: 0 bytes OK +2023/10/12-09:07:20.290020 7ff865e026c0 Delete type=0 #304 +2023/10/12-09:07:20.303924 7ff865e026c0 Manual compaction at level-0 from '!folders!3uquYH73ttCdoH0I' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end) +2023/10/12-09:07:20.304012 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-000299 b/packs/antidotes-and-remedes/MANIFEST-000307 similarity index 71% rename from packs/antidotes-and-remedes/MANIFEST-000299 rename to packs/antidotes-and-remedes/MANIFEST-000307 index 0412eda1e65bb940b23aeed0d3771ddc1c0089cb..c7a4fc6b917d9b0c16ba8ad12c3479b40afc54ff 100644 GIT binary patch delta 43 scmdnQxQTH>pGvb$?<8&pMy4%HoD9rcnOM#-N(q(3fJC-}M7D!O002G;IsgCw delta 43 tcmdnQxQTH>pUQPRJw|Q@My54PoD9rsnOM#-zT>~V6C|=0B(feP0ssXK3k?7O diff --git a/packs/apothicarium/000300.log b/packs/apothicarium/000308.log similarity index 100% rename from packs/apothicarium/000300.log rename to packs/apothicarium/000308.log diff --git a/packs/apothicarium/CURRENT b/packs/apothicarium/CURRENT index 7604222..759a159 100644 --- a/packs/apothicarium/CURRENT +++ b/packs/apothicarium/CURRENT @@ -1 +1 @@ -MANIFEST-000298 +MANIFEST-000306 diff --git a/packs/apothicarium/LOG b/packs/apothicarium/LOG index 4e54a5c..8ceeb07 100644 --- a/packs/apothicarium/LOG +++ b/packs/apothicarium/LOG @@ -1,8 +1,8 @@ -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) +2023/10/12-12:52:21.469812 7ffafd7f96c0 Recovering log #304 +2023/10/12-12:52:21.479826 7ffafd7f96c0 Delete type=3 #302 +2023/10/12-12:52:21.479883 7ffafd7f96c0 Delete type=0 #304 +2023/10/12-14:21:05.542955 7ff865e026c0 Level-0 table #309: started +2023/10/12-14:21:05.542977 7ff865e026c0 Level-0 table #309: 0 bytes OK +2023/10/12-14:21:05.548879 7ff865e026c0 Delete type=0 #307 +2023/10/12-14:21:05.556607 7ff865e026c0 Manual compaction at level-0 from '!journal!cZtNgayIw2QFhC9u' @ 72057594037927935 : 1 .. '!journal!cZtNgayIw2QFhC9u' @ 0 : 0; will stop at (end) +2023/10/12-14:21:05.556642 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 3d5caf4..9dfd363 100644 --- a/packs/apothicarium/LOG.old +++ b/packs/apothicarium/LOG.old @@ -1,8 +1,8 @@ -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) +2023/10/12-08:42:23.329050 7ffafd7f96c0 Recovering log #300 +2023/10/12-08:42:23.340331 7ffafd7f96c0 Delete type=3 #298 +2023/10/12-08:42:23.340426 7ffafd7f96c0 Delete type=0 #300 +2023/10/12-09:07:20.304375 7ff865e026c0 Level-0 table #305: started +2023/10/12-09:07:20.304424 7ff865e026c0 Level-0 table #305: 0 bytes OK +2023/10/12-09:07:20.311700 7ff865e026c0 Delete type=0 #303 +2023/10/12-09:07:20.311889 7ff865e026c0 Manual compaction at level-0 from '!journal!cZtNgayIw2QFhC9u' @ 72057594037927935 : 1 .. '!journal!cZtNgayIw2QFhC9u' @ 0 : 0; will stop at (end) +2023/10/12-09:07:20.311934 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-000298 b/packs/apothicarium/MANIFEST-000298 deleted file mode 100644 index 47a510ffe2e2552ecd41d9beba21c017400271f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/packs/apothicarium/MANIFEST-000306 b/packs/apothicarium/MANIFEST-000306 new file mode 100644 index 0000000000000000000000000000000000000000..e89c5c39423979dd53a2ede09f925eac709f2c8c GIT binary patch literal 143 zcmb=OIA>}a10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAei1tp>+6Y(ii%nJrA2v( zIf}_qC4T9Nm7e8Bfo>VjmZgl03}8T5#XqqtJGmGbnKm`pgoS$2eSd>_jU&PMDx@`%wqGDElX;EHc zj-shSsYRG$R!VMuS!IzyMg=1y0~jDwR92N+dKwfNXE=MC2YBUGF^WS}I9~XDnTvsu aX*Clk1M?at7I8a`pgoS$2eSd>_jU&PMDx@`%wqGDElX;EHc zj-shSsYRG$R!VMuS!IzyMg=1y0~jDwR92N+dKwfNXE=MC2YBUGF^WS}Y|wf1gNuQY aX)_Zi1M?Op7V-6S-spn_wtxh-0R;fK(kR*h literal 0 HcmV?d00001 diff --git a/packs/plats-dauberges/000300.log b/packs/plats-dauberges/000308.log similarity index 100% rename from packs/plats-dauberges/000300.log rename to packs/plats-dauberges/000308.log diff --git a/packs/plats-dauberges/CURRENT b/packs/plats-dauberges/CURRENT index 7604222..759a159 100644 --- a/packs/plats-dauberges/CURRENT +++ b/packs/plats-dauberges/CURRENT @@ -1 +1 @@ -MANIFEST-000298 +MANIFEST-000306 diff --git a/packs/plats-dauberges/LOG b/packs/plats-dauberges/LOG index 528e3d6..d3dec44 100644 --- a/packs/plats-dauberges/LOG +++ b/packs/plats-dauberges/LOG @@ -1,8 +1,8 @@ -2023/10/11-22:55:17.266209 7ffafcff86c0 Recovering log #296 -2023/10/11-22:55:17.281214 7ffafcff86c0 Delete type=3 #294 -2023/10/11-22:55:17.281272 7ffafcff86c0 Delete type=0 #296 -2023/10/11-23:48:48.281025 7ff865e026c0 Level-0 table #301: started -2023/10/11-23:48:48.281102 7ff865e026c0 Level-0 table #301: 0 bytes OK -2023/10/11-23:48:48.287113 7ff865e026c0 Delete type=0 #299 -2023/10/11-23:48:48.301224 7ff865e026c0 Manual compaction at level-0 from '!tables!4l60Lxv8cpsyy2Cg' @ 72057594037927935 : 1 .. '!tables.results!tfaYKDZqu7kgZvRG.yvbwKursaixh2dby' @ 0 : 0; will stop at (end) -2023/10/11-23:48:48.301283 7ff865e026c0 Manual compaction at level-1 from '!tables!4l60Lxv8cpsyy2Cg' @ 72057594037927935 : 1 .. '!tables.results!tfaYKDZqu7kgZvRG.yvbwKursaixh2dby' @ 0 : 0; will stop at (end) +2023/10/12-12:52:21.401250 7ffafdffa6c0 Recovering log #304 +2023/10/12-12:52:21.411393 7ffafdffa6c0 Delete type=3 #302 +2023/10/12-12:52:21.411454 7ffafdffa6c0 Delete type=0 #304 +2023/10/12-14:21:05.522295 7ff865e026c0 Level-0 table #309: started +2023/10/12-14:21:05.522318 7ff865e026c0 Level-0 table #309: 0 bytes OK +2023/10/12-14:21:05.528847 7ff865e026c0 Delete type=0 #307 +2023/10/12-14:21:05.529104 7ff865e026c0 Manual compaction at level-0 from '!tables!4l60Lxv8cpsyy2Cg' @ 72057594037927935 : 1 .. '!tables.results!tfaYKDZqu7kgZvRG.yvbwKursaixh2dby' @ 0 : 0; will stop at (end) +2023/10/12-14:21:05.529131 7ff865e026c0 Manual compaction at level-1 from '!tables!4l60Lxv8cpsyy2Cg' @ 72057594037927935 : 1 .. '!tables.results!tfaYKDZqu7kgZvRG.yvbwKursaixh2dby' @ 0 : 0; will stop at (end) diff --git a/packs/plats-dauberges/LOG.old b/packs/plats-dauberges/LOG.old index 050235c..ad3bf5e 100644 --- a/packs/plats-dauberges/LOG.old +++ b/packs/plats-dauberges/LOG.old @@ -1,8 +1,8 @@ -2023/10/11-21:14:58.092033 7ffafdffa6c0 Recovering log #292 -2023/10/11-21:14:58.102808 7ffafdffa6c0 Delete type=3 #290 -2023/10/11-21:14:58.102982 7ffafdffa6c0 Delete type=0 #292 -2023/10/11-21:31:23.777784 7ff865e026c0 Level-0 table #297: started -2023/10/11-21:31:23.777834 7ff865e026c0 Level-0 table #297: 0 bytes OK -2023/10/11-21:31:23.814914 7ff865e026c0 Delete type=0 #295 -2023/10/11-21:31:23.853440 7ff865e026c0 Manual compaction at level-0 from '!tables!4l60Lxv8cpsyy2Cg' @ 72057594037927935 : 1 .. '!tables.results!tfaYKDZqu7kgZvRG.yvbwKursaixh2dby' @ 0 : 0; will stop at (end) -2023/10/11-21:31:23.853538 7ff865e026c0 Manual compaction at level-1 from '!tables!4l60Lxv8cpsyy2Cg' @ 72057594037927935 : 1 .. '!tables.results!tfaYKDZqu7kgZvRG.yvbwKursaixh2dby' @ 0 : 0; will stop at (end) +2023/10/12-08:42:23.253449 7ffafcff86c0 Recovering log #300 +2023/10/12-08:42:23.265283 7ffafcff86c0 Delete type=3 #298 +2023/10/12-08:42:23.265373 7ffafcff86c0 Delete type=0 #300 +2023/10/12-09:07:20.268061 7ff865e026c0 Level-0 table #305: started +2023/10/12-09:07:20.268126 7ff865e026c0 Level-0 table #305: 0 bytes OK +2023/10/12-09:07:20.276287 7ff865e026c0 Delete type=0 #303 +2023/10/12-09:07:20.276521 7ff865e026c0 Manual compaction at level-0 from '!tables!4l60Lxv8cpsyy2Cg' @ 72057594037927935 : 1 .. '!tables.results!tfaYKDZqu7kgZvRG.yvbwKursaixh2dby' @ 0 : 0; will stop at (end) +2023/10/12-09:07:20.276572 7ff865e026c0 Manual compaction at level-1 from '!tables!4l60Lxv8cpsyy2Cg' @ 72057594037927935 : 1 .. '!tables.results!tfaYKDZqu7kgZvRG.yvbwKursaixh2dby' @ 0 : 0; will stop at (end) diff --git a/packs/plats-dauberges/MANIFEST-000298 b/packs/plats-dauberges/MANIFEST-000306 similarity index 76% rename from packs/plats-dauberges/MANIFEST-000298 rename to packs/plats-dauberges/MANIFEST-000306 index d013313f610a2574b4104c1eeb4bd8482da30b42..fe6fbeb149875ddd470a11ac8f0368871c8f792f 100644 GIT binary patch delta 43 tcmZ3%xPoy)i%RH%_#4~|j7*!EI2o9?FtNO1T;BK43?#AzB(e=80stO*3+?~_ delta 43 tcmZ3%xPoy)iwff+20LyBMyAzFoD9rsm{?vh7WXvW1&OQyiL3*O008i43Y7o= diff --git a/packs/tables-des-traductions/000300.log b/packs/tables-des-traductions/000308.log similarity index 100% rename from packs/tables-des-traductions/000300.log rename to packs/tables-des-traductions/000308.log diff --git a/packs/tables-des-traductions/CURRENT b/packs/tables-des-traductions/CURRENT index 7604222..759a159 100644 --- a/packs/tables-des-traductions/CURRENT +++ b/packs/tables-des-traductions/CURRENT @@ -1 +1 @@ -MANIFEST-000298 +MANIFEST-000306 diff --git a/packs/tables-des-traductions/LOG b/packs/tables-des-traductions/LOG index 09897c6..1f29b2d 100644 --- a/packs/tables-des-traductions/LOG +++ b/packs/tables-des-traductions/LOG @@ -1,8 +1,8 @@ -2023/10/11-22:55:17.323178 7ffafcff86c0 Recovering log #296 -2023/10/11-22:55:17.333063 7ffafcff86c0 Delete type=3 #294 -2023/10/11-22:55:17.333136 7ffafcff86c0 Delete type=0 #296 -2023/10/11-23:48:48.315450 7ff865e026c0 Level-0 table #301: started -2023/10/11-23:48:48.315773 7ff865e026c0 Level-0 table #301: 0 bytes OK -2023/10/11-23:48:48.322181 7ff865e026c0 Delete type=0 #299 -2023/10/11-23:48:48.322811 7ff865e026c0 Manual compaction at level-0 from '!journal!056ILNNrLiPq3Gi3' @ 72057594037927935 : 1 .. '!journal!yfZxl4I7XAuUF6r3' @ 0 : 0; will stop at (end) -2023/10/11-23:48:48.322856 7ff865e026c0 Manual compaction at level-1 from '!journal!056ILNNrLiPq3Gi3' @ 72057594037927935 : 1 .. '!journal!yfZxl4I7XAuUF6r3' @ 0 : 0; will stop at (end) +2023/10/12-12:52:21.457131 7ffafdffa6c0 Recovering log #304 +2023/10/12-12:52:21.466846 7ffafdffa6c0 Delete type=3 #302 +2023/10/12-12:52:21.466893 7ffafdffa6c0 Delete type=0 #304 +2023/10/12-14:21:05.535621 7ff865e026c0 Level-0 table #309: started +2023/10/12-14:21:05.535656 7ff865e026c0 Level-0 table #309: 0 bytes OK +2023/10/12-14:21:05.542859 7ff865e026c0 Delete type=0 #307 +2023/10/12-14:21:05.556592 7ff865e026c0 Manual compaction at level-0 from '!journal!056ILNNrLiPq3Gi3' @ 72057594037927935 : 1 .. '!journal!yfZxl4I7XAuUF6r3' @ 0 : 0; will stop at (end) +2023/10/12-14:21:05.556651 7ff865e026c0 Manual compaction at level-1 from '!journal!056ILNNrLiPq3Gi3' @ 72057594037927935 : 1 .. '!journal!yfZxl4I7XAuUF6r3' @ 0 : 0; will stop at (end) diff --git a/packs/tables-des-traductions/LOG.old b/packs/tables-des-traductions/LOG.old index deee1fc..fa9f7af 100644 --- a/packs/tables-des-traductions/LOG.old +++ b/packs/tables-des-traductions/LOG.old @@ -1,8 +1,8 @@ -2023/10/11-21:14:58.153045 7ffafdffa6c0 Recovering log #292 -2023/10/11-21:14:58.164845 7ffafdffa6c0 Delete type=3 #290 -2023/10/11-21:14:58.165021 7ffafdffa6c0 Delete type=0 #292 -2023/10/11-21:31:23.969144 7ff865e026c0 Level-0 table #297: started -2023/10/11-21:31:23.969192 7ff865e026c0 Level-0 table #297: 0 bytes OK -2023/10/11-21:31:24.006733 7ff865e026c0 Delete type=0 #295 -2023/10/11-21:31:24.007046 7ff865e026c0 Manual compaction at level-0 from '!journal!056ILNNrLiPq3Gi3' @ 72057594037927935 : 1 .. '!journal!yfZxl4I7XAuUF6r3' @ 0 : 0; will stop at (end) -2023/10/11-21:31:24.007121 7ff865e026c0 Manual compaction at level-1 from '!journal!056ILNNrLiPq3Gi3' @ 72057594037927935 : 1 .. '!journal!yfZxl4I7XAuUF6r3' @ 0 : 0; will stop at (end) +2023/10/12-08:42:23.313383 7ffafcff86c0 Recovering log #300 +2023/10/12-08:42:23.325901 7ffafcff86c0 Delete type=3 #298 +2023/10/12-08:42:23.326114 7ffafcff86c0 Delete type=0 #300 +2023/10/12-09:07:20.290221 7ff865e026c0 Level-0 table #305: started +2023/10/12-09:07:20.290277 7ff865e026c0 Level-0 table #305: 0 bytes OK +2023/10/12-09:07:20.297074 7ff865e026c0 Delete type=0 #303 +2023/10/12-09:07:20.303956 7ff865e026c0 Manual compaction at level-0 from '!journal!056ILNNrLiPq3Gi3' @ 72057594037927935 : 1 .. '!journal!yfZxl4I7XAuUF6r3' @ 0 : 0; will stop at (end) +2023/10/12-09:07:20.304050 7ff865e026c0 Manual compaction at level-1 from '!journal!056ILNNrLiPq3Gi3' @ 72057594037927935 : 1 .. '!journal!yfZxl4I7XAuUF6r3' @ 0 : 0; will stop at (end) diff --git a/packs/tables-des-traductions/MANIFEST-000298 b/packs/tables-des-traductions/MANIFEST-000298 deleted file mode 100644 index 46802460544ac3ec9fe5d18d4c6c06d150f9fded..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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# diff --git a/packs/tables-des-traductions/MANIFEST-000306 b/packs/tables-des-traductions/MANIFEST-000306 new file mode 100644 index 0000000000000000000000000000000000000000..dfbb78e2791bb572e0217c40b1dc781f035cdafb 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_}Nw(axpM6 aZD!(RVBW&S!V}o*`~xJg1thQyC;$LA(k1l( literal 0 HcmV?d00001