From b5862a7ea72294fedc7612db2325fca8200ac71e Mon Sep 17 00:00:00 2001
From: dat972 <wayoung12@gmail.com>
Date: Thu, 9 Jul 2026 16:48:07 -0500
Subject: [PATCH] tweaked the ignore list so it includes all files not just
 prefix, so 02800 and 02800TP now

---
 README.md                             |   6 ++--
 __pycache__/fccs_scan.cpython-313.pyc | Bin 5893 -> 6283 bytes
 fccs_scan.py                          |  42 +++++++++++++++-----------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 7d98f84..b57ca09 100644
--- a/README.md
+++ b/README.md
@@ -36,12 +36,12 @@ python fccs_scan.py
 
 Reads the restored FCCS backup directory and writes all drawer IDs (subfolder names) to `drawer_ids.txt`. It also:
 
-- **Flags prefix clashes** — if one drawer ID is a prefix of another (e.g. `02218` and `02218A`), searching the shorter ID in FCCS pops up a selection box that breaks automated navigation. These clashes are reported, and the shorter (prefix) IDs are auto-seeded into `ignore.txt` for review.
+- **Flags prefix clashes** — if one drawer ID is a prefix of another (e.g. `02218` and `02218A`), searching them in FCCS can pop up a selection box that breaks automated navigation. These clashes are reported, and **every drawer in each clash group** is auto-seeded into `ignore.txt` for review.
 - **Reports ignored drawers** — any IDs listed in `ignore.txt` that exist in this backup are shown as ones the export will skip.
 
-**Ignoring drawers:** The scan creates `ignore.txt` (at `ignore_file`, default `C:\Migration\ignore.txt`) if it doesn't exist and pre-fills it with the clash prefixes — searching those in FCCS shows a selection box that stalls the automation, so they're skipped by default. Open the file and:
+**Ignoring drawers:** The scan creates `ignore.txt` (at `ignore_file`, default `C:\Migration\ignore.txt`) if it doesn't exist and pre-fills it with every drawer in each clash group — searching those in FCCS can show a selection box that stalls the automation, so they're skipped by default. Open the file and:
 
-- **Delete or comment out** any clash prefix you actually want exported (then handle it manually in FCCS).
+- **Delete or comment out** any clashing drawer you actually want exported (then handle it manually in FCCS).
 - **Add** any other drawers to skip (e.g. password-protected folders), one ID per line.
 
 Re-running the scan never overwrites your edits — it only appends newly-discovered clashes. `drawer_ids.txt` stays a full inventory; the export skips anything active in the ignore list. Lines starting with `#` are comments.
diff --git a/__pycache__/fccs_scan.cpython-313.pyc b/__pycache__/fccs_scan.cpython-313.pyc
index b210fde3536e5426c9764c0a72bfafd808b83a63..ec8de81c1386342933ac8ca53a053060ea59b558 100644
GIT binary patch
delta 1936
zcmZuyTWk|Y6rJ_%+UxZzwo^mMYl2OaREa~#qd))^k;FtL0TMQ}jaqBt9pi=dthKu)
z54B2ukP<~zg65;VRH=V}T9r0G{X#-&)!$Ga3Y!Y`qv~&YRIP+ssk3(6fXYZSp1FJO
zz30xocYGna)ERsp2#A1=hp`i9e-3{W9C0xz@}X;AgN$dOo`qHp<)MmahvIPX$dNIa
zkufaj1#;81yYuj|V^A^VDP)+lsW?SJBxiCkqse9to-y=d0m=q~<~g-cKnk3kA-}ug
z?CiU75@8eDU{1!0hRPoDGA_!RHq+WhPO;6*8u^$#H#fmJ%$y;yJ)3*XcL3~`m?$`^
z0Z?=SP?(lH9n6HUjHFnhf^DZF?3KJxFfN*|4q&>dmLCB9ro{JAdkWParqN5{3D<BC
z03Uz=`>-haS{!2?be15!6vB@N9NDWw@>N_xAi2ph*FNX1NP?itCHcBtl`{mxxa>mW
zO6I94*-I_ED<{WS2T0I~{aYC24T|xPMql;poF=L(vMnETlAFfZym>PlR54TmZT(7t
zErr*cemSt=*8kC_M90|U%ovA*6Wc0w-wTfMV>Rx5tP9}K7JoTR`G-bp$VDznMtDD4
z*%$a2sSA0@GT$^nNsm{JhsPr(x0$9$IRspV!%{d3Xiz*&W<-jdV23?rLc=uvQp%z@
zOmPvi!S7<CgmFiGwG~oQlr*~IiD)HYnia0Hr#XuzXi-2qv6v<ML$y0brVg@=Aj_1b
z9F91av!K;q%#y3_-nsU2RS)%>Nl_d)kBphk2B5`%Uf0gkDyLl_Z?-_oq;BP$`i2Dq
zWz}g&3%=YUnvTyP0}l1mud*fPWh;|ICRD9fsG3k#6r{94Q^grXb+-Dj)P0tr7D`4-
z{b(W$Wh_<4a8jR6lE?1uIm!-V-GZ`aAX%AloSO(+ZKC5|LG4PhKz*4y1vw0;!zn|x
zEQFyorDjkPjv}jQV6)^zQ%%cx2OOg%UP*B_6o0wL_rn*iHfS@l%}l-Eix&CE(-qi6
zl<$ii61Foza$2ZQagIIPT`VZFg>1J>9|o-0+*w`4wi``T5{ey652Z$qj}D}d4jk?u
z7_~W_f^6O)iELIwxV4&mC3MYkCZclpq^4)inKp0cbi=Yen|EpRrBvC>8QX)=R9aOi
zL{l*`ZBIte=jnymTwYg@&17vRZL<!5QEk2yr0KL4e9f?%I&yj*bxg@KB<XDzyD6@L
zPV*W;-j=yveZht4rGxYR>w(bx;Kq)o#oz+J9*(Vet|cx_U2VTx)x5wzYKY&9^jtxg
z!ne3DKKZQkGFtGgMS32GVvqdQ>w<sTx9D3*-52WCh2U~vF>tBzdiB>eH)?M6+-u#p
z*0O(XTi<u5*J1+?g~6u*P`mTb2oR#5_pXP+<hD1qYol)GU19rzXI%&^`xpHyr|%2(
z|Lq?N^-p<FA19)iYG_D2@ONGrzu3Fdxsv&E>^ie_^2XTW$;;#O13&pY2@-cPN63=c
z*z>FpM0@{A0I}<VchBE{h#;`XbfUgf>rMIGcUs(Z{XTvmRmJ|$UXyAPeypO_S09Vt
za!lju#ZV&?-0R#COBV>|jV^M#s+sv<^|va`)pvjjZPuJIZ4OPVv^GqdMx@vtr&1Kv
zFzP74sCO2}r9qn?7&Xq)O+Jm*?rox5+ou<;LeWZRRSg-9jzlc~F*$iRl8%5?RK<XF
zXT0ew&E%J8tffSYzWlG|`W>T-ifDPrDmF&wc6ha+`fV4zjPcl8yPdbiaPnUIWDDsu
zmh&i`z5$+7At>t#2WV{-HFU_3$gNmsqKyeZ`-n+0?=w#(8Nm4$X78~zk2vAN;1d>b
JJB(9Q^Izli-q-*D

delta 1405
zcmYjQO>7%Q6rSDnuGj0e6DM)(G`ODBZX7!(p(JsYCTS0e)AAE2ahz6)AliDz@ixw`
znO&0~2_+m5sVYIy^juNk04Hbz2e=>voVcWFKw*Uth#QDQ2`WNxV8(U`BkkLn_ujtu
zy>Gs~e(KeM;6Wgu0J?q+U%dKa>z&{;JeMQS^P?S38LdFWgwvCg`Hc$+ShcD)`G|ik
zOatpFjG(=2RI5mbSJr8mgoOkd6OzJ4e}XIuQ9(0x@{*9^qU4sayjkGd!Mr#x*}@>O
z`F3!j1%Mh4Kz06devAV^r~4TdfXnm4{6&5y1b`nvV0ul_lnS0c29Pez2SCAlcw*lS
zf+T%R`6x#Z(;Ru$-}s_wz4iBkN}dzjTfDUW=wbVUOkN3ekgq*mUD5~z!d4Ir@rQdz
zi?NK^f_UVb8EfD>>Z(yJdEr?u?=gJ~?Ts>Y8ed+_OQQl0Oyz&Mbh?5v8zz5?ae=*K
zQks*=c`4mbp;4Cn|FJ}I*I8O9h?EsNeVrARvf?KnODE&%As1RNt;wGNd1WDT*u9{V
zzoZ1G604;%SWuIccnEC4luVJF^Tr~}6G9x6xTe={iY1U%Yv)MKn+?D!MkQknJ~3qv
zDC9|bc(Yj1>~hnMZ0M9VN6|1cQx4QB7-{-C3);wZ2H;$os-tXS2VvOPsFbFqpjCoM
zE0$rSmcgnZXqiZ1)u4lor6q(LUZy%|qY5fIhGoJl32W_9Xj{;5QjLTn6_}xG4uXzV
zmm<aanH=q@ms&+spPH^CeL&f0O*9%()T@S5Ccnv(!DJId100#~MPsTf*vP>WrO)Lp
z+x1j6r|e2-&9EJtyzcAjku<7zQ+GXAEyHv@7CpG)DmEPC3Ke9g1LRZRP*$u@?s``=
zr&va|D>>F8h2n}8!=y*gilrl$E4kdFE7l>}0oszxDLJK|ZjRH(E|7PWzRjOT#{U3Z
zu<!1r+h^Yz*$;Kz3-uldpe4RtyB|D$=hD{n0~UTL1G)WHcE2UG?fX#;ZsmUPckau9
zH`HtD%@_9M<j=?8wcxhcbnQk`?|DA(z3=-lb-(Y-Zfa~dJiaGSG@~~P-^$$&M9|&y
zP$sYWa~;Xdo|<_(`{vq>+V#Ti>{jlcnjydVPjXYFRgDiHoTdQ&gg_bk#`pL?2MP%E
z+c7%9C;r@^^ttS%_KS}3+=%dHEI2JmUyUf!!j7)q^>DGBNGQ$)2idp+H4tv$44G<6
zadSJBwhGS;k?%U-<}n(=-ON0~4EvFB7c-12+{O&Mv2@V&Xn4tXg<@$5$EnBlTQ#Rz
za~4ZR1!0ECRdlRTWh@%HjZ@4aPz7N|I6lElg8970l4)V2yIv+|k?I)_l9$7g)(ne!
zRy4!JIl4W+^KSSw&z&LPM>2l)&ovO`NGKX^<jUjps%sT=7C%k0(NkhC7y5mcRHEIU
Hr)c`WVc23K

diff --git a/fccs_scan.py b/fccs_scan.py
index 597e548..1299714 100644
--- a/fccs_scan.py
+++ b/fccs_scan.py
@@ -19,39 +19,45 @@ _IGNORE_HEADER = [
     "#",
     "# Add password-protected or otherwise-excluded drawers here.",
     "#",
-    "# The IDs auto-added below are prefix clashes: searching them in FCCS",
-    "# pops a selection box that breaks the automation, so they're skipped by",
-    "# default. DELETE or comment out any you actually DO want exported (then",
-    "# handle them manually), and keep the rest.",
+    "# The IDs auto-added below are prefix clashes: searching any of them in",
+    "# FCCS can pop a selection box that breaks the automation, so ALL drawers",
+    "# in each clash group are skipped by default. DELETE or comment out any",
+    "# you actually DO want exported (then handle them manually), keep the rest.",
     "",
 ]
 
 
 def update_ignore_file(ignore_file, clashes, log):
-    """Create ignore.txt if missing and seed it with clash prefix IDs.
+    """Create ignore.txt if missing and seed it with clash-group IDs.
 
-    Never overwrites existing entries — only appends clash prefixes that
-    aren't already present. The shorter (prefix) ID of each clash is the one
-    that triggers the FCCS selection box, so it's the candidate to skip.
-    Returns the list of IDs that were added.
+    Every drawer involved in a clash (both the prefix and each longer ID that
+    matches it) is added, since any of them can trip the FCCS selection box.
+    Never overwrites existing entries — only appends IDs not already present,
+    and de-dupes so no ID is written twice. Returns the list of IDs added.
     """
     existing = set(load_lines(ignore_file))
     file_exists = os.path.exists(ignore_file)
 
-    to_add = [(short, matches) for short, matches in clashes
-              if short not in existing]
+    seen = set(existing)  # never re-add anything already listed
+    blocks = []           # (comment, [new_ids]) to append, in clash order
+    for short, matches in clashes:
+        group = [short] + list(matches)
+        new_ids = [g for g in group if g not in seen]
+        if not new_ids:
+            continue
+        seen.update(new_ids)
+        blocks.append((f"# clash group: {', '.join(group)}", new_ids))
 
     # Existing file already covers every clash — leave it untouched.
-    if file_exists and not to_add:
+    if file_exists and not blocks:
         return []
 
     lines = []
     if not file_exists:
         lines.extend(_IGNORE_HEADER)
-
-    for short, matches in to_add:
-        lines.append(f"# clashes with: {', '.join(matches)}")
-        lines.append(short)
+    for comment, new_ids in blocks:
+        lines.append(comment)
+        lines.extend(new_ids)
 
     mode = "a" if file_exists else "w"
     with open(ignore_file, mode, encoding="utf-8") as f:
@@ -59,11 +65,11 @@ def update_ignore_file(ignore_file, clashes, log):
             f.write("\n")  # separate the new block from prior content
         f.write("\n".join(lines) + "\n")
 
-    added = [short for short, _ in to_add]
+    added = [i for _, ids in blocks for i in ids]
     if not file_exists:
         log(f"Created ignore file: {ignore_file}")
     if added:
-        log(f"Added {len(added)} clash prefix ID(s) to ignore list: "
+        log(f"Added {len(added)} clash-group ID(s) to ignore list: "
             f"{', '.join(added)}")
     return added