diff --git a/ryzom/tools/extract_r2_required/merge_sitem_list.py b/ryzom/tools/extract_r2_required/merge_sitem_list.py index f5ef71f7f..f8b0ba147 100644 --- a/ryzom/tools/extract_r2_required/merge_sitem_list.py +++ b/ryzom/tools/extract_r2_required/merge_sitem_list.py @@ -16,18 +16,25 @@ def listPathExt(path, ext): listPathExt(sitemPath, ".sitem") +knownMissing = {} +with open("missing_sheets.txt", "r") as r: + for l in r: + knownMissing[l.strip()] = True + with open("sitem_list.txt", "w") as w: with open("sitem_missing.txt", "w") as wm: with open("sitem_list_r2.txt", "r") as r: for l in r: - w.write(l) - if not l.strip() in fileMap: - wm.write(l) - with open("sitem_list_wk.txt", "r") as r: - for l in r: - if len(l.strip()) > 0 and not l.startswith(";"): + if not l.strip() in knownMissing: w.write(l) if not l.strip() in fileMap: wm.write(l) + with open("sitem_list_wk.txt", "r") as r: + for l in r: + if len(l.strip()) > 0 and not l.startswith(";"): + if not l.strip() in knownMissing: + w.write(l) + if not l.strip() in fileMap: + wm.write(l) wm.flush() w.flush() diff --git a/ryzom/tools/extract_r2_required/sitem_list.txt b/ryzom/tools/extract_r2_required/sitem_list.txt index 7190f91a2..62380696c 100644 --- a/ryzom/tools/extract_r2_required/sitem_list.txt +++ b/ryzom/tools/extract_r2_required/sitem_list.txt @@ -2,9 +2,6 @@ iccm1bm.sitem iccm1pd.sitem iccm1sa.sitem iccm1ss.sitem -icf.sitem -icf_2.sitem -icf_3.sitem icfacb_3.sitem icfacp.sitem icfacp_2.sitem @@ -95,9 +92,6 @@ icfsb_3.sitem icfss.sitem icfss_2.sitem icfss_3.sitem -icm.sitem -icm_2.sitem -icm_3.sitem icmacb_3.sitem icmacp.sitem icmacp_2.sitem @@ -189,9 +183,6 @@ icmss.sitem icmss_2.sitem icmss_3.sitem icravr.sitem -ict.sitem -ict_2.sitem -ict_3.sitem ictacb_3.sitem ictacp.sitem ictacp_2.sitem @@ -282,9 +273,6 @@ ictsb_3.sitem ictss.sitem ictss_2.sitem ictss_3.sitem -icz.sitem -icz_2.sitem -icz_3.sitem iczacp.sitem iczacp_2.sitem iczacp_3.sitem diff --git a/ryzom/tools/extract_r2_required/sitem_missing.txt b/ryzom/tools/extract_r2_required/sitem_missing.txt index 2464e9f16..ca94c6e8e 100644 --- a/ryzom/tools/extract_r2_required/sitem_missing.txt +++ b/ryzom/tools/extract_r2_required/sitem_missing.txt @@ -2,9 +2,6 @@ iccm1bm.sitem iccm1pd.sitem iccm1sa.sitem iccm1ss.sitem -icf.sitem -icf_2.sitem -icf_3.sitem icfacb_3.sitem icfacs_3.sitem icfacv_3.sitem @@ -44,9 +41,6 @@ icfsb_3.sitem icfss.sitem icfss_2.sitem icfss_3.sitem -icm.sitem -icm_2.sitem -icm_3.sitem icmacb_3.sitem icmacs_3.sitem icmacv_3.sitem @@ -86,9 +80,6 @@ icmsb_3.sitem icmss.sitem icmss_2.sitem icmss_3.sitem -ict.sitem -ict_2.sitem -ict_3.sitem ictacb_3.sitem ictacs_3.sitem ictacv_3.sitem @@ -128,9 +119,6 @@ ictsb_3.sitem ictss.sitem ictss_2.sitem ictss_3.sitem -icz.sitem -icz_2.sitem -icz_3.sitem iczm1bm.sitem iczm1bm_2.sitem iczm1bm_3.sitem