Minor enhancements

clarkcb · Jan 12, 2025 · 830302c · 830302c
1 parent fec2da9
commit 830302c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/dart/dartfind/lib/src/finder.dart b/dart/dartfind/lib/src/finder.dart
@@ -84,8 +84,8 @@ class Finder {
   }
 
   bool hasMatchingExtension(FileResult fr) {
-    var fileName = path.basename(fr.file.path);
     if (settings.inExtensions.isNotEmpty || settings.outExtensions.isNotEmpty) {
+      var fileName = path.basename(fr.file.path);
       var ext = FileUtil.extension(fileName);
       return isMatchingExtension(
           ext, settings.inExtensions, settings.outExtensions);

diff --git a/elixir/exfind/lib/findsettings.ex b/elixir/exfind/lib/findsettings.ex
@@ -43,12 +43,13 @@ defmodule ExFind.FindSettings do
   def new(args), do: __struct__(args)
 
   def add_extensions(settings, extensions, extensions_name) when is_list(extensions) do
-    exts = Enum.map(extensions, fn e -> String.split(e, ",") end) |> List.flatten()
-    case extensions_name do
-      :in_archive_extensions -> %{settings | in_archive_extensions: settings.in_archive_extensions ++ exts}
-      :in_extensions -> %{settings | in_extensions: settings.in_extensions ++ exts}
-      :out_archive_extensions -> %{settings | out_archive_extensions: settings.out_archive_extensions ++ exts}
-      :out_extensions -> %{settings | out_extensions: settings.out_extensions ++ exts}
+    # Treat settings struct as a map to check for and update field
+    if Map.has_key?(settings, extensions_name) and is_list(Map.get(settings, extensions_name)) do
+      new_exts = Enum.map(extensions, fn e -> String.split(e, ",") end) |> List.flatten()
+      ext_list = Map.get(settings, extensions_name)
+      Map.put(settings, extensions_name, ext_list ++ new_exts)
+    else
+      settings
     end
   end
 

diff --git a/haskell/hsfind/src/HsFind/Config.hs b/haskell/hsfind/src/HsFind/Config.hs
@@ -5,6 +5,7 @@ module HsFind.Config
     , getHome
   ) where
 
+import System.Directory (getHomeDirectory)
 import System.Environment (getEnv, lookupEnv)
 import System.FilePath ((</>))
 import System.Info (os)
@@ -13,8 +14,9 @@ isWin :: Bool
 isWin = os == "mingw32"
 
 getHome :: IO FilePath
-getHome = getEnv homeName
-  where homeName = if isWin then "HOMEPATH" else "HOME"
+-- getHome = getEnv homeName
+--   where homeName = if isWin then "HOMEPATH" else "HOME"
+getHome = getHomeDirectory
 
 getXfindPath :: IO FilePath
 getXfindPath = do