octospacc/staticoso
1
0
Fork 0
mirror of https://gitlab.com/octtspacc/staticoso synced 2025-06-05 22:09:23 +02:00
Code Issues Projects Releases Wiki Activity

Fix title issues, some conf. flags changes, minor fixes

Browse Source
This commit is contained in:
octospacc
2022-08-22 17:20:35 +02:00
parent 98c39d3604
commit 93a725839e
5 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Modules/Site.py
View File

@ -16,7 +16,7 @@ from Modules.Pug import *
from Modules.Utils import *
def DashifyTitle(Title, Done=[]):
return UndupeStr(DashifyStr(Title), Done, '-')
return UndupeStr(DashifyStr(Title.lstrip(' ').rstrip(' ')), Done, '-')
def MakeLinkableTitle(Line, Title, DashTitle, Type):
if Type == 'md':
@ -365,7 +365,7 @@ def DoMinifyHTML(HTML):
convert_charrefs=True,
keep_pre=True)
def MakeSite(TemplatesText, StaticPartsText, DynamicParts, DynamicPartsText, ConfMenu, GlobalMacros, SiteName, BlogName, SiteTagline, SiteTemplate, SiteDomain, SiteRoot, FolderRoots, SiteLang, Locale, Minify, NoScripts, Sorting, MarkdownExts, AutoCategories):
def MakeSite(TemplatesText, StaticPartsText, DynamicParts, DynamicPartsText, ConfMenu, GlobalMacros, SiteName, BlogName, SiteTagline, SiteTemplate, SiteDomain, SiteRoot, FolderRoots, SiteLang, Locale, Minify, NoScripts, ImgAltAndTitle, Sorting, MarkdownExts, AutoCategories):
PagesPaths, PostsPaths, Pages, MadePages, Categories = [], [], [], [], {}
for Ext in FileExtensions['Pages']:
for File in Path('Pages').rglob(f"*.{Ext}"):
@ -448,7 +448,7 @@ def MakeSite(TemplatesText, StaticPartsText, DynamicParts, DynamicPartsText, Con
elif File.lower().endswith(('.pug')):
Content = PagePostprocessor('pug', ReadFile(PagePath), Meta)
elif File.lower().endswith(('.txt')):
Content = '<pre>' + Content + '</pre>'
Content = '<pre>' + html.escape(Content) + '</pre>'
elif File.lower().endswith(FileExtensions['HTML']):
Content = ReadFile(PagePath)
@ -483,11 +483,13 @@ def MakeSite(TemplatesText, StaticPartsText, DynamicParts, DynamicPartsText, Con
SiteLang=SiteLang,
Locale=Locale)
HTML = ImgAltToTitle(HTML)
if NoScripts:
HTML = StripTags(HTML, ['script'])
if Minify:
HTML = DoMinifyHTML(HTML)
if NoScripts:
HTML = StripTags(HTML, ['script'])
if ImgAltAndTitle:
HTML = WriteImgAltAndTitle(HTML)
WriteFile(PagePath, HTML)
MadePages += [[File, Content, Titles, Meta, ContentHTML, SlimHTML, Description, Image]]