From 238b886bea0df9a3e6806ba07724ed788a2fd6b7 Mon Sep 17 00:00:00 2001 From: Cyrille LOUARN Date: Wed, 8 Nov 2023 01:14:56 +0100 Subject: [PATCH] [1.9.34] --- CHANGELOG.md | 7 + src/usr/bin/tyto | 2 +- .../program/__pycache__/post.cpython-311.pyc | Bin 12957 -> 13131 bytes .../program/__pycache__/tyto.cpython-311.pyc | Bin 2518 -> 2591 bytes .../program/__pycache__/wip.cpython-311.pyc | Bin 28936 -> 35666 bytes src/var/lib/tyto/program/post.py | 31 +- src/var/lib/tyto/program/tyto.py | 9 +- src/var/lib/tyto/program/wip.py | 272 ++++++++++++++---- src/var/lib/tyto/tpl_files/styles.css | 18 ++ .../__pycache__/logs_fr.cpython-311.pyc | Bin 4550 -> 4645 bytes src/var/lib/tyto/translations/logs_en.py | 3 + src/var/lib/tyto/translations/logs_fr.py | 3 + 12 files changed, 271 insertions(+), 74 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bab16f..4f6b1e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,13 @@ Tyto - Littérateur # CURRENTLY IN DEV (in devel branch) ! +## [1.9.34] +- Working on creating modules +- - fixes typos codes +- - header, navbar, sidebar = ok +- - toto footer contents and testing things +- - Manage modules with an ini db file to avoid creating HTML updated modules + ## [1.9.33] - Working on creating modules (header, navbar, sidebar, header) - - Added working header module diff --git a/src/usr/bin/tyto b/src/usr/bin/tyto index 1c0911b..2d28505 100755 --- a/src/usr/bin/tyto +++ b/src/usr/bin/tyto @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Version: 1.9.33 +# Version: 1.9.34 # Updated: 2023-10-18 1697613100 # Tyto - Littérateur 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 ea6f09abe173e23f6c3738cdb4617411bdc6dbf9..60ace8393723d72f94e218c0fb31013fcf3c0904 100644 GIT binary patch delta 2215 zcmbVNU2GFa5Z?3I=byw*>?C#^r-{=*!dVbXNfAk)Ktmk<`b*LPs<1A;b8O=H=-!0@ zikeU%HHxT+SP88Dx~fEj=tC;^p)a6Hz*Ar9))LZHsPuuSzN8XV5vovU&M_q@{ZUuC z?`FT9-PxI)o&8w(F5&sY?RF7p>%ZKm_+I$R!`r!sd7r(X^G4rHUle79eRQj_{gtoO-ZZ#jd&g>wO?QxlX_Aw< z%N9be!dGgtU(J}eJVwYdXIYl{Niu1Xt+EYPfc36EUQ=?(+(9A> zQiYB?UT(+SW$7{qSIZp&TIk$z%X!!?z80)jTREcp*+NarVY}>DxkVb%SKpFTcKy?q zoUmfq5Fxp0G-Z`5{VR0?I0LT^ZAJ(oG$NQeUAha{#j9Wl`q=SUJVB$#^dn%V8?F&W zA6C`0B4rF7WW$MidP+|#C2>j`R>yV2fi!MG#?S&s5LO8@|{aPOuDMN@SVsLs?hR%=qEA{Iv&+kLt znv}F;)Ue8ut{8%*OL{6kK=M(hM?V2xgKdQK~@&TSBFA1q$wt zrp8u^w2JVQ>9xoqJYw%OeF~IKLg`5`!v^!{Szw#<_rvdVo6q3PEeK%*jJC)bTtb7SCCk$s z5N*>EodL2l|MjysEK^v-4O={^#7D(y(__Pl*CUZiE1Ka#F*PQQD4KbLQBzJ)iUr)T zPDts|(lh2zGO{+2(vzjv$-Lq%pi>H*AjS2RnxV7EhybG9uxC^~sZjR&+Pd!da5Y;3 zZy{|1S+fJ6yU@(n%7X&Y3I(eBf>G-NqJ<;Zai^amsW;6NBG%!!ej5xiR4{Qi?ZC$AJD#9BG zBLId~mqs*0kjC|-O6dSl>}bay&3&k_GQl1?wvDOscv^Xp-eIRUUaQ)`RV|XokjVEv KH(;?wVB()YSMsd@ delta 1953 zcma)7U2GIp6rR7G-EMcc?R2}#wm@5UX?F_cr`E73KLG=+C9xtD8>(@g-I?u9yWJ^w zrWBfDk@!PUV&g?@j6`098egjGD^K8yKIkSJO>V^C15X-5V(`KE;5oCd0s-SB^Ub;6 zJ@?!_=YIF>*SX6^=vpx7=iu?aHEi_te-;wG{Cr9A4)J`lH0}#|cpo)`Jv~uyVZN+Y zbc~{7Gl>|QPC9@j^*AHi#taGKFhs8hht@QKX^Q|I9UY__`Irl(wV__IC5(0p!Wx8j zgjV`e)6VD)FhAjlij2E#16mvCYSTEc(t0H({3_7iL@V8^Y!()H`hn6-_lgl-ro0qZ z7PzYd$9)QK^*Jrl?TLtRMW*}2Fr92}++(*n4YgU0oAlLeonPP<1YOWYUAihm40x-L zR;NoxINhW9ohW@(3e!|`gU9bc3iOtzo&F-lB%X7^^p)n$XJp;`;13{=+s>!g{nvJN ze@A@5uh%~qQEM!A#yQyW(P;$q;DY$*G>&nY$Vu@SH^Ha z5l(F!Ay~6fA^{GPP4q;|@S>`af6qDs6QmAdJwgD%J^!k1aEP*DvNJuC&gRGgWCjsX z70iqDEHRllVK}S~M~>+fjH;<+tXW5um~W0urDrVLVIDoRm^O9h*E8wb(g4oXMmGLZ z&}UVk%!f_|3uOHw@K@lqkMSILhPx+o%`F$Z-{1W1=F2BOJiTI+mHvv-e`es860Xse z_P*7p%gXMGvir=gJO04i-S2EUza_EUTJ|R@{={8Ql$!6z^{<&r{8DOpd?mbce05`4 zPF3U-{XNo^x-eH3qZKjwtr)!{2i}}KJGm5HPL}0(MULOMSXdfdKDZ*SXsaz{c}GRw zL7$Ia>b&g_olDqQ${Pc1`y<@VNZbB?@n)*+K$!b7+;*Ukrq_HP+XVBfNS=ZZ^Fs+U zmQ^scA~{Oqv5g8|HYR6tX_z4y7<^S4k0ph^VdSN}X6FZ)q-&1BWZTgkGdoHS;*>Zx ze2BQsK^z+!Q-dT!zi2xf8-ls}ZgCuk2;b3X*Z#z-rS0oZ@4Hlru+6$517b#V6rW+C_NECK5w$W!LXShO>h_%JHRa5ro_0<-R$3z*s_D)_i?u$B1s=(5V6N0bvY~OQrKY-wTV_P2iAD+12iVI;hIR?IEo=#8y^K4Z8_( zPXd#y{sV153op1Ua#xeCI^4r^55moaDX4Ngoyl6dVW$gb5vm`sOSgMvzB`4>M-ZMv zFaVh3XcIP*wOJ=`5hh_`G_dv0_WkJbpd|nB?V7gq*@Cf${6M?6U2jP64R^VJV6^nx KwoyUCD*gp+tI@gu 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 c5e5e2a2632ce30b9acbc58e176d934634379c46..67d1412edc28cd94a17f3843b23d9756f75d88e1 100644 GIT binary patch delta 186 zcmca6JYR%&IWI340}#ls_ey=dk++YHH{M23S63lCHK{nWBz5uvwvfamWD$kn%#_rm z#3BVaFoffQN^*;VlB&gAHu|MGKvnu+12&7X ocQNww<>sf9=D-cvyp}_RQIt)HrGf8*0HYvF11|^`nE)LN02E(1cmMzZ delta 113 zcmbO)a!r_bIWI340}$}kx~Ia{|4ZI*& IWCFAU05NqR`~Uy| diff --git a/src/var/lib/tyto/program/__pycache__/wip.cpython-311.pyc b/src/var/lib/tyto/program/__pycache__/wip.cpython-311.pyc index 2863a3a91ff73dcc9f051bc35e8b8f3b5668f593..20bf17d04ce75d8e736f63bf518b4dc0f44828d7 100644 GIT binary patch delta 10181 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 b77l4lC^-+6CXQHU@^2P delta 5222 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 diff --git a/src/var/lib/tyto/program/post.py b/src/var/lib/tyto/program/post.py index 70ab4f9..88ad2b1 100644 --- a/src/var/lib/tyto/program/post.py +++ b/src/var/lib/tyto/program/post.py @@ -157,40 +157,49 @@ def cf_load(): #======================================# # Load another post configuration file # #--------------------------------------# -def tmp_load(wrk_post, db_id): +def tmp_load(wrk_post, wrk_post_uri): global error - db_tmp_uri = os.path.join(domain.wrk_db, db_id) - post_tmp_uri = os.path.join(domain.wrk_articles, wrk_post) + db_uri = os.path.join( + domain.wrk_db, + tools.get_filesum(wrk_post_uri, False) + ".ini" + ) - if not os.path.exists(db_tmp_uri): + if not os.path.exists(db_uri): error = \ - debug.out(5, wrk_post, db_tmp_uri, True, 2, False) + debug.out(5, wrk_post, db_uri, True, 2, False) return False global tmp_cf tmp_cf = "" tmp_cf = configparser.ConfigParser() - tmp_cf.read(tmp_uri) + tmp_cf.read(db_uri) - if tmp_cf.get("CHECK", "errors"): + if tmp_cf.getboolean("CHECK", "errors"): error = \ - debug.out(10, "True", db_tmp_uri, True, 2, False) + debug.out(10, "True", db_uri, True, 2, False) return False - global tmp_title, tmp_about + global tmp_title, tmp_about, tmp_logo try: tmp_title = tmp_cf.get("HEADERS", "title") except: error = \ - debug.out(51, "title:", post_tmp_uri, True, 2, False) + debug.out(51, "title:", wrk_post_uri, True, 2, False) return False try: tmp_about = tmp_cf.get("HEADERS", "about") except: error = \ - debug.out(51, "about:", post_tmp_uri, True, 2, False) + debug.out(51, "about:", wrk_post_uri, True, 2, False) + return False + + try: + tmp_logo = tmp_cf.get("HEADERS", "logo") + except: + error = \ + debug.out(51, "logo:", wrk_post_uri, True, 2, False) return False return True diff --git a/src/var/lib/tyto/program/tyto.py b/src/var/lib/tyto/program/tyto.py index 9802265..0046ee5 100644 --- a/src/var/lib/tyto/program/tyto.py +++ b/src/var/lib/tyto/program/tyto.py @@ -161,14 +161,19 @@ module_header = """ """ -module_navbar = """ +module_navbar = """ """ -module_aside = """ +module_sidebar = """ + """ module_footer = """ diff --git a/src/var/lib/tyto/program/wip.py b/src/var/lib/tyto/program/wip.py index 52a5b39..8caefd8 100644 --- a/src/var/lib/tyto/program/wip.py +++ b/src/var/lib/tyto/program/wip.py @@ -35,7 +35,7 @@ # file program : #-------------------------- -import sys, os +import sys, os, configparser import args, debug, tyto, tools, post, domain, check, langs @@ -105,6 +105,11 @@ def convert(target): for key, directory in domain.cf.items("WIP_DIRS"): tools.create_dirs(directory) + # Warn if unused registred file in wrk template/ directory + for key, uri in domain.cf.items("USER_TEMPLATE_FILES"): + os.path.exists(uri) or \ + debug.out(5, key, uri, True, 1, False) + # Check/Create modules files # navbar, sidebar, header, footer if not get_modules("wip"): @@ -591,6 +596,27 @@ def convert_list(markdown_str, mark_b, mark_c): #=========# # Modules #==================================================================== #---------# +#==================================# +# Create modules ini database file # +# return False if: # +# - datas changed # +# - not created # +#----------------------------------# +def modules_db(): + global db_mods_uri, mods_cf + + db_mods_uri = os.path.join(domain.wrk_mods, ".modules.ini") + + if not os.path.exists(db_mods_uri): + tools.create_file(db_mods_uri, ini_mods) + + mods_cf = configparser.ConfigParser() + mods_cf.read(db_mods_uri) + + + + + #============================================# # Check / Create modules files (.raw + .html # # process: "wip" or "www" # @@ -599,40 +625,10 @@ def convert_list(markdown_str, mark_b, mark_c): # - header # # - footer # #--------------------------------------------# -def get_modules(srv): +def get_modules(srv): global modules # Modules settings - """ - raws_uris = { - "header" : domain.wrk_header, - "navbar" : domain.wrk_navbar, - "sidebar" : domain.wrk_sidebar, - "footer" : domain.wrk_footer - } - raws_sets = \ - { - "header" : tyto.module_header%( - "/template/%s"%domain.logo, domain.about, - "/template/%s"%domain.logo, domain.about, domain.about, - domain.title, - domain.about - ), - "navbar" : langs.logs.navbar_header%( - domain.title, domain.wrk_articles, - domain.wrk_navbar, - domain.wip_navbar, - domain.www_navbar - ), - "sidebar" : langs.logs.sidebar_header%( - domain.title, domain.wrk_articles, - domain.wrk_sidebar, - domain.wip_sidebar, - domain.www_sidebar - ), - "footer" : tyto.module_footer, - } - """ modules = \ { "header" : { @@ -680,16 +676,43 @@ def get_modules(srv): }, } + # Avois creating again module if files are same + modules_db() + mods_cf_write = False + # Manage modules # Create raw files, and set html "srv" file for mod in modules: + create_html_module = False + # Create user raw files modules in modules/ directory - os.path.exists( modules[mod]["wrk"]) or \ - tools.create_file(modules[mod]["wrk"], modules[mod]["raw"]) - - # Create HTML file in srv (wip or www) - if not modules[mod]["set"](srv): - return False + if os.path.exists(modules[mod]["wrk"]): + cur_raw_id = tools.get_filesum(modules[mod]["wrk"], True) + mod_raw_id = mods_cf.get(mod.upper(), "raw") + if cur_raw_id != mod_raw_id: + mods_cf.set(mod.upper(), "raw", cur_raw_id) + mods_cf_write = True + create_html_module = True + + else: + tools.create_file(modules[mod]["wrk"], modules[mod]["raw"]) + mods_cf.set(mod.upper(), "raw", cur_raw_id) + mods_cf_write = True + create_html_module = True + + # Unused module HTML file + if not os.path.exists(modules[mod][srv]): + create_html_module = True + + # Create HTML module if needed (raw updated, or unused html file) + if create_html_module: + print(">> HTML", mod) + if not modules[mod]["set"](srv): + return False + + if mods_cf_write: + with open(db_mods_uri, "w") as f: + mods_cf.write(f) return True @@ -700,7 +723,7 @@ def get_modules(srv): # Copy other lines # # modules/tyto_header.raw has default contents # #------------------------------------------------# -def header_html_create(srv): +def header_html_create(srv): with open(domain.wrk_header, "r") as f: header_raw = f.read().rsplit("\n") header_html = "" @@ -737,11 +760,11 @@ def navbar_check(srv): return True #=================================================# +# navbar is True in domain configuration file # # Create HTML li lists from tyto_navbar.raw datas # #-------------------------------------------------# def navbar_html_create(srv): - items = False - + items = False html_indexes = { "wip" : domain.wip, "www" : domain.www @@ -749,19 +772,23 @@ def navbar_html_create(srv): with open(domain.wrk_navbar, "r") as f: navbar_raw = f.read().rsplit("\n") - navbar_html = "" + navbar_html = "" + html_line = '
  • ' + \ + '%s
    • ' for ln, line in enumerate(navbar_raw, 1): if line.lstrip().startswith("#") or \ not line or \ line.isspace(): continue + + # Get directory name and link name (if separated by "#") + try: + folder = line.lstrip().rsplit("#")[0].rstrip() + link_name = line.lstrip().rsplit("#")[1].lstrip().rstrip() + except: + link_name = folder = line.lstrip().rstrip() - html_line = '
  • %s
    • ' - title_html = "" - - # Get directory name - folder = line.lstrip() folder_uri = os.path.join(domain.wrk_articles, folder) # Unused directory in articles/ @@ -795,23 +822,19 @@ def navbar_html_create(srv): # Load post configuration file in tmp module # return if unused or post errors - db_id = tools.get_filesum(wrk_index_uri, False) + ".ini" - if not post.tmp_load(wrk_index, db_id): + if not post.tmp_load(wrk_index, wrk_index_uri): return False items = True title_html = ' title="%s - %s"'%(post.tmp_title, post.tmp_about) - + # Format HTML href uri if not folder.startswith("/"): folder = "/%s"%folder - if not navbar_html: - navbar_html = html_line%(title_html, folder, folder) - else: - navbar_html = "%s\n%s"%( - navbar_html, - html_line%(title_html, folder, folder) - ) + navbar_html = "%s\n%s"%( + navbar_html, + html_line%(title_html, domain.css, folder, link_name) + ) if not items: post.error = \ @@ -823,10 +846,121 @@ def navbar_html_create(srv): return True -# -# -# +#=========================================================# +# Create sidebar.html in server (wip/ or www/) # +# If sidebar is deactivated, create one HTML comment line # +# else, create HTML li lists from tyto_sidebar.raw datas # +#---------------------------------------------------------# def sidebar_check(srv): + # sidebar is NOT activated (= 0) in domain configuration file + sidebar_html = "" + if int(domain.sidebar_items) == 0: + tools.create_file(modules["sidebar"][srv], sidebar_html) + return True + + # Create sidebar HTML file in srv, from raw + if not sidebar_html_create(srv): + return False + + return True + + +#==================================================# +# sidebar_items > 0 in domain configuration file # +# Create HTML li lists from tyto_sidebar.raw datas # +#--------------------------------------------------# +def sidebar_html_create(srv): + max_items = int(domain.sidebar_items) + items = 0 + html_post_uri = { + "wip" : domain.wip, + "www" : domain.www + } + + with open(domain.wrk_sidebar, "r") as f: + sidebar_raw = f.read().rsplit("\n") + sidebar_html = "" + html_line = '
  • ' + \ + '' + \ + '
    ' + \ + '
    ' + \ + '

    %s

    ' + \ + '
    ' + \ + '
    ' + \ + '%s' + \ + '

    %s

    ' + \ + '
    ' + \ + '
    ' + \ + '    ' + \ + '
    • ' + + for ln, line in enumerate(sidebar_raw, 1): + # User wants max_items + if items > max_items: + break + + if line.lstrip().startswith("#") or \ + not line or \ + line.isspace(): + continue + + # Set post uri from line + wrk_post = line.lstrip() + wrk_post_uri = os.path.join(domain.wrk_articles, wrk_post) + + # Unused file in articles/ + if not os.path.exists(wrk_post_uri): + post.error = \ + debug.out(5, "Sidebar. %s) %s"%( + ln, wrk_post + ), wrk_post_uri, True, 2, False) + return False + + # Set HTML post uri in srv + srv_post_uri = os.path.join( + html_post_uri[srv], + wrk_post[:-4] + "html" + ) + + # Unused HTML post + if not os.path.exists(srv_post_uri): + post.error = \ + debug.out(5, "Sidebar. %s) %s"%( + ln, wrk_post + ), srv_post_uri, True, 2, False) + return False + + # Load post configuration file in tmp module + # return if unused or post errors + if not post.tmp_load(wrk_post, wrk_post_uri): + return False + + # Post can be added to list + items += 1 + if not wrk_post.startswith("/"): + wrk_post = "/" + wrk_post + wrk_post = wrk_post[:-4] + "html" + if wrk_post.endswith("index.html"): + wrk_post = wrk_post[:-10] + sidebar_html = "%s\n%s"%( + sidebar_html, + html_line%( + wrk_post, + post.tmp_title, + '/%s'%post.tmp_logo.rsplit(domain.www_url)[1], + post.tmp_title, + post.tmp_about, + ) + ) + + # sidebar configuration error + if items == 0: + post.error = \ + debug.out(9, 'Sidebar', domain.wrk_sidebar, True, 2, False) + return False + + + tools.create_file(modules["sidebar"][srv], tyto.module_sidebar%sidebar_html) return True @@ -852,3 +986,21 @@ def footer_html_create(srv): tools.create_file(modules["footer"][srv], footer_html) return True + + +#======# +# MAIN #======================================================================= +#======# +ini_mods = """ +[HEADER] +raw = + +[NAVBAR] +raw = + +[SIDEBAR] +raw = + +[FOOTER] +raw = +""" diff --git a/src/var/lib/tyto/tpl_files/styles.css b/src/var/lib/tyto/tpl_files/styles.css index 5608a1b..0e7209b 100644 --- a/src/var/lib/tyto/tpl_files/styles.css +++ b/src/var/lib/tyto/tpl_files/styles.css @@ -31,6 +31,8 @@ p#site_infos_text {} nav#site_menu {} menu#site_menu_items {} li.site_menu_item {} +/* also a.tyto {} */ +a.site_menu_link {} /* div contains
    and