From ad632fc63d0fdb4dc8de0ea66901b2229f8fb92e Mon Sep 17 00:00:00 2001
From: Cyrille LOUARN <echolib@a-lec.org>
Date: Tue, 3 Oct 2023 18:05:28 +0200
Subject: [PATCH] [1.9.17] - Working on 'check', check set header post tags
 file

---
 CHANGELOG.md                                  |   4 ++
 src/usr/bin/tyto                              |   4 +-
 .../program/__pycache__/check.cpython-311.pyc | Bin 21257 -> 22436 bytes
 .../program/__pycache__/post.cpython-311.pyc  | Bin 5809 -> 5950 bytes
 src/var/lib/tyto/program/check.py             |  49 +++++++++++++-----
 src/var/lib/tyto/program/post.py              |   1 +
 6 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b74bc2c..acf3b96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ Tyto - Littérateur
 
 # CURRENTLY IN DEV !
 
+## [1.9.17]
+- working on 'check' process
+- - dev on checking file used in some post header tags
+
 ## [1.9.16]
 - working on 'check' process
 - - dev: post database values (lots are missing)
diff --git a/src/usr/bin/tyto b/src/usr/bin/tyto
index 348c3ac..daba6a8 100755
--- a/src/usr/bin/tyto
+++ b/src/usr/bin/tyto
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
-# Version: 1.9.16
-# Updated: 2023-10-03 1696344805
+# Version: 1.9.17
+# Updated: 2023-10-03 1696349064
 # Tyto - Littérateur
 
 # Copyright (C) 2023 Cyrille Louarn <echolib+tyto@a-lec.org>
diff --git a/src/var/lib/tyto/program/__pycache__/check.cpython-311.pyc b/src/var/lib/tyto/program/__pycache__/check.cpython-311.pyc
index 886576d0fc763bb12b47e886509ce9fe58db6e47..66025eb73031a19726c90b3851c2e63bd205dea5 100644
GIT binary patch
delta 1670
zcmZ{kTTE0(7{_PM>^XZqXD{pp1eWEtxD`_44MeP$Dz(AXfEJO5Znw^Yi%9D^2gG&_
zYeEw+SXalkG}Z>2hSJ!eX8X{jO?r8=Pb@u&xCseO<C9IgrnRws>NiV3qwSoX-^}-)
z+3(DJ^UWEb#-H85%IC6dLr`4X%Hr|e7nS0wFTwf{QABY+>RxVfHwIhi7fz6Fg3-l&
zkzPJ*?Y2@fin?vo1hi8T=%5l%re>f*EkGx=0$tPwbW=OfLmj{(Dg(V#0s5#D=%+4V
zfVzRj6dyzp&#j+EDuoSFrmgBdQkKMeVXb_<2=&R!EkZ*`-ORqLuEh$Q^8_0Gdd12J
zLP<o)+h8Vf(lkvFx(;=@XacnyL{v_iu3)O@A@*x+9d@(IpqEvId$EU|t?{wni>&N+
zU4VTX_Ji_s_+{*UMlUFK--_QUKa17+*e7*W&uB|^w{U=6TKm$LoP8+PKN#PjMF-VH
z&b4C1hjlJ!IbTAHE{oBgM1MRQA5Lhx#_p~)@GqI!$Q8U#LX!3T9>Y;KC-UEdTy#ec
z&db58x>2zyD{nUB&3S^P@_UZTsj8{=Yc(@urZel<WH>hE5te)lPVd;@qr4?^V4WF9
zR-*#Dut4SZACkZ`At_K?va&hE&K3uXglP<sgt}bRt-8Q|sP~BkPDo<6AZ~w!J;b34
zmrUO983G;%Mehoay_^vSUi%Nfrl<S{!0-2FZ}I=QsAscMJ-b`(VC!maY{8>=sEMC7
zOow+CdM20>z;=EjjZb;kp3@&M=!tBiViG|{NJ)GJUnNNsyV2xhxpMnRR9V?DwL;>U
zAwO-es1PIc58kP6DYVb4uS2W$0S>9J0$U?absLvNK+bwfJzh9aO)cf(dM?_ym^cyZ
zjcYjv@5fX<akL*S;Y}@PdMl<M%b96nL>-8oh^t-vFVb>8sGZ!&VU7qOBC0&|)gv75
z0CEy{M|*OXLK5-J;>!r}qVlVxYAfi1)6^b-l|oCReQek0kvn3^yjU_>ofU(I7|f#)
zH)*)1cnu|(>dZ^X>Nu}YBqw)GjLchtbC%$uJ7Bo0#-t_1n{H2cq&p`1Qk{jF7G*3p
zdisvJblzM#`C`@_GR&bol1Rg%%Wt@<Q$q_bfBIxvO{<q}siD-+Lkm(|6NfKE&qc2u
z`nW4AhYdMAQ*<aR*QZ+H&G3Sr@n~x8qSZbTxDY%SoU~-Em4>x4j|lPH6K$hM#!gP|
z=Fb$FB6FUasbe=yH)CJ>vf>Uy-0={ug>AHZ$>AQ`%TAUCGH=xXDdAyucq7B3nfn{l
z1UIo{<9<Atx!rg`fE&BDxdHEDl})v5qPdv(bQ5#d`PpK#&wQ$o1}^q@^G4+|kLCLu
zjR4lUEh8=RsE#vdOR2PmgdU(ZY<<gK_=F6#ED%u)vDo$og2hng+V*)Ff57y%YWpyE
zz)wk?WuLaaVE>4Bw{m>N?zc5Gf5E#g9N%yRIbs|~0Xdt_KOy~zfw-n#=jsf{Ajc`z
zv45w4gv{mry2)OWBid<A9fuL7v=3m74Y${a=fULHT00KR6O3`b6(j6SDNjD^$M#3N
go3N5ctJouyaeEbAxE*uh393RlS60!=e(Naz7kPoM+5i9m

delta 727
zcmZY5-%Aux6bJBoX55)}XJ>YI+;vUY*4?EY*9viqG|)yv?U&^)V&(SGL$@CfnzTET
zhL8`X6%olHth5Z&B9LsEUU~_lr|88E2?>P$foOZ{sk&E1itfN?zUR#0a_`J7!mVeZ
zJy%s1VQaiLbZ)VELMx9xVbvs|ghC(5@VC$h{X#~7^`4j!Ck`cg#p@*Fq$Nxjbubkw
zG2K*Vs&oreqfVxWx|m+7Fn!d`)TzoWr5e*uJ<I_0GRr7*lY}q7axEe(IPBi&UC~9=
zk&-E(npJ^U;s$6qQ69k8@$*<^I`NGW1TPkh9pJ$W#$oVb-Ux4Wcn*M$^+p(zHPMY^
z)#SmC@x(!#O)SHVJybgdl7mQfMYnx=rwp@4>tz_k&PIe&_SeRHA`Ic>rcStTzisLg
ze1_%ZziNF^?+D<MGlUgp#E~9>rxF%o0jz6w<8((*&u;%`*tan}W=7;mDzl5~_|n{6
zdxLG39pf}GuDVUL+8VY7&YT_S&#hG#t^U5X3cs7Skq1I@FBqd_Rj+*9KEG$qe3dT5
z_7?PpWxb(DLSpp~62cEH?NElE)|FD(QN1cDH;+GPD@c)LDY7I*@Lj-<zgoAJ3jcqz
zD-L{8VI048#gsvQEC*)>D^vTG+dS^$%p*<hQXcWx#96@URM<Ps<3moCW8ueCi|`q2
zHEoqh!7pNNIEQz7F5&N<nr-jd1iJ>wbu)`102DibfHLah4<0-5GnoXfNH%E`(!d*k
PnH9pkv&j)0KUwt$K`g_Y

diff --git a/src/var/lib/tyto/program/__pycache__/post.cpython-311.pyc b/src/var/lib/tyto/program/__pycache__/post.cpython-311.pyc
index 8e5f981363bcd760f196da36d494b55242341c8c..4716b558040d1ab8df334d910896b2be2eba0a38 100644
GIT binary patch
delta 319
zcmdm}yHAgAIWI340}v#c%A~4DPUMqdw3w*gS)VGBA}k3K2Lm8a1cfJx;H5D~iKU1|
ziKmE1Nu)?bNv23fNu@|dNvB9h$)w7pFd$T>$Ye4`$)?Cg$)(7p$fqczD5fZ-$j)Jn
zl22iXQUGE_AXWlm<&?>+j4FZ*QMy2mUW#&*ehOnSgQm)6BSs4WnIaCLn~GR~#7kx%
zp~-ZMC8MOI;1+XQNx|kU!R?HU29uS9JJfD*mnG(urWzH;mlkE-5`b}1D@s5D#YKT2
zV}dqs6b@tLDgm+?fw*|bWI@pnihK+L;u8vcs%DrkFq~txpnOH)lBx@QMh)CIgq1EZ
M2z=n0%p|rR00iYt8vp<R

delta 158
zcmdm|w^5gGIWI340}ve3lu6wvF_BM#k!_-Sr&Ee>lvs*Llz570lthYHlw^u{lvJuz
z3WFp_Ef}OoWHLrcr$|Q0q)4Smr^uwprpTp8&S8y`O<{<VOJSHS!)VSaAEleZ7|ful
zusMa%LSXX_!R?HUdXo!;JJ^f-fTk4rZ<Z4YW8}&QvKfK6c*f*9(GQFwll#Ti0|5Ow
BB&PrX

diff --git a/src/var/lib/tyto/program/check.py b/src/var/lib/tyto/program/check.py
index 9251f9c..39a9597 100644
--- a/src/var/lib/tyto/program/check.py
+++ b/src/var/lib/tyto/program/check.py
@@ -32,7 +32,7 @@
 # file program  : 
 #--------------------------
 
-import sys
+import sys, os
 from dateutil.parser import parse
 
 import args, domain, langs, debug, post, tools
@@ -306,8 +306,10 @@ def ml_tag_values(ln, tag, stats):
      return False
   
   # Check value2 link for some tags (file, image...)
-  if tag in post.value2s_uri():
-    if not is_value2_file_exists(ln+2, tag)
+  if tag in post.value2s_uri \
+     and not value2.startswith(post.value2s_ext_uris):
+     if not is_value2_file_exists(ln+2, tag, value2):
+        return False
   
   # Convert values to HTML (put in post database)
   html_value = '<a href="%s" class="%s" target="%s" alt="%s">%s</a>'%(
@@ -334,18 +336,39 @@ def ml_tag_values(ln, tag, stats):
 
 #================================#
 # Check value2 uri for some tags #
+# uri starts with:               #
+# - @... for generic articles/   #
+# - /... for root work directory #
+# - ...  for post directory      #
 #--------------------------------#
-def is_value2_file_exists(ln, tag):
-  # check first char if "@" to check file in generic folders
-  print("post: value2", ln, value2)
+def is_value2_file_exists(ln, tag, value2):
+  # uri "@..." means generic folders
+  if value2[0].startswith("@"):
+     # Set defaut directory for files in /files
+     wrk_df = domain.wrk_files
+    
+     # Set directory for images in /images
+     if tag == post.ml_tags[1]: # image:
+        wrk_df = domain.wrk_images
   
-  # Set defaut directory for files in /files
-  wrk_df = domain.wrk_file
-  
-  # Set directory for images in /images
-  if tag == post.ml_tags[1]: # image:
-     wrk_df = domain.wrk_images
+     value2 = value2[1:]
+
+  # uri "/..." means from wrk root folder
+  elif value2[0].startswith("/"):
+       wrk_df = domain.wrk_articles
+       value2 = value2[1:]
   
+  # uri "..." means from legacy post folder
+  else:
+    wrk_df = os.path.dirname(post.uri) + "/"
+       
+  # Check if file exists
+  file_uri = wrk_df + value2
+  if not os.path.exists(file_uri):
+     post.error = \
+     debug.out(5, "%s) %s"%(ln, tag), file_uri, True, 2, False)
+     return False
+        
   return True
 
 
@@ -474,12 +497,10 @@ def titles():
 
     # Count Tyto Comments
     elif line.startswith("#"):
-      print("?? tyto_coms", line)
       post.stats_tyto_text_coms += 1
     
     # Count HTML comments
     elif line.startswith(post.text_comments):
-      print("?? html_coms", line)
       post.stats_html_coms += 1
 
   return True
diff --git a/src/var/lib/tyto/program/post.py b/src/var/lib/tyto/program/post.py
index d03ffd0..5a8aced 100644
--- a/src/var/lib/tyto/program/post.py
+++ b/src/var/lib/tyto/program/post.py
@@ -181,6 +181,7 @@ ml_marks = {
 
 # Markers with uri in value2
 value2s_uri = (ml_tags[1], ml_tags[2], ml_tags[3])
+value2s_ext_uris = ("http", "ftp")
 
 # text_contents
 # =============