mirror of https://gitlab.com/octtspacc/staticoso
Refactorin'
This commit is contained in:
parent
91450570f4
commit
087c6c6f9a
|
@ -103,7 +103,7 @@ def GetModifiedFiles(OutDir):
|
||||||
return Mod
|
return Mod
|
||||||
|
|
||||||
def Main(Args, FeedEntries):
|
def Main(Args, FeedEntries):
|
||||||
Flags = {}
|
Flags, Snippets = {}, {}
|
||||||
HavePages, HavePosts = False, False
|
HavePages, HavePosts = False, False
|
||||||
SiteConf = LoadConfFile('Site.ini')
|
SiteConf = LoadConfFile('Site.ini')
|
||||||
|
|
||||||
|
@ -120,8 +120,6 @@ def Main(Args, FeedEntries):
|
||||||
CheckSafeOutDir(OutDir)
|
CheckSafeOutDir(OutDir)
|
||||||
print(f"[I] Outputting to: {OutDir}/")
|
print(f"[I] Outputting to: {OutDir}/")
|
||||||
|
|
||||||
DiffBuild = Args.DiffBuild
|
|
||||||
|
|
||||||
BlogName = Flags['BlogName'] = OptionChoose('', Args.BlogName, ReadConf(SiteConf, 'Site', 'BlogName'))
|
BlogName = Flags['BlogName'] = OptionChoose('', Args.BlogName, ReadConf(SiteConf, 'Site', 'BlogName'))
|
||||||
SiteTagline = Flags['SiteTagline'] = OptionChoose('', Args.SiteTagline, ReadConf(SiteConf, 'Site', 'Tagline'))
|
SiteTagline = Flags['SiteTagline'] = OptionChoose('', Args.SiteTagline, ReadConf(SiteConf, 'Site', 'Tagline'))
|
||||||
SiteTemplate = Flags['SiteTemplate'] = OptionChoose('Default.html', Args.SiteTemplate, ReadConf(SiteConf, 'Site', 'Template'))
|
SiteTemplate = Flags['SiteTemplate'] = OptionChoose('Default.html', Args.SiteTemplate, ReadConf(SiteConf, 'Site', 'Template'))
|
||||||
|
@ -130,8 +128,11 @@ def Main(Args, FeedEntries):
|
||||||
SiteLang = Flags['SiteLang'] = OptionChoose('en', Args.SiteLang, ReadConf(SiteConf, 'Site', 'Lang'))
|
SiteLang = Flags['SiteLang'] = OptionChoose('en', Args.SiteLang, ReadConf(SiteConf, 'Site', 'Lang'))
|
||||||
|
|
||||||
Sorting = Flags['Sorting'] = literal_eval(OptionChoose('{}', Args.Sorting, ReadConf(SiteConf, 'Site', 'Sorting')))
|
Sorting = Flags['Sorting'] = literal_eval(OptionChoose('{}', Args.Sorting, ReadConf(SiteConf, 'Site', 'Sorting')))
|
||||||
DynamicParts = Flags['DynamicParts'] = literal_eval(OptionChoose('{}', Args.DynamicParts, ReadConf(SiteConf, 'Site', 'DynamicParts')))
|
Sorting = Flags['Sorting'] = SetSorting(Sorting)
|
||||||
|
|
||||||
NoScripts = Flags['NoScripts'] = StringBoolChoose(False, Args.NoScripts, ReadConf(SiteConf, 'Site', 'NoScripts'))
|
NoScripts = Flags['NoScripts'] = StringBoolChoose(False, Args.NoScripts, ReadConf(SiteConf, 'Site', 'NoScripts'))
|
||||||
|
FolderRoots = Flags['FolderRoots'] = literal_eval(Args.FolderRoots) if Args.FolderRoots else {}
|
||||||
|
DiffBuild = Args.DiffBuild
|
||||||
|
|
||||||
ActivityPubTypeFilter = Flags['ActivityPubTypeFilter'] = OptionChoose('Post', Args.ActivityPubTypeFilter, ReadConf(SiteConf, 'ActivityPub', 'TypeFilter'))
|
ActivityPubTypeFilter = Flags['ActivityPubTypeFilter'] = OptionChoose('Post', Args.ActivityPubTypeFilter, ReadConf(SiteConf, 'ActivityPub', 'TypeFilter'))
|
||||||
ActivityPubHoursLimit = Flags['ActivityPubHoursLimit'] = OptionChoose(168, Args.ActivityPubHoursLimit, ReadConf(SiteConf, 'ActivityPub', 'HoursLimit'))
|
ActivityPubHoursLimit = Flags['ActivityPubHoursLimit'] = OptionChoose(168, Args.ActivityPubHoursLimit, ReadConf(SiteConf, 'ActivityPub', 'HoursLimit'))
|
||||||
|
@ -157,6 +158,11 @@ def Main(Args, FeedEntries):
|
||||||
FeedCategoryFilter = Flags['FeedCategoryFilter'] = OptionChoose('Blog', Args.FeedCategoryFilter, ReadConf(SiteConf, 'Feed', 'CategoryFilter'))
|
FeedCategoryFilter = Flags['FeedCategoryFilter'] = OptionChoose('Blog', Args.FeedCategoryFilter, ReadConf(SiteConf, 'Feed', 'CategoryFilter'))
|
||||||
FeedEntries = Flags['FeedEntries'] = int(FeedEntries) if (FeedEntries or FeedEntries == 0) and FeedEntries != 'Default' else int(ReadConf(SiteConf, 'Feed', 'Entries')) if ReadConf(SiteConf, 'Feed', 'Entries') else 10
|
FeedEntries = Flags['FeedEntries'] = int(FeedEntries) if (FeedEntries or FeedEntries == 0) and FeedEntries != 'Default' else int(ReadConf(SiteConf, 'Feed', 'Entries')) if ReadConf(SiteConf, 'Feed', 'Entries') else 10
|
||||||
|
|
||||||
|
DynamicParts = Flags['DynamicParts'] = literal_eval(OptionChoose('{}', Args.DynamicParts, ReadConf(SiteConf, 'Site', 'DynamicParts')))
|
||||||
|
DynamicPartsText = Snippets['DynamicParts'] = LoadFromDir('DynamicParts', ['*.htm', '*.html'])
|
||||||
|
StaticPartsText = Snippets['StaticParts'] = LoadFromDir('StaticParts', ['*.htm', '*.html'])
|
||||||
|
TemplatesText = Snippets['Templates'] = LoadFromDir('Templates', ['*.htm', '*.html'])
|
||||||
|
|
||||||
MenuEntries = ReadConf(SiteConf, 'Menu')
|
MenuEntries = ReadConf(SiteConf, 'Menu')
|
||||||
if MenuEntries:
|
if MenuEntries:
|
||||||
ConfMenu = GetConfMenu(MenuEntries, MarkdownExts)
|
ConfMenu = GetConfMenu(MenuEntries, MarkdownExts)
|
||||||
|
@ -192,25 +198,11 @@ def Main(Args, FeedEntries):
|
||||||
print("[I] Generating HTML")
|
print("[I] Generating HTML")
|
||||||
Pages = MakeSite(
|
Pages = MakeSite(
|
||||||
Flags=Flags,
|
Flags=Flags,
|
||||||
OutputDir=OutDir,
|
|
||||||
LimitFiles=LimitFiles,
|
LimitFiles=LimitFiles,
|
||||||
TemplatesText=LoadFromDir('Templates', ['*.htm', '*.html']),
|
Snippets=Snippets,
|
||||||
StaticPartsText=LoadFromDir('StaticParts', ['*.htm', '*.html']),
|
|
||||||
DynamicParts=DynamicParts,
|
|
||||||
DynamicPartsText=LoadFromDir('DynamicParts', ['*.htm', '*.html']),
|
|
||||||
ConfMenu=ConfMenu,
|
ConfMenu=ConfMenu,
|
||||||
GlobalMacros=ReadConf(SiteConf, 'Macros'),
|
GlobalMacros=ReadConf(SiteConf, 'Macros'),
|
||||||
SiteName=SiteName,
|
Locale=Locale)
|
||||||
BlogName=BlogName,
|
|
||||||
SiteTagline=SiteTagline,
|
|
||||||
SiteTemplate=SiteTemplate,
|
|
||||||
SiteDomain=SiteDomain,
|
|
||||||
SiteRoot=SiteRoot,
|
|
||||||
FolderRoots=literal_eval(Args.FolderRoots) if Args.FolderRoots else {},
|
|
||||||
SiteLang=SiteLang,
|
|
||||||
Locale=Locale,
|
|
||||||
Sorting=SetSorting(Sorting),
|
|
||||||
MarkdownExts=MarkdownExts)
|
|
||||||
|
|
||||||
if FeedEntries != 0:
|
if FeedEntries != 0:
|
||||||
print("[I] Generating Feeds")
|
print("[I] Generating Feeds")
|
||||||
|
|
|
@ -0,0 +1,103 @@
|
||||||
|
""" ================================= |
|
||||||
|
| This file is part of |
|
||||||
|
| staticoso |
|
||||||
|
| Just a simple Static Site Generator |
|
||||||
|
| |
|
||||||
|
| Licensed under the AGPLv3 license |
|
||||||
|
| Copyright (C) 2022, OctoSpacc |
|
||||||
|
| ================================= """
|
||||||
|
|
||||||
|
from Modules.HTML import *
|
||||||
|
from Modules.Utils import *
|
||||||
|
|
||||||
|
HTMLSectionTitleLine = '<h{Index} class="SectionHeading"><span class="SectionLink"><a href="#{DashTitle}"><span>»</span></a> </span><span class="SectionTitle" id="{DashTitle}">{Title}</span></h{Index}>'
|
||||||
|
#PugSectionTitleLine = "{Line[:Index]}{Line[Index:Index+2]}.SectionHeading #[span.SectionLink #[a(href='#{DashTitle}') #[span »]] ]#[span#{DashTitle}.SectionTitle {Line[Index+2:]}]"
|
||||||
|
CategoryPageTemplate = """\
|
||||||
|
// Title: {Name}
|
||||||
|
// Type: Page
|
||||||
|
// Index: True
|
||||||
|
|
||||||
|
# {Name}
|
||||||
|
|
||||||
|
<div>[staticoso:Category:{Name}]</div>
|
||||||
|
"""
|
||||||
|
|
||||||
|
def DashifyTitle(Title, Done=[]):
|
||||||
|
return UndupeStr(DashifyStr(Title.lstrip(' ').rstrip(' ')), Done, '-')
|
||||||
|
|
||||||
|
def MakeLinkableTitle(Line, Title, DashTitle, Type):
|
||||||
|
if Type == 'md':
|
||||||
|
Index = Title.split(' ')[0].count('#')
|
||||||
|
return HTMLSectionTitleLine.format(
|
||||||
|
Index=Index,
|
||||||
|
DashTitle=DashTitle,
|
||||||
|
Title=Title[Index+1:])
|
||||||
|
elif Type == 'pug':
|
||||||
|
Index = Line.find('h')
|
||||||
|
return f"{Line[:Index]}{Line[Index:Index+2]}.SectionHeading #[span.SectionLink #[a(href='#{DashTitle}') #[span »]] ]#[span#{DashTitle}.SectionTitle {Line[Index+2:]}]"
|
||||||
|
|
||||||
|
def GetTitle(FileName, Meta, Titles, Prefer='MetaTitle', BlogName=None):
|
||||||
|
if Prefer == 'BodyTitle':
|
||||||
|
Title = Titles[0].lstrip('#') if Titles else Meta['Title'] if Meta['Title'] else FileName
|
||||||
|
elif Prefer == 'MetaTitle':
|
||||||
|
Title = Meta['Title'] if Meta['Title'] else Titles[0].lstrip('#') if Titles else FileName
|
||||||
|
elif Prefer == 'HTMLTitle':
|
||||||
|
Title = Meta['HTMLTitle'] if Meta['HTMLTitle'] else Meta['Title'] if Meta['Title'] else Titles[0].lstrip('#') if Titles else FileName
|
||||||
|
if BlogName and 'Blog' in Meta['Categories']:
|
||||||
|
Title += ' - ' + BlogName
|
||||||
|
return Title
|
||||||
|
|
||||||
|
def GetDescription(Meta, BodyDescription, Prefer='MetaDescription'):
|
||||||
|
if Prefer == 'BodyDescription':
|
||||||
|
Description = BodyDescription if BodyDescription else Meta['Description'] if Meta['Description'] else ''
|
||||||
|
elif Prefer == 'MetaDescription':
|
||||||
|
Description = Meta['Description'] if Meta['Description'] else BodyDescription if BodyDescription else ''
|
||||||
|
return Description
|
||||||
|
|
||||||
|
def GetImage(Meta, BodyImage, Prefer='MetaImage'):
|
||||||
|
if Prefer == 'BodyImage':
|
||||||
|
Image = BodyImage if BodyImage else Meta['Image'] if Meta['Image'] else ''
|
||||||
|
elif Prefer == 'MetaImage':
|
||||||
|
Image = Meta['Image'] if Meta['Image'] else BodyImage if BodyImage else ''
|
||||||
|
return Image
|
||||||
|
|
||||||
|
def MakeContentHeader(Meta, Locale, Categories=''):
|
||||||
|
Header = ''
|
||||||
|
for i in ['CreatedOn', 'EditedOn']:
|
||||||
|
if Meta[i]:
|
||||||
|
Header += f'{Locale[i]}: {Meta[i]}<br>'
|
||||||
|
if Categories:
|
||||||
|
Header += f"{Locale['Categories']}:{Categories.removesuffix(' ')}<br>"
|
||||||
|
return f'<p>{Header}</p>'
|
||||||
|
|
||||||
|
def MakeCategoryLine(File, Meta):
|
||||||
|
Categories = ''
|
||||||
|
if Meta['Categories']:
|
||||||
|
for Cat in Meta['Categories']:
|
||||||
|
Categories += f' <a href="{GetPathLevels(File)}Categories/{Cat}.html">{html.escape(Cat)}</a> '
|
||||||
|
return Categories
|
||||||
|
|
||||||
|
def MakeListTitle(File, Meta, Titles, Prefer, SiteRoot, BlogName, PathPrefix=''):
|
||||||
|
Title = GetTitle(File.split('/')[-1], Meta, Titles, Prefer, BlogName)
|
||||||
|
Link = False if Meta['Index'] == 'Unlinked' else True
|
||||||
|
if Link:
|
||||||
|
Title = '[{}]({})'.format(
|
||||||
|
Title,
|
||||||
|
'{}{}.html'.format(PathPrefix, StripExt(File)))
|
||||||
|
if Meta['Type'] == 'Post':
|
||||||
|
CreatedOn = Meta['CreatedOn'] if Meta['CreatedOn'] else '?'
|
||||||
|
Title = f"[{CreatedOn}] {Title}"
|
||||||
|
return Title
|
||||||
|
|
||||||
|
def FormatTitles(Titles, Flatten=False):
|
||||||
|
# TODO: Somehow titles written in Pug can end up here and don't work, they should be handled
|
||||||
|
HTMLTitles, DashyTitles = '', []
|
||||||
|
for t in Titles:
|
||||||
|
n = 0 if Flatten else t.split(' ')[0].count('#')
|
||||||
|
Title = MkSoup(t.lstrip('#')).get_text()
|
||||||
|
DashyTitle = DashifyTitle(Title, DashyTitles)
|
||||||
|
DashyTitles += [DashyTitle]
|
||||||
|
Start = '<ul><li>' * (n - 1)
|
||||||
|
End = '</li></ul>' * (n - 1)
|
||||||
|
HTMLTitles += f'<li>{Start}<a href="#{DashyTitle}">{html.escape(Title)}</a>{End}</li>'
|
||||||
|
return f'<ul>{HTMLTitles}</ul>'
|
|
@ -8,81 +8,15 @@
|
||||||
| ================================= """
|
| ================================= """
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from multiprocessing import Pool
|
from multiprocessing import Pool, cpu_count
|
||||||
from Libs.bs4 import BeautifulSoup
|
from Libs.bs4 import BeautifulSoup
|
||||||
from Modules.Config import *
|
from Modules.Config import *
|
||||||
|
from Modules.Elements import *
|
||||||
from Modules.HTML import *
|
from Modules.HTML import *
|
||||||
from Modules.Markdown import *
|
from Modules.Markdown import *
|
||||||
from Modules.Pug import *
|
from Modules.Pug import *
|
||||||
from Modules.Utils import *
|
from Modules.Utils import *
|
||||||
|
|
||||||
HTMLSectionTitleLine = '<h{Index} class="SectionHeading"><span class="SectionLink"><a href="#{DashTitle}"><span>»</span></a> </span><span class="SectionTitle" id="{DashTitle}">{Title}</span></h{Index}>'
|
|
||||||
#PugSectionTitleLine = "{Line[:Index]}{Line[Index:Index+2]}.SectionHeading #[span.SectionLink #[a(href='#{DashTitle}') #[span »]] ]#[span#{DashTitle}.SectionTitle {Line[Index+2:]}]"
|
|
||||||
CategoryPageTemplate = """\
|
|
||||||
// Title: {Name}
|
|
||||||
// Type: Page
|
|
||||||
// Index: True
|
|
||||||
|
|
||||||
# {Name}
|
|
||||||
|
|
||||||
<div>[staticoso:Category:{Name}]</div>
|
|
||||||
"""
|
|
||||||
|
|
||||||
def DashifyTitle(Title, Done=[]):
|
|
||||||
return UndupeStr(DashifyStr(Title.lstrip(' ').rstrip(' ')), Done, '-')
|
|
||||||
|
|
||||||
def MakeLinkableTitle(Line, Title, DashTitle, Type):
|
|
||||||
if Type == 'md':
|
|
||||||
Index = Title.split(' ')[0].count('#')
|
|
||||||
return HTMLSectionTitleLine.format(
|
|
||||||
Index=Index,
|
|
||||||
DashTitle=DashTitle,
|
|
||||||
Title=Title[Index+1:])
|
|
||||||
elif Type == 'pug':
|
|
||||||
Index = Line.find('h')
|
|
||||||
return f"{Line[:Index]}{Line[Index:Index+2]}.SectionHeading #[span.SectionLink #[a(href='#{DashTitle}') #[span »]] ]#[span#{DashTitle}.SectionTitle {Line[Index+2:]}]"
|
|
||||||
|
|
||||||
def GetTitle(FileName, Meta, Titles, Prefer='MetaTitle', BlogName=None):
|
|
||||||
if Prefer == 'BodyTitle':
|
|
||||||
Title = Titles[0].lstrip('#') if Titles else Meta['Title'] if Meta['Title'] else FileName
|
|
||||||
elif Prefer == 'MetaTitle':
|
|
||||||
Title = Meta['Title'] if Meta['Title'] else Titles[0].lstrip('#') if Titles else FileName
|
|
||||||
elif Prefer == 'HTMLTitle':
|
|
||||||
Title = Meta['HTMLTitle'] if Meta['HTMLTitle'] else Meta['Title'] if Meta['Title'] else Titles[0].lstrip('#') if Titles else FileName
|
|
||||||
if BlogName and 'Blog' in Meta['Categories']:
|
|
||||||
Title += ' - ' + BlogName
|
|
||||||
return Title
|
|
||||||
|
|
||||||
def GetDescription(Meta, BodyDescription, Prefer='MetaDescription'):
|
|
||||||
if Prefer == 'BodyDescription':
|
|
||||||
Description = BodyDescription if BodyDescription else Meta['Description'] if Meta['Description'] else ''
|
|
||||||
elif Prefer == 'MetaDescription':
|
|
||||||
Description = Meta['Description'] if Meta['Description'] else BodyDescription if BodyDescription else ''
|
|
||||||
return Description
|
|
||||||
|
|
||||||
def GetImage(Meta, BodyImage, Prefer='MetaImage'):
|
|
||||||
if Prefer == 'BodyImage':
|
|
||||||
Image = BodyImage if BodyImage else Meta['Image'] if Meta['Image'] else ''
|
|
||||||
elif Prefer == 'MetaImage':
|
|
||||||
Image = Meta['Image'] if Meta['Image'] else BodyImage if BodyImage else ''
|
|
||||||
return Image
|
|
||||||
|
|
||||||
def MakeContentHeader(Meta, Locale, Categories=''):
|
|
||||||
Header = ''
|
|
||||||
for i in ['CreatedOn', 'EditedOn']:
|
|
||||||
if Meta[i]:
|
|
||||||
Header += f'{Locale[i]}: {Meta[i]}<br>'
|
|
||||||
if Categories:
|
|
||||||
Header += f"{Locale['Categories']}:{Categories.removesuffix(' ')}<br>"
|
|
||||||
return f'<p>{Header}</p>'
|
|
||||||
|
|
||||||
def MakeCategoryLine(File, Meta):
|
|
||||||
Categories = ''
|
|
||||||
if Meta['Categories']:
|
|
||||||
for Cat in Meta['Categories']:
|
|
||||||
Categories += f' <a href="{GetPathLevels(File)}Categories/{Cat}.html">{html.escape(Cat)}</a> '
|
|
||||||
return Categories
|
|
||||||
|
|
||||||
def GetHTMLPagesList(Pages, BlogName, SiteRoot, PathPrefix, Unite=[], Type='Page', Category=None, For='Menu', MarkdownExts=(), MenuStyle='Default'):
|
def GetHTMLPagesList(Pages, BlogName, SiteRoot, PathPrefix, Unite=[], Type='Page', Category=None, For='Menu', MarkdownExts=(), MenuStyle='Default'):
|
||||||
ShowPaths, Flatten, SingleLine = True, False, False
|
ShowPaths, Flatten, SingleLine = True, False, False
|
||||||
if MenuStyle == 'Flat':
|
if MenuStyle == 'Flat':
|
||||||
|
@ -252,31 +186,6 @@ def PagePostprocessor(FileType, Text, Meta):
|
||||||
Text = ReplWithEsc(Text, f"[: {e} :]", f"[:{e}:]")
|
Text = ReplWithEsc(Text, f"[: {e} :]", f"[:{e}:]")
|
||||||
return Text
|
return Text
|
||||||
|
|
||||||
def MakeListTitle(File, Meta, Titles, Prefer, SiteRoot, BlogName, PathPrefix=''):
|
|
||||||
Title = GetTitle(File.split('/')[-1], Meta, Titles, Prefer, BlogName)
|
|
||||||
Link = False if Meta['Index'] == 'Unlinked' else True
|
|
||||||
if Link:
|
|
||||||
Title = '[{}]({})'.format(
|
|
||||||
Title,
|
|
||||||
'{}{}.html'.format(PathPrefix, StripExt(File)))
|
|
||||||
if Meta['Type'] == 'Post':
|
|
||||||
CreatedOn = Meta['CreatedOn'] if Meta['CreatedOn'] else '?'
|
|
||||||
Title = f"[{CreatedOn}] {Title}"
|
|
||||||
return Title
|
|
||||||
|
|
||||||
def FormatTitles(Titles, Flatten=False):
|
|
||||||
# TODO: Somehow titles written in Pug can end up here and don't work, they should be handled
|
|
||||||
HTMLTitles, DashyTitles = '', []
|
|
||||||
for t in Titles:
|
|
||||||
n = 0 if Flatten else t.split(' ')[0].count('#')
|
|
||||||
Title = MkSoup(t.lstrip('#')).get_text()
|
|
||||||
DashyTitle = DashifyTitle(Title, DashyTitles)
|
|
||||||
DashyTitles += [DashyTitle]
|
|
||||||
Start = '<ul><li>' * (n - 1)
|
|
||||||
End = '</li></ul>' * (n - 1)
|
|
||||||
HTMLTitles += f'<li>{Start}<a href="#{DashyTitle}">{html.escape(Title)}</a>{End}</li>'
|
|
||||||
return f'<ul>{HTMLTitles}</ul>'
|
|
||||||
|
|
||||||
def OrderPages(Old):
|
def OrderPages(Old):
|
||||||
New, NoOrder, Max = [], [], 0
|
New, NoOrder, Max = [], [], 0
|
||||||
for i,e in enumerate(Old):
|
for i,e in enumerate(Old):
|
||||||
|
@ -390,11 +299,98 @@ def PatchHTML(File, HTML, StaticPartsText, DynamicParts, DynamicPartsText, HTMLP
|
||||||
|
|
||||||
return HTML, ContentHTML, Description, Image
|
return HTML, ContentHTML, Description, Image
|
||||||
|
|
||||||
def MakeSite(Flags, OutputDir, LimitFiles, TemplatesText, StaticPartsText, DynamicParts, DynamicPartsText, ConfMenu, GlobalMacros, SiteName, BlogName, SiteTagline, SiteTemplate, SiteDomain, SiteRoot, FolderRoots, SiteLang, Locale, Sorting, MarkdownExts):
|
def HandlePage(Flags, Page, Pages, Categories, LimitFiles, Snippets, ConfMenu, Locale):
|
||||||
PagesPaths, PostsPaths, Pages, MadePages, Categories = [], [], [], [], {}
|
File, Content, Titles, Meta = Page
|
||||||
|
OutDir, MarkdownExts, Sorting, MinifyKeepComments = Flags['OutDir'], Flags['MarkdownExts'], Flags['Sorting'], Flags['MinifyKeepComments']
|
||||||
|
SiteName, BlogName, SiteTagline = Flags['SiteName'], Flags['BlogName'], Flags['SiteTagline']
|
||||||
|
SiteTemplate, SiteLang = Flags['SiteTemplate'], Flags['SiteLang']
|
||||||
|
SiteDomain, SiteRoot, FolderRoots = Flags['SiteDomain'], Flags['SiteRoot'], Flags['FolderRoots']
|
||||||
AutoCategories, CategoryUncategorized = Flags['CategoriesAutomatic'], Flags['CategoriesUncategorized']
|
AutoCategories, CategoryUncategorized = Flags['CategoriesAutomatic'], Flags['CategoriesUncategorized']
|
||||||
ImgAltToTitle, ImgTitleToAlt = Flags['ImgAltToTitle'], Flags['ImgTitleToAlt']
|
ImgAltToTitle, ImgTitleToAlt = Flags['ImgAltToTitle'], Flags['ImgTitleToAlt']
|
||||||
MinifyKeepComments = Flags['MinifyKeepComments']
|
DynamicParts, DynamicPartsText, StaticPartsText, TemplatesText = Flags['DynamicParts'], Snippets['DynamicParts'], Snippets['StaticParts'], Snippets['Templates']
|
||||||
|
|
||||||
|
FileLower = File.lower()
|
||||||
|
PagePath = f"{OutDir}/{StripExt(File)}.html"
|
||||||
|
LightRun = False if LimitFiles == False or File in LimitFiles else True
|
||||||
|
|
||||||
|
if FileLower.endswith(FileExtensions['Markdown']):
|
||||||
|
Content = markdown(PagePostprocessor('md', Content, Meta), extensions=MarkdownExts)
|
||||||
|
elif FileLower.endswith(('.pug')):
|
||||||
|
Content = PagePostprocessor('pug', ReadFile(PagePath), Meta)
|
||||||
|
elif FileLower.endswith(('.txt')):
|
||||||
|
Content = '<pre>' + html.escape(Content) + '</pre>'
|
||||||
|
elif FileLower.endswith(FileExtensions['HTML']):
|
||||||
|
Content = ReadFile(PagePath)
|
||||||
|
|
||||||
|
if LightRun:
|
||||||
|
HTMLPagesList = None
|
||||||
|
else:
|
||||||
|
TemplateMeta = TemplatePreprocessor(TemplatesText[Meta['Template']])
|
||||||
|
HTMLPagesList = GetHTMLPagesList(
|
||||||
|
Pages=Pages,
|
||||||
|
BlogName=BlogName,
|
||||||
|
SiteRoot=SiteRoot,
|
||||||
|
PathPrefix=GetPathLevels(File),
|
||||||
|
Unite=ConfMenu,
|
||||||
|
Type='Page',
|
||||||
|
For='Menu',
|
||||||
|
MarkdownExts=MarkdownExts,
|
||||||
|
MenuStyle=TemplateMeta['MenuStyle'])
|
||||||
|
|
||||||
|
HTML, ContentHTML, Description, Image = PatchHTML(
|
||||||
|
File=File,
|
||||||
|
HTML=TemplatesText[Meta['Template']],
|
||||||
|
StaticPartsText=StaticPartsText,
|
||||||
|
DynamicParts=DynamicParts,
|
||||||
|
DynamicPartsText=DynamicPartsText,
|
||||||
|
HTMLPagesList=HTMLPagesList,
|
||||||
|
PagePath=PagePath[len(f"{OutDir}/"):],
|
||||||
|
Content=Content,
|
||||||
|
Titles=Titles,
|
||||||
|
Meta=Meta,
|
||||||
|
SiteRoot=SiteRoot,
|
||||||
|
SiteName=SiteName,
|
||||||
|
BlogName=BlogName,
|
||||||
|
FolderRoots=FolderRoots,
|
||||||
|
Categories=Categories,
|
||||||
|
SiteLang=SiteLang,
|
||||||
|
Locale=Locale,
|
||||||
|
LightRun=LightRun)
|
||||||
|
|
||||||
|
if Flags['Minify']:
|
||||||
|
if not LightRun:
|
||||||
|
HTML = DoMinifyHTML(HTML, MinifyKeepComments)
|
||||||
|
ContentHTML = DoMinifyHTML(ContentHTML, MinifyKeepComments)
|
||||||
|
if Flags['NoScripts']:
|
||||||
|
if not LightRun:
|
||||||
|
HTML = StripTags(HTML, ['script'])
|
||||||
|
ContentHTML = StripTags(ContentHTML, ['script'])
|
||||||
|
if ImgAltToTitle or ImgTitleToAlt:
|
||||||
|
if not LightRun:
|
||||||
|
HTML = WriteImgAltAndTitle(HTML, ImgAltToTitle, ImgTitleToAlt)
|
||||||
|
ContentHTML = WriteImgAltAndTitle(ContentHTML, ImgAltToTitle, ImgTitleToAlt)
|
||||||
|
|
||||||
|
if LightRun:
|
||||||
|
SlimHTML = None
|
||||||
|
else:
|
||||||
|
SlimHTML = HTMLPagesList + ContentHTML
|
||||||
|
if not LightRun:
|
||||||
|
WriteFile(PagePath, HTML)
|
||||||
|
|
||||||
|
return [File, Content, Titles, Meta, ContentHTML, SlimHTML, Description, Image]
|
||||||
|
|
||||||
|
#def MultiprocHandlePage(Data):
|
||||||
|
# pass
|
||||||
|
|
||||||
|
def MakeSite(Flags, LimitFiles, Snippets, ConfMenu, GlobalMacros, Locale):
|
||||||
|
PagesPaths, PostsPaths, Pages, MadePages, MultiprocPages, Categories = [], [], [], [], [], {}
|
||||||
|
OutDir, MarkdownExts, Sorting, MinifyKeepComments = Flags['OutDir'], Flags['MarkdownExts'], Flags['Sorting'], Flags['MinifyKeepComments']
|
||||||
|
SiteName, BlogName, SiteTagline = Flags['SiteName'], Flags['BlogName'], Flags['SiteTagline']
|
||||||
|
SiteTemplate, SiteLang = Flags['SiteTemplate'], Flags['SiteLang']
|
||||||
|
SiteDomain, SiteRoot, FolderRoots = Flags['SiteDomain'], Flags['SiteRoot'], Flags['FolderRoots']
|
||||||
|
AutoCategories, CategoryUncategorized = Flags['CategoriesAutomatic'], Flags['CategoriesUncategorized']
|
||||||
|
ImgAltToTitle, ImgTitleToAlt = Flags['ImgAltToTitle'], Flags['ImgTitleToAlt']
|
||||||
|
DynamicParts, DynamicPartsText, StaticPartsText, TemplatesText = Flags['DynamicParts'], Snippets['DynamicParts'], Snippets['StaticParts'], Snippets['Templates']
|
||||||
|
|
||||||
for Ext in FileExtensions['Pages']:
|
for Ext in FileExtensions['Pages']:
|
||||||
for File in Path('Pages').rglob(f"*.{Ext}"):
|
for File in Path('Pages').rglob(f"*.{Ext}"):
|
||||||
|
@ -424,7 +420,7 @@ def MakeSite(Flags, OutputDir, LimitFiles, TemplatesText, StaticPartsText, Dynam
|
||||||
Pages += [[TempPath, Content, Titles, Meta]]
|
Pages += [[TempPath, Content, Titles, Meta]]
|
||||||
for Cat in Meta['Categories']:
|
for Cat in Meta['Categories']:
|
||||||
Categories.update({Cat:''})
|
Categories.update({Cat:''})
|
||||||
PugCompileList(OutputDir, Pages, LimitFiles)
|
PugCompileList(OutDir, Pages, LimitFiles)
|
||||||
|
|
||||||
if Categories:
|
if Categories:
|
||||||
print("[I] Generating Category Lists")
|
print("[I] Generating Category Lists")
|
||||||
|
@ -442,7 +438,7 @@ def MakeSite(Flags, OutputDir, LimitFiles, TemplatesText, StaticPartsText, Dynam
|
||||||
MenuStyle='Flat')
|
MenuStyle='Flat')
|
||||||
|
|
||||||
if AutoCategories:
|
if AutoCategories:
|
||||||
Dir = f"{OutputDir}/Categories"
|
Dir = f"{OutDir}/Categories"
|
||||||
for Cat in Categories:
|
for Cat in Categories:
|
||||||
Exists = False
|
Exists = False
|
||||||
for File in Path(Dir).rglob(str(Cat)+'.*'):
|
for File in Path(Dir).rglob(str(Cat)+'.*'):
|
||||||
|
@ -450,7 +446,7 @@ def MakeSite(Flags, OutputDir, LimitFiles, TemplatesText, StaticPartsText, Dynam
|
||||||
break
|
break
|
||||||
if not Exists:
|
if not Exists:
|
||||||
File = f"Categories/{Cat}.md"
|
File = f"Categories/{Cat}.md"
|
||||||
FilePath = f"{OutputDir}/{File}"
|
FilePath = f"{OutDir}/{File}"
|
||||||
WriteFile(FilePath, CategoryPageTemplate.format(Title=Cat))
|
WriteFile(FilePath, CategoryPageTemplate.format(Title=Cat))
|
||||||
Content, Titles, Meta = PagePreprocessor(FilePath, 'Page', SiteTemplate, SiteRoot, GlobalMacros, CategoryUncategorized, LightRun=LightRun)
|
Content, Titles, Meta = PagePreprocessor(FilePath, 'Page', SiteTemplate, SiteRoot, GlobalMacros, CategoryUncategorized, LightRun=LightRun)
|
||||||
Pages += [[File, Content, Titles, Meta]]
|
Pages += [[File, Content, Titles, Meta]]
|
||||||
|
@ -462,75 +458,11 @@ def MakeSite(Flags, OutputDir, LimitFiles, TemplatesText, StaticPartsText, Dynam
|
||||||
ConfMenu[i] = None
|
ConfMenu[i] = None
|
||||||
|
|
||||||
print("[I] Writing Pages")
|
print("[I] Writing Pages")
|
||||||
for File, Content, Titles, Meta in Pages:
|
for Page in Pages:
|
||||||
#print(f'-> {File}')
|
#print(f'-> {File}')
|
||||||
LightRun = False if LimitFiles == False or File in LimitFiles else True
|
MadePages += [HandlePage(Flags, Page, Pages, Categories, LimitFiles, Snippets, ConfMenu, Locale)]
|
||||||
PagePath = f"{OutputDir}/{StripExt(File)}.html"
|
#MultiprocPages += [{'Flags':Flags, 'Page':Page, 'Pages':Pages, 'Categories':Categories, 'LimitFiles':LimitFiles, 'Snippets':Snippets, 'ConfMenu':ConfMenu, 'Locale':Locale}]
|
||||||
|
#with Pool(cpu_count()) as MultiprocPool:
|
||||||
if File.lower().endswith(FileExtensions['Markdown']):
|
#MadePages = MultiprocPool.map(HandlePage, MultiprocPages)
|
||||||
Content = markdown(PagePostprocessor('md', Content, Meta), extensions=MarkdownExts)
|
|
||||||
elif File.lower().endswith(('.pug')):
|
|
||||||
Content = PagePostprocessor('pug', ReadFile(PagePath), Meta)
|
|
||||||
elif File.lower().endswith(('.txt')):
|
|
||||||
Content = '<pre>' + html.escape(Content) + '</pre>'
|
|
||||||
elif File.lower().endswith(FileExtensions['HTML']):
|
|
||||||
Content = ReadFile(PagePath)
|
|
||||||
|
|
||||||
if LightRun:
|
|
||||||
HTMLPagesList = None
|
|
||||||
else:
|
|
||||||
TemplateMeta = TemplatePreprocessor(TemplatesText[Meta['Template']])
|
|
||||||
HTMLPagesList = GetHTMLPagesList(
|
|
||||||
Pages=Pages,
|
|
||||||
BlogName=BlogName,
|
|
||||||
SiteRoot=SiteRoot,
|
|
||||||
PathPrefix=GetPathLevels(File),
|
|
||||||
Unite=ConfMenu,
|
|
||||||
Type='Page',
|
|
||||||
For='Menu',
|
|
||||||
MarkdownExts=MarkdownExts,
|
|
||||||
MenuStyle=TemplateMeta['MenuStyle'])
|
|
||||||
|
|
||||||
HTML, ContentHTML, Description, Image = PatchHTML(
|
|
||||||
File=File,
|
|
||||||
HTML=TemplatesText[Meta['Template']],
|
|
||||||
StaticPartsText=StaticPartsText,
|
|
||||||
DynamicParts=DynamicParts,
|
|
||||||
DynamicPartsText=DynamicPartsText,
|
|
||||||
HTMLPagesList=HTMLPagesList,
|
|
||||||
PagePath=PagePath[len(f"{OutputDir}/"):],
|
|
||||||
Content=Content,
|
|
||||||
Titles=Titles,
|
|
||||||
Meta=Meta,
|
|
||||||
SiteRoot=SiteRoot,
|
|
||||||
SiteName=SiteName,
|
|
||||||
BlogName=BlogName,
|
|
||||||
FolderRoots=FolderRoots,
|
|
||||||
Categories=Categories,
|
|
||||||
SiteLang=SiteLang,
|
|
||||||
Locale=Locale,
|
|
||||||
LightRun=LightRun)
|
|
||||||
|
|
||||||
if Flags['Minify']:
|
|
||||||
if not LightRun:
|
|
||||||
HTML = DoMinifyHTML(HTML, MinifyKeepComments)
|
|
||||||
ContentHTML = DoMinifyHTML(ContentHTML, MinifyKeepComments)
|
|
||||||
if Flags['NoScripts']:
|
|
||||||
if not LightRun:
|
|
||||||
HTML = StripTags(HTML, ['script'])
|
|
||||||
ContentHTML = StripTags(ContentHTML, ['script'])
|
|
||||||
if ImgAltToTitle or ImgTitleToAlt:
|
|
||||||
if not LightRun:
|
|
||||||
HTML = WriteImgAltAndTitle(HTML, ImgAltToTitle, ImgTitleToAlt)
|
|
||||||
ContentHTML = WriteImgAltAndTitle(ContentHTML, ImgAltToTitle, ImgTitleToAlt)
|
|
||||||
|
|
||||||
if LightRun:
|
|
||||||
SlimHTML = None
|
|
||||||
else:
|
|
||||||
SlimHTML = HTMLPagesList + ContentHTML
|
|
||||||
if not LightRun:
|
|
||||||
WriteFile(PagePath, HTML)
|
|
||||||
|
|
||||||
MadePages += [[File, Content, Titles, Meta, ContentHTML, SlimHTML, Description, Image]]
|
|
||||||
|
|
||||||
return MadePages
|
return MadePages
|
||||||
|
|
Loading…
Reference in New Issue