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

ui: display multi-line maven error messages (issue #622)

Browse Source
This commit is contained in:
mlangkabel
2018-10-05 13:32:25 +02:00
parent 9edfdacd72
commit 10658b2801
6 changed files with 71 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_java/project/SourceGroupJavaMaven.cpp
+9 -16
View File
@@ -94,26 +94,19 @@ bool SourceGroupJavaMaven::prepareMavenData()
dialogView->hideUnknownProgressDialog();
});
bool success = utility::mavenGenerateSources(mavenPath, projectRootPath);
if (!success)
const std::wstring errorMessage = utility::mavenGenerateSources(mavenPath, projectRootPath);
if (!errorMessage.empty())
{
const std::wstring dialogMessage =
L"Sourcetrail was unable to locate Maven on this machine.\n"
"Please make sure to provide the correct Maven Path in the preferences.";
MessageStatus(dialogMessage, true, false).dispatch();
Application::getInstance()->handleDialog(dialogMessage);
MessageStatus(errorMessage, true, false).dispatch();
Application::getInstance()->handleDialog(errorMessage);
return false;
}
if (success)
{
dialogView->showUnknownProgressDialog(L"Preparing Project", L"Maven\nExporting Dependencies");
dialogView->showUnknownProgressDialog(L"Preparing Project", L"Maven\nExporting Dependencies");
success = utility::mavenCopyDependencies(
mavenPath, projectRootPath, m_settings->getMavenDependenciesDirectoryExpandedAndAbsolute()
);
}
bool success = utility::mavenCopyDependencies(
mavenPath, projectRootPath, m_settings->getMavenDependenciesDirectoryExpandedAndAbsolute()
);
return success;
}
src/lib_java/utility/utilityMaven.cpp
+51 -29
View File
@@ -58,48 +58,76 @@ namespace
putenv(const_cast<char*>(("JAVA_HOME=" + javaHomePath.str()).c_str()));
}
}
std::wstring getErrorMessageFromMavenOutput(std::shared_ptr<const TextAccess> mavenOutput)
{
const std::string errorPrefix = "[ERROR]";
const std::string fatalPrefix = "[FATAL]";
std::wstring errorMessage;
for (const std::string& line : mavenOutput->getAllLines())
{
const std::string trimmedLine = utility::trim(line);
if (utility::isPrefix<std::string>(errorPrefix, trimmedLine))
{
errorMessage += utility::decodeFromUtf8(utility::trim(trimmedLine.substr(errorPrefix.size())) + "\n");
}
else if (utility::isPrefix<std::string>(fatalPrefix, trimmedLine))
{
errorMessage += utility::decodeFromUtf8(trimmedLine + "\n");
}
}
if (!errorMessage.empty())
{
errorMessage = L"The following error occurred while executing a Maven command:\n\n" + errorMessage;
}
return errorMessage;
}
}
namespace utility
{
bool mavenGenerateSources(const FilePath& mavenPath, const FilePath& projectDirectoryPath)
std::wstring mavenGenerateSources(const FilePath& mavenPath, const FilePath& projectDirectoryPath)
{
setJavaHomeVariableIfNotExists();
const std::string output = utility::executeProcessUntilNoOutput(
std::shared_ptr<TextAccess> outputAccess = TextAccess::createFromString(utility::executeProcessUntilNoOutput(
"\"" + mavenPath.str() + "\" generate-sources",
projectDirectoryPath,
60000
);
return !output.empty();
));
if (outputAccess->isEmpty())
{
return L"Sourcetrail was unable to locate Maven on this machine.\nPlease make sure to provide the correct Maven Path in the preferences.";
}
return getErrorMessageFromMavenOutput(outputAccess);
}
bool mavenCopyDependencies(const FilePath& mavenPath, const FilePath& projectDirectoryPath, const FilePath& outputDirectoryPath)
{
setJavaHomeVariableIfNotExists();
const std::string output = utility::executeProcessUntilNoOutput(
std::shared_ptr<TextAccess> outputAccess = TextAccess::createFromString(utility::executeProcessUntilNoOutput(
"\"" + mavenPath.str() + "\" dependency:copy-dependencies -DoutputDirectory=" + outputDirectoryPath.str(),
projectDirectoryPath,
60000
);
));
std::shared_ptr<TextAccess> outputAccess = TextAccess::createFromString(output);
for (const std::string& line: outputAccess->getAllLines())
const std::wstring errorMessage = getErrorMessageFromMavenOutput(outputAccess);
if (!errorMessage.empty())
{
if (utility::isPrefix<std::string>("[ERROR]", utility::trim(line)))
{
// TODO: move error handling to caller of this function
const std::wstring dialogMessage =
L"The following error occurred while executing a Maven command:\n\n" +
utility::decodeFromUtf8(utility::replace(line, "\r\n", "\n"));
MessageStatus(dialogMessage, true, false).dispatch();
Application::getInstance()->handleDialog(dialogMessage);
return false;
}
MessageStatus(errorMessage, true, false).dispatch();
Application::getInstance()->handleDialog(errorMessage);
return false;
}
return !output.empty();
return !outputAccess->isEmpty();
}
std::vector<FilePath> mavenGetAllDirectoriesFromEffectivePom(const FilePath& mavenPath, const FilePath& projectDirectoryPath, bool addTestDirectories)
@@ -112,17 +140,11 @@ namespace utility
60000
));
if (outputAccess->getLineCount() > 0 && utility::isPrefix<std::string>("Error", utility::trim(outputAccess->getLine(1))))
const std::wstring errorMessage = getErrorMessageFromMavenOutput(outputAccess);
if (!errorMessage.empty())
{
// TODO: move error handling to caller of this function
const std::wstring dialogMessage =
L"The following error occurred while executing a Maven command:\n\n" +
utility::decodeFromUtf8(utility::replace(outputAccess->getText(), "\r\n", "\n"));
MessageStatus(dialogMessage, true, false).dispatch();
Application::getInstance()->handleDialog(dialogMessage);
MessageStatus(errorMessage, true, false).dispatch();
Application::getInstance()->handleDialog(errorMessage);
return std::vector<FilePath>();
}
src/lib_java/utility/utilityMaven.h
+1 -1
View File
@@ -7,7 +7,7 @@ class FilePath;
namespace utility
{
bool mavenGenerateSources(const FilePath& mavenPath, const FilePath& projectDirectoryPath);
std::wstring mavenGenerateSources(const FilePath& mavenPath, const FilePath& projectDirectoryPath);
bool mavenCopyDependencies(const FilePath& mavenPath, const FilePath& projectDirectoryPath, const FilePath& outputDirectoryPath);
std::vector<FilePath> mavenGetAllDirectoriesFromEffectivePom(const FilePath& mavenPath, const FilePath& projectDirectoryPath, bool addTestDirectories);
}