From a4bdd3cff9b05c60ff53e6ffddaaa2d76825fb31 Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Fri, 30 Sep 2022 19:39:27 +0900 Subject: [PATCH 1/2] added yml file list to specified target path #8 --- src/takajo.nim | 9 ++++++++- src/takajopkg/submodule.nim | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/takajo.nim b/src/takajo.nim index c23841a4..e3002001 100644 --- a/src/takajo.nim +++ b/src/takajo.nim @@ -20,5 +20,12 @@ Options: when isMainModule: let args = docopt(doc) - if args["c"] == true and not args[""]: + if args[""]: let csvData = getHayabusaCsvData($args[""]) + if args[""]: + let rulePath: string = args[""] + for f in walkDirRec(rulePath, "*.yml"): + + if args["c"] == true and args[""]: + let targetColumn = args[""] + csvData[targetColumn] diff --git a/src/takajopkg/submodule.nim b/src/takajopkg/submodule.nim index 3fcb333a..b9b9e33b 100644 --- a/src/takajopkg/submodule.nim +++ b/src/takajopkg/submodule.nim @@ -5,8 +5,17 @@ import std/tables import std/parsecsv +import std/os +import std/strutils from std/streams import newFileStream +proc getYMLLists*(targetDirPath: string): seq[string] = + var r: seq[string] = @[] + for f in walkDirRec(targetDirPath): + if f.endsWith(".yml"): + r.insert(f) + return r + proc getHayabusaCsvData*(csvPath: string): Tableref[string, seq[string]] = ## procedure for Hayabusa output csv read data. From d3125a160ac15ffd007e1f4d15050036137e855a Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Fri, 30 Sep 2022 19:40:12 +0900 Subject: [PATCH 2/2] added tests #8 --- tests/testsubmodule.nim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/testsubmodule.nim b/tests/testsubmodule.nim index 60ea5f2d..9d55b062 100644 --- a/tests/testsubmodule.nim +++ b/tests/testsubmodule.nim @@ -34,3 +34,6 @@ test "csv file path import": writeFile("temp.csv", expect_content) check getHayabusaCsvData("./tests/data/1.csv") == expect_table +test "check getYMLLists": + let expect = @["tests\\data\\1.yml"] + check getYMLLists("./tests") == expect