style: Site improvement ( Fixes #344 )

StartAutomating · StartAutomating · commit 7e9569292e0d · 2025-11-03T11:16:52.000-08:00
Improving build, buildPage, and config
diff --git a/psturtle.com/build.ps1 b/psturtle.com/build.ps1
@@ -28,24 +28,59 @@ $Site.Files =
     else { Get-ChildItem -Recurse -File }
 
 $Site.PSScriptRoot = "$PSScriptRoot"
+foreach ($underbarDirectory in Get-ChildItem -Path $site.PSScriptRoot -Filter _* -Directory) {
+    $Site[$underbarDirectory.Name -replace '^_'] = $Site[$underbarDirectory.Name] = [Ordered]@{}    
+    foreach ($underbarFile in Get-ChildItem -Path $underbarDirectory -Recurse) {
+        $relativePath = $underbarFile.FullName.Substring($underbarDirectory.FullName.Length + 1)
+        $pointer = $site
+        $hierarchy = @($relativePath -split '[\\/]')
+        for ($index = 0; $index -lt ($hierarchy.Length - 1); $index++) {
+            $subdirectory = $hierarchy[$index] -replace '_'
+            if (-not $pointer[$subdirectory]) {
+                $pointer[$subdirectory] = [Ordered]@{}
+            }
+            $pointer = $pointer[$subdirectory]
+        }
+
+        $propertyName = $hierarchy[-1] -replace '_'
+        $getFile = @{LiteralPath=$underbarFile.FullName}
+        $fileData  =
+            switch -regex ($underbarFile.Extension) {
+                '\.ps1$' { $ExecutionContext.SessionState.InvokeCommand.GetCommand($underbarFile.FullName, 'ExternalScript') }
+                '\.(css|html|txt)$' { Get-Content @getFile }
+                '\.json$' { Get-Content @getFile | ConvertFrom-Json }
+                '\.jsonl$' { Get-Content @getFile | ConvertFrom-Json }
+                '\.psd1$' { Get-Content @getFile -Raw | ConvertFrom-StringData }
+                '\.(?>ps1xml|xml|svg)$' { (Get-Content @getFile -Raw) -as [xml] }
+                '\.(?>yaml|toml)$' { Get-Content @getFile -Raw }
+                '\.csv$' { Import-Csv @getFile }
+                '\.tsv$' { Import-Csv @getFile -Delimiter "`t" }
+            }        
+        if (-not $fileData) { continue }
+        $pointer[$relativePath -replace '\.ps1$'] = $fileData        
+    }
+}
 
 #region Common Functions and Filters
+# Any functions or filter file at the site root should be loaded.
 $functionFileNames = 'functions', 'function', 'filters', 'filter'
 $functionPattern   = "(?>$($functionFileNames -join '|'))\.ps1$"
 $functionFiles     = Get-ChildItem -Path $Site.PSScriptRoot |
     Where-Object Name -Match $functionPattern
 
 foreach ($file in $functionFiles) {
-    # If we have a file with the name function or functions, we'll use it to set the site configuration.
+    # If we have a file with the name function or functions, 
+    # we'll dot source it now so we can use the functions in the config
     . $file.FullName
 }
 #endregion Common Functions and Filters
 
 # Set an alias to buildPage.ps1
 Set-Alias BuildPage ./buildPage.ps1
 
-# If we have an event path,
-$gitHubEvent =
+# If we have a github event,
+# save it to a variable and to the `$site`
+$site.GitHubEvent = $gitHubEvent =
     if ($env:GITHUB_EVENT_PATH) {
         # all we need to do to serve it is copy it.
         Copy-Item $env:GITHUB_EVENT_PATH .\gitHubEvent.json
@@ -59,12 +94,15 @@ if (Test-Path 'CNAME') {
     $Site.CNAME = $CNAME = (Get-Content -Path 'CNAME' -Raw).Trim()
     $Site.RootUrl = "https://$CNAME/"
 } elseif (
+    # otherwise, if we are in a directory that could be a domain
     ($site.PSScriptRoot | Split-Path -Leaf) -like '*.*'
 ) {
+    # assume it _is_ the domain.
     $site.CNAME = $CNAME = ($site.PSScriptRoot | Split-Path -Leaf)
     $site.RootUrl = "https://$CNAME/"
 }
 
+#region config
 # If we have a config.json file, it can be used to set the site configuration.
 if (Test-Path 'config.json') {
     $siteConfig = Get-Content -Path 'config.json' -Raw | ConvertFrom-Json
@@ -98,17 +136,20 @@ if (Test-Path 'config.ps1') {
     # run it, and let it configure anything it chooses to.
     . $configScript
 }
+#endregion config
 
 # Start the clock
 $site['LastBuildTime'] = $lastBuildTime = [DateTime]::Now
 #region Build Files
 
 # Start the clock on the build process
 $buildStart = [DateTime]::Now
+Write-Host "Started Building Pages @ $buildStart"
 # pipe every file we find to buildFile
 $Site.Files | . buildPage
 # and stop the clock
 $buildEnd = [DateTime]::Now
+Write-Host "Finished Building Pages @ $buildEnd ($($buildEnd - $buildStart))"
 
 #endregion Build Files
 
diff --git a/psturtle.com/buildPage.ps1 b/psturtle.com/buildPage.ps1
@@ -28,7 +28,12 @@ if (-not $site.PagesByUrl) {
 }
 $pagesByUrl = $site.PagesByUrl
 
-:nextFile foreach ($file in $allFiles) {
+$fileQueue = [Collections.Queue]::new()
+foreach ($file in $allFiles) { $fileQueue.Enqueue($file) }
+
+:nextFile while ($fileQueue.Count) {
+    $file = $fileQueue.Dequeue()
+    if ($file.FullName -match '/_[^\.]') { continue }
     if ($Site -and $Site.Exclude) {
         $included = $false
         :exclude do {
@@ -50,6 +55,7 @@ $pagesByUrl = $site.PagesByUrl
             }
             $included = $true
         } until ($included)
+        if (-not $included) { continue }
     }
     $fileRoot = $file.Directory.FullName
     Push-Location $fileRoot
@@ -83,15 +89,15 @@ $pagesByUrl = $site.PagesByUrl
             $gitDates = 
                 try {
                     # we can use `git log --follow --format=%ci` to get the dates in order
-                    (& $gitCommand log --follow --format=%ci --date default $file.FullName *>&1) -as [datetime[]]
+                    (& $gitCommand log --follow --format=%ci --date default $file.FullName *>&1) -as [datetime]
                 } catch {
                     $null
                 }
             # Because the file might not be in git, we want to always set the `$LASTEXITCODE` to 0
             $LASTEXITCODE = 0
-            # Set the date to the last date we find.
+            # Set the date to the first date we find.
             if ($gitDates) {
-                $page.Date = $gitDates[-1]                
+                $page.Date = $gitDates[0]
             }            
         }
     }
@@ -186,11 +192,37 @@ $pagesByUrl = $site.PagesByUrl
             }
             
         }
+        default {
+            Pop-Location
+            continue nextFile
+        }
     }
     #endregion Get Page Content
+
+    # We want to filter out files from the rest of output
+    $outputFiles = @()
+    $otherOutput = @(foreach ($out in $output) {
+        if ($out -is [IO.FileInfo]) {            
+            $outputFiles += $out
+        } else {
+            $out
+        }
+    })
+
+    # If there were any files output
+    if ($outputFiles) {
+        # queue them
+        foreach ($outputFile in $outputFiles) {
+            $fileQueue.Enqueue($outputFile)
+            $totalFiles++
+        }
+    }
+
+    # Set out output to any non-file output.
+    $output = $otherOutput
     
     # If we don't have output,
-    if ($null -eq $Output) {
+    if ($null -eq $OtherOutput) {
         Pop-Location
         continue nextFile # continue to the next file.
     }
@@ -330,6 +362,7 @@ $pagesByUrl = $site.PagesByUrl
                 if ($?) {
                     $page.OutputFile = Get-Item -Path $outFile
                     $page.OutputFile
+                    Pop-Location
                     continue nextFile
                 }                
             }
@@ -338,6 +371,7 @@ $pagesByUrl = $site.PagesByUrl
                 if ($?) {
                     $page.OutputFile = Get-Item -Path $outFile
                     $page.OutputFile
+                    Pop-Location
                     continue nextFile
                 }
             }
@@ -346,6 +380,7 @@ $pagesByUrl = $site.PagesByUrl
                 if ($?) {
                     $page.OutputFile = Get-Item -Path $outFile
                     $page.OutputFile
+                    Pop-Location
                     continue nextFile
                 }
             }
@@ -379,21 +414,26 @@ $pagesByUrl = $site.PagesByUrl
         # just output them directly.
         $outputFiles
     } else {
-        # otherwise, we'll save output to a file.
-
-        # If the file does not exists
-        if (-not (Test-Path -Path $outFile)) {
-            # create an empty file.
-            $null = New-Item -Path $outFile -ItemType File -Force
-        }
-
-        $output > $outFile
-        # and if that worked,
-        if ($?) {
-            # output the file.
-            $page.OutputFile = Get-Item -Path $outFile
-            $page.OutputFile
-        }
+        # otherwise, we'll save output to a file (assuming we have output).
+        if ("$output") {
+            # If the file does not exists
+            if (-not (Test-Path -Path $outFile)) {
+                # create an empty file.
+                $null = New-Item -Path $outFile -ItemType File -Force
+            }        
+            if ($outFile -like '*.svg') {
+                $null = $null
+            }
+            $output > $outFile
+            # and if that worked,
+            if ($?) {
+                # output the file.
+                $page.OutputFile = Get-Item -Path $outFile
+                $page.OutputFile
+            }
+        } else {
+            $null = $null
+        }        
     }
     #endregion Output
 
diff --git a/psturtle.com/config.ps1 b/psturtle.com/config.ps1
@@ -145,9 +145,13 @@ $site.Taskbar = [Ordered]@{
     'BlueSky' = 'https://bsky.app/profile/psturtle.com'
     'GitHub' = 'https://github.com/PowerShellWeb/Turtle'
     'RSS' = 'https://psturtle.com/RSS/index.rss'
-    'Help' = 'https://psturtle.com/Commands/Get-Turtle'
+    'Help' = '/Commands/Get-Turtle'
 }
 
+$env:TURTLE_BOT = $true
+
+$Site.Palette = "Cyberdyne"
+
 $site.Footer = @(
     . $site.includes.SelectPalette
     . $site.includes.GetRandomPalette
