glenux/mfm
glenux/mfm
1
0
Fork 1
Code Issues 20 Pull requests 5 Projects 1 Releases 2 Packages 1 Wiki Activity

Merge pull request 'fix: delay config file discovery' (#20) from feature/14-add-support-for-global-config-file into develop
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source 
Reviewed-on: #20
This commit is contained in:
Glenn Y. Rolland 2023-11-18 22:31:21 +00:00
commit 576b7c62c6
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/config.cr
View file

@ -25,7 +25,7 @@ module GX
getter home_dir : String getter home_dir : String
property verbose : Bool property verbose : Bool
property mode : Mode property mode : Mode
property path : String property path : String?
property args : AddArgs.class | DelArgs.class | NoArgs.class property args : AddArgs.class | DelArgs.class | NoArgs.class
def initialize() def initialize()
@ -37,7 +37,7 @@ module GX
@verbose = false @verbose = false
@mode = Mode::Mount @mode = Mode::Mount
@filesystems = [] of Filesystem @filesystems = [] of Filesystem
@path = detect_config_file() @path = nil
@args = NoArgs @args = NoArgs
end end
@ -66,13 +66,18 @@ module GX
end end
def load_from_file def load_from_file
path = @path
if path.nil?
path = detect_config_file()
end
@path = path
@filesystems = [] of Filesystem @filesystems = [] of Filesystem
if !File.exists? @path if !File.exists? path
Log.error { "File #{@path} does not exist!".colorize(:red) } Log.error { "File #{path} does not exist!".colorize(:red) }
exit(1) exit(1)
end end
load_filesystems(@path) load_filesystems(path)
end end
private def load_filesystems(config_path : String) private def load_filesystems(config_path : String)