修复错误,优化性能,实现类型系统,优化安装卸载过程
This commit is contained in:
1 parent
fd5f320360
commit
48eec484b7
104 files changed
+4127
-845
No files matched your search
@@ -229,7 +229,7 @@ reservedDatabase name = name == systemDatabase
|
||||
resolveSettingsFileSafe :: IO FilePath
|
||||
resolveSettingsFileSafe = do
|
||||
found <- try defaultConfigFile :: IO (Either IOException FilePath)
|
||||
pure (either (const "chusql.toml") id found)
|
||||
pure (either (const "settings.toml") id found)
|
||||
|
||||
-- | 定位 IDE 设置文件,找不到就定下首个候选路径
|
||||
resolveUISettingsFileSafe :: IO FilePath
|
||||
@@ -403,7 +403,7 @@ indexH env = do
|
||||
case content of
|
||||
Nothing -> do
|
||||
status status500
|
||||
json (apiErrorJson "missing_static" "index.html not found (check the --static directory)")
|
||||
json (apiErrorJson "missing_static" "index.html not found in the static directory")
|
||||
Just page -> do
|
||||
nonce <- liftIO sessionToken
|
||||
let (beforeHead, afterHead) = BS.breakSubstring "</head>" page
|
||||
|
||||
@@ -22,13 +22,13 @@ import qualified Data.Vector as V
|
||||
import System.Directory (createDirectoryIfMissing, doesDirectoryExist, doesFileExist)
|
||||
import System.FilePath (takeDirectory, (</>))
|
||||
|
||||
-- 前端 IDE 设置单独存一份文件,与全局启动配置 chusql.toml 互不干扰。
|
||||
-- 前端 IDE 设置单独存一份文件,与全局启动配置 settings.toml 互不干扰。
|
||||
|
||||
-- | IDE 设置文件的候选位置
|
||||
uiSettingsFileCandidates :: [FilePath]
|
||||
uiSettingsFileCandidates =
|
||||
[ "scripts" </> "chusql.ui.settings.json"
|
||||
, ".." </> "scripts" </> "chusql.ui.settings.json"
|
||||
[ "resources" </> "chusql.ui.settings.json"
|
||||
, ".." </> "resources" </> "chusql.ui.settings.json"
|
||||
, "chusql.ui.settings.json"
|
||||
]
|
||||
|
||||
|
||||
Reference in new issue
Block a user