From 29912a0ac95ac683bad49eaa6962cebc7f604ef7 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 28 Dec 2015 19:17:29 +0100 Subject: [PATCH 1/2] Remove temporary files when updating library_index.json Fix #4272 #4332 --- .../src/cc/arduino/contributions/GZippedJsonDownloader.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arduino-core/src/cc/arduino/contributions/GZippedJsonDownloader.java b/arduino-core/src/cc/arduino/contributions/GZippedJsonDownloader.java index df7eee420b1..4ba66378e17 100644 --- a/arduino-core/src/cc/arduino/contributions/GZippedJsonDownloader.java +++ b/arduino-core/src/cc/arduino/contributions/GZippedJsonDownloader.java @@ -53,8 +53,13 @@ public void download(File tmpFile, Progress progress, String statusText, Progres try { new JsonDownloader(downloader, gzippedUrl).download(tmpFile, progress, statusText, progressListener); File gzipTmpFile = new File(tmpFile.getParentFile(), GzipUtils.getCompressedFilename(tmpFile.getName())); + // remove eventual leftovers from previous downloads + if (gzipTmpFile.exists()) { + gzipTmpFile.delete(); + } tmpFile.renameTo(gzipTmpFile); decompress(gzipTmpFile, tmpFile); + gzipTmpFile.delete(); } catch (Exception e) { new JsonDownloader(downloader, url).download(tmpFile, progress, statusText, progressListener); } From cce61f6aad3c7007f1f269464094fd9121e57833 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 30 Dec 2015 10:08:29 +0100 Subject: [PATCH 2/2] Remove unnecessary rename in GZippedJsonDownloader See #4361 --- .../src/cc/arduino/contributions/GZippedJsonDownloader.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arduino-core/src/cc/arduino/contributions/GZippedJsonDownloader.java b/arduino-core/src/cc/arduino/contributions/GZippedJsonDownloader.java index 4ba66378e17..6b6f3812327 100644 --- a/arduino-core/src/cc/arduino/contributions/GZippedJsonDownloader.java +++ b/arduino-core/src/cc/arduino/contributions/GZippedJsonDownloader.java @@ -51,13 +51,12 @@ public GZippedJsonDownloader(DownloadableContributionsDownloader downloader, URL public void download(File tmpFile, Progress progress, String statusText, ProgressListener progressListener) throws Exception { try { - new JsonDownloader(downloader, gzippedUrl).download(tmpFile, progress, statusText, progressListener); File gzipTmpFile = new File(tmpFile.getParentFile(), GzipUtils.getCompressedFilename(tmpFile.getName())); // remove eventual leftovers from previous downloads if (gzipTmpFile.exists()) { gzipTmpFile.delete(); } - tmpFile.renameTo(gzipTmpFile); + new JsonDownloader(downloader, gzippedUrl).download(gzipTmpFile, progress, statusText, progressListener); decompress(gzipTmpFile, tmpFile); gzipTmpFile.delete(); } catch (Exception e) {