Change handling of extension stripping

This commit is contained in:
octospacc 2022-05-27 11:11:33 +02:00
parent 3fff1e9442
commit afb1289e1e
1 changed files with 8 additions and 8 deletions

View File

@ -62,9 +62,9 @@ def FormatTitles(Titles):
MDTitles += Heading + Title + '\n' MDTitles += Heading + Title + '\n'
return Markdown().convert(MDTitles) return Markdown().convert(MDTitles)
def LoadFromDir(Dir): def LoadFromDir(Dir, Rglob):
Contents = {} Contents = {}
for File in Path(Dir).rglob('*.html'): for File in Path(Dir).rglob(Rglob):
File = str(File)[len(Dir)+1:] File = str(File)[len(Dir)+1:]
Contents.update({File: ReadFile('{}/{}'.format(Dir, File))}) Contents.update({File: ReadFile('{}/{}'.format(Dir, File))})
return Contents return Contents
@ -166,7 +166,7 @@ def GetHTMLPagesList(Pages, Root):
Title = Meta['Title'] if Meta['Title'] else 'Untitled' if not Titles else Titles[0].lstrip('#') Title = Meta['Title'] if Meta['Title'] else 'Untitled' if not Titles else Titles[0].lstrip('#')
Title = '[{}]({})'.format( Title = '[{}]({})'.format(
Title, Title,
'{}{}.html'.format(Root, File.rstrip('.pug'))) '{}{}html'.format(Root, File[:-3]))
List += Levels + Title + '\n' List += Levels + Title + '\n'
return Markdown().convert(List) return Markdown().convert(List)
@ -190,10 +190,10 @@ def MakeSite(Templates, Parts, Root):
'[HTML:Page:CSS]', '[HTML:Page:CSS]',
'{}{}.css'.format('../'*File.count('/'), Meta['Template'][:-5])) '{}{}.css'.format('../'*File.count('/'), Meta['Template'][:-5]))
WriteFile( WriteFile(
'public/{}.html'.format(File.rstrip('.pug')), 'public/{}html'.format(File[:-3]),
PatchHTML( PatchHTML(
Template, Parts, HTMLPagesList, Template, Parts, HTMLPagesList,
ReadFile('public/{}.html'.format(File.rstrip('.pug'))), ReadFile('public/{}html'.format(File[:-3])),
Titles, Meta)) Titles, Meta))
for File in Path('Pages').rglob('*.md'): for File in Path('Pages').rglob('*.md'):
File = FileToStr(File, 'Pages/') File = FileToStr(File, 'Pages/')
@ -203,7 +203,7 @@ def MakeSite(Templates, Parts, Root):
'[HTML:Page:CSS]', '[HTML:Page:CSS]',
'{}{}.css'.format('../'*File.count('/'), Meta['Template'][:-5])) '{}{}.css'.format('../'*File.count('/'), Meta['Template'][:-5]))
WriteFile( WriteFile(
'public/{}.html'.format(File.rstrip('.md')), 'public/{}html'.format(File[:-2]),
PatchHTML( PatchHTML(
Template, Parts, HTMLPagesList, Template, Parts, HTMLPagesList,
Markdown().convert(Content), Markdown().convert(Content),
@ -214,8 +214,8 @@ def Main(Args):
ResetPublic() ResetPublic()
Root = Args.Root if Args.Root else '/' Root = Args.Root if Args.Root else '/'
Templates = LoadFromDir('Templates') Templates = LoadFromDir('Templates', '*.html')
Parts = LoadFromDir('Parts') Parts = LoadFromDir('Parts', '*.html')
shutil.copytree('Pages', 'public') shutil.copytree('Pages', 'public')
MakeSite(Templates, Parts, Root) MakeSite(Templates, Parts, Root)
os.system("cp -R Assets/* public/") os.system("cp -R Assets/* public/")