forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autodetect line endings while processing resource list for embedding; issue #49

This commit is contained in:
Vadim Lopatin 2015-02-08 19:43:07 +03:00
parent 5212b97151
commit 1f26e95467
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dlangui/graphics/resources.d
View File

@ -168,9 +168,21 @@ EmbeddedResource[] embedResources(string[] resourceNames)() {
return embedResources!(resourceNames[0 .. $/2])() ~ embedResources!(resourceNames[$/2 .. $])(); return embedResources!(resourceNames[0 .. $/2])() ~ embedResources!(resourceNames[$/2 .. $])();
} }
/// split string into lines, autodetect line endings
string[] splitLines(string s) {
auto lines_crlf = split(s, "\r\n");
auto lines_cr = split(s, "\r");
auto lines_lf = split(s, "\n");
if (lines_crlf.length >= lines_cr.length && lines_crlf.length >= lines_lf.length)
return lines_crlf;
if (lines_cr.length > lines_lf.length)
return lines_cr;
return lines_lf;
}
/// embed all resources from list /// embed all resources from list
EmbeddedResource[] embedResourcesFromList(string resourceList)() { EmbeddedResource[] embedResourcesFromList(string resourceList)() {
return embedResources!(split(import(resourceList), "\n"))(); return embedResources!(splitLines(import(resourceList)))();
} }