diff --git a/src/nimassets.nim b/src/nimassets.nim index eaf124c..8c4109f 100644 --- a/src/nimassets.nim +++ b/src/nimassets.nim @@ -1,4 +1,5 @@ import + distros, os, strformat, strutils, @@ -31,7 +32,10 @@ proc handleFile(path: string): string {.thread.} = var val, valString: string val = readFile(path).encode() valString = "\"\"\"" & val & "\"\"\"" - result = &"""assets["{escape(path, prefix="", suffix="")}"] = {valString}""" & "\n\n" + if detectOs(Windows): + result = &"""assets["{escape(path, prefix="", suffix="")}"] = {valString}""" & "\n\n" + else: + result = &"""assets["{path}"] = {valString}""" & "\n\n" proc generateDirAssetsSimple*(dir: string): string = for path in expandTilde(dir).walkDirRec(): diff --git a/tests/test.nim b/tests/test.nim index 297e8ef..6e2c05c 100644 --- a/tests/test.nim +++ b/tests/test.nim @@ -1,14 +1,23 @@ import + distros, unittest, assetfile, # will be generated by the 'nimble test' task assetfile_fast # will be generated by the 'nimble test' task suite "Nimassets Tests": test "Can Obtain Assets (normal)": - check assetfile.getAsset("tests/testassets/asset1.txt") == readFile("tests/testassets/asset1.txt") - check assetfile.getAsset("tests/testassets/asset2.txt") == readFile("tests/testassets/asset2.txt") + if detectOs(Windows): + check assetfile.getAsset("tests\\testassets\\asset1.txt") == readFile("tests\\testassets\\asset1.txt") + check assetfile.getAsset("tests\\testassets\\asset2.txt") == readFile("tests\\testassets\\asset2.txt") + else: + check assetfile.getAsset("tests/testassets/asset1.txt") == readFile("tests/testassets/asset1.txt") + check assetfile.getAsset("tests/testassets/asset2.txt") == readFile("tests/testassets/asset2.txt") test "Can Obtain Assets (fast)": - check assetfile_fast.getAsset("tests/testassets/asset1.txt") == readFile("tests/testassets/asset1.txt") - check assetfile_fast.getAsset("tests/testassets/asset2.txt") == readFile("tests/testassets/asset2.txt") + if detectOs(Windows): + check assetfile_fast.getAsset("tests\\testassets\\asset1.txt") == readFile("tests\\testassets\\asset1.txt") + check assetfile_fast.getAsset("tests\\testassets\\asset2.txt") == readFile("tests\\testassets\\asset2.txt") + else: + check assetfile_fast.getAsset("tests/testassets/asset1.txt") == readFile("tests/testassets/asset1.txt") + check assetfile_fast.getAsset("tests/testassets/asset2.txt") == readFile("tests/testassets/asset2.txt")