v2 (#36)

* Use PostgreSQL JSON-based data implementation
* Fix back link on RSS settings page (#34)
* Show theme upload messages (#28)
* Fix admin page list paging (#35)
* Add db migrations for all stores
* Support both .NET 6 and 7

src/MyWebLog/Handlers/Helpers.fs

@@ -120,7 +120,6 @@ module ViewContext =
     /// The current web log
     [<Literal>]
     let WebLog = "web_log"
-    
 
 
 /// The HTTP item key for loading the session

src/MyWebLog/Handlers/Page.fs

@@ -12,9 +12,14 @@ let all pageNbr : HttpHandler = requireAccess Author >=> fun next ctx -> task {
     return!
         hashForPage "Pages"
         |> withAntiCsrf ctx
-        |> addToHash "pages"     (pages |> List.map (DisplayPage.fromPageMinimal ctx.WebLog))
+        |> addToHash "pages"     (pages
+                                  |> Seq.ofList
+                                  |> Seq.truncate 25
+                                  |> Seq.map (DisplayPage.fromPageMinimal ctx.WebLog)
+                                  |> List.ofSeq)
         |> addToHash "page_nbr"  pageNbr
         |> addToHash "prev_page" (if pageNbr = 2 then "" else $"/page/{pageNbr - 1}")
+        |> addToHash "has_next"  (List.length pages > 25)
         |> addToHash "next_page" $"/page/{pageNbr + 1}"
         |> adminView "page-list" next ctx
 }

src/MyWebLog/MyWebLog.fsproj

@@ -23,14 +23,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DotLiquid" Version="2.2.656" />
+    <PackageReference Include="DotLiquid" Version="2.2.682" />
     <PackageReference Include="Giraffe" Version="6.0.0" />
-    <PackageReference Include="Giraffe.Htmx" Version="1.8.0" />
-    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.8.0" />
+    <PackageReference Include="Giraffe.Htmx" Version="1.8.5" />
+    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.8.5" />
     <PackageReference Include="NeoSmart.Caching.Sqlite" Version="6.0.1" />
     <PackageReference Include="RethinkDB.DistributedCache" Version="1.0.0-rc1" />
-    <PackageReference Update="FSharp.Core" Version="6.0.5" />
-    <PackageReference Include="System.ServiceModel.Syndication" Version="6.0.0" />
+    <PackageReference Include="System.ServiceModel.Syndication" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/MyWebLog/Program.fs

@@ -10,7 +10,7 @@ type WebLogMiddleware (next : RequestDelegate, log : ILogger<WebLogMiddleware>)
     /// Is the debug level enabled on the logger?
     let isDebug = log.IsEnabled LogLevel.Debug
         
-    member this.InvokeAsync (ctx : HttpContext) = task {
+    member _.InvokeAsync (ctx : HttpContext) = task {
         /// Create the full path of the request
         let path = $"{ctx.Request.Scheme}://{ctx.Request.Host.Value}{ctx.Request.Path.Value}"
         match WebLogCache.tryGet path with
@@ -36,10 +36,16 @@ open Npgsql
 module DataImplementation =
     
     open MyWebLog.Converters
-    // open Npgsql.Logging
     open RethinkDb.Driver.FSharp
     open RethinkDb.Driver.Net
 
+    /// Create an NpgsqlDataSource from the connection string, configuring appropriately
+    let createNpgsqlDataSource (cfg : IConfiguration) =
+        let builder = NpgsqlDataSourceBuilder (cfg.GetConnectionString "PostgreSQL")
+        let _ = builder.UseNodaTime ()
+        // let _ = builder.UseLoggerFactory(LoggerFactory.Create(fun it -> it.AddConsole () |> ignore))
+        builder.Build ()
+
     /// Get the configured data implementation
     let get (sp : IServiceProvider) : IData =
         let config   = sp.GetRequiredService<IConfiguration> ()
@@ -62,11 +68,11 @@ module DataImplementation =
             let conn       = await (rethinkCfg.CreateConnectionAsync log)
             RethinkDbData (conn, rethinkCfg, log)
         elif hasConnStr "PostgreSQL" then
+            let source = createNpgsqlDataSource config
+            use conn = source.CreateConnection ()
             let log  = sp.GetRequiredService<ILogger<PostgresData>> ()
-            // NpgsqlLogManager.Provider <- ConsoleLoggingProvider NpgsqlLogLevel.Debug
-            let conn = new NpgsqlConnection (connStr "PostgreSQL")
-            log.LogInformation $"Using PostgreSQL database {conn.Host}:{conn.Port}/{conn.Database}"
-            PostgresData (conn, log, Json.configure (JsonSerializer.CreateDefault ()))
+            log.LogInformation $"Using PostgreSQL database {conn.Database}"
+            PostgresData (source, log, Json.configure (JsonSerializer.CreateDefault ()))
         else
             createSQLite "Data Source=./myweblog.db;Cache=Shared"
 
@@ -152,16 +158,15 @@ let rec main args =
         let cachePath = defaultArg (Option.ofObj (cfg.GetConnectionString "SQLiteCachePath")) "./session.db"
         let _ = builder.Services.AddSqliteCache (fun o -> o.CachePath <- cachePath)
         ()
-    | :? PostgresData ->
-        // ADO.NET connections are designed to work as per-request instantiation
-        let cfg  = sp.GetRequiredService<IConfiguration> ()
+    | :? PostgresData as postgres ->
+        // ADO.NET Data Sources are designed to work as singletons
         let _ =
-            builder.Services.AddScoped<NpgsqlConnection> (fun sp ->
-                new NpgsqlConnection (cfg.GetConnectionString "PostgreSQL"))
-        let _ = builder.Services.AddScoped<IData, PostgresData> ()
+            builder.Services.AddSingleton<NpgsqlDataSource> (fun sp ->
+                DataImplementation.createNpgsqlDataSource (sp.GetRequiredService<IConfiguration> ()))
+        let _ = builder.Services.AddSingleton<IData> postgres
         let _ =
-            builder.Services.AddSingleton<IDistributedCache> (fun sp ->
-                Postgres.DistributedCache (cfg.GetConnectionString "PostgreSQL") :> IDistributedCache)
+            builder.Services.AddSingleton<IDistributedCache> (fun _ ->
+                Postgres.DistributedCache () :> IDistributedCache)
         ()
     | _ -> ()
     

src/MyWebLog/appsettings.json

@@ -1,5 +1,5 @@
 {
-  "Generator": "myWebLog 2.0-rc2",
+  "Generator": "myWebLog 2.0",
   "Logging": {
     "LogLevel": {
       "MyWebLog.Handlers": "Information"