bit-badger/myWebLog
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 11 Activity

Simplify catch-all route; bump admin theme version

Browse Source
This commit is contained in:
Daniel J. Summers 2025-07-05 13:40:06 -04:00
parent 161a61823f
commit ba5e27e011
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/MyWebLog/Handlers/Routes.fs
View File

@ -28,15 +28,13 @@ module CatchAll =
"wwwroot" "wwwroot"
if textLink.Length > 1 then textLink[1..] else textLink ] if textLink.Length > 1 then textLink[1..] else textLink ]
|> String.concat (string Path.DirectorySeparatorChar) |> String.concat (string Path.DirectorySeparatorChar)
match File.Exists staticFileName with if File.Exists staticFileName then
| true ->
debug (fun () -> $"File {textLink} is a static file") debug (fun () -> $"File {textLink} is a static file")
yield yield
File.GetLastWriteTimeUtc staticFileName File.GetLastWriteTimeUtc staticFileName
|> System.DateTimeOffset |> System.DateTimeOffset
|> Some |> Some
|> streamFile true staticFileName None |> streamFile true staticFileName None
| false -> ()
// Home page directory without the directory slash // Home page directory without the directory slash
if textLink = "" then yield redirectTo true (webLog.RelativeUrl Permalink.Empty) if textLink = "" then yield redirectTo true (webLog.RelativeUrl Permalink.Empty)
let permalink = Permalink textLink[1..] let permalink = Permalink textLink[1..]
@ -99,11 +97,8 @@ module CatchAll =
} }
// GET {all-of-the-above} // GET {all-of-the-above}
let route : HttpHandler = fun next ctx -> task { let route : HttpHandler = fun next ctx ->
match deriveAction ctx |> Seq.tryHead with match deriveAction ctx |> Seq.tryHead with Some handler -> handler next ctx | None -> Error.notFound next ctx
| Some handler -> return! handler next ctx
| None -> return None // Error.notFound next ctx
}
/// Serve theme assets /// Serve theme assets
module Asset = module Asset =

2
src/admin-theme/version.txt
View File

@ -1,2 +1,2 @@
myWebLog Admin myWebLog Admin
2.2 3