From eea94fd4aa8237f92e73b0e56b31bae6d25c58b9 Mon Sep 17 00:00:00 2001
From: Amber <amber@wubook.net>
Date: Thu, 18 Jan 2024 21:41:19 +0100
Subject: [PATCH] colorize find results and comments

---
 src/__pycache__/tree_repr.cpython-39.pyc | Bin 5173 -> 5563 bytes
 src/tree_repr.py                         |  36 ++++++++++++++++-------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/__pycache__/tree_repr.cpython-39.pyc b/src/__pycache__/tree_repr.cpython-39.pyc
index b6586859e10809677e5f6eda7cfc996b7bfe6e7a..524222bce526db1431f1c399101e0f60326b0f50 100644
GIT binary patch
delta 2106
zcmZ`)O>Epm6!wgN*6VfL&2HQLwAngsn#9SHq=mMqv?y&;0{s`=qLNaAyLOUQH{Q+I
z8&t3fB0?%c2+&+A4k+aUTo6^^REZmc3kOa}K2+ic0wm6G;k{Y5DF`gho0<1B^X7f;
zJ%2fRZ`^Xbx(o@vKi~e;f42XQ^%1qQuvKB4fDzv0U(t!R$_q46V5o@}t4Su-Jklqz
zAl5cykKQKiMc~jrsm)&}i5}?fb)v^=toKMsCQ@P=sj;$7;>^07(3P>6ZfLiqi;^Rs
zOO?P~_R}rZM!mu27aDBYjUt~pnRLs^vll9SLN4{C@}eKH0yxFC0!cL%My%F!viv1^
zI+tc^k-t2T$M6k#xYP?O5;ciQ47!ylL?;F*P#xw1Wj4PrzeRfal2RfiPKrhTfzrF9
z3>IM??Lc2qERqKsN=(W|`FF}2g;9{OK_t6@IF#+>u3GLs44Y5`BI$4qWn=t9bzto$
z*vArvDWS2nA&D^Az`-z42$38>KoVKV<lCe<wJ0S@L@+=z($!D?4z>t%L{}wtVdZeF
zMl#AhrB}L6F{BXQ468>f&f#jLCD}mn)Fc}>G*9c3yv%jVzKw~ed-|Jjabm>AMkdaB
z#8Ycz0gxk7q{k%Ifs;kfI`y(WQk0Fg*zk;ZC?J;$thP?9p*+dOvX_f<J<=g5k-;e$
z5H$JwTED@z!K2xBApDNDC%+RGDKQ*_^&`KJ|ExWyAubUAlbI2+lP_n=RtXq$S}m-*
z0OtVzI5Y9Y0btF-2oVt}gV0%2p%%>poRsD%z(W+E8gLQf0vQ6SMcIM7rv5#7auUoO
zx$VvbtW({+7S1=_Xz33+G3ltA5_SZ{Y#hlRAQgu&hwm`<pTMgHA2=vU$%3Q&+YSYe
znd*Mvg)i5lrBn@@^;*QlBggoA#_sd`@EnmesLY1&sC?ivZ$4taKM!wiRU;?M_M#M3
z<}y*Eeab;(;ZxWlASn$)2FaQ$sWY%`@}XRn%<!AJfwk9Q-_Es|0N_LIe2YkpAiz*&
zkbz<)LAiEvO^#*Av*U>pE1m+WqJm`wid2DgpzAV`Rt|y$@>iS*Ys}$)oT=cMD+j$b
z4Kg6}%B*3-cQJBVR0|gE1=a}cpyBytoB7oi3u~)>{YKeds0E(ji(0i^*wv!Y4qMkS
zAaKTJ7PWCf07V$iIclo4nw|@tK}MzsbHBvP<|AaB&zZaSVAgyABg76NsV1?Y{4FSZ
zSV5*(gw66>=JeXH!q@4h%iLx3y7PtTJ?2S=(Vnr<1dIP;^Punir;RWQeV0|2>}bgs
zFSjQ#S#0c8M~`lrk6v@bTGg%BZ`f`p9*&I%@O|nIzO`$lgvc{|B;=yVm|d`*QyIpY
zox)Bwki`JcBjX#8g*p%^t3$CsA3M$8?YcGfnegeE2yls7EC}JYsMW0dhXvmTgrKw9
zt8TsJ+ZERG`FU$#Tc?2RT4*mcT7g#vZT_ltXxJ8y5zpu-foQX^Do;VH?B`!wV*t|c
zR(a$Mc=QAMCVI369U8i_NiFQs02R(q%4hDL*h0xJ8PCGHXs5+dT#0fO1$u-x^3&u9
z|2$u&S;Ft<_n$qD8ht=grP^rTV0arlhNKG#-sxDI!DFX@k>(yMM)ox7i7OxHSGxza
z^SB@9uXj)7euHH=1w@khz3xeJng7y#vPYnTO^Y1|0*yyNbBWIuM!JgxEX3ad9;p*H
z$JYw(;N^}oL$im$WS3C%JV3d7uorDj*h>&1{Dt9QSI~k~oSkft&lHbe=|O|XknBhD
zD3T%)(Rv>IFPV)z@edormGJjLJ~0tC5i8-_9I9O5KNgP_3%X@=nT|PQ7WKToT_4uf
FzW_8tzhnRa

delta 1723
zcmZ8hPfQ$D7=Q20-<{nZmfeMg0%aEI?hb6ArL`p3Sc;TNlNu8UrKrJ$S?H#8S>6my
zOx}c4VoVS9;JbLFjRy}JW2z^j*Cr-L4<;rPFUG{12M-=<jQV}EKofWKe)Il(-~0ak
zzIQnKRmHBQ(-wi>>%V?d|E=(a{g~M%EHxOf!0_Le->|Vu)i+tF!q7rpXrUo=J|{Gx
z7f5IXieP~%)O{+9eI;Z&BZ3`hkH`YyDY(GZWnCH0^DNAH9w5@WAMi%YHRWSvTK=w-
zdhm>}6irc!<*5pPlV%z3m*><6v|Apkr)i&z)X}~Q$oUzRMk&>%8ER2RQ;ZKwM|(Fr
z3@3a5;WU8Dcu{_-RXZ=j!q)+a30E^-l7DCedq2Qh5RdkfkOf4reHto)98ixvqOJZ-
z5~=~iux80yA0LITqjaF$BmB}%Noeh`J*9`-VUP$dG=;&J10BEqT402Urs}C-Lg=2>
zOFaD!<DUxZ8J_VT>%B=rOIQb{NO<Z7n4}~~2r5j^++h36GYcfJgf1*E@sL5Dlg(`V
z94-SVP$o<Y#j`}RKqg73fJ4dxag*|I{gfW5&D!0%bc`3edLhh+T5ghKO(SKq9`J%(
zFqZUgSVNLOH_EhE{$y0`KG;~%8~#=eDs)PAnq!maVJqeVrk)rkq|as<s1#!vhLutQ
zb*9GEv#G<faL&)m1D1dCf%!Fkxe98o!prdCqX3avTk}_2wcz$&Y;4@so}ch3ltDXu
z5Ma@z{EU2HO_bc@eb~X1h;F#*|MdptFIJ%)Qc3<}4Q0krE9L^~a7Ug^_LPe_#r292
zZ2PUPM!+xN7JA8F1c;dL^FFzqJgv>ZvLQcAuJ7S&T>&`$VJ1&HWDOQ=9tjE+?gsk9
z8Vh>DrXgUHA{1cKg%DcBQ-BRB$j%|dpy+I0p=755Cs5k>mP&k!inr{Xsd&&$uJ&3x
z<~T!`%GhhjZCuAOnMse)ioBd29Gr#2&tSA$1xjN<QA{YB4Rby#@297WtCj;lzh2|(
zx1B~%zq^WzaT-m>-(3rMy)L)ynPH5a<8_d5%w3c?5na)EbK9%)Yw~-0Aa{u7OaP*p
zzzFEbdHJvXQRQK5W<GFuJ=o<<->EslZfmPvbv7FC4mkH}Tf1P@mrpweI@%ui&c^m`
z)2mwYS;u4!^q&)BaSnQVOfF?cAkzDpYWX@Ce2S)fV$%>QJRK=!;}ZfA;}__7{mG9R
zMn~+}mzkPZEEe(Fm=`fIUjpqm^J1<|$v-=%>6E;ft+HoCdfAD+d6XysMC$r>>m81U
z`DKJO0+ztF;}r2%apM|5l*Bx)LND#E2mC5-$0qSPifC&^YvEP!!MG#6Rpa$$z;B=&
z)_BEgcOv$R?8+6BKf|Vf7J#VoN^YDk$(`KQLR=zjQ$7s<bci{=Aiv9%JAqY44<Dq(
zq<k4lpO?M)8^xt#1&*pm)or`JfJZmw`}v`wiTe186G$w+$~gEf)S!!QKOd0a=4amM
zLWKzgbdH}x$RWfnc=GV`e%y<n=n~FipHB$J;|#}XjeT22ky~=J>q^cxZ7ZEBrDjvM
LnKHY~vZ?(CCUH^G

diff --git a/src/tree_repr.py b/src/tree_repr.py
index 3009c71..7ee1d90 100644
--- a/src/tree_repr.py
+++ b/src/tree_repr.py
@@ -31,8 +31,12 @@ def produce_treeline(prec_seps, lsep):
 
   for level_n, (sep, item) in enumerate(lseps):
     tomount = sep
-    if item:
-      tomount = sep + item
+    if item['name']:
+      if item.get('color_formatter'):
+        item_name = item['color_formatter'](item['name'])
+      else:
+        item_name = item['name']
+      tomount = sep + item_name
     tree_line = mount_str_at(tree_line, level2indent(level_n), tomount)
   
   return tree_line.rstrip()
@@ -72,7 +76,10 @@ def nerd_tree_from_struct(rootnode, prec_seps=[]):
 
   ## rootnode is always a dir -> colorize 
   rootnode_name = rootnode['name']
-  nerd_tree_txt = CYAN(rootnode_name)
+  if rootnode.get('color_formatter'):  
+    nerd_tree_txt = rootnode['color_formatter'](rootnode_name)
+  else:
+    nerd_tree_txt = rootnode_name
 
   items = rootnode.get('children') or []
 
@@ -93,10 +100,10 @@ def nerd_tree_from_struct(rootnode, prec_seps=[]):
 
     if item['type'] == 'd':
       seps = prec_seps[:]
-      seps.append((psep_char, ''))
-      treeline = produce_treeline(prec_seps, (sep, ' ')) + ' ' + nerd_tree_from_struct(item, prec_seps=seps)
+      seps.append((psep_char, {'name' : ''}))
+      treeline = produce_treeline(prec_seps, (sep, {'name' : ' '})) + ' ' + nerd_tree_from_struct(item, prec_seps=seps)
     else:
-      treeline = produce_treeline(prec_seps, (sep, item['name']))
+      treeline = produce_treeline(prec_seps, (sep, item))
 
     nerd_tree_txt += '\n' + treeline
 
@@ -171,8 +178,12 @@ def nerd_tree_struct(startpath, path=[]):
   return d
 
 def find_subtree(node, node_name, results=[]):
+  '''
+    Starting fron node, recursively, find node_name and its subtree
+  '''
 
   if node['name'] == node_name:
+    node.update({'color_formatter' : YELLOW})
     results.append(node)
 
   children = node.get('children') or []
@@ -182,11 +193,16 @@ def find_subtree(node, node_name, results=[]):
       find_subtree(item_child, node_name, results)
     else:
       if item_child['name'] == node_name:
+        item_child.update({'color_formatter' : YELLOW})
         results.append(item_child)
 
 def find_node(startpath, item_name):
   '''
-    search item_name in subtree starting from startpath
+    @param            startpath              string
+    @param            item_name              string
+
+    search the node with name==item_name (basically a subtree) 
+    starting from startpath
     Note: it finds all occurrencies
   '''
   rnode = nerd_tree_struct(startpath)
@@ -198,8 +214,9 @@ def find_node(startpath, item_name):
 
 def find_children(tree, item_abs_path):
   '''
-    It returns a tuple, first value is if father of node with item_name is found,
-    second value represents the children of parent node
+    It returns a tuple:
+      first value True if father of node with item_abs_path is found,
+      second value represents the children of parent node with item_abs_path
   '''
   if tree['abs_path'] == item_abs_path:
     if not tree.get('children'):
@@ -219,7 +236,6 @@ def find_children(tree, item_abs_path):
 
 def find_tree_struct(startpath, item_name):
   '''
-    Bad!!!
   '''
   results = find_node(startpath, item_name)
   if not results: