ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: implemented handling of non-ASCII characters in Gradle and Maven project paths

Browse Source 
* also: fixed loading sqlite database from path with non-ascii characters
This commit is contained in:
mlangkabel
2018-02-09 15:54:28 +01:00
parent 333fc7eea2
commit 70d619a173
7 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/utility/utilityApp.cpp
+6 -6
View File
@@ -18,14 +18,14 @@ namespace utility
std::set<QProcess*> s_runningProcesses;
}
std::string utility::executeProcess(const std::string& command, const std::string& workingDirectory, const int timeout)
std::string utility::executeProcess(const std::string& command, const FilePath& workingDirectory, const int timeout)
{
QProcess process;
process.setProcessChannelMode(QProcess::MergedChannels);
if (!workingDirectory.empty())
{
process.setWorkingDirectory(workingDirectory.c_str());
process.setWorkingDirectory(QString::fromStdWString(workingDirectory.wstr()));
}
{
@@ -49,14 +49,14 @@ std::string utility::executeProcess(const std::string& command, const std::strin
return processoutput;
}
std::string utility::executeProcessUntilNoOutput(const std::string& command, const std::string& workingDirectory, const int waitTime)
std::string utility::executeProcessUntilNoOutput(const std::string& command, const FilePath& workingDirectory, const int waitTime)
{
QProcess process;
process.setProcessChannelMode(QProcess::MergedChannels);
if (!workingDirectory.empty())
{
process.setWorkingDirectory(workingDirectory.c_str());
process.setWorkingDirectory(QString::fromStdWString(workingDirectory.wstr()));
}
{
@@ -92,13 +92,13 @@ std::string utility::executeProcessUntilNoOutput(const std::string& command, con
return processoutput;
}
int utility::executeProcessAndGetExitCode(const std::string& command, const std::string& workingDirectory, const int timeout)
int utility::executeProcessAndGetExitCode(const std::string& command, const FilePath& workingDirectory, const int timeout)
{
QProcess process;
if (!workingDirectory.empty())
{
process.setWorkingDirectory(workingDirectory.c_str());
process.setWorkingDirectory(QString::fromStdWString(workingDirectory.wstr()));
}
{