Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-03-17 20:52:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

When serving a website, delete the unzipped directory if the index file is not found.

Browse Source 
This is a quick solution to rebuild directory structures with missing files. This whole area of the code needs some reworking, as serving the site from a temporary folder is not a robust long term solution.
This commit is contained in:
CalDescent 2021-07-10 15:51:46 +01:00
parent f938d8c878
commit 5a95c827b4
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@ -450,6 +450,11 @@
<artifactId>commons-text</artifactId>
<version>${commons-text.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
<!-- For bitset/bitmap compression -->
<dependency>
<groupId>io.druid</groupId>

14
src/main/java/org/qortal/api/resource/WebsiteResource.java
View File

@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.qortal.api.ApiError;
@ -355,8 +356,19 @@ public class WebsiteResource {
inputStream.close();
}
return response;
} catch (FileNotFoundException e) {
LOGGER.info("File not found at path: {}", unzippedPath);
if (inPath.equals("/")) {
// Delete the unzipped folder if no index file was found
try {
FileUtils.deleteDirectory(new File(unzippedPath));
} catch (IOException ioException) {
LOGGER.info("Unable to delete directory: {}", unzippedPath, e);
}
}
} catch (IOException e) {
LOGGER.info("Unable to serve file at path: {}", inPath);
LOGGER.info("Unable to serve file at path: {}", inPath, e);
}
return this.get404Response();