octospacc
/
staticoso
mirror of https://gitlab.com/octtspacc/staticoso
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Complete DirectoryList feature

This commit is contained in:
octospacc 2022-10-25 12:04:17 +02:00
parent 5449dfeb07
commit 64453af5e7
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -40,7 +40,9 @@ Needed for Gemtext output support:
## Features roadmap
- [ ] Page redirects / Alt URLs (+ ActivityPub URL overrides)
- [ ] HTML feeds (pages with list of N most recent posts)
- [x] Lists of all pages in a site directory
- [x] Page redirects / Alt URLs (+ ActivityPub URL overrides)
- [x] Progress bars for the build process!
- [x] Multithreading
- [x] Differential building

10
Source/Modules/Site.py
View File

@ -18,7 +18,7 @@ from Modules.Markdown import *
from Modules.Pug import *
from Modules.Utils import *
def GetHTMLPagesList(Pages, BlogName, SiteRoot, PathPrefix, Unite=[], Type=None, PathFilter='', Category=None, For='Menu', MarkdownExts=(), MenuStyle='Default'):
def GetHTMLPagesList(Pages, BlogName, SiteRoot, PathPrefix, CallbackFile=None, Unite=[], Type=None, PathFilter='', Category=None, For='Menu', MarkdownExts=(), MenuStyle='Default'):
ShowPaths, Flatten, SingleLine = True, False, False
if MenuStyle == 'Flat':
Flatten = True
@ -41,7 +41,12 @@ def GetHTMLPagesList(Pages, BlogName, SiteRoot, PathPrefix, Unite=[], Type=None,
if e:
IndexPages.insert(i,[e,None,None,{'Type':Type,'Index':'True','Order':'Unite'}])
for File, Content, Titles, Meta in IndexPages:
if (not Type or (Meta['Type'] == Type and CanIndex(Meta['Index'], For))) and (not Category or Category in Meta['Categories']) and File.startswith(PathFilter):
TmpPathFilter = PathFilter
if TmpPathFilter.startswith('Pages/'):
TmpPathFilter = TmpPathFilter[len('Pages/'):]
if File.startswith('Posts/'):
continue
if (not Type or (Meta['Type'] == Type and CanIndex(Meta['Index'], For))) and (not Category or Category in Meta['Categories']) and File.startswith(TmpPathFilter) and File != CallbackFile:
Depth = (File.count('/') + 1) if Meta['Order'] != 'Unite' else 1
if Depth > 1 and Meta['Order'] != 'Unite': # Folder names are handled here
CurParent = File.split('/')[:-1]
@ -429,6 +434,7 @@ def HandlePage(Flags, Page, Pages, Categories, LimitFiles, Snippets, ConfMenu, L
if Line.startswith('<staticoso:DirectoryList:') and Line.endswith('>'):
Path = Line[len('<staticoso:DirectoryList:'):-1]
DirectoryList = GetHTMLPagesList(
CallbackFile=File,
Pages=Pages,
BlogName=BlogName,
SiteRoot=SiteRoot,