Eliminate compiler warnings

- Change RethinkDB to use connection-string style settings

src/MyWebLog.Data/MyWebLog.Data.fsproj

@@ -16,7 +16,7 @@
 		<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.7" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 		<PackageReference Include="RethinkDb.Driver" Version="2.3.150" />
-		<PackageReference Include="RethinkDb.Driver.FSharp" Version="0.9.0-beta-06" />
+		<PackageReference Include="RethinkDb.Driver.FSharp" Version="0.9.0-beta-07" />
 		<PackageReference Update="FSharp.Core" Version="6.0.5" />
 	</ItemGroup>
 	

src/MyWebLog.Data/RethinkDbData.fs

@@ -676,7 +676,7 @@ type RethinkDbData (conn : Net.IConnection, config : DataConfig, log : ILogger<R
                 
                 member _.FindByWebLog webLogId = rethink<TagMap list> {
                     withTable Table.TagMap
-                    between [| webLogId :> obj; r.Minval () |] [| webLogId :> obj, r.Maxval () |]
+                    between [| webLogId :> obj; r.Minval () |] [| webLogId :> obj; r.Maxval () |]
                             [ Index Index.WebLogAndTag ]
                     orderBy (nameof TagMap.empty.Tag)
                     result; withRetryDefault conn

src/MyWebLog.Domain/ViewModels.fs

@@ -470,6 +470,36 @@ type EditPageModel =
           MetaValues        = page.Metadata |> List.map (fun m -> m.Value) |> Array.ofList
         }
     
+    /// Whether this is a new page
+    member this.IsNew = this.PageId = "new"
+    
+    /// Update a page with values from this model
+    member this.UpdatePage (page : Page) now =
+        let revision = { AsOf = now; Text = MarkupText.parse $"{this.Source}: {this.Text}" }
+        // Detect a permalink change, and add the prior one to the prior list
+        match Permalink.toString page.Permalink with
+        | "" -> page
+        | link when link = this.Permalink -> page
+        | _ -> { page with PriorPermalinks = page.Permalink :: page.PriorPermalinks }
+        |> function
+        | page ->
+            { page with
+                Title        = this.Title
+                Permalink    = Permalink this.Permalink
+                UpdatedOn    = now
+                IsInPageList = this.IsShownInPageList
+                Template     = match this.Template with "" -> None | tmpl -> Some tmpl
+                Text         = MarkupText.toHtml revision.Text
+                Metadata     = Seq.zip this.MetaNames this.MetaValues
+                               |> Seq.filter (fun it -> fst it > "")
+                               |> Seq.map (fun it -> { Name = fst it; Value = snd it })
+                               |> Seq.sortBy (fun it -> $"{it.Name.ToLower ()} {it.Value.ToLower ()}")
+                               |> List.ofSeq
+                Revisions    = match page.Revisions |> List.tryHead with
+                               | Some r when r.Text = revision.Text -> page.Revisions
+                               | _ -> revision :: page.Revisions
+            }
+
 
 /// View model to edit a post
 [<CLIMutable; NoComparison; NoEquality>]
@@ -617,8 +647,19 @@ type EditPostModel =
           EpisodeDescription = defaultArg episode.EpisodeDescription ""
         }
     
+    /// Whether this is a new post
+    member this.IsNew = this.PostId = "new"
+    
     /// Update a post with values from the submitted form
-    member this.UpdatePost (post : Post) (revision : Revision) now =
+    member this.UpdatePost (post : Post) now =
+        let revision  = { AsOf = now; Text = MarkupText.parse $"{this.Source}: {this.Text}" }
+        // Detect a permalink change, and add the prior one to the prior list
+        match Permalink.toString post.Permalink with
+        | "" -> post
+        | link when link = this.Permalink -> post
+        | _ -> { post with PriorPermalinks = post.Permalink :: post.PriorPermalinks }
+        |> function
+        | post ->
             { post with
                 Title       = this.Title
                 Permalink   = Permalink this.Permalink

src/MyWebLog/Handlers/Page.fs

@@ -172,8 +172,6 @@ let deleteRevision (pgId, revDate) : HttpHandler = requireAccess Author >=> fun
     | _, None -> return! Error.notFound next ctx
 }
 
-//#nowarn "3511"
-
 open System.Threading.Tasks
 
 // POST /admin/page/save
@@ -181,10 +179,8 @@ let save : HttpHandler = requireAccess Author >=> fun next ctx -> task {
     let! model   = ctx.BindFormAsync<EditPageModel> ()
     let  data    = ctx.Data
     let  now     = DateTime.UtcNow
-    let  pg    =
+    let  tryPage =
-        match model.PageId with
+        if model.IsNew then Task.FromResult (
-        | "new" ->
-            Task.FromResult (
             Some
                 { Page.empty with
                     Id          = PageId.create ()
@@ -192,35 +188,12 @@ let save : HttpHandler = requireAccess Author >=> fun next ctx -> task {
                     AuthorId    = ctx.UserId
                     PublishedOn = now
                 })
-        | pgId -> data.Page.FindFullById (PageId pgId) ctx.WebLog.Id
+        else data.Page.FindFullById (PageId model.PageId) ctx.WebLog.Id
-    match! pg with
+    match! tryPage with
     | Some page when canEdit page.AuthorId ctx ->
         let updateList  = page.IsInPageList <> model.IsShownInPageList
-        let revision   = { AsOf = now; Text = MarkupText.parse $"{model.Source}: {model.Text}" }
+        let updatedPage = model.UpdatePage page now
-        // Detect a permalink change, and add the prior one to the prior list
+        do! (if model.PageId = "new" then data.Page.Add else data.Page.Update) updatedPage
-        let page =
-            match Permalink.toString page.Permalink with
-            | "" -> page
-            | link when link = model.Permalink -> page
-            | _ -> { page with PriorPermalinks = page.Permalink :: page.PriorPermalinks }
-        let page =
-            { page with
-                Title          = model.Title
-                Permalink      = Permalink model.Permalink
-                UpdatedOn      = now
-                IsInPageList = model.IsShownInPageList
-                Template       = match model.Template with "" -> None | tmpl -> Some tmpl
-                Text           = MarkupText.toHtml revision.Text
-                Metadata       = Seq.zip model.MetaNames model.MetaValues
-                                 |> Seq.filter (fun it -> fst it > "")
-                                 |> Seq.map (fun it -> { Name = fst it; Value = snd it })
-                                 |> Seq.sortBy (fun it -> $"{it.Name.ToLower ()} {it.Value.ToLower ()}")
-                                 |> List.ofSeq
-                Revisions      = match page.Revisions |> List.tryHead with
-                                 | Some r when r.Text = revision.Text -> page.Revisions
-                                 | _ -> revision :: page.Revisions
-            }
-        do! (if model.PageId = "new" then data.Page.Add else data.Page.Update) page
         if updateList then do! PageListCache.update ctx
         do! addMessage ctx { UserMessage.success with Message = "Page saved successfully" }
         return! redirectToGet $"admin/page/{PageId.toString page.Id}/edit" next ctx

src/MyWebLog/Handlers/Post.fs

@@ -376,16 +376,13 @@ let deleteRevision (postId, revDate) : HttpHandler = requireAccess Author >=> fu
     | _, None -> return! Error.notFound next ctx
 }
 
-//#nowarn "3511"
-
 // POST /admin/post/save
 let save : HttpHandler = requireAccess Author >=> fun next ctx -> task {
     let! model   = ctx.BindFormAsync<EditPostModel> ()
     let  data    = ctx.Data
     let  now     = DateTime.UtcNow
     let  tryPost =
-        if model.PostId = "new" then
+        if model.IsNew then Task.FromResult (
-            Task.FromResult (
             Some
                 { Post.empty with
                     Id        = PostId.create ()
@@ -396,15 +393,10 @@ let save : HttpHandler = requireAccess Author >=> fun next ctx -> task {
     match! tryPost with
     | Some post when canEdit post.AuthorId ctx ->
         let priorCats   = post.CategoryIds
-        let revision  = { AsOf = now; Text = MarkupText.parse $"{model.Source}: {model.Text}" }
+        let updatedPost =
-        // Detect a permalink change, and add the prior one to the prior list
+            model.UpdatePost post now
-        let post =
+            |> function
-            match Permalink.toString post.Permalink with
+            | post ->
-            | "" -> post
-            | link when link = model.Permalink -> post
-            | _ -> { post with PriorPermalinks = post.Permalink :: post.PriorPermalinks }
-        let post = model.UpdatePost post revision now
-        let post =
                 if model.SetPublished then
                     let dt = parseToUtc (model.PubOverride.Value.ToString "o")
                     if model.SetUpdated then
@@ -415,11 +407,11 @@ let save : HttpHandler = requireAccess Author >=> fun next ctx -> task {
                         }
                     else { post with PublishedOn = Some dt }
                 else post
-        do! (if model.PostId = "new" then data.Post.Add else data.Post.Update) post
+        do! (if model.PostId = "new" then data.Post.Add else data.Post.Update) updatedPost
         // If the post was published or its categories changed, refresh the category cache
         if model.DoPublish
            || not (priorCats
-                   |> List.append post.CategoryIds
+                   |> List.append updatedPost.CategoryIds
                    |> List.distinct
                    |> List.length = List.length priorCats) then
             do! CategoryCache.update ctx

src/MyWebLog/Handlers/User.fs

@@ -91,8 +91,7 @@ let saveMyInfo : HttpHandler = requireAccess Author >=> fun next ctx -> task {
     let! model = ctx.BindFormAsync<EditMyInfoModel> ()
     let  data  = ctx.Data
     match! data.WebLogUser.FindById ctx.UserId ctx.WebLog.Id with
-    | Some user ->
+    | Some user when model.NewPassword = model.NewPasswordConfirm ->
-        if model.NewPassword = model.NewPasswordConfirm then
         let pw, salt =
             if model.NewPassword = "" then
                 user.PasswordHash, user.Salt
@@ -111,7 +110,7 @@ let saveMyInfo : HttpHandler = requireAccess Author >=> fun next ctx -> task {
         let pwMsg = if model.NewPassword = "" then "" else " and updated your password"
         do! addMessage ctx { UserMessage.success with Message = $"Saved your information{pwMsg} successfully" }
         return! redirectToGet "admin/user/my-info" next ctx
-        else
+    | Some user ->
         do! addMessage ctx { UserMessage.error with Message = "Passwords did not match; no updates made" }
         return! showMyInfo user (Hash.FromAnonymousObject {|
                 model = { model with NewPassword = ""; NewPasswordConfirm = "" }

src/MyWebLog/Program.fs

@@ -40,25 +40,26 @@ module DataImplementation =
     /// Get the configured data implementation
     let get (sp : IServiceProvider) : IData =
         let config   = sp.GetRequiredService<IConfiguration> ()
-        if (config.GetConnectionString >> isNull >> not) "SQLite" then
+        let await it = (Async.AwaitTask >> Async.RunSynchronously) it
+        let connStr    name = config.GetConnectionString name
+        let hasConnStr name = (connStr >> isNull >> not) name
+        let createSQLite connStr =
             let log  = sp.GetRequiredService<ILogger<SQLiteData>> ()
-            let conn = new SqliteConnection (config.GetConnectionString "SQLite")
+            let conn = new SqliteConnection (connStr)
             log.LogInformation $"Using SQL database {conn.DataSource}"
-            SQLiteData.setUpConnection conn |> Async.AwaitTask |> Async.RunSynchronously
+            await (SQLiteData.setUpConnection conn)
-            upcast SQLiteData (conn, sp.GetRequiredService<ILogger<SQLiteData>> ())
+            SQLiteData (conn, log)
-        elif (config.GetSection "RethinkDB").Exists () then
+        
+        if hasConnStr "SQLite" then
+            upcast createSQLite (connStr "SQLite")
+        elif hasConnStr "RethinkDB" then
             let log = sp.GetRequiredService<ILogger<RethinkDbData>> ()
             Json.all () |> Seq.iter Converter.Serializer.Converters.Add 
-            let rethinkCfg = DataConfig.FromConfiguration (config.GetSection "RethinkDB")
+            let rethinkCfg = DataConfig.FromUri (connStr "RethinkDB")
-            let conn       = rethinkCfg.CreateConnectionAsync () |> Async.AwaitTask |> Async.RunSynchronously
+            let conn       = await (rethinkCfg.CreateConnectionAsync log)
-            log.LogInformation $"Using RethinkDB database {rethinkCfg.Database}"
+            upcast RethinkDbData (conn, rethinkCfg, log)
-            upcast RethinkDbData (conn, rethinkCfg, sp.GetRequiredService<ILogger<RethinkDbData>> ())
         else
-            let log  = sp.GetRequiredService<ILogger<SQLiteData>> ()
+            upcast createSQLite "Data Source=./myweblog.db;Cache=Shared"
-            log.LogInformation "Using default SQLite database myweblog.db"
-            let conn = new SqliteConnection ("Data Source=./myweblog.db;Cache=Shared")
-            SQLiteData.setUpConnection conn |> Async.AwaitTask |> Async.RunSynchronously
-            upcast SQLiteData (conn, log)
 
 
 open Giraffe

src/admin-theme/page-edit.liquid

@@ -15,7 +15,7 @@
             <input type="text" name="Permalink" id="permalink" class="form-control" required
                    value="{{ model.permalink }}">
             <label for="permalink">Permalink</label>
-            {%- if model.page_id != "new" %}
+            {%- unless model.is_new %}
               <span class="form-text">
                 <a href="{{ "admin/page/" | append: model.page_id | append: "/permalinks" | relative_link }}">
                   Manage Permalinks
@@ -25,7 +25,7 @@
                   Manage Revisions
                 </a>
               </span>
-            {% endif -%}
+            {% endunless -%}
           </div>
           <div class="mb-2">
             <label for="text">Text</label> &nbsp; &nbsp;

src/admin-theme/post-edit.liquid

@@ -15,7 +15,7 @@
             <input type="text" name="Permalink" id="permalink" class="form-control" placeholder="Permalink" required
                    value="{{ model.permalink }}">
             <label for="permalink">Permalink</label>
-            {%- if model.post_id != "new" %}
+            {%- unless model.is_new %}
               <span class="form-text">
                 <a href="{{ "admin/post/" | append: model.post_id | append: "/permalinks" | relative_link }}">
                   Manage Permalinks
@@ -25,7 +25,7 @@
                   Manage Revisions
                 </a>
               </span>
-            {% endif -%}
+            {% endunless -%}
           </div>
           <div class="mb-2">
             <label for="text">Text</label> &nbsp; &nbsp;