Merge branch 'develop' of code.apps.glenux.net:glenux/mfm into develop

Makefile

@@ -6,4 +6,8 @@
 all: build
 
 build:
-	shards build
+	shards build --error-trace
+	@echo SUCCESS
+
+watch: 
+	 watchexec --restart --delay-run 3 -c -e cr make build

src/cli.cr

@@ -173,7 +173,9 @@ module GX
         }
       end
 
-      result_filesystem_name = Fzf.run(names_display.values.map(&.[:ansi_name]).sort).strip
+      ## FIXME: feat: allow to sort by name or by filesystem
+      sorted_values = names_display.values.sort_by { |item| item[:filesystem].name }
+      result_filesystem_name = Fzf.run(sorted_values.map(&.[:ansi_name])).strip
       selected_filesystem = names_display[result_filesystem_name][:filesystem]
       puts ">> #{selected_filesystem.name}".colorize(:yellow)
 

src/config.cr

@@ -90,13 +90,13 @@ module GX
 
       root = Models::RootConfig.from_yaml(file_patched)
 
-      global_mount_point = root.global.mount_point
-      raise Models::InvalidMountpointError.new("Invalid global mount point") if global_mount_point.nil?
+      mount_point_base_safe = root.global.mount_point_base
+      raise Models::InvalidMountpointError.new("Invalid global mount point") if mount_point_base_safe.nil?
 
       root.filesystems.each do |selected_filesystem|
         if !selected_filesystem.mount_point?
           selected_filesystem.mount_point = 
-            File.join(global_mount_point, selected_filesystem.mounted_name)
+            File.join(mount_point_base_safe, selected_filesystem.mounted_name)
         end
       end
       @root = root

src/models/global_config.cr

@@ -14,16 +14,16 @@ module GX::Models
     include YAML::Serializable
     include YAML::Serializable::Strict
 
-    @[YAML::Field(key: "mount_point")]
-    getter mount_point : String?
+    @[YAML::Field(key: "mount_point_base")]
+    getter mount_point_base : String?
 
     def after_initialize()
       raise InvalidEnvironmentError.new("Home directory not found") if !ENV["HOME"]?
       home_dir = ENV["HOME"]
 
       # Set default mountpoint from global if none defined
-      if @mount_point.nil? || @mount_point.try &.empty?
-        @mount_point = File.join(home_dir, "mnt")
+      if @mount_point_base.nil? || @mount_point_base.try &.empty?
+        @mount_point_base = File.join(home_dir, "mnt")
       end
     end
   end