Add support for website tree in left bar

This commit is contained in:
Octo Andri 2022-05-23 20:36:50 +00:00
parent 5a71f9f306
commit e62e83717b
2 changed files with 66 additions and 15 deletions

View File

@ -15,13 +15,13 @@ Feel free to experiment with all of this stuff!
- [pug-cli >= 1.0.0-alpha6](https://npmjs.com/package/pug-cli) - [pug-cli >= 1.0.0-alpha6](https://npmjs.com/package/pug-cli)
## Features roadmap ## Features roadmap
- [] SCSS compilation support for CSS templates - [ ] SCSS compilation support for CSS templates
- [] Pug support for base templates and page side parts - [ ] Pug support for base templates and page side parts
- [] Differential recompile (to optimize resource waste on non-ephemeral servers) - [ ] Differential recompile (to optimize resource waste on non-ephemeral servers)
- [] Hot-recompile (for website development) - [ ] Hot-recompile (for website development)
- [] XML sitemap generation - [ ] XML sitemap generation
- [] RSS feed generation - [ ] RSS feed generation
- [] Generation of website page tree in left sidebar - [x] Generation of website page tree in left sidebar
- [x] Generation of titles in right sidebar with clickable links - [x] Generation of titles in right sidebar with clickable links
- [x] Detections of titles in a page - [x] Detections of titles in a page
- [x] Pug support for pages - [x] Pug support for pages

View File

@ -73,7 +73,8 @@ def PreProcessor(p):
Content, Titles, Meta = '', [], { Content, Titles, Meta = '', [], {
'Template': 'Standard.html', 'Template': 'Standard.html',
'Style': '', 'Style': '',
'Index': 'True'} 'Index': 'True',
'Title': ''}
for l in File.splitlines(): for l in File.splitlines():
ls = l.lstrip() ls = l.lstrip()
if p.endswith('.pug'): if p.endswith('.pug'):
@ -86,6 +87,8 @@ def PreProcessor(p):
Meta['Style'] += ls[len('// Style: '):] + ' ' Meta['Style'] += ls[len('// Style: '):] + ' '
elif ls.startswith('// Index: '): elif ls.startswith('// Index: '):
Meta['Index'] += ls[len('// Index: '):] + ' ' Meta['Index'] += ls[len('// Index: '):] + ' '
elif ls.startswith('// Title: '):
Meta['Title'] += ls[len('// Title: '):] + ' '
elif ls.startswith(('h1', 'h2', 'h3', 'h4', 'h5', 'h6')): elif ls.startswith(('h1', 'h2', 'h3', 'h4', 'h5', 'h6')):
if ls[2:].startswith(("(class='NoTitle", '(class="NoTitle')): if ls[2:].startswith(("(class='NoTitle", '(class="NoTitle')):
Content += l + '\n' Content += l + '\n'
@ -110,6 +113,10 @@ def PreProcessor(p):
Meta['Style'] += "#MainBox{Background:" + ls[len('% Background: '):] + ";} " Meta['Style'] += "#MainBox{Background:" + ls[len('% Background: '):] + ";} "
elif ls.startswith('% Style: '): elif ls.startswith('% Style: '):
Meta['Style'] += ls[len('% Style: '):] + ' ' Meta['Style'] += ls[len('% Style: '):] + ' '
elif ls.startswith('% Index: '):
Meta['Index'] += ls[len('% Index: '):] + ' '
elif ls.startswith('% Title: '):
Meta['Title'] += ls[len('% Title: '):] + ' '
else: else:
Content += l + '\n' Content += l + '\n'
Heading = ls.split(' ')[0].count('#') Heading = ls.split(' ')[0].count('#')
@ -126,12 +133,12 @@ def PugCompileList(Pages):
# Pug-cli seems to shit itself with folder paths as input, so we pass ALL the files as arguments # Pug-cli seems to shit itself with folder paths as input, so we pass ALL the files as arguments
os.system('pug {} > /dev/null'.format(Paths)) os.system('pug {} > /dev/null'.format(Paths))
def PatchHTML(Template, Parts, Content, Titles, Meta): def PatchHTML(Template, Parts, HTMLPagesList, Content, Titles, Meta):
HTMLTitles = FormatTitles(Titles) HTMLTitles = FormatTitles(Titles)
Template = Template.replace('[HTML:Page:Title]', 'Untitled' if not Titles else Titles[0].lstrip('#')) Template = Template.replace('[HTML:Page:Title]', 'Untitled' if not Titles else Titles[0].lstrip('#'))
Template = Template.replace('[HTML:Page:Style]', Meta['Style']) Template = Template.replace('[HTML:Page:Style]', Meta['Style'])
#Template = Template.replace('[HTML:Page:LeftBox]', HTMLSiteTree) Template = Template.replace('[HTML:Page:LeftBox]', HTMLPagesList)
Template = Template.replace('[HTML:Page:RightBox]', HTMLTitles) Template = Template.replace('[HTML:Page:RightBox]', HTMLTitles)
Template = Template.replace('[HTML:Page:MainBox]', Content) Template = Template.replace('[HTML:Page:MainBox]', Content)
@ -139,6 +146,48 @@ def PatchHTML(Template, Parts, Content, Titles, Meta):
Template = Template.replace('[HTML:Part:{}]'.format(p), Parts[p]) Template = Template.replace('[HTML:Part:{}]'.format(p), Parts[p])
return Template return Template
def FileToStr(File, Truncate=''):
return str(File)[len(Truncate):]
def GetHTMLPagesList(Pages):
List = ''
LastParent = []
for File, Content, Titles, Meta in Pages:
if Meta['Index'] == 'True' and Titles:
n = File.count('/') + 1
if n > 1:
CurParent = File.split('/')[:-1]
for i,s in enumerate(CurParent):
if LastParent != CurParent:
LastParent = CurParent
Levels = '- ' * (n-1+i)
Title = CurParent[n-2+i]
List += Levels + Title + '\n'
Levels = '- ' * n
Title = Meta['Title'] if Meta['Title'] else 'Untitled' if not Titles else Titles[0].lstrip('#')
Title = '[{}]({})'.format(
Title,
'/{}.html'.format(File.rstrip('.pug')))
List += Levels + Title + '\n'
return Markdown().convert(List)
"""
for t in Titles:
n = t.split(' ')[0].count('#')
Heading = '- ' * n
Title = t.lstrip('#')
Title = '[{}](#{})'.format(Title, DashifyStr(Title))
MDTitles += Heading + Title + '\n'
Pages = ''
for File in Path('Pages').rglob('*.pug'):
File = FileToStr(File, 'Pages/')
Content = ReadFile(File)
for File in Path('Pages').rglob('*.md'):
File = FileToStr(File, 'Pages/')
Content = ReadFile(File)
return Pages
"""
def DelTmp(): def DelTmp():
for File in Path('public').rglob('*.pug'): for File in Path('public').rglob('*.pug'):
os.remove(File) os.remove(File)
@ -148,10 +197,11 @@ def DelTmp():
def MakeSite(Templates, Parts): def MakeSite(Templates, Parts):
Pages = [] Pages = []
for File in Path('Pages').rglob('*.pug'): for File in Path('Pages').rglob('*.pug'):
File = str(File)[len('Pages/'):] File = FileToStr(File, 'Pages/')
Content, Titles, Meta = PreProcessor('Pages/{}'.format(File)) Content, Titles, Meta = PreProcessor('Pages/{}'.format(File))
Pages += [[File, Content, Titles, Meta]] Pages += [[File, Content, Titles, Meta]]
PugCompileList(Pages) PugCompileList(Pages)
HTMLPagesList = GetHTMLPagesList(Pages)
for File, Content, Titles, Meta in Pages: for File, Content, Titles, Meta in Pages:
Template = Templates[Meta['Template']] Template = Templates[Meta['Template']]
Template = Template.replace( Template = Template.replace(
@ -160,11 +210,11 @@ def MakeSite(Templates, Parts):
WriteFile( WriteFile(
'public/{}.html'.format(File.rstrip('.pug')), 'public/{}.html'.format(File.rstrip('.pug')),
PatchHTML( PatchHTML(
Template, Parts, Template, Parts, HTMLPagesList,
ReadFile('public/{}.html'.format(File.rstrip('.pug'))), ReadFile('public/{}.html'.format(File.rstrip('.pug'))),
Titles, Meta)) Titles, Meta))
for File in Path('Pages').rglob('*.md'): for File in Path('Pages').rglob('*.md'):
File = str(File)[len('Pages/'):] File = FileToStr(File, 'Pages/')
Content, Titles, Meta = PreProcessor('Pages/{}'.format(File)) Content, Titles, Meta = PreProcessor('Pages/{}'.format(File))
Template = Templates[Meta['Template']] Template = Templates[Meta['Template']]
Template = Template.replace( Template = Template.replace(
@ -173,7 +223,7 @@ def MakeSite(Templates, Parts):
WriteFile( WriteFile(
'public/{}.html'.format(File.rstrip('.md')), 'public/{}.html'.format(File.rstrip('.md')),
PatchHTML( PatchHTML(
Template, Parts, Template, Parts, HTMLPagesList,
Markdown().convert(Content), Markdown().convert(Content),
Titles, Meta)) Titles, Meta))
DelTmp() DelTmp()
@ -182,8 +232,9 @@ def Main():
ResetPublic() ResetPublic()
Templates = LoadFromDir('Templates') Templates = LoadFromDir('Templates')
Parts = LoadFromDir('Parts') Parts = LoadFromDir('Parts')
#HTMLPages = SearchIndexedPages()
shutil.copytree('Pages', 'public') shutil.copytree('Pages', 'public')
MakeSite(Templates, Parts) MakeSite(Templates, Parts) #, HTMLPages)
os.system("cp -R Assets/* public/") os.system("cp -R Assets/* public/")
if __name__ == '__main__': if __name__ == '__main__':