From 34afac630b62bae7c3e823ecf17076f3022e0a37 Mon Sep 17 00:00:00 2001 From: Cyrille LOUARN Date: Wed, 11 Oct 2023 17:52:15 +0200 Subject: [PATCH] [1.9.22] - new bcodes, icodes process done first in text article --- CHANGELOG.md | 7 + src/usr/bin/tyto | 4 +- .../program/__pycache__/check.cpython-311.pyc | Bin 30358 -> 34603 bytes .../program/__pycache__/debug.cpython-311.pyc | Bin 3846 -> 3905 bytes .../__pycache__/domain.cpython-311.pyc | Bin 24791 -> 24780 bytes .../program/__pycache__/post.cpython-311.pyc | Bin 6072 -> 9259 bytes .../program/__pycache__/tools.cpython-311.pyc | Bin 6311 -> 7063 bytes .../program/__pycache__/tyto.cpython-311.pyc | Bin 1182 -> 1384 bytes .../program/__pycache__/wip.cpython-311.pyc | Bin 0 -> 1399 bytes src/var/lib/tyto/program/check.py | 521 +++++++++++------- src/var/lib/tyto/program/debug.py | 1 + src/var/lib/tyto/program/domain.py | 188 +++---- src/var/lib/tyto/program/post.py | 175 ++++-- src/var/lib/tyto/program/tools.py | 40 +- src/var/lib/tyto/program/tyto.py | 16 +- src/var/lib/tyto/program/wip.py | 76 +++ .../__pycache__/logs_fr.cpython-311.pyc | Bin 3077 -> 3129 bytes src/var/lib/tyto/translations/logs_fr.py | 1 + 18 files changed, 682 insertions(+), 347 deletions(-) create mode 100644 src/var/lib/tyto/program/__pycache__/wip.cpython-311.pyc create mode 100644 src/var/lib/tyto/program/wip.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 84e5828..886fd5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,13 @@ Tyto - Littérateur # CURRENTLY IN DEV ! +## [1.9.22] (Not Yet push) +- new bcode process (html prepared for wip) +- new post database management values +- new icode process (html prepared for wip) +- bcodes and icodes are FIRST processed in text article +- lots more + ## [1.9.21] - new indentation (3 spaces) - added 'raw:' marker diff --git a/src/usr/bin/tyto b/src/usr/bin/tyto index 01f12d5..d5f0e32 100755 --- a/src/usr/bin/tyto +++ b/src/usr/bin/tyto @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Version: 1.9.21 -# Updated: 2023-10-08 1696756865 +# Version: 1.9.22 +# Updated: 2023-10-11 1697039459 # Tyto - Littérateur # Copyright (C) 2023 Cyrille Louarn 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 b52b8168337137d9a7595dcbb6b1d5b1106c28b0..20bf5f14402daf1f778b992297f688cdc40dcc85 100644 GIT binary patch literal 34603 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 OPkls?)?AcrC(nF literal 30358 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 diff --git a/src/var/lib/tyto/program/__pycache__/debug.cpython-311.pyc b/src/var/lib/tyto/program/__pycache__/debug.cpython-311.pyc index c751f538f4148c0807124c0372ecdba8c28499f6..c1b80bbb344a1ed6aafdd68007f0c77540df2bd6 100644 GIT binary patch delta 859 zcmZwFJ#5oJ6bJA-VY|lUlF|a9ZQ|H*-GW<6%U3}v<-3J;>`)Mh3^Wqz2Q6tB7*Hmd zU_f3gHb4jo33X**WdZ~v5^ERq76urA`(NNC11I^fyPw|a*}i+=zxCB~r97d>##CIr z_E=Tqo7XEp>~z4%cPDU+h2ahBsl1n~&!=n7ZFQxo$i)Mj-<-Tu*4BHy+WLU_m@2nN zj%*IPzop8ot*+NAH*PLf?pEt*>^<|Abj_H4)?cQdy(f*tvcFpPqxfO+$t#epm*fcB zX+n`Y04_s;wgWtdKH34uFa)FkS%wnj0G$j0?F4igXrOPAx*@x`B&6MdJ;Ls2zDPiM zz+Q%sdH}r)W$FVI7$PbHe1;;G00Bdp!la?4%o0(Al75DMiU9&K(58cceQmHGkTAqF z1Q-#v`|kq|0!A4k8Ur*AvG{Zta)cqIqkv-!B^n1DZ-Wzn2?n1|0wx*CbP8}iM$|Aa8XsSgenl^N?MIl`>G}BJAhD4ISQ-vV>;^lD0y)^fib#L=O zw+Sor{d)RK-5B~FZ6yS$XXCeGPz04FVdp->`)@cz!iKoJ6orIkw63K3vILYdmB zm8iT{ELDXVQ9l9S0HjV#EDYJ6g@H<_z5k^=$-qhe>+a|0biVU_^;doOlj}M{w_nq0 zzOvyymz!Uf|5(o4=w@nLzVCVSDEW|iX+fT{0GlC4 zM*t4PFm(aC85FqykD)+4fTIkGjscDvXkgtuoq+UmNkAt7eZtDNK15MJV1OZ@LBJ40 zNW*{}LqvIi&yc4AKrw_A#0@PWOGFV$Mi@q@2oQ)<9eNsYrUPO?iJ?ekz*%A0|28lV zm|%!#6401p@#!37njxU`fC~%-ngLwwfC`|>;L{~QjUlAVfGd(EpsNye&CpZx;}u;u zcB5Su(M?0Q+Ek$1hVHZ}pu2|db<%x9B2NCgxq%^icsSH+nsZEvbocLPNyS?!&+2eEC2z`qoqiF5eQQ2 zSw>wA8KQb)X%@9Qo2ahXM3q{VWu-3eMMq-OQM<{mi&SbPq;5LbPC}qTRk!s>UVL-@ zJLjDLocrXF`R7Mw+t(b&n2cY3d3f&aH@>w+y?sY+%wPRv?$d`=uPbg|RW40O8ilo` z=Azc$d5d@o;3=%+>GSmI(@kVuiO99qG(kgvhAPxGF}6D|&1T*~T??p9VfH6?EQffMVwm;Zwk;q^Jtch{R zN1GuvLaZ^c#-x6=VUxfnr5l?z1y_9z+MjxB zk)SZ3Fh*hJSk2Rg)mDn2AfO;d!GqxsH7bwF@3+GQMFB-IiYgy=QEt?26XdhaWo>xJxL(iAmQ%XJEibDh>sLsk1c?%H zl)+J!7O3+F#ZQ@c1lr~A((gzg^1uOvHmeK`D86ow0bAhT!UPm}Q{-P%5468s10%$AzD_1TkP`f)H#f+7S( zT5|1m^X_Rsx`?|9?y7Wa(>{RRVJ*%I?*+8SRHcvBTjOyJLa937x^f8L+P6QSr+DPXD;c~#`cGl2rIYTYR zo|txNgCmX_IBH#cvGatwq@_km?4`$qI#I%vfGbJwZn8Xfg*C6Sb`4ep zR+L1YanKy6%{r|ps?|Fm5c_GcpO)qgXR+hBI;UMA)-kY-?F~WEFq57$(6JJ>0BpgS zf_^9FLt3A)^8IP(PaF3UWAAp)tlI=UFrsB~dYag(V5>@V+l;AUVOC=DQtQs%#_Gl$ z7nAR`CkPq?G=|YwkKAqh35o-XV-)X^J8kRUqVB4)dt2Hg%k9VuN$_o zikYD5Tc05)2PlV8PWfnNhq~9j1dRh4$7o#nZ8z4d6$lami5Q8>qZvOv;Z?P7-A7Og zPzs}z^81XpM~|*Y3CaM zrnLV4FtY2^ delta 2276 zcmd^9OH3PA6!qk}6puX~V>`CNZXgt565D`37=QU1JP8h!8U;cWHEI$#Gb@>ZF~LWh`@CJEC6Ob_2v zsR5(XC}G0Dg!zaD{5#{2B&cc5N_Pnp0w%=wR_KOp-CO!}#oi*iq_}*W*ayKr$j@j% zTJVjuTvT7B%T{7ffj!0F*{RprnhT4PN4`s}39u&kM8$eS0o?L6VvU0}&c`+2gd(!0 zz?$MyJ0>0N*tjLuN%h1K1Vc~|M;yyN6_cyr5~EU#m?B_`@Ykzm%i7HP-0IwBxTqHw zzNCrS2WB51tJFr+QRD~;0199fs2YrG&UMeKC$E$x1}_-Ad|0Ek7i|Q!18T>p{U2zi z!#rVdw9&$D(1mlQw+ZS7)QwTM@Oso)1G(aDf`Wj87zKq#dtkOWMNk)@E{wYVn|xXQ z&|$eUA9GXTv^XUn+cQ}6hSHBv6^o}ZB^kE*NO%~+!^DySONO6OSL7%`c3&W;zqga{ z2(gTUWmMrS1}urEq*g))+JO!zD@2>Obx7Z;uEl9_qI3}g84?(UfU;y+V6wt@*~ACO zH)h4-(lKK2fx)K?m}a(hls>FF*C>uiQDO>#DWo`OP?>J&n&$5TGn%*MFFbNRaTNw1 zdp10pZcMfjQxBMWgv(qL%We9_CAsr?J89yei4#8OPO`~-PHdDo`3A8k!JZVJac#?) zd=8%s$y|Aw*fU_ytVGpE&5x}aw*=+>=R?Gn1zVO+S7_(9?wCGRakS!hBl1U;R_|A5 zpf&L`qMWH;bjlw;zf-5Pw;ZLT^f_wtvscZLm(3B<9EIkn+H!80+OPI}fjGv%F~-kV zSvU3sq)*F3gzX2mUs-+Hrm{2CX8e`g|I+Oz?oM!bYM7D>+}thu$_vCg4Ax%Cs-&UsL;K0GH#FlGsc6V#Lf}1*JLpem4K4ALx zf=ubptKQ>xf^xh(Pb@jGJb&=)jD-$nlQt_4D&atCKqlD zNQ+8xO(`&?_-KW;sAoS%RhHFWyXB5@j<9EeJkn5SZgTikl(4i9x3*}4l7NyJB~>)> z7qr@7d*XcRdFA_m zs|HRKFA>xUs1u`3wX0s0d3d~4hFzOnzp{E|(_0J^#tV#B*}j@D7mHbf{DAxz`GwNB zGp=e68=(a5U?5rX3SmRQhHCS8gDCtqt{vy_myZTtoY$Ct>gGuK|D$j2O~bSx)fJfH az5O87a-<^n54=_#RFOY&^o+dstL1kq`#z%p 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 f314b29dff96a4f0f7e36175d1b4cafb4a975892..c310828b802ce7c0b73f278e8ed7a5d79be096e5 100644 GIT binary patch delta 4248 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 delta 1260 zcmb7?%WoS+9LM+VUB}+Flhk(X#98m!O@RIB+R58%PzE3$y$E%IW^hORF2=z^5UDrjSDF^!wsbaHB-P_Y?s?2cKJ4kF%J)w1DwU2> z!M7s!lU~hDSqW~`?B2SV+O6D8_^xJ{d(+AjxFOE?d|k&61vYgCDJ)2 zg&qR$Xh^5QI?;X;h!t-B9x-k+_;kYP2Nt+5Ifi*awAUP;AvtTgl7^0Fyy?% zY9LO}o}0cH2uqf`6!5hRZxGaKWzl(o%pLHHwin3trFZAUyu7)*{;##U8CuR6GVbZu zkim`ltJcagII|@2F_Am>3Zc*ZAu(F=)5eX)XSF+xUA5FvOa8;<~+MT$9!D#dFQm+OoP zD0GTh{B!;td}+9Zw}*c)m9?h3?AfcF(9K=hWq6*~~Eh31AA2w-_OzNVv5=S^CB zg$|L{Eyr4PgP3D&&exl3p1tO|LEN*idBj~^wb$^k`ruJ#l2#l%?!V-z)h2AL*k_y% zNS6L??h_V&UKpP#{K))|w<|G9)EB$GC06S)`*;iMhOUWhvCHfui*Fi(N^hSZdq{!5 zG4fGr^-x6dPe%DzS7qW^Um=r5lRi(ooG(69vJ?Zp@DFmn^jOZ|ljgQch9ru9jC9Fi TKaO`yQ_GkM!H>}=y!pQYT9G>C diff --git a/src/var/lib/tyto/program/__pycache__/tools.cpython-311.pyc b/src/var/lib/tyto/program/__pycache__/tools.cpython-311.pyc index 7e2b40bd97b574b3dc86a80d420690167c1996bd..6db0642a4bf573b5f67f867a042287699c7f1e2f 100644 GIT binary patch delta 1701 zcmah}U1$_n6rR7G-I@J0e;Z?si^PPpA~#wqV8WX740fGrJSco%mC2 zvx*O?h&EiPc`8zUEa&OLuO z2Ci;T-AE>F1=o{ci@TOxNOh_|EWCc`6NPD>eZ*$^1?5Pb8HfoMK}<3eF~y>YX%<7w zFbi=Vvk_ZZ9I=%p5ZhQ1v7Mz5JD7G@ancL7x>FIfrQ?1)k8pKiE!)XdrZN3G5|@Y} zm#PG+xNWzI_34zYDrXhYm~vPV^;Cx#jkgV>HsfFz8F~M}$XIB)06y^0$iuAbL_%Z6 z=Rs(eCJNjQ!WjNfLOF0nPCYQ3K=nYd6*u35P*Wc2(F?ohPcFu;_11M~MR)G%4$=0W z+jn7KZQrW+QvI{LmE=`~9HbG$Xw^T-ih&F5c-tu|+Mt?QzNUSz<|Nzp{8G^?NQqvQ zcn3GXj8Id=HKSc{;}pvOZCqBfQa(QE28D^T=knPK458eoV!=GEW<)%Cr>zU`qj|>+ zjd9=iLe1yUFIJ;Hn|G5|4I$U`%4TIKxTnfI;IJ3zCD9xE2n_|X*VH+Pk{%%WN0bKG zMnK9P6L!$KpI|3K7^@VgT~x+l7tzR&qe}k2gAgx)i!mrj!4Z_H;^vgun$plrW8h&j zed)6+$1WaQe7C-wu|XRln|W#U(I0qhy7N089SgSO?{mk_3rIQu zACLwU#>84?(;Elz!cBynTu%!kJv&3$E|jZfnMn8?1uie|Sa(b7e-n?P5*o9?#E#Hp zZpmk^69q{&$BW$EHXK^x+lJjLaiAbJxB1N%BDGNRt0!Ct;5e$eA#S!UVMg=qJ!-cs zot7rMFcnn10xwTiIdGJ`ExzkGx*>z75~cjvq8_9D_-9dV-zb*SnFLeUKjSK5Akrbu zL{j38mYvhCW5q8~)yu{77jj=|XEmM(jAuMWIsUwRi6=W0NFK5TBH~vD?;{lXs zU=v;R66cN{8eX~ThDN0b({KXm9JS3+fSc_`{ehBj8hO7Fe+;3fJg|~iHeB5BZN6@G ztyo=)11r|X`&Q3AtEX=Du2{YIt*!U0tv5?`YjDLH`~}%>)rKC}$%djD*@uaiOCQ!s zt9G)s3tkD7hW4LEssl}3#UXT7otAIJVWb|$35jpi59UXIQXDNbP87WXiG%;?$W+O% z%oM>bAb-~7@HOiCi~Og#f&QEJJUj2zya&m3^Z8XfJ-$QfToX}C~_dc2wkaFWPQq#lGP#uE4_m=#HDa_ z$=E-M?Wy=|)^p#6b4a9W;O~j^*~y`YcQA3<`ex3I*@4cCMyEVAoTeEGN zhJs`L(J|T|FV!4YH%pz@M|}5{8H4zd5fVT~iH z${z35KDU`dAvPxsYdyEU{h_99+3s=rsnM&WyL(4Mwe@RG=K4b=C7vL6MGw*svc!K#zckZt2h` z)?ET;5MC&sUZNO{K~m^MCQFs}f6pJu0>$H}q~kF9*f`k(#F|pkbbs#`v-a_gCvy+y zo{g2?8%!G&DW_!4{asvEtJ%S&6^35?J5UI8pw0`dfQ`5OyA-}`j#O{0nqFKSTtUa> z@{T#{>mCwu{$_&nC|l;i$kk}mv4qu$4xSI+z>A~_NimvrZKvS*7aydz(ju}3vhKBMnhZJ*k7yy;xJ7KN-Qu9J*{G;-pUnS~O>nqA1)bVf4 N8#Riq#wr3b@-J?j^JV}5 diff --git a/src/var/lib/tyto/program/__pycache__/tyto.cpython-311.pyc b/src/var/lib/tyto/program/__pycache__/tyto.cpython-311.pyc index e930bb74518f093040085057fe0b7e0796bf1685..5f6e52d5a6d45a99720cfbe551e3bc744ea9a009 100644 GIT binary patch delta 407 zcmbQo`GSjYIWI340}$kusH7_MOyrYboHJ2QfoxWSnFnH)Bo?KomOz9PbD)fp%#xf`u$Udl zrbN3cQyU`mV`$TqxW$^5UzA&Xi+%HYCN4%TE|5Rt!G62N31;U2-F%BHGdD3kH6F;$ zzQvXZrY9d}Hsmq@1}-BI7q6N8k9m?36CZa2*9Q(}Uf~AL4_pj2Njdq+*~$4SsY-TSHXs_8Tz(D?8P#Gg8~ywopmu$beh>|`!cJ547He95QEu@q z_Qd3p%=|ncqa<;10P}w?PM~~z5=imnN)|&dU7&jzfw*|aQEMAV5Z=ALJ6Tc`OO{$kYE(?@7StFChd2+Z2?>-^QgESdUPM}B>y%XTNvG^> z+C-d+3N6S%A$chH+BEbYT(`w9p>GNO5xSxWv0w<4K=URreepx->{)ls5$JF`J3BMq z%dPtrsrw6h*FW(0u9tFPjE}23?!T(Y;#`Nfgc;8T@d$zWf(8&>nLm{Fr&J6 z>tbz57O@l!eIxyM0@tKA+!vfDHi<<#xc{4lA7BkzLHGCM8#=77nfQ%##L&z^cv&QYV&5JO4nJHE6gx-lSi&s*;>Ukx!f{L#?_6Ap;b*z z^lFpOm~5SyYe%Xzz19SSs+)|~T3lwgnZcvN+q3YPCwjgGl`BWyvCmjTpCBc@$z`GD zMC6mMRZP*Ka~>U@EPcLCOL}diBm$RO)VNO98>KI5tzzpoSG>412mYsFnEwFlqES3~ zZ{^O4ExYmjFrM!&kCHRp^ZV(O_7yihKTOY$QA$4Nv9E4*Y47YP8t>h>GuxZppU(6< z_QyY+-Ff?$8#@===`+LWGrjaEntB?I-!<PQ@`D0XZT@_6e0!d9(cdpK`vKW=`%`Ca3OhMQX)<`&)Ki@lj=iB$hn`$H$= zY&aFCvXiwxa1*Dy+9)wQMmTcL(d?X^8!Z%_%g*IT@*{bWTke&6FHJdQ0 literal 0 HcmV?d00001 diff --git a/src/var/lib/tyto/program/check.py b/src/var/lib/tyto/program/check.py index 5c83af6..024986d 100644 --- a/src/var/lib/tyto/program/check.py +++ b/src/var/lib/tyto/program/check.py @@ -32,10 +32,10 @@ # file program : #-------------------------- -import sys, os +import sys, os, re from dateutil.parser import parse -import args, domain, langs, debug, post, tools, tyto +import args, domain, langs, debug, post, tools, tyto, wip #=====================================# @@ -71,14 +71,12 @@ def manage(action, target): # Also used with multiple (loop) # #--------------------------------# def is_article(target): - valid(target) + valid(target) or tools.exit(targets, post.error) # When all is OK # Will create post database, but now, show some values - print("chk_date", chk_date) - print() - print("Final text_contents string") - for ln, line in enumerate(post.text_contents.rsplit("\n"), post.head_lines): + print("Final texts string") + for ln, line in enumerate(texts, post.head_lines + 1): print(">", ln, line) print() @@ -91,38 +89,48 @@ def is_article(target): # In error case, exit or return if targetS # #-------------------------------------------# def valid(target): + global targets targets = args.targets # Target is a tyto article format post.is_article(target) or tools.exit(targets, post.error) + if not post.do_chk: + post.error = debug.out(210, post.chk_date, post.uri, True, 0, False) + return False + + # Reset post database (Old values are prepared) + tools.create_file(post.cf_uri, post.ini_template) + post.cf_load() global css - css = domain.cf.get("WEBSITE", "css") + css = domain.css global headers, texts headers = post.head_contents.rsplit("\n") - texts = post.text_contents.rsplit("\n") - - # ============= - # Head contents - # ============= - - # One Line targs in head_contents - post.error == 0 and ol_tags() or tools.exit(targets, post.error) - #Multiple and optional Tags on 3 linges - post.error == 0 and ml_tags() or tools.exit(targets, post.error) - + texts = post.text_contents.rsplit("\n") + + # ============ + # Text article + # ============ + # Process bcodes and icodes first to protect their contents + post.error == 0 and bcodes() or tools.exit(targets, post.error) + post.error == 0 and icodes() or tools.exit(targets, post.error) + + # ============= + # Head contents + # ============= + # One Line targs in head_contents + post.error == 0 and ol_tags() or tools.exit(targets, post.error) + # Multiple and optional Tags on 3 linges + post.error == 0 and ml_tags() or tools.exit(targets, post.error) + # ============ # Text article # ============ - # Start Lines - # ----------- - # Paired tags. - post.error == 0 and sl_paired("bcodes") or tools.exit(targets, post.error) - post.error == 0 and sl_paired("quotes") or tools.exit(targets, post.error) - post.error == 0 and sl_paired("parags") or tools.exit(targets, post.error) # Single tags - post.error == 0 and titles() or tools.exit(targets, post.error) + post.error == 0 and sl_tags() or tools.exit(targets, post.error) + + return True #===========================================# @@ -144,14 +152,23 @@ def ol_tags(): sitemap = "True" for ln, line in enumerate(headers, 1): - if not line or line.isspace(): continue + # Optional one line markers if line.startswith("#"): post.stats_tyto_head_coms += 1 - continue + elif line.startswith(post.nositemap): + sitemap = "False" + elif line.startswith(post.logo[0]): + if not post.logo[1]: + post.logo = (post.logo[0], ol_tag_value(line, False)) + logo_ln = ln + if is_value2_file_exists(logo_ln, "logo:", post.logo[1]): + src_uri = "%s%s"%(domain.www_url, src_uri) + else: + return False # One Line tags (Must be set) # =========================== - if not post.title[1] and line.startswith(post.title[0]): + elif not post.title[1] and line.startswith(post.title[0]): post.title = (post.title[0], ol_tag_value(line, False)) elif not post.about[1] and line.startswith(post.about[0]): @@ -166,17 +183,7 @@ def ol_tags(): elif not post.tags[1] and line.startswith(post.tags[0]): post.tags = (post.tags[0], ol_tag_value(line, True)) - - # Optional tags - # ------------- - elif not post.logo[1] and line.startswith(post.logo[0]): - post.logo = (post.logo[0], ol_tag_value(line, False)) - logo_ln = ln - - elif line.startswith(post.nositemap): - sitemap = "False" - - + # Sets are done from loop # Check if tag value exists # ========================= @@ -188,14 +195,10 @@ def ol_tags(): if not is_ol_tag(post.tags[0], post.tags[1]): return False # Default domain logo for this post - src_uri = "%stemplate/%s"%(domain.www_url, domain.logo) - # logo is set with specific uri - if is_value2_file_exists(logo_ln, "logo:", post.logo[1]): - src_uri = "%s%s"%(domain.www_url, src_uri) - else: - return False - post.logo = (post.logo[0], src_uri) - post.cf.set("HEADERS", "logo", src_uri) + if not post.logo[1]: + src_uri = "%stemplate/%s"%(domain.www_url, domain.logo) + post.logo = (post.logo[0], src_uri) + post.cf_set("HEADERS", "logo", src_uri) return True @@ -255,8 +258,6 @@ def is_valid_date(date): # Tags are stric start line # #----------------------------# def ml_tags(): - #global value1 - c = 0 # Continue for next x lines, as tags are 3 lines values for ln, line in enumerate(headers): @@ -302,12 +303,12 @@ def ml_tag_values(ln, tag, stats): # value1 must not starts or contains:o elif value1.startswith("_"): - debug.out(56, "%s) '_...'"%(ln+1), post.uri, True, 2, False) + post.error = debug.out(56, "%s) '_...'"%(ln+1), post.uri, True, 2, False) return False # Specific for image: logo name is reserved elif tag == post.ml_tags[1] and value1 == "logo": - debug.out(56, "%s) 'logo'"%(ln+1), post.uri, True, 2, False) + post.error = debug.out(56, "%s) 'logo'"%(ln+1), post.uri, True, 2, False) return False # value2 @@ -350,24 +351,25 @@ def ml_tag_values(ln, tag, stats): if tag == post.ml_tags[0]: section = "LINKS" post.stats_text_links += post.text_contents.count(tyto_value) - html_value = '%s'%( - value2, css, "%%s", value3, value1 + html_value = tyto.a_link%( + value2, "%s link"%css, "%%s", value3, value1 ) # file: elif tag == post.ml_tags[2]: section = "FILES" post.stats_text_files += post.text_contents.count(tyto_value) - html_value = '%s'%( - value2, css, "%%s", value3, value1 + html_value = tyto.a_link%( + value2, "%s file"%css, "%%s", value3, value1 ) # image: elif tag == post.ml_tags[1]: section = "IMAGES" post.stats_text_images += post.text_contents.count(tyto_value) - html_value = '%s'%( - value2, "%%s", "%%s", value3, "%%s" + html_value = tyto.image_link%( + value2, "%%s image", "%%s", + value3, value3, "%%s" ) # raw: (content file converted to base64) @@ -386,18 +388,15 @@ def ml_tag_values(ln, tag, stats): post.stats_text_codes += post.text_contents.count(tyto_value) htmlbcode = ""%value3 with open(value2_uri, "r") as f: - for line in f.read().rsplit("\n"): + for ln, line in enumerate(f.read().rsplit("\n"), 1): line = tools.convert_html_signs(line) - line = '
  • %s
    • '%(domain.css, line) + line = tyto.code_line%(ln, line) htmlbcode = "%s\n%s"%(htmlbcode, line) - html_value = tyto.pre_bcode%( - domain.css, domain.css, domain.css, - htmlbcode - ) - print() - print(html_value) - print() + html_value = tyto.code_bcode%(css, htmlbcode) + #print() + #print(html_value) + #print() html_value = tools.b64_convert("encode", html_value) # abbr: @@ -405,11 +404,11 @@ def ml_tag_values(ln, tag, stats): section = "ABBRS" post.stats_text_abbrs += post.text_contents.count(tyto_value) html_value = '%s'%( - domain.css, value2, value3 + css, value2, value3 ) - post.cf.set(section, link_var, tyto_value) - post.cf.set(section, html_var, html_value) + post.cf_set(section, link_var, tyto_value) + post.cf_set(section, html_var, html_value) return True @@ -458,7 +457,7 @@ def is_value2_file_exists(ln, tag, val2): # Add file to [SOURCE_FILES] post database post.stats_total_files += 1 - post.cf.set("SOURCE_FILES", "file_%s"%post.stats_total_files, src_uri) + post.cf_set("SOURCE_FILES", "file_%s"%post.stats_total_files, src_uri) return True @@ -466,99 +465,181 @@ def is_value2_file_exists(ln, tag, val2): #=====================# # check text contents #======================================================== #=====================# -#========================================# -# First process ! # -# Used for bvodes, quotes, parags # -# Check if opened and closed tags match # -# Check if contents in tags are indented # -# Count tags for stats # -# Remove bcodes, quotes lines # -# - Create new post.text_contents # -# Return True/False # -#----------------------------------------# -def sl_paired(markers): +#=======================================# +# bcodes: first process ! # +# Check if opened and closed tags match # +# Count bcodes for stats # +# Remove bcodes lines # +# - Create new post "texts" contents # +# Return True/False # +#---------------------------------------# +def bcodes(): global texts + + markers = post.bcodes + index0 = index1 = -1 - new_text_contents = "" - opened = closed = in_tag = False - stats_opened = stats_closed = 0 - tags = () - - if markers == "bcodes" : tags = post.bcodes - elif markers == "quotes" : tags = post.quotes - elif markers == "parags" : tags = post.parags - - # loop lines in text_contents for ln, line in enumerate(texts, post.head_lines + 1): - - # Tag was closed, but not in_tag content line - if closed and in_tag: - in_tag = False - - # Tag is opened - if line.startswith(tags[0]): - # Tag was already opened - if opened: - post.error = \ - debug.out(53, "%s) %s ... %s"%( - ln+1, - tags[0], tags[1] - ), post.uri, True, 2, False) - return False - - # check next line if exists or is a closed tag - try: - next_line = post.contents.rsplit("\n")[ln] - if next_line.startswith(tags[1]): + if index0 >= 0 : + #print(">>>", ln, line) + bcode = "%s\n%s"%(bcode, line) + texts[ln - 1 - post.head_lines] = "" + + # Opened mark + if line.lstrip().startswith(markers[0]): + # Mark was opened yet + if index0 >= 0: + # at the same position + if line.index(markers[0][0]) == index0: post.error = \ - debug.out(55, "%s) '%s'"%(ln, tags[0]), post.uri, True, 2, False) - return False - except: - post.error = \ - debug.out(55, "%s) '%s'"%(ln, tags[0]), post.uri, True, 2, False) - return False - - opened = in_tag = True - closed = False - stats_opened += 1 - - # Tag is closed - if line.startswith(tags[1]): - # Tag was already closed - if closed: - post.error = \ - debug.out(53, "%s) %s ... %s"%( - ln+1, - tags[0], tags[1] - ), post.uri, True, 2, False) - return False - - closed = True - opened = False - stats_closed += 1 - - - if in_tag: - # Contents must be indented - if not line.startswith(tags): - if len(line) - len(line.lstrip()) < 3: - post.error = \ - debug.out(54, "%s) '\t'%s..."%( - ln+1, line[0:10] + debug.out(53, '%s...%s) "%s"'%( + tag_ln, ln, markers[1] ), post.uri, True, 2, False) return False - line = "" + continue + index0 = line.index(markers[0][0]) + tag_ln = ln + bcode = line + #print(">>>", ln, line) + texts[ln - 1 - post.head_lines] = "" - # Create new string, removing in_tag line if in bcodes or quotes - if markers in post.raw_contents: - if not new_text_contents: new_text_contents = line - else: new_text_contents = "%s\n%s"%(new_text_contents, line) + # Closed mark + if line.lstrip().startswith(markers[1]): + if index0 < 0: + post.error = \ + debug.out(53, '%s) "%s"...'%( + ln, markers[0] + ), post.uri, True, 2, False) + return False + index1 = line.index(markers[1][0]) + # at same position as opened + if index1 == index0: + index0 = index1 = -1 + tag_ln = "" + post.stats_bcodes += 1 + + # create ini values for this bcode + var_name = "bcode_%s"%post.stats_bcodes + val_raws = tools.b64_convert("encode", bcode) + var_html = "html_%s"%post.stats_bcodes + val_html = tools.b64_convert("encode", wip.bcode(bcode)) + post.cf_set("BCODES", var_name, val_raws) + post.cf_set("BCODES", var_html, val_html) + + # bcode not opened, but closed tag found + elif index0 < 0: + tag_ln = ln + + + # Check if markers match + # ---------------------- + if index1 >= 0 and index0 < 0: + post.error = \ + debug.out(53, '%s) "%s"...'%(tag_ln, markers[0]), post.uri, True,2, False) + return False + + if index0 >= 0 and index1 < 0: + post.error = \ + debug.out(53, '%s) ..."%s"'%(tag_ln, markers[1]), post.uri, True,2, False) + return False + + if index0 != index1: + post.error = \ + debug.out(53, '%s) "%s"..."%s"'%( + tag_ln, markers[0], markers[1] + ), post.uri, True,2, False) + return False + return True + + +# +# icodes (SAME LINE) +# Check if opened and closed markers match # +# +def icodes(): + global texts + + markers = post.icodes + for ln, line in enumerate(texts, post.head_lines + 1): + # Search for opened, closed markers + # markers cannot be at same position on line + m0 = line.find(markers[0]) + m1 = line.find(markers[1]) + if m0 == m1: + continue - texts = new_text_contents.rsplit("\n") + # Simple 3 cases errors + # --------------------- + # First marker is a closed one + if m1 < m0: + post.error = \ + debug.out(53, '%s) "%s"..."%s"'%( + ln, markers[1], markers[0] + ), post.uri, True,2, False) + return False + + # First marker but unused closed one + if m0 >= 0 and m1 == -1: + post.error = \ + debug.out(53, '%s) ..."%s"'%( + ln, markers[1] + ), post.uri, True,2, False) + return False + + # Last marker but unused opened one + elif m1 >= 0 and m0 == -1: + post.error = \ + debug.out(53, '%s) "%s"...'%( + ln, markers[0] + ), post.uri, True,2, False) + return False + + if post.words_markers[0][0] in line: + line = line.replace(post.words_markers[0][0], post.words_markers[0][4]) + line = line.replace(post.words_markers[0][1], post.words_markers[0][5]) + icodes = re.findall('%s(.*?)%s'%( + post.words_markers[0][4], post.words_markers[0][5] + ), line) - # Create post.stats - post.cf.set("STATS_TEXTS", markers, str(stats_opened)) + for icode in icodes: + post.stats_text_icodes += 1 + icnew = post.words_markers[0][4] + icode + post.words_markers[0][5] + line = line.replace(icnew, "") + + # Set HTML [ICODES] to post database + icode_var = "icode_%s"%post.stats_text_icodes + icleg = post.words_markers[0][0] + icode + post.words_markers[0][1] + html_var = "html_%s"%post.stats_text_icodes + html_val = icnew.replace(post.words_markers[0][4], + post.words_markers[0][2]%css) + html_val = html_val.replace(post.words_markers[0][5], + post.words_markers[0][3]) + post.cf_set("ICODES", icode_var, icleg) + post.cf_set("ICODES", html_var, html_val) + + line = line.replace(post.words_markers[1][0], post.words_markers[1][4]) + line = line.replace(post.words_markers[1][1], post.words_markers[1][5]) + icodes = re.findall('%s(.*?)%s'%( + post.words_markers[1][4], post.words_markers[1][5] + ), line) + for icode in icodes: + post.stats_text_icodes += 1 + icnew = post.words_markers[1][4] + icode + post.words_markers[1][5] + line = line.replace(icnew, "") + # Set HTML [ICODES] to post database + icode_var = "icode_%s"%post.stats_text_icodes + icleg = post.words_markers[1][0] + icode + post.words_markers[1][1] + html_var = "html_%s"%post.stats_text_icodes + html_val = icnew.replace(post.words_markers[1][4], + post.words_markers[1][2]%css) + html_val = html_val.replace(post.words_markers[1][5], + post.words_markers[1][3]) + post.cf_set("ICODES", icode_var, icleg) + post.cf_set("ICODES", html_var, html_val) + + texts[ln - 1 - post.head_lines] = line + return True @@ -568,7 +649,7 @@ def sl_paired(markers): # Add stat for _image:logo # # Return True/False # #----------------------------# -def titles(): +def sl_tags(): for ln, line in enumerate(texts, post.head_lines + 1): # legacy Tyto Titles if line.startswith(post.tyto_titles): @@ -587,13 +668,13 @@ def titles(): # Create html value for this title in database link_var = "title_%s"%post.stats_titles - post.cf.set("TITLES", link_var, line) + post.cf_set("TITLES", link_var, line) html_var = "html_%s"%post.stats_titles mark = line[0:2] title = line[3:] - html_val = post.html_titles[mark]%(domain.css, title) - post.cf.set("TITLES", html_var, html_val) + html_val = post.html_titles[mark]%(css, title) + post.cf_set("TITLES", html_var, html_val) # Count Tyto Comments elif line.lstrip().startswith("#"): @@ -606,9 +687,9 @@ def titles(): if line.lstrip().startswith(post.text_comments[0]): real_com = line.lstrip()[3:] link_var = "comm_%s"%post.stats_html_coms - post.cf.set("COMMENTS", link_var, line.lstrip()) + post.cf_set("COMMENTS", link_var, line.lstrip()) html_var = "html_%s"%post.stats_html_coms - post.cf.set("COMMENTS", html_var, ''%real_com) + post.cf_set("COMMENTS", html_var, ''%real_com) # Add stat + html for [IMAGES] when user wants to show logo in post @@ -617,12 +698,13 @@ def titles(): link_var = "image_%s"%(post.ml_tags_stats["image:"] + 1) link_val = "_image:logo" html_var = "html_%s"%(post.ml_tags_stats["image:"] + 1) - html_val = '%s'%( - post.logo[1], "%%s", "%%s", post.title[1], "%%s" + html_val = tyto.image_link%( + post.logo[1], "post_logo image", "%%s", + post.title[1], post.title[1], "%%s" ) - post.cf.set("IMAGES", link_var, link_val) - post.cf.set("IMAGES", html_var, html_val) - + post.cf_set("IMAGES", link_var, link_val) + post.cf_set("IMAGES", html_var, html_val) + return True @@ -632,56 +714,79 @@ def titles(): def cf_update_values(): post.date = ("date:", tools.local_date(post.date[1])) - post.cf.set("DOMAIN", "name", domain.name) + post.cf_set("DOMAIN", "name", domain.name) - post.cf.set("FILE", "id", post.uri_id) - post.cf.set("FILE", "uri", post.uri) - post.cf.set("FILE", "db", post.cf_uri) - post.cf.set("FILE", "target", post.wrk_target) + # [FILE] + post.cf_set("FILE", "id", post.uri_id) + post.cf_set("FILE", "uri", post.uri) + post.cf_set("FILE", "db", post.cf_uri) + post.cf_set("FILE", "target", post.wrk_target) - post.cf.set("HEADERS", "title", post.title[1]) - post.cf.set("HEADERS", "about", post.about[1]) - post.cf.set("HEADERS", "date", post.date[1]) - post.cf.set("HEADERS", "tags", post.tags[1]) - post.cf.set("HEADERS", "authors", post.author[1]) - post.cf.set("HEADERS", "sitemap", str(sitemap)) + # [HEADERS] + # --------- + post.cf_set("HEADERS", "title", post.title[1]) + post.cf_set("HEADERS", "about", post.about[1]) + post.cf_set("HEADERS", "date", post.date[1]) + post.cf_set("HEADERS", "tags", post.tags[1]) + post.cf_set("HEADERS", "authors", post.author[1]) + post.cf_set("HEADERS", "sitemap", str(sitemap)) - post.cf.set("CHECK", "hash", post.wrk_id) - post.cf.set("CHECK", "date", chk_date) - post.cf.set("CHECK", "static", str(domain.static)) + # [check] + # ------- + post.cf_set("CHECK", "hash", post.wrk_id) + post.cf_set("CHECK", "date", chk_date) + post.cf_set("CHECK", "static", str(domain.static)) + post.cf_set("CHECK", "errors", "False") - post.cf.set("WIP", "web", "%s%s"%(domain.wip_url, post.wrk_target)) - post.cf.set("WIP", "uri", "%s%s"%(domain.wip, post.wrk_target)) + # [WIP] + # ----- + post.cf_set("WIP", "hash", post.wip_hash) + post.cf_set("WIP", "date", post.wip_date) + post.cf_set("WIP", "web", "%s%s"%(domain.wip_url, post.wrk_target)) + post.cf_set("WIP", "uri", "%s%s"%(domain.wip, post.wrk_target)) - post.cf.set("WWW", "web", "%s%s"%(domain.www_url, post.wrk_target)) - post.cf.set("WWW", "uri", "%s%s"%(domain.www, post.wrk_target)) + # [WWW] + # ----- + post.cf_set("WWW", "hash", post.www_hash) + post.cf_set("WWW", "date", post.www_date) + post.cf_set("WWW", "web", "%s%s"%(domain.www_url, post.wrk_target)) + post.cf_set("WWW", "uri", "%s%s"%(domain.www, post.wrk_target)) + # [STATS_FILE] + # ------------ stats_tyto_all_coms = post.stats_tyto_text_coms + post.stats_tyto_head_coms - post.cf.set("STATS_FILE", "lines", str(post.lines)) - post.cf.set("STATS_FILE", "tyto_coms", str(stats_tyto_all_coms)) - post.cf.set("STATS_FILE", "files", str(post.stats_total_files)) + post.cf_set("STATS_FILE", "lines", str(post.lines)) + post.cf_set("STATS_FILE", "tyto_coms", str(stats_tyto_all_coms)) + post.cf_set("STATS_FILE", "files", str(post.stats_total_files)) - post.cf.set("STATS_HEADERS", "lines", str(post.head_lines)) - post.cf.set("STATS_HEADERS", "tyto_coms", str(post.stats_tyto_head_coms)) - post.cf.set("STATS_HEADERS", "links", str(post.ml_tags_stats["link:"])) - post.cf.set("STATS_HEADERS", "files", str(post.ml_tags_stats["file:"])) - post.cf.set("STATS_HEADERS", "images", str(post.ml_tags_stats["image:"])) - post.cf.set("STATS_HEADERS", "abbrs", str(post.ml_tags_stats["abbr:"])) - post.cf.set("STATS_HEADERS", "codes", str(post.ml_tags_stats["code:"])) - post.cf.set("STATS_HEADERS", "raws", str(post.ml_tags_stats["raw:"])) + # [STATS_HEADERS] + # --------------- + post.cf_set("STATS_HEADERS", "lines", str(post.head_lines)) + post.cf_set("STATS_HEADERS", "tyto_coms", str(post.stats_tyto_head_coms)) + post.cf_set("STATS_HEADERS", "links", str(post.ml_tags_stats["link:"])) + post.cf_set("STATS_HEADERS", "files", str(post.ml_tags_stats["file:"])) + post.cf_set("STATS_HEADERS", "images", str(post.ml_tags_stats["image:"])) + post.cf_set("STATS_HEADERS", "abbrs", str(post.ml_tags_stats["abbr:"])) + post.cf_set("STATS_HEADERS", "codes", str(post.ml_tags_stats["code:"])) + post.cf_set("STATS_HEADERS", "raws", str(post.ml_tags_stats["raw:"])) - post.cf.set("STATS_TEXTS", "lines", str(post.text_lines)) - post.cf.set("STATS_TEXTS", "tyto_coms", str(post.stats_tyto_text_coms)) - post.cf.set("STATS_TEXTS", "html_coms", str(post.stats_html_coms)) - post.cf.set("STATS_TEXTS", "titles", str(post.stats_titles)) - post.cf.set("STATS_TEXTS", "links", str(post.stats_text_links)) - post.cf.set("STATS_TEXTS", "files", str(post.stats_text_files)) - post.cf.set("STATS_TEXTS", "images", str(post.stats_text_images)) - post.cf.set("STATS_TEXTS", "abbrs", str(post.stats_text_abbrs)) - post.cf.set("STATS_TEXTS", "codes", str(post.stats_text_codes)) - post.cf.set("STATS_TEXTS", "raws", str(post.stats_text_raws)) + # [STATS_TEXTS] + # ------------- + post.cf_set("STATS_TEXTS", "lines", str(post.text_lines)) + post.cf_set("STATS_TEXTS", "tyto_coms", str(post.stats_tyto_text_coms)) + post.cf_set("STATS_TEXTS", "html_coms", str(post.stats_html_coms)) + post.cf_set("STATS_TEXTS", "titles", str(post.stats_titles)) + post.cf_set("STATS_TEXTS", "bcodes", str(post.stats_bcodes)) + post.cf_set("STATS_TEXTS", "bcodes_lines", str(post.stats_bcodes_lines)) + # Founds from header tags + post.cf_set("STATS_TEXTS", "links", str(post.stats_text_links)) + post.cf_set("STATS_TEXTS", "files", str(post.stats_text_files)) + post.cf_set("STATS_TEXTS", "images", str(post.stats_text_images)) + post.cf_set("STATS_TEXTS", "abbrs", str(post.stats_text_abbrs)) + post.cf_set("STATS_TEXTS", "icodes", str(post.stats_text_icodes)) + post.cf_set("STATS_TEXTS", "codes", str(post.stats_text_codes)) + post.cf_set("STATS_TEXTS", "raws", str(post.stats_text_raws)) - with open(post.cf_uri, "w") as f: - post.cf.write(f) - - + # Write new values in database + post.cf_write() + diff --git a/src/var/lib/tyto/program/debug.py b/src/var/lib/tyto/program/debug.py index 4aaf6d0..79af455 100644 --- a/src/var/lib/tyto/program/debug.py +++ b/src/var/lib/tyto/program/debug.py @@ -113,6 +113,7 @@ def out(nbr, var, val, show, color, stop): 207 : langs.logs.updated_file, 208 : langs.logs.website_lang, 209 : langs.logs.domain_on, + 210 : langs.logs.post_chk_yet, 255 : langs.logs.later, } diff --git a/src/var/lib/tyto/program/domain.py b/src/var/lib/tyto/program/domain.py index f7c98cb..cfc8333 100644 --- a/src/var/lib/tyto/program/domain.py +++ b/src/var/lib/tyto/program/domain.py @@ -178,7 +178,7 @@ def cf_create(): # Create section, set key if not exists # # Ask yser when default is a key form and not value # #---------------------------------------------------# -def cf_set_value(section, key, default): +def cf_set(section, key, default): global new_val try: new_val except: new_val = False @@ -223,270 +223,270 @@ def cf_update_values(write): # ======== global activated, title, date, about, mail, tags, license, license_url try: activated = cf.getboolean("DOMAIN", "activated") - except: activated = cf_set_value("DOMAIN", "activated", "no") + except: activated = cf_set("DOMAIN", "activated", "no") - cf_set_value("DOMAIN", "name", name) + cf_set("DOMAIN", "name", name) - title = cf_set_value("DOMAIN", "title", "title") - date = cf_set_value("DOMAIN", "date", "date") - about = cf_set_value("DOMAIN", "about", "about") - mail = cf_set_value("DOMAIN", "mail", "mail") - tags = cf_set_value("DOMAIN", "tags", "tags") - license = cf_set_value("DOMAIN", "lincese", "") + title = cf_set("DOMAIN", "title", "title") + date = cf_set("DOMAIN", "date", "date") + about = cf_set("DOMAIN", "about", "about") + mail = cf_set("DOMAIN", "mail", "mail") + tags = cf_set("DOMAIN", "tags", "tags") + license = cf_set("DOMAIN", "lincese", "") if not license: - license = cf_set_value("DOMAIN", "lincese", "gfdl-1.3") - license_url = cf_set_value("DOMAIN", "lincese_url", + license = cf_set("DOMAIN", "lincese", "gfdl-1.3") + license_url = cf_set("DOMAIN", "lincese_url", "https://www.gnu.org/licenses/fdl-1.3.txt") elif not license == "gfdl-1.3": - license_url = cf_set_value("DOMAIN", "lincese_url","") + license_url = cf_set("DOMAIN", "lincese_url","") # Optional global legals_url, terms_url, statuses_url - legals_url = cf_set_value("DOMAIN", "legals_url", "") - terms_url = cf_set_value("DOMAIN", "terms_url", "") - statuses_url = cf_set_value("DOMAIN", "statuses_url", "") + legals_url = cf_set("DOMAIN", "legals_url", "") + terms_url = cf_set("DOMAIN", "terms_url", "") + statuses_url = cf_set("DOMAIN", "statuses_url", "") # [SERVER] # ======== global srv, srv_name, wip, www - srv = cf_set_value("SERVER", "root", "server") + srv = cf_set("SERVER", "root", "server") if not tools.dir_exists(srv, False): - srv = cf_set_value("SERVER", "root", "server") + srv = cf_set("SERVER", "root", "server") srv_name = os.path.join(srv, name + "/") - cf_set_value("SERVER", "domain", srv_name) + cf_set("SERVER", "domain", srv_name) wip = os.path.join(srv_name, "wip/") - cf_set_value("SERVER", "wip", wip) + cf_set("SERVER", "wip", wip) www = os.path.join(srv_name, "www/") - cf_set_value("SERVER", "www", www) + cf_set("SERVER", "www", www) # [WIP_DIRS] # ========== global wip_tpl, wip_images, wip_files wip_tpl = os.path.join(wip, "template/") - cf_set_value("WIP_DIRS", "template", wip_tpl) + cf_set("WIP_DIRS", "template", wip_tpl) wip_images = os.path.join(wip, "images/") - cf_set_value("WIP_DIRS", "images", wip_images) + cf_set("WIP_DIRS", "images", wip_images) wip_files = os.path.join(wip, "files/") - cf_set_value("WIP_DIRS", "files", wip_files) + cf_set("WIP_DIRS", "files", wip_files) # [WWW_DIRS] # ========== global www_tpl, www_images, www_files www_tpl = os.path.join(www, "template/") - cf_set_value("WWW_DIRS", "template", www_tpl) + cf_set("WWW_DIRS", "template", www_tpl) www_images = os.path.join(www, "images/") - cf_set_value("WWW_DIRS", "images", www_images) + cf_set("WWW_DIRS", "images", www_images) www_files = os.path.join(www, "files/") - cf_set_value("WWW_DIRS", "files", www_files) + cf_set("WWW_DIRS", "files", www_files) # [WEBSITE] # ========= global wip_url, www_url, lang, css, sep, article_code, static - wip_url = cf_set_value("WEBSITE", "wip_url", "") + wip_url = cf_set("WEBSITE", "wip_url", "") if not wip_url: - wip_url = cf_set_value("WEBSITE", "wip_url", create_wip_url()) + wip_url = cf_set("WEBSITE", "wip_url", create_wip_url()) - www_url = cf_set_value("WEBSITE", "www_url", "") + www_url = cf_set("WEBSITE", "www_url", "") if not www_url: - www_url = cf_set_value("WEBSITE", "www_url", "https://%s/"%name) + www_url = cf_set("WEBSITE", "www_url", "https://%s/"%name) - lang = cf_set_value("WEBSITE", "lang", "") + lang = cf_set("WEBSITE", "lang", "") if not lang: - lang = cf_set_value("WEBSITE", "lang", langs.load_website_lang()) + lang = cf_set("WEBSITE", "lang", langs.load_website_lang()) elif not langs.translation_exists("website", lang, False): lang = langs.get_sys_lang() langs.load_website_lang() - css = cf_set_value("WEBSITE", "css", "") + css = cf_set("WEBSITE", "css", "") if not css: - css = cf_set_value("WEBSITE", "css", "tyto") + css = cf_set("WEBSITE", "css", "tyto") - sep = cf_set_value("WEBSITE", "separator", "") + sep = cf_set("WEBSITE", "separator", "") if not sep or len(sep) > 2: - sep = cf_set_value("WEBSITE", "separator", "|") + sep = cf_set("WEBSITE", "separator", "|") try: article_code = cf.getboolean("WEBSITE", "article_code") - except: article_code = cf_set_value("WEBSITE", "article_code", "yes") + except: article_code = cf_set("WEBSITE", "article_code", "yes") try: static = cf.getboolean("WEBSITE", "static") - except: static = cf_set_value("WEBSITE", "static", "no") + except: static = cf_set("WEBSITE", "static", "no") # [WEBSITE_MODULES] # ================= global navbar, sidebar_title, sidebar_items, rss_items, sitemaps try: navbar = cf.getboolean("WEBSITE_MODULES", "navbar") - except: navbar = cf_set_value("WEBSITE_MODULES", "navbar", "yes") + except: navbar = cf_set("WEBSITE_MODULES", "navbar", "yes") - sidebar_title = cf_set_value("WEBSITE_MODULES", "sidebar_title", "") + sidebar_title = cf_set("WEBSITE_MODULES", "sidebar_title", "") if not sidebar_title: - sidebar_title = cf_set_value("WEBSITE_MODULES", "sidebar_title", + sidebar_title = cf_set("WEBSITE_MODULES", "sidebar_title", langs.site.sidebar_title) - sidebar_items = cf_set_value("WEBSITE_MODULES", "sidebar_items", "") + sidebar_items = cf_set("WEBSITE_MODULES", "sidebar_items", "") if not sidebar_items or not sidebar_items.isdigit(): - sidebar_items = cf_set_value("WEBSITE_MODULES", "sidebar_items", "0") + sidebar_items = cf_set("WEBSITE_MODULES", "sidebar_items", "0") - rss_items = cf_set_value("WEBSITE_MODULES", "rss_items", "") + rss_items = cf_set("WEBSITE_MODULES", "rss_items", "") if not rss_items or not rss_items.isdigit(): - rss_items = cf_set_value("WEBSITE_MODULES", "rss_items", "0") + rss_items = cf_set("WEBSITE_MODULES", "rss_items", "0") try: sitemaps = cf.getboolean("WEBSITE_MODULES", "sitemaps") - except: sitemaps = cf_set_value("WEBSITE_MODULES", "sitemaps", "yes") + except: sitemaps = cf_set("WEBSITE_MODULES", "sitemaps", "yes") # TEMPLATE_FILENAMES # ================== global favicon, logo, styles, rss, stats - favicon = cf_set_value("TEMPLATE_FILENAMES", "favicon", "") + favicon = cf_set("TEMPLATE_FILENAMES", "favicon", "") if not favicon: - favicon = cf_set_value("TEMPLATE_FILENAMES", "favicon", "favicon.png") + favicon = cf_set("TEMPLATE_FILENAMES", "favicon", "favicon.png") - logo = cf_set_value("TEMPLATE_FILENAMES", "logo", "") + logo = cf_set("TEMPLATE_FILENAMES", "logo", "") if not logo: - logo = cf_set_value("TEMPLATE_FILENAMES", "logo", "logo.png") + logo = cf_set("TEMPLATE_FILENAMES", "logo", "logo.png") - styles = cf_set_value("TEMPLATE_FILENAMES", "styles", "") + styles = cf_set("TEMPLATE_FILENAMES", "styles", "") if not styles: - styles = cf_set_value("TEMPLATE_FILENAMES", "styles", "styles.css") + styles = cf_set("TEMPLATE_FILENAMES", "styles", "styles.css") - rss = cf_set_value("TEMPLATE_FILENAMES", "rss", "") + rss = cf_set("TEMPLATE_FILENAMES", "rss", "") if not rss: - rss = cf_set_value("TEMPLATE_FILENAMES", "rss", "rss.xml") + rss = cf_set("TEMPLATE_FILENAMES", "rss", "rss.xml") - stats = cf_set_value("TEMPLATE_FILENAMES", "stats", "") + stats = cf_set("TEMPLATE_FILENAMES", "stats", "") if not stats: - stats = cf_set_value("TEMPLATE_FILENAMES", "stats", "tyto_stats.ini") + stats = cf_set("TEMPLATE_FILENAMES", "stats", "tyto_stats.ini") # [USER_DIRS] # =========== - cf_set_value("USER_DIRS", "root", wrk_dir) - cf_set_value("USER_DIRS", "articles", wrk_articles) - cf_set_value("USER_DIRS", "images", wrk_images) - cf_set_value("USER_DIRS", "files", wrk_files) - cf_set_value("USER_DIRS", "template", wrk_tpl) - cf_set_value("USER_DIRS", "modules", wrk_mods) - cf_set_value("USER_DIRS", "database", wrk_db) + cf_set("USER_DIRS", "root", wrk_dir) + cf_set("USER_DIRS", "articles", wrk_articles) + cf_set("USER_DIRS", "images", wrk_images) + cf_set("USER_DIRS", "files", wrk_files) + cf_set("USER_DIRS", "template", wrk_tpl) + cf_set("USER_DIRS", "modules", wrk_mods) + cf_set("USER_DIRS", "database", wrk_db) # [USER_TEMPLATE_FILES] # ===================== global wrk_favicon, wrk_logo, wri_styles wrk_favicon = os.path.join(wrk_tpl, favicon) - cf_set_value("USER_TEMPLATE_FILES", "favicon", wrk_favicon) + cf_set("USER_TEMPLATE_FILES", "favicon", wrk_favicon) wrk_logo = os.path.join(wrk_tpl, logo) - cf_set_value("USER_TEMPLATE_FILES", "logo", wrk_logo) + cf_set("USER_TEMPLATE_FILES", "logo", wrk_logo) wrk_styles = os.path.join(wrk_tpl, styles) - cf_set_value("USER_TEMPLATE_FILES", "styles", wrk_styles) + cf_set("USER_TEMPLATE_FILES", "styles", wrk_styles) # [USER_MODULES_FILES] # ==================== global wrk_metas, wrk_header, wrk_navbar, wrk_sidebar, wrk_footer wrk_metas = os.path.join(wrk_mods, "tyto_metas.raw") - cf_set_value("USER_MODULES_FILES", "metas", wrk_metas) + cf_set("USER_MODULES_FILES", "metas", wrk_metas) wrk_header = os.path.join(wrk_mods, "tyto_header.raw") - cf_set_value("USER_MODULES_FILES", "header", wrk_header) + cf_set("USER_MODULES_FILES", "header", wrk_header) wrk_navbar = os.path.join(wrk_mods, "tyto_navbar.raw") - cf_set_value("USER_MODULES_FILES", "navbar", wrk_navbar) + cf_set("USER_MODULES_FILES", "navbar", wrk_navbar) wrk_sidebar = os.path.join(wrk_mods, "tyto_sidebar.raw") - cf_set_value("USER_MODULES_FILES", "sidebar", wrk_sidebar) + cf_set("USER_MODULES_FILES", "sidebar", wrk_sidebar) wrk_footer = os.path.join(wrk_mods, "tyto_footer.raw") - cf_set_value("USER_MODULES_FILES", "footer", wrk_footer) + cf_set("USER_MODULES_FILES", "footer", wrk_footer) # [WIP_FILES] # =========== global wip_favicon, wip_logo, wip_styles, wip_rss, wip_stats wip_favicon = os.path.join(wip_tpl, favicon) - cf_set_value("WIP_FILES", "favicon", wip_favicon) + cf_set("WIP_FILES", "favicon", wip_favicon) wip_logo = os.path.join(wip_tpl, logo) - cf_set_value("WIP_FILES", "logo", wip_logo) + cf_set("WIP_FILES", "logo", wip_logo) wip_styles = os.path.join(wip_tpl, styles) - cf_set_value("WIP_FILES", "styles", wip_styles) + cf_set("WIP_FILES", "styles", wip_styles) wip_rss = os.path.join(wip_tpl, rss) - cf_set_value("WIP_FILES", "rss", wip_rss) + cf_set("WIP_FILES", "rss", wip_rss) wip_stats = os.path.join(wip_tpl, stats) - cf_set_value("WIP_FILES", "stats", wip_stats) + cf_set("WIP_FILES", "stats", wip_stats) global wip_metas, wip_header, wip_navbar, wip_sidebar, wip_footer wip_metas = os.path.join(wip_tpl, "metas.html") - cf_set_value("WIP_FILES", "metas", wip_metas) + cf_set("WIP_FILES", "metas", wip_metas) wip_header = os.path.join(wip_tpl, "header.html") - cf_set_value("WIP_FILES", "header", wip_header) + cf_set("WIP_FILES", "header", wip_header) wip_navbar = os.path.join(wip_tpl, "navbar.html") - cf_set_value("WIP_FILES", "navbar", wip_navbar) + cf_set("WIP_FILES", "navbar", wip_navbar) wip_sidebar = os.path.join(wip_tpl, "sidebar.html") - cf_set_value("WIP_FILES", "sidebar", wip_sidebar) + cf_set("WIP_FILES", "sidebar", wip_sidebar) wip_footer = os.path.join(wip_tpl, "footer.html") - cf_set_value("WIP_FILES", "footer", wip_footer) + cf_set("WIP_FILES", "footer", wip_footer) # [WWW_FILES] # =========== global www_favicon, www_logo, www_styles, www_rss, www_stats www_favicon = os.path.join(www_tpl, favicon) - cf_set_value("WWW_FILES", "favicon", www_favicon) + cf_set("WWW_FILES", "favicon", www_favicon) www_logo = os.path.join(www_tpl, logo) - cf_set_value("WWW_FILES", "logo", www_logo) + cf_set("WWW_FILES", "logo", www_logo) www_styles = os.path.join(www_tpl, styles) - cf_set_value("WWW_FILES", "styles", www_styles) + cf_set("WWW_FILES", "styles", www_styles) www_rss = os.path.join(www_tpl, rss) - cf_set_value("WWW_FILES", "rss", www_rss) + cf_set("WWW_FILES", "rss", www_rss) www_stats = os.path.join(www_tpl, stats) - cf_set_value("WWW_FILES", "stats", www_stats) + cf_set("WWW_FILES", "stats", www_stats) global www_metas, www_header, www_navbar, www_sidebar, www_footer www_metas = os.path.join(www_tpl, "metas.html") - cf_set_value("WWW_FILES", "metas", www_metas) + cf_set("WWW_FILES", "metas", www_metas) www_header = os.path.join(www_tpl, "header.html") - cf_set_value("WWW_FILES", "header", www_header) + cf_set("WWW_FILES", "header", www_header) www_navbar = os.path.join(www_tpl, "navbar.html") - cf_set_value("WWW_FILES", "navbar", www_navbar) + cf_set("WWW_FILES", "navbar", www_navbar) www_sidebar = os.path.join(www_tpl, "sidebar.html") - cf_set_value("WWW_FILES", "sidebar", www_sidebar) + cf_set("WWW_FILES", "sidebar", www_sidebar) www_footer = os.path.join(www_tpl, "footer.html") - cf_set_value("WWW_FILES", "footer", www_footer) + cf_set("WWW_FILES", "footer", www_footer) # [TYTO] # ====== - cf_set_value("TYTO", "domain_hash", cf_id) - cf_set_value("TYTO", "domain_conf", cf_uri) - cf_set_value("TYTO", "domain_user", ult_cf_uri) + cf_set("TYTO", "domain_hash", cf_id) + cf_set("TYTO", "domain_conf", cf_uri) + cf_set("TYTO", "domain_user", ult_cf_uri) # ================================= # diff --git a/src/var/lib/tyto/program/post.py b/src/var/lib/tyto/program/post.py index b009313..1bf5fea 100644 --- a/src/var/lib/tyto/program/post.py +++ b/src/var/lib/tyto/program/post.py @@ -33,10 +33,11 @@ #-------------------------- import os, sys, configparser -import domain, debug, tools, tyto +import args, domain, debug, tools, tyto error = 0 +write = False # When updating database in cf_set(), cf_write() #============================================# @@ -57,7 +58,7 @@ def is_article(target): # Article exists global uri - uri = os.path.join(domain.wrk_articles, target) + uri = os.path.join(domain.user_dir, target) if not os.path.exists(uri): error = debug.out(5, "False", uri, True, 2, False) return False @@ -77,11 +78,10 @@ def is_article(target): # Set target from articles/ wrk_target = uri.rsplit(domain.wrk_articles)[1] - # Load Database - global db - db = False - db = cf_load() # True or False - + # Load Database, get and compare values + cf_load() + cf_datas() + compare_datas() return True @@ -131,19 +131,112 @@ def cf_load(): cf = configparser.ConfigParser() cf.read(cf_uri) - + return True -#====================================================# -# Check if post database configuration file is valid # -#----------------------------------------------------# -def cf_valid(): - global chk_hash, wip_hash, www_hash +#================================# +# Return value from section, key # +#--------------------------------# +def cf_get(section, key, boolean): + if boolean: + try: return cf.getboolean(section, key) + except: return False - chk_hash = cf.get("CHECK", "hash") - wip_hash = cf.get("WIP", "hash") - www_hash = cf.get("WWW", "hash") + try: return cf.get(section, key) + except: return "" + + +#=============================================# +# Get and prepare new vars from post database # +#---------------------------------------------# +def cf_datas(): + # [CHECK] + # ------- + global chk_hash, chk_date, chk_static, chk_errors + chk_hash = cf_get("CHECK", "hash", False) + chk_date = cf_get("CHECK", "date", False) + chk_static = cf_get("CHECK", "static", True) + chk_errors = cf_get("CHECK", "errors", True) + + # [WIP] + # ----- + global wip_hash, wip_date, wip_uri, wip_static + wip_hash = cf_get("WIP", "hash", False) + wip_date = cf_get("WIP", "date", False) + wip_uri = cf_get("WIP", "uri", False) + wip_static = cf_get("WIP", "static", True) + + # [WIP] + # ----- + global www_hash, www_date, www_uri, www_static + www_hash = cf_get("WWW", "hash", False) + www_date = cf_get("WWW", "date", False) + www_uri = cf_get("WWW", "uri", False) + www_static = cf_get("WWW", "static", True) + + +#===============================# +# Do some datas comparisons # +# after post cf_datas() setup # +# Used to do processes (mainly) # +#-------------------------------# +def compare_datas(): + global do_chk, do_wip + + do_chk = False + + if chk_errors: + do_chk = True + do_wip = False + + if chk_static != domain.static: + do_chk = True + + if args.force: + do_chk = do_wip = True + + else: + do_chk = tools.compare_values(wrk_id, chk_hash) + do_wip = tools.compare_values(chk_hash, wip_hash) + + +#===============================# +# Set a value in post database # +# only if changed value # +# check for [section] in file # +# or create it with key and val # +# config file must be loaded # +#-------------------------------# +def cf_set(section, key, value): + global write + + try: cf + except: cf_load() + + if not cf.has_section(section): + cf.add_section(section) + + try: curval = cf.get(section, key) + except: curval = "" + + if not curval or curval != value: + cf.set(section, key, value) + write = True + + +#=====================# +# Write post database # +# if new value is set # +#---------------------# +def cf_write(): + global write + + if write: + with open(cf_uri, "w") as f: + cf.write(f) + + write = False #======# @@ -156,16 +249,16 @@ stats_tyto_text_coms = 0 stats_html_coms = 0 stats_titles = 0 stats_bcodes = 0 +stats_bcodes_lines = 0 stats_quotes = 0 stats_parags = 0 +stats_lists = 0 stats_links = 0 stats_images = 0 stats_files = 0 stats_raws = 0 stats_codes = 0 stats_abbrs = 0 -stats_codes = 0 -stats_raws = 0 stats_total_files = 0 @@ -175,27 +268,26 @@ stats_text_images = 0 stats_text_abbrs = 0 stats_text_codes = 0 stats_text_raws = 0 +stats_text_icodes = 0 # head_contents #============== - # Optional Tags nositemap = "! NoSitemap" # Article will not be included in sitemap # One Line needed -sep = "-----" # Splitter between header and article +sep = "-----" # Splitter between header and article texts # Will replace "Fals" with title value -title = ("title:", False) -about = ("about:", False) -date = ("date:", False) -tags = ("tags:", False) +title = ("title:", False) +about = ("about:", False) +date = ("date:", False) +tags = ("tags:", False) author = ("author:", False) -# optional -logo = ("logo:", False) +logo = ("logo:", False) # optional -# Multiple lines (3) +# Multiple lines (3) markers ml_tags = ("link:", "image:", "file:", "raw:", "code:", "abbr:") ml_tags_marks = { "link:" : "__", @@ -224,12 +316,7 @@ value2s_ext_uris = ("http", "ftp") bcodes = ("{{", "}}") quotes = ("[[", "]]") parags = ("((", "))") - -# markers with "protected" contents -raw_contents = ("bcodes", "quotes") - -# Comments -text_comments = (";;", "