mirror of https://gitlab.com/octtspacc/staticoso
Fix for path-based absolute root
This commit is contained in:
parent
ef25d13441
commit
657b3f8504
|
@ -186,7 +186,7 @@ def MakeContentHeader(Meta):
|
||||||
Header += "Modificato in data {} \n".format(Meta['EditedOn'])
|
Header += "Modificato in data {} \n".format(Meta['EditedOn'])
|
||||||
return Markdown().convert(Header)
|
return Markdown().convert(Header)
|
||||||
|
|
||||||
def PatchHTML(Template, PartsText, ContextParts, ContextPartsText, HTMLPagesList, PagePath, Content, Titles, Meta, SiteRoot, Categories):
|
def PatchHTML(Template, PartsText, ContextParts, ContextPartsText, HTMLPagesList, PagePath, Content, Titles, Meta, SiteRoot, FolderRoots, Categories):
|
||||||
HTMLTitles = FormatTitles(Titles)
|
HTMLTitles = FormatTitles(Titles)
|
||||||
for Line in Template.splitlines():
|
for Line in Template.splitlines():
|
||||||
Line = Line.lstrip().rstrip()
|
Line = Line.lstrip().rstrip()
|
||||||
|
@ -215,6 +215,8 @@ def PatchHTML(Template, PartsText, ContextParts, ContextPartsText, HTMLPagesList
|
||||||
Template = Template.replace('[HTML:Page:Content]', Content)
|
Template = Template.replace('[HTML:Page:Content]', Content)
|
||||||
Template = Template.replace('[HTML:Page:ContentHeader]', MakeContentHeader(Meta))
|
Template = Template.replace('[HTML:Page:ContentHeader]', MakeContentHeader(Meta))
|
||||||
Template = Template.replace('[HTML:Site:AbsoluteRoot]', SiteRoot)
|
Template = Template.replace('[HTML:Site:AbsoluteRoot]', SiteRoot)
|
||||||
|
for i in FolderRoots:
|
||||||
|
Template = Template.replace('[HTML:Folder:{}:AbsoluteRoot]'.format(i), FolderRoots[i])
|
||||||
for i in Categories:
|
for i in Categories:
|
||||||
Template = Template.replace('<span>[HTML:Category:{}]</span>'.format(i), Categories[i])
|
Template = Template.replace('<span>[HTML:Category:{}]</span>'.format(i), Categories[i])
|
||||||
return Template
|
return Template
|
||||||
|
@ -280,11 +282,10 @@ def DelTmp():
|
||||||
for File in Path('public').rglob('*.md'):
|
for File in Path('public').rglob('*.md'):
|
||||||
os.remove(File)
|
os.remove(File)
|
||||||
|
|
||||||
def MakeSite(TemplatesText, PartsText, ContextParts, ContextPartsText, SiteRoot):
|
def MakeSite(TemplatesText, PartsText, ContextParts, ContextPartsText, SiteRoot, FolderRoots):
|
||||||
Files = []
|
Files = []
|
||||||
Pages = []
|
Pages = []
|
||||||
Categories = {}
|
Categories = {}
|
||||||
# 'Blog': ''}
|
|
||||||
for File in Path('Pages').rglob('*.pug'):
|
for File in Path('Pages').rglob('*.pug'):
|
||||||
Files += [FileToStr(File, 'Pages/')]
|
Files += [FileToStr(File, 'Pages/')]
|
||||||
for File in Path('Pages').rglob('*.md'):
|
for File in Path('Pages').rglob('*.md'):
|
||||||
|
@ -298,7 +299,6 @@ def MakeSite(TemplatesText, PartsText, ContextParts, ContextPartsText, SiteRoot)
|
||||||
Categories.update({Category:''})
|
Categories.update({Category:''})
|
||||||
PugCompileList(Pages)
|
PugCompileList(Pages)
|
||||||
HTMLPagesList = GetHTMLPagesList(Pages, SiteRoot, 'Page')
|
HTMLPagesList = GetHTMLPagesList(Pages, SiteRoot, 'Page')
|
||||||
#Categories['Blog'] = GetHTMLPagesList(Pages, SiteRoot, 'Post', 'Blog')
|
|
||||||
for Category in Categories:
|
for Category in Categories:
|
||||||
Categories[Category] = GetHTMLPagesList(Pages, SiteRoot, 'Post', Category)
|
Categories[Category] = GetHTMLPagesList(Pages, SiteRoot, 'Post', Category)
|
||||||
for File, Content, Titles, Meta in Pages:
|
for File, Content, Titles, Meta in Pages:
|
||||||
|
@ -318,7 +318,7 @@ def MakeSite(TemplatesText, PartsText, ContextParts, ContextPartsText, SiteRoot)
|
||||||
PagePath,
|
PagePath,
|
||||||
PatchHTML(
|
PatchHTML(
|
||||||
Template, PartsText, ContextParts, ContextPartsText, HTMLPagesList,
|
Template, PartsText, ContextParts, ContextPartsText, HTMLPagesList,
|
||||||
PagePath[len('public/'):], Content, Titles, Meta, SiteRoot, Categories))
|
PagePath[len('public/'):], Content, Titles, Meta, SiteRoot, FolderRoots, Categories))
|
||||||
DelTmp()
|
DelTmp()
|
||||||
|
|
||||||
def Main(Args):
|
def Main(Args):
|
||||||
|
@ -329,12 +329,14 @@ def Main(Args):
|
||||||
LoadFromDir('Parts', '*.html'),
|
LoadFromDir('Parts', '*.html'),
|
||||||
literal_eval(Args.ContextParts) if Args.ContextParts else {},
|
literal_eval(Args.ContextParts) if Args.ContextParts else {},
|
||||||
LoadFromDir('ContextParts', '*.html'),
|
LoadFromDir('ContextParts', '*.html'),
|
||||||
Args.SiteRoot if Args.SiteRoot else '/')
|
Args.SiteRoot if Args.SiteRoot else '/',
|
||||||
|
literal_eval(Args.FolderRoots) if Args.FolderRoots else {})
|
||||||
os.system("cp -R Assets/* public/")
|
os.system("cp -R Assets/* public/")
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
Parser = argparse.ArgumentParser()
|
Parser = argparse.ArgumentParser()
|
||||||
Parser.add_argument('--SiteRoot', type=str)
|
Parser.add_argument('--SiteRoot', type=str)
|
||||||
|
Parser.add_argument('--FolderRoots', type=str)
|
||||||
Parser.add_argument('--ContextParts', type=str)
|
Parser.add_argument('--ContextParts', type=str)
|
||||||
Args = Parser.parse_args()
|
Args = Parser.parse_args()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue