Upstream
/
Plan
mirror of https://github.com/plan-player-analytics/Plan.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed export open options 

FlatIcon_circle.png is truncated to 0 bytes on second write.

Added WRITE Open option to the FileOutputStream

Affected issues:
- Possibly fixed #1194
This commit is contained in:
Rsl1122 2019-10-19 13:18:15 +03:00
parent e41b270f1b
commit 50a0e3ccdd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plan/common/src/main/java/com/djrapitops/plan/delivery/export/FileExporter.java
View File

@ -26,6 +26,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.OpenOption;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.Arrays;
@ -38,6 +39,8 @@ import java.util.List;
*/
abstract class FileExporter {
private static final OpenOption[] OPEN_OPTIONS = {StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE};
private static void copy(InputStream in, OutputStream out) throws IOException {
int read;
byte[] bytes = new byte[1024];
@ -49,12 +52,12 @@ abstract class FileExporter {
void export(Path to, List<String> content) throws IOException {
Files.createDirectories(to.getParent());
Files.write(to, content, StandardCharsets.UTF_8, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE);
Files.write(to, content, StandardCharsets.UTF_8, OPEN_OPTIONS);
}
void export(Path to, String content) throws IOException {
Files.createDirectories(to.getParent());
Files.write(to, Arrays.asList(StringUtils.split(content, "\r\n")), StandardCharsets.UTF_8, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE);
Files.write(to, Arrays.asList(StringUtils.split(content, "\r\n")), StandardCharsets.UTF_8, OPEN_OPTIONS);
}
void export(Path to, Resource resource) throws IOException {
@ -62,7 +65,7 @@ abstract class FileExporter {
try (
InputStream in = resource.asInputStream();
OutputStream out = Files.newOutputStream(to, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE)
OutputStream out = Files.newOutputStream(to, OPEN_OPTIONS)
) {
copy(in, out);
}