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

Non-case-sensitive transclude; Warn on duplicate file names

Browse Source
This commit is contained in:
octospacc
2023-03-09 13:06:07 +01:00
parent fe4cf294d5
commit ad0a8be875
4 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App/Source/Modules/Globals.py
View File

@ -22,6 +22,8 @@ PageIndexStrNeg = tuple(list(NegStrBools) + ['none', 'unlisted', 'unindexed', 'h
InternalMacrosWraps = (('[', ']'), ('<', '>'))
PageTypeOutPrefix = {"Pages": "", "Posts": "/Posts"}
PageMetaDefault = {
'Template': None, # Replace with var
'Head': '',

5
App/Source/Modules/Site.py
View File

@ -49,7 +49,6 @@ def HandleDynamicParts(Flags:dict, Html:str, Snippets:dict):
# TODO: This would need to be handled either fully before or fully after after all pages' content has been transformed to HTML, else other markups end up in HTML and the page is broken
def HandleTransclusions(Base:str, Caller:str, Pages:list):
#if Type == 'Evals': # [% cmd %] | {% cmd %}
Targets = []
Finding = Base
Start = Finding.find('{{')
@ -64,7 +63,7 @@ def HandleTransclusions(Base:str, Caller:str, Pages:list):
# We should show an error message on inexistant transclusion and possible recursive transclusion, as currently this doesn't handle escaped tokens
if Target != Caller:
for File, Content, _, _ in Pages:
if File == Target:
if File.lower() == Target.lower():
Base = ReplWithEsc(Base, '{{' + Target + '}}', Content)
break
return Base
@ -215,7 +214,7 @@ def BuildPagesSearch(Flags:dict, Pages:list, Template:str, Snippets:dict, Locale
SearchContent += f'''
<div
class="staticoso-HtmlSearch-Page"
data-staticoso-htmlsearch-name="{html.escape(html.unescape(Page["Titles"][0]), quote=True)}"
data-staticoso-htmlsearch-name="{html.escape(html.unescape(Page["Titles"][0] if Page["Titles"] else ""), quote=True)}"
data-staticoso-htmlsearch-href="{StripExt(Page["File"])}.html"
>
{Page["ContentHtml"]}

5
App/Source/Modules/Utils.py
View File

@ -50,8 +50,9 @@ def LoadFromDir(Dir:str, Matchs:list):
Matchs = SureList(Matchs)
for Match in Matchs:
for File in Path(Dir).rglob(Match):
File = str(File)[len(Dir)+1:]
Contents.update({File: ReadFile(f"{Dir}/{File}")})
if os.path.isfile(File):
Name = str(File)[len(Dir)+1:]
Contents.update({Name: ReadFile(File)})
return Contents
def mkdirps(Dir:str):