From fe0f6bd76654e77d291bf43a89262d6f9d795292 Mon Sep 17 00:00:00 2001 From: Angelino Date: Sun, 1 Dec 2019 06:41:44 +0200 Subject: [PATCH 1/4] Fix #67 Now config file can have empty lines without breaking boomer --- src/config.nim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/config.nim b/src/config.nim index 4a5d1ed..69d844d 100644 --- a/src/config.nim +++ b/src/config.nim @@ -36,6 +36,8 @@ macro parseObject(obj: typed, key, val: string) = proc loadConfig*(filePath: string): Config = result = defaultConfig for rawLine in filePath.lines: + if rawLine.len == 0: + continue let line = rawLine.strip if line.len > 0 and line[0] == '#': continue From 6e1fe1e790cfd87074e8abeaed68c29ff70d93f2 Mon Sep 17 00:00:00 2001 From: Angelino Date: Sun, 1 Dec 2019 17:53:37 +0200 Subject: [PATCH 2/4] fix request change from #67 fixed also the case of a non-empty line in config, with only whitespace. --- src/config.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.nim b/src/config.nim index 69d844d..7532646 100644 --- a/src/config.nim +++ b/src/config.nim @@ -36,9 +36,9 @@ macro parseObject(obj: typed, key, val: string) = proc loadConfig*(filePath: string): Config = result = defaultConfig for rawLine in filePath.lines: - if rawLine.len == 0: - continue let line = rawLine.strip + if line.len == 0: + continue if line.len > 0 and line[0] == '#': continue let pair = line.split('=', 1) From 77471a8d3f275a66f02ce9439656c24bea43d9c0 Mon Sep 17 00:00:00 2001 From: Angelino Date: Sun, 1 Dec 2019 18:07:25 +0200 Subject: [PATCH 3/4] Small optimization in if statement Co-Authored-By: Solitude --- src/config.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.nim b/src/config.nim index 7532646..f70fb2a 100644 --- a/src/config.nim +++ b/src/config.nim @@ -39,7 +39,7 @@ proc loadConfig*(filePath: string): Config = let line = rawLine.strip if line.len == 0: continue - if line.len > 0 and line[0] == '#': + if line.len == 0 or line[0] == '#': continue let pair = line.split('=', 1) let key = pair[0].strip From 6152c2bd7fed9e3306fd36c764f9e492b03a52df Mon Sep 17 00:00:00 2001 From: Angelino Date: Sun, 1 Dec 2019 18:10:45 +0200 Subject: [PATCH 4/4] Fix from last commit, forgot to delete line --- src/config.nim | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/config.nim b/src/config.nim index f70fb2a..1012e69 100644 --- a/src/config.nim +++ b/src/config.nim @@ -37,8 +37,6 @@ proc loadConfig*(filePath: string): Config = result = defaultConfig for rawLine in filePath.lines: let line = rawLine.strip - if line.len == 0: - continue if line.len == 0 or line[0] == '#': continue let pair = line.split('=', 1)