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

Merge pull request #228 from MyLittleRobo/master 

Few fixes
This commit is contained in:
Vadim Lopatin 2016-04-09 13:29:15 +03:00
parent 48f8ac2577 a36ef7e447
commit 2f39fd8891
3 changed files with 105 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/example1/dub.json
View File

@ -27,6 +27,12 @@
"subConfigurations" : { "subConfigurations" : {
"dlangui" : "sdl" "dlangui" : "sdl"
} }
},
{
"name" : "minimal",
"subConfigurations" : {
"dlangui" : "minimal"
}
} }
] ]
} }

8
src/dlangui/core/files.d
View File

@ -427,7 +427,7 @@ RootEntry[] getBookmarkPaths() nothrow
string linksFolder = linksFolderZ[0..wcslen(linksFolderZ)].toUTF8; string linksFolder = linksFolderZ[0..wcslen(linksFolderZ)].toUTF8;
CoInitialize(null); enforce(SUCCEEDED(CoInitialize(null)));
scope(exit) CoUninitialize(); scope(exit) CoUninitialize();
HRESULT hres; HRESULT hres;
@ -435,7 +435,7 @@ RootEntry[] getBookmarkPaths() nothrow
auto clsidShellLink = CLSID_ShellLink; auto clsidShellLink = CLSID_ShellLink;
auto iidShellLink = IID_IShellLinkW; auto iidShellLink = IID_IShellLinkW;
hres = CoCreateInstance(&clsidShellLink, null, CLSCTX_INPROC, &iidShellLink, cast(LPVOID*)&psl); hres = CoCreateInstance(&clsidShellLink, null, CLSCTX.CLSCTX_INPROC_SERVER, &iidShellLink, cast(LPVOID*)&psl);
enforce(SUCCEEDED(hres), "Failed to create IShellLink instance"); enforce(SUCCEEDED(hres), "Failed to create IShellLink instance");
scope(exit) psl.Release(); scope(exit) psl.Release();
@ -456,7 +456,7 @@ RootEntry[] getBookmarkPaths() nothrow
hres = ppf.Load(linkFile.name.toUTF16z, STGM_READ); hres = ppf.Load(linkFile.name.toUTF16z, STGM_READ);
enforce(SUCCEEDED(hres), "Failed to load link file"); enforce(SUCCEEDED(hres), "Failed to load link file");
hres = psl.Resolve(null, 0); hres = psl.Resolve(null, SLR_FLAGS.SLR_NO_UI);
enforce(SUCCEEDED(hres), "Failed to resolve link"); enforce(SUCCEEDED(hres), "Failed to resolve link");
hres = psl.GetPath(szGotPath.ptr, szGotPath.length, &wfd, 0); hres = psl.GetPath(szGotPath.ptr, szGotPath.length, &wfd, 0);
@ -464,7 +464,7 @@ RootEntry[] getBookmarkPaths() nothrow
auto path = szGotPath[0..wcslen(szGotPath.ptr)]; auto path = szGotPath[0..wcslen(szGotPath.ptr)];
if (path.length) { if (path.length && path.isDir) {
res ~= RootEntry(RootEntryType.BOOKMARK, path.toUTF8, linkFile.name.baseName.stripExtension.toUTF32); res ~= RootEntry(RootEntryType.BOOKMARK, path.toUTF8, linkFile.name.baseName.stripExtension.toUTF32);
} }
} catch(Exception e) { } catch(Exception e) {

215
src/dlangui/platforms/sdl/sdlapp.d
View File

@ -1277,14 +1277,14 @@ class SDLPlatform : Platform {
return toReturn.data; return toReturn.data;
} }
static auto unescapeExecArgument(string arg) nothrow pure static auto unescapeValue(string arg) nothrow pure
{ {
static immutable Tuple!(char, char)[] pairs = [ static immutable Tuple!(char, char)[] pairs = [
tuple('s', ' '), tuple('n', '\n'), tuple('r', '\r'), tuple('t', '\t'), tuple('s', ' '),
tuple('"', '"'), tuple('\'', '\''), tuple('\\', '\\'), tuple('>', '>'), tuple('n', '\n'),
tuple('<', '<'), tuple('~', '~'), tuple('|', '|'), tuple('&', '&'), tuple('r', '\r'),
tuple(';', ';'), tuple('$', '$'), tuple('*', '*'), tuple('?', '?'), tuple('t', '\t'),
tuple('#', '#'), tuple('(', '('), tuple(')', ')'), tuple('`', '`') tuple('\\', '\\')
]; ];
return doUnescape(arg, pairs); return doUnescape(arg, pairs);
} }
@ -1292,7 +1292,10 @@ class SDLPlatform : Platform {
static string unescapeQuotedArgument(string value) nothrow pure static string unescapeQuotedArgument(string value) nothrow pure
{ {
static immutable Tuple!(char, char)[] pairs = [ static immutable Tuple!(char, char)[] pairs = [
tuple('`', '`'), tuple('$', '$'), tuple('"', '"'), tuple('\\', '\\') tuple('`', '`'),
tuple('$', '$'),
tuple('"', '"'),
tuple('\\', '\\')
]; ];
return doUnescape(value, pairs); return doUnescape(value, pairs);
} }
@ -1345,7 +1348,7 @@ class SDLPlatform : Platform {
static string[] parseExecString(string execString) pure static string[] parseExecString(string execString) pure
{ {
return unquoteExecString(execString).map!(unescapeExecArgument).array; return unquoteExecString(execString).map!(unescapeValue).array;
} }
static string[] expandExecArgs(in string[] execArgs, in string[] urls = null, string iconName = null, string name = null, string fileName = null) pure static string[] expandExecArgs(in string[] execArgs, in string[] urls = null, string iconName = null, string name = null, string fileName = null) pure
@ -1411,6 +1414,39 @@ class SDLPlatform : Platform {
} }
return null; return null;
} }
static void parseConfigFile(string fileName, string wantedGroup, bool delegate (in char[], in char[]) onKeyValue)
{
bool inNeededGroup;
foreach(line; File(fileName).byLine()) {
if (!line.length || line[0] == '#') {
continue;
} else if (line[0] == '[') {
if (line.equal(wantedGroup)) {
inNeededGroup = true;
} else {
if (inNeededGroup) {
break;
}
inNeededGroup = false;
}
} else if (line[0].isAlpha) {
if (inNeededGroup) {
auto splitted = findSplit(line, "=");
if (splitted[1].length) {
auto key = splitted[0];
auto value = splitted[2];
if (!onKeyValue(key, value)) {
return;
}
}
}
} else {
//unexpected line content
break;
}
}
}
static string[] findFileManagerCommand(string app, const(string)[] appDirs, const(string)[] binPaths) nothrow static string[] findFileManagerCommand(string app, const(string)[] appDirs, const(string)[] binPaths) nothrow
{ {
@ -1429,54 +1465,28 @@ class SDLPlatform : Platform {
if (fileExists) { if (fileExists) {
try { try {
bool inDesktopEntry;
bool canOpenDirectory; //not used for now. Some file managers does not have MimeType in their .desktop file. bool canOpenDirectory; //not used for now. Some file managers does not have MimeType in their .desktop file.
string exec; string exec;
string tryExec; string tryExec;
foreach(line; File(appPath).byLine()) { parseConfigFile(appPath, "[Desktop Entry]", delegate bool(in char[] key, in char[] value) {
if (exec.length || tryExec.length) { if (key.equal("MimeType")) {
break; canOpenDirectory = value.splitter(';').canFind("inode/directory");
} else if (key.equal("Exec")) {
exec = value.idup;
} else if (key.equal("TryExec")) {
tryExec = value.idup;
} }
if (!line.length || line[0] == '#') { return true;
continue; });
} else if (line[0] == '[') {
if (line.equal("[Desktop Entry]")) {
inDesktopEntry = true;
} else {
if (inDesktopEntry) {
break;
}
inDesktopEntry = false;
}
} else if (line[0].isAlpha) {
if (inDesktopEntry) {
auto splitted = findSplit(line, "=");
if (splitted[1].length) {
auto key = splitted[0];
auto value = splitted[2];
if (key.equal("MimeType")) {
canOpenDirectory = value.splitter(';').canFind("inode/directory");
} else if (key.equal("Exec")) {
exec = value.idup;
} else if (key.equal("TryExec")) {
tryExec = value.idup;
}
}
}
} else {
//unexpected line content
break;
}
}
if (tryExec.length) {
auto program = findExecutable(tryExec, binPaths);
if (program.length) {
return [program];
}
}
if (exec.length) { if (exec.length) {
if (tryExec.length) {
auto program = findExecutable(tryExec, binPaths);
if (!program.length) {
continue;
}
}
return expandExecArgs(parseExecString(exec)); return expandExecArgs(parseExecString(exec));
} }
@ -1544,95 +1554,60 @@ class SDLPlatform : Platform {
string appHome = environment.get("XDG_DATA_HOME", buildPath(environment.get("HOME"), ".local/share")).buildPath("applications"); string appHome = environment.get("XDG_DATA_HOME", buildPath(environment.get("HOME"), ".local/share")).buildPath("applications");
auto configDirs = environment.get("XDG_CONFIG_DIRS", "/etc/xdg").splitter(':').find!(p => p.length > 0); auto configDirs = environment.get("XDG_CONFIG_DIRS", "/etc/xdg").splitter(':').find!(p => p.length > 0);
auto appDirs = environment.get("XDG_DATA_DIRS", "/usr/local/share:/usr/share").splitter(':').find!(p => p.length > 0).map!(p => buildPath(p, "applications")); auto appDirs = environment.get("XDG_DATA_DIRS", "/usr/local/share:/usr/share").splitter(':').filter!(p => p.length > 0).map!(p => buildPath(p, "applications"));
auto allAppDirs = chain(only(appHome), appDirs).array; auto allAppDirs = chain(only(appHome), appDirs).array;
auto binPaths = environment.get("PATH").splitter(':').find!(p => p.length > 0).array; auto binPaths = environment.get("PATH").splitter(':').filter!(p => p.length > 0).array;
string[] fileManagerArgs;
foreach(mimeappsList; chain(only(configHome), only(appHome), configDirs, appDirs).map!(p => buildPath(p, "mimeapps.list"))) { foreach(mimeappsList; chain(only(configHome), only(appHome), configDirs, appDirs).map!(p => buildPath(p, "mimeapps.list"))) {
try { try {
bool inDefaultApps; parseConfigFile(mimeappsList, "[Default Applications]", delegate bool(in char[] key, in char[] value) {
foreach(line; File(mimeappsList).byLine()) { if (key.equal("inode/directory") && value.length) {
if (!line.length || line[0] == '#') { auto app = value.idup;
continue; fileManagerArgs = findFileManagerCommand(app, allAppDirs, binPaths);
} else if (line[0] == '[') { return false;
if (line.equal("[Default Applications]")) {
inDefaultApps = true;
} else {
if (inDefaultApps) {
break;
}
inDefaultApps = false;
}
} else if (line[0].isAlpha) {
if (inDefaultApps) {
auto keyValue = findSplit(line, "=");
auto key = keyValue[0];
auto value = keyValue[2];
if (keyValue[1].length && key.equal("inode/directory") && value.length) {
auto app = value.idup;
auto fileManagerArgs = findFileManagerCommand(app, allAppDirs, binPaths);
if (fileManagerArgs.length) {
execShowInFileManager(fileManagerArgs, toOpen);
return true;
} else {
break;
}
}
}
} else {
//unexpected line content
break;
} }
} return true;
});
} catch(Exception e) { } catch(Exception e) {
} }
if (fileManagerArgs.length) {
execShowInFileManager(fileManagerArgs, toOpen);
return true;
}
} }
foreach(mimeinfoCache; allAppDirs.map!(p => buildPath(p, "mimeinfo.cache"))) { foreach(mimeinfoCache; allAppDirs.map!(p => buildPath(p, "mimeinfo.cache"))) {
try { try {
bool inMimeCache; parseConfigFile(mimeinfoCache, "[MIME Cache]", delegate bool(in char[] key, in char[] value) {
foreach(line; File(mimeinfoCache).byLine()) { if (key > "inode/directory") { //no need to proceed, since MIME types are sorted in alphabetical order.
if (!line.length || line[0] == '#') { return false;
continue;
} else if (line[0] == '[') {
if (line.equal("[MIME Cache]")) {
inMimeCache = true;
} else {
if (inMimeCache) {
break;
}
inMimeCache = false;
}
} else if (line[0].isAlpha) {
if (inMimeCache) {
auto keyValue = findSplit(line, "=");
auto key = keyValue[0];
auto value = keyValue[2];
if (keyValue[1].length && key.equal("inode/directory") && value.length) {
auto alternatives = value.splitter(';').filter!(p => p.length > 0);
foreach(alternative; alternatives) {
auto fileManagerArgs = findFileManagerCommand(alternative.idup, allAppDirs, binPaths);
if (fileManagerArgs.length) {
execShowInFileManager(fileManagerArgs, toOpen);
return true;
}
}
break;
}
}
} else {
//unexpected line content
break;
} }
} if (key.equal("inode/directory") && value.length) {
auto alternatives = value.splitter(';').filter!(p => p.length > 0);
foreach(alternative; alternatives) {
fileManagerArgs = findFileManagerCommand(alternative.idup, allAppDirs, binPaths);
if (fileManagerArgs.length) {
break;
}
}
return false;
}
return true;
});
} catch(Exception e) { } catch(Exception e) {
} }
if (fileManagerArgs.length) {
execShowInFileManager(fileManagerArgs, toOpen);
return true;
}
} }
Log.e("showInFileManager -- could not find application to open directory"); Log.e("showInFileManager -- could not find application to open directory");
return false; return false;
} }