fsimphy
/
bayernfahrplan
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Moved check for the existance of the substitution file from 

loadSubstitutionFile to main
This commit is contained in:
Johannes Loher 2017-04-10 21:07:53 +02:00
parent d657873f9f
commit 99d36745eb
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/app.d
View File

@ -1,5 +1,6 @@
import std.array : array, replace;
import std.datetime : Clock;
import std.file : exists, isFile;
import std.format : format;
import std.getopt : defaultGetoptPrinter, getopt;
import std.json : JSONValue;
@ -35,8 +36,11 @@ void main(string[] args)
"mode" : "direct",
"type_dm" : "any",
"itdLPxx_bcl" : "true"]);
loadSubstitutionFile(substitutionFileName);
if (substitutionFileName.exists && substitutionFileName.isFile)
{
loadSubstitutionFile(substitutionFileName);
}
auto currentTime = Clock.currTime;
JSONValue j = ["time" : "%02s:%02s".format(currentTime.hour, currentTime.minute)];

16
source/substitution.d
View File

@ -4,19 +4,11 @@ public:
void loadSubstitutionFile(string fileName)
{
import std.file : slurp, exists, isFile;
import std.file : slurp;
import std.algorithm.iteration : each;
if (fileName.exists && fileName.isFile)
{
auto data = slurp!(string, string)(fileName, `"%s" = "%s"`);
map = (string[string]).init;
data.each!(pair => map[pair[0]] = pair[1]);
}
else
{
map = (string[string]).init;
}
auto data = slurp!(string, string)(fileName, `"%s" = "%s"`);
map = (string[string]).init;
data.each!(pair => map[pair[0]] = pair[1]);
}
auto substitute(string s) @safe nothrow