|
|
@ -55,8 +55,8 @@ class ProjectGenerator {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
Log.info("Could not extract '" + response.getContentType() + "'");
|
|
|
|
Log.info("Could not extract '" + response.getContentType() + "'");
|
|
|
|
fileName = response.getFileName(); // Use value from the server since we
|
|
|
|
// Use value from the server since we can't extract it
|
|
|
|
// can't extract it
|
|
|
|
fileName = response.getFileName();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (fileName == null) {
|
|
|
|
if (fileName == null) {
|
|
|
@ -71,12 +71,14 @@ class ProjectGenerator {
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Detect if the project should be extracted.
|
|
|
|
* Detect if the project should be extracted.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
private boolean shouldExtract(ProjectGenerationRequest request, ProjectGenerationResponse response) {
|
|
|
|
private boolean shouldExtract(ProjectGenerationRequest request,
|
|
|
|
|
|
|
|
ProjectGenerationResponse response) {
|
|
|
|
if (request.isExtract()) {
|
|
|
|
if (request.isExtract()) {
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// An explicit name has been provided for an archive and there is no extension in it
|
|
|
|
// explicit name hasn't been provided for an archive and there is no extension
|
|
|
|
if (isZipArchive(response) && request.getOutput() != null && !request.getOutput().contains(".")) {
|
|
|
|
if (isZipArchive(response) && request.getOutput() != null
|
|
|
|
|
|
|
|
&& !request.getOutput().contains(".")) {
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|