#76 Fixes error when deleting last item in folder.

mattstermiller · Jan 17, 2020 · 35fa3b7 · 35fa3b7
1 parent 7d0e4b2
commit 35fa3b7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+### 0.5.2  (2020-01-17)
+- #76 Fixes error when deleting the last item in a folder
+
 ### 0.5.1  (2019-11-15)
 - #75 Fixes crash on startup when the Koffee AppData folder does not exist
 

diff --git a/src/Koffee/AssemblyInfo.fs b/src/Koffee/AssemblyInfo.fs
@@ -34,8 +34,8 @@ open System.Runtime.InteropServices
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [<assembly: AssemblyVersion("1.0.*")>]
-[<assembly: AssemblyVersion("0.5.1")>]
-[<assembly: AssemblyFileVersion("0.5.1")>]
+[<assembly: AssemblyVersion("0.5.2")>]
+[<assembly: AssemblyFileVersion("0.5.2")>]
 
 do
     ()
diff --git a/src/Koffee/MainController.fs b/src/Koffee/MainController.fs
@@ -63,12 +63,7 @@ module Nav =
             |> List.filter (fun i -> model.Config.ShowHidden || not i.IsHidden ||
                                      String.equalsIgnoreCase selectName i.Name)
             |> (model.Sort |> Option.map SortField.SortByTypeThen |? id)
-            |> Seq.ifEmpty (
-                let text =
-                    if model.Location = Path.Network then "Remote hosts that you visit will appear here"
-                    else "Empty folder"
-                [ { Item.Empty with Name = sprintf "<%s>" text; Path = model.Location } ]
-            )
+            |> Seq.ifEmpty (Item.EmptyFolder model.Location)
         { model with Items = items } |> select selectType
 
     let openPath (fsReader: IFileSystemReader) path select (model: MainModel) = result {
@@ -617,7 +612,7 @@ module Action =
             yield
                 { model with
                     Directory = model.Directory |> List.except [item]
-                    Items = model.Items |> List.except [item]
+                    Items = model.Items |> List.except [item] |> Seq.ifEmpty (Item.EmptyFolder model.Location)
                 }.WithCursor model.Cursor
                 |> performedAction action
     }
@@ -628,7 +623,7 @@ module Action =
             yield
                 { model with
                     Directory = model.Directory |> List.except [model.SelectedItem]
-                    Items = model.Items |> List.except [model.SelectedItem]
+                    Items = model.Items |> List.except [model.SelectedItem] |> Seq.ifEmpty (Item.EmptyFolder model.Location)
                     History = model.History.WithoutNetHost host
                     Status = Some <| MainStatus.removedNetworkHost host
                 }.WithCursor model.Cursor

diff --git a/src/Koffee/MainModel.fs b/src/Koffee/MainModel.fs
@@ -58,6 +58,12 @@ with
           Modified = None; Size = None; IsHidden = false
         }
 
+    static member EmptyFolder path =
+        let text =
+            if path = Path.Network then "Remote hosts that you visit will appear here"
+            else "Empty folder"
+        [ { Item.Empty with Name = sprintf "<%s>" text; Path = path } ]
+
     static member Basic path name itemType =
         { Item.Empty with
             Path = path