优化信息

app/Commands.hs

@@ -8,20 +8,17 @@ module Commands
   , printShellIntegration
   ) where
 
-import           Control.Monad        (forM_, unless, when)
+import           Control.Monad        (forM_, unless)
 import           Data.List            (intercalate)
-import           Data.Map             (Map)
 import qualified Data.Map             as M
-import           Data.Maybe           (fromMaybe, isJust)
+import           Data.Maybe           (fromMaybe)
 import           Data.Text            (Text)
 import qualified Data.Text            as T
-import           System.Directory     (doesDirectoryExist, doesFileExist)
-import           System.Environment   (lookupEnv)
-import           System.Exit          (exitFailure, exitSuccess)
-import           System.FilePath      ((</>))
+import           System.Directory     (doesDirectoryExist)
+import           System.Exit          (exitFailure)
 import           System.Info          (os)
 import           System.IO            (hFlush, stdout)
-import           System.Process       (callCommand, spawnCommand, waitForProcess)
+import           System.Process       (spawnCommand, waitForProcess)
 
 import           Config
 import           Types
@@ -135,18 +132,18 @@ openPath p cfg quiet = do
   -- 尝试使用配置的文件管理器，或者自动检测
   let fm = fileManager cfg
   case fm of
-    Just cmd -> runFileManager cmd expanded quiet
+    Just cmd -> runFileManager cmd expanded
     Nothing  -> autoDetectAndOpen expanded quiet
 
 -- | 自动检测并打开文件管理器
 autoDetectAndOpen :: FilePath -> Bool -> IO ()
-autoDetectAndOpen path quiet = do
+autoDetectAndOpen targetPath quiet = do
   let (cmd, args) = case os of
-        "darwin"  -> ("open", [path])
-        "mingw32" -> ("explorer", [path])
-        "mingw64" -> ("explorer", [path])
-        "cygwin"  -> ("cygstart", [path])
-        _         -> ("xdg-open", [path])  -- Linux and others
+        "darwin"  -> ("open", [targetPath])
+        "mingw32" -> ("explorer", [targetPath])
+        "mingw64" -> ("explorer", [targetPath])
+        "cygwin"  -> ("cygstart", [targetPath])
+        _         -> ("xdg-open", [targetPath])  -- Linux and others
 
   -- 检查命令是否存在
   exists <- commandExists cmd
@@ -159,12 +156,12 @@ autoDetectAndOpen path quiet = do
         putStrLn $ "Cannot open file manager. Please configure one:"
         putStrLn $ "  quickjump config set-file-manager <command>"
         -- 输出 cd 命令作为备选
-        putStrLn $ "cd " ++ show path
+        putStrLn $ "cd " ++ show targetPath
 
 -- | 运行文件管理器
-runFileManager :: FilePath -> FilePath -> Bool -> IO ()
-runFileManager cmd path quiet = do
-  expanded <- expandPath path
+runFileManager :: FilePath -> FilePath -> IO ()
+runFileManager cmd targetPath = do
+  expanded <- expandPath targetPath
   let fullCmd = cmd ++ " " ++ show expanded
   _ <- spawnCommand fullCmd >>= waitForProcess
   return ()
@@ -174,19 +171,19 @@ runConfigCmd :: ConfigAction -> Bool -> IO ()
 runConfigCmd action quiet = do
   cfg <- ensureConfigExists
   case action of
-    ConfigAdd name path mDesc -> do
-      expanded <- expandPath path
+    ConfigAdd name targetPath mDesc -> do
+      expanded <- expandPath targetPath
       exists <- doesDirectoryExist expanded
       unless exists $ do
         unless quiet $ putStrLn $ "Warning: Directory does not exist: " ++ expanded
       let entry = JumpEntry
-            { path = path
+            { path = targetPath
             , description = mDesc
             , priority = 100
             }
           newCfg = cfg { entries = M.insert name entry (entries cfg) }
       saveConfig newCfg
-      unless quiet $ putStrLn $ "Added '" ++ T.unpack name ++ "' -> " ++ path
+      unless quiet $ putStrLn $ "Added '" ++ T.unpack name ++ "' -> " ++ targetPath
 
     ConfigRemove name -> do
       if M.member name (entries cfg)
@@ -212,14 +209,14 @@ runConfigCmd action quiet = do
                       ++ " -> " ++ padRight 30 (path entry)
                       ++ if T.null desc then "" else " # " ++ T.unpack desc
 
-    ConfigSetDefault path -> do
-      expanded <- expandPath path
+    ConfigSetDefault targetPath -> do
+      expanded <- expandPath targetPath
       exists <- doesDirectoryExist expanded
       unless exists $ do
         unless quiet $ putStrLn $ "Warning: Directory does not exist: " ++ expanded
-      let newCfg = cfg { defaultPath = Just path }
+      let newCfg = cfg { defaultPath = Just targetPath }
       saveConfig newCfg
-      unless quiet $ putStrLn $ "Set default path to: " ++ path
+      unless quiet $ putStrLn $ "Set default path to: " ++ targetPath
 
     ConfigSetEditor cmd -> do
       let newCfg = cfg { editor = Just cmd }
@@ -231,12 +228,12 @@ runConfigCmd action quiet = do
       saveConfig newCfg
       unless quiet $ putStrLn $ "Set file manager to: " ++ cmd
 
-    ConfigExport path -> do
-      saveConfigTo path cfg
-      unless quiet $ putStrLn $ "Config exported to: " ++ path
+    ConfigExport targetPath -> do
+      saveConfigTo targetPath cfg
+      unless quiet $ putStrLn $ "Config exported to: " ++ targetPath
 
-    ConfigImport path merge -> do
-      imported <- loadConfigFrom path
+    ConfigImport targetPath merge -> do
+      imported <- loadConfigFrom targetPath
       let merged = mergeConfigs cfg imported merge
       saveConfig merged
       unless quiet $

app/Config.hs

@@ -34,7 +34,7 @@ getConfigPath = do
   -- 首先检查环境变量
   mEnvPath <- lookupEnv "QUICKJUMP_CONFIG"
   case mEnvPath of
-    Just path -> return path
+    Just configPath -> return configPath
     Nothing   -> do
       -- 默认使用 XDG 配置目录
       xdgConfig <- lookupEnv "XDG_CONFIG_HOME"
@@ -47,19 +47,19 @@ getConfigPath = do
 
 -- | 展开路径中的 ~ 和环境变量
 expandPath :: FilePath -> IO FilePath
-expandPath path = do
+expandPath inputPath = do
   -- 首先处理 ~ 展开
-  expanded1 <- if take 1 path == "~"
+  expanded1 <- if take 1 inputPath == "~"
     then do
       home <- getHomeDirectory
-      return $ home </> drop 2 path
-    else return path
+      return $ home </> drop 2 inputPath
+    else return inputPath
   -- 然后处理环境变量（支持 Unix $VAR 和 Windows %VAR% 格式）
   expandEnvVars expanded1
 
 -- | 展开环境变量
 expandEnvVars :: FilePath -> IO FilePath
-expandEnvVars path = do
+expandEnvVars inputPath = do
   -- 处理 Unix 风格的环境变量 $VAR
   let expandUnixVars s = case s of
         '$':'{':rest -> 
@@ -92,9 +92,9 @@ expandEnvVars path = do
         c:cs -> (c:) <$> expandEnvVars cs
         [] -> return []
   -- 根据操作系统选择展开方式
-  if '%' `elem` path
-    then expandWindowsVars path
-    else expandUnixVars path
+  if '%' `elem` inputPath
+    then expandWindowsVars inputPath
+    else expandUnixVars inputPath
   where
     isAlphaNum c = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')
 
@@ -119,8 +119,8 @@ loadConfig = do
 
 -- | 从指定路径加载配置
 loadConfigFrom :: FilePath -> IO Config
-loadConfigFrom path = do
-  expanded <- expandPath path
+loadConfigFrom configPath = do
+  expanded <- expandPath configPath
   result <- catch
     (Right <$> BL.readFile expanded)
     (\e -> if isDoesNotExistError e
@@ -141,8 +141,8 @@ saveConfig cfg = do
 
 -- | 保存配置到指定路径
 saveConfigTo :: FilePath -> Config -> IO ()
-saveConfigTo path cfg = do
-  expanded <- expandPath path
+saveConfigTo configPath cfg = do
+  expanded <- expandPath configPath
   createDirectoryIfMissing True (takeDirectory expanded)
   BL.writeFile expanded (encodePretty cfg)