test(downloader.http): expand testing

davinkevin · Feb 12, 2016 · e23b95f · e23b95f
1 parent 3df79d8
commit e23b95f
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 39 deletions.
diff --git a/src/main/java/lan/dk/podcastserver/manager/worker/downloader/AbstractDownloader.java b/src/main/java/lan/dk/podcastserver/manager/worker/downloader/AbstractDownloader.java
@@ -7,7 +7,6 @@
 import lan.dk.podcastserver.repository.PodcastRepository;
 import lan.dk.podcastserver.service.MimeTypeService;
 import lan.dk.podcastserver.service.PodcastServerParameters;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -19,10 +18,7 @@
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.nio.file.*;
 import java.time.ZonedDateTime;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -39,6 +35,8 @@ public abstract class AbstractDownloader implements Runnable, Downloader {
     protected Item item;
     protected String temporaryExtension;
     protected File target = null;
+    protected PathMatcher hasTempExtensionMatcher;
+
 
     @Resource protected PodcastRepository podcastRepository;
     @Resource protected ItemRepository itemRepository;
@@ -103,12 +101,13 @@ public void finishDownload() {
 
         item.setStatus(Status.FINISH);
         try {
+            if (hasTempExtensionMatcher.matches(target.toPath().getFileName())) {
+                Path targetWithoutExtension = target.toPath().resolveSibling(target.toPath().getFileName().toString().replace(temporaryExtension, ""));
+
+                Files.deleteIfExists(targetWithoutExtension);
+                Files.move(target.toPath(), targetWithoutExtension);
 
-            if (target.getAbsolutePath().contains(temporaryExtension)) {
-                File targetWithoutExtension = new File(target.getAbsolutePath().replace(temporaryExtension, ""));
-                if (targetWithoutExtension.exists()) targetWithoutExtension.delete();
-                FileUtils.moveFile(target, targetWithoutExtension);
-                target = targetWithoutExtension;
+                target = targetWithoutExtension.toFile();
             }
             item
                 .setLength(Files.size(target.toPath()))
@@ -118,8 +117,8 @@ public void finishDownload() {
             item.setMimeType(mimeTypeService.getMimeType(FilenameUtils.getExtension(target.getAbsolutePath())));
         }
 
-        item.setFileName(FilenameUtils.getName(target.getAbsolutePath()));
-        item.setDownloadDate(ZonedDateTime.of(LocalDateTime.now(), ZoneId.systemDefault()));
+        item.setFileName(FilenameUtils.getName(target.toPath().getFileName().toString()));
+        item.setDownloadDate(ZonedDateTime.now());
 
         saveSyncWithPodcast();
         convertAndSaveBroadcast();
@@ -132,40 +131,30 @@ public void resetDownload() {
     @Transactional
     public File getTagetFile (Item item) {
 
-        if (target != null)
-            return target;
+        if (nonNull(target)) return target;
 
-        File finalFile = getDestinationFile(item);
-        logger.debug("Création du fichier : {}", finalFile.getAbsolutePath());
+        Path finalFile = getDestinationFile(item);
+        logger.debug("Creation of file : {}", finalFile.toFile().getAbsolutePath());
 
-        if (!finalFile.getParentFile().exists()) {
-            finalFile.getParentFile().mkdirs();
-        }
+        try {
+            if (Files.notExists(finalFile.getParent())) Files.createDirectory(finalFile.getParent());
 
-        if (finalFile.exists() || new File(finalFile.getAbsolutePath().concat(temporaryExtension)).exists()) {
-            logger.info("Doublon sur le fichier en lien avec {} - {}, {}", item.getPodcast().getTitle(), item.getId(), item.getTitle() );
-            try {
-                finalFile  = File.createTempFile(
-                        FilenameUtils.getBaseName(getItemUrl()).concat("-"),
-                        ".".concat(FilenameUtils.getExtension(getItemUrl())),
-                        finalFile.getParentFile());
-                finalFile.delete();
-            } catch (IOException e) {
-                logger.error("Erreur lors du renommage d'un doublon", e);
-                stopDownload();
+            if (!(Files.exists(finalFile) || Files.exists(finalFile.resolveSibling(finalFile.getFileName() + temporaryExtension)))) {
+                return finalFile.resolveSibling(finalFile.getFileName() + temporaryExtension).toFile();
             }
-        }
 
-        return new File(finalFile.getAbsolutePath() + temporaryExtension) ;
+            logger.info("Doublon sur le fichier en lien avec {} - {}, {}", item.getPodcast().getTitle(), item.getId(), item.getTitle() );
+            return Files.createTempFile(finalFile.getParent(), FilenameUtils.getBaseName(getItemUrl()) + "-", "." + FilenameUtils.getExtension(getItemUrl()) + temporaryExtension).toFile();
+        } catch (IOException e) {
+            logger.error("Erreur lors du renommage d'un doublon", e);
+            stopDownload();
+            return null;
+        }
     }
 
-    private File getDestinationFile(Item item) {
-        String fileName = FilenameUtils.getName(String.valueOf(getItemUrl()));
-
-        if (StringUtils.contains(fileName, "?"))
-            fileName = fileName.substring(0, fileName.lastIndexOf("?"));
-
-        return  Paths.get(itemDownloadManager.getRootfolder(), item.getPodcast().getTitle(), fileName).toFile();
+    private Path getDestinationFile(Item item) {
+        String fileName = FilenameUtils.getName(StringUtils.substringBefore(getItemUrl(), "?"));
+        return  Paths.get(itemDownloadManager.getRootfolder(), item.getPodcast().getTitle(), fileName);
     }
 
     @Transactional
@@ -191,5 +180,6 @@ public String getItemUrl() {
     @PostConstruct
     public void postConstruct() {
         temporaryExtension = podcastServerParameters.getDownloadExtension();
+        hasTempExtensionMatcher = FileSystems.getDefault().getPathMatcher("glob:*" + temporaryExtension);
     }
 }
diff --git a/src/test/java/lan/dk/podcastserver/manager/worker/downloader/HTTPDownloaderTest.java b/src/test/java/lan/dk/podcastserver/manager/worker/downloader/HTTPDownloaderTest.java
@@ -339,4 +339,20 @@ public void should_get_the_same_target_file_each_call() throws MalformedURLExcep
         /* Then */
         assertThat(httpDownloader.target).isSameAs(target2);
     }
+
+    @Test
+    public void should_handle_duplicate_on_file_name() throws IOException {
+        /* Given */
+        httpDownloader.setItem(item);
+        Files.createDirectory(Paths.get(ROOT_FOLDER, podcast.getTitle()));
+        Files.createFile(Paths.get(ROOT_FOLDER, podcast.getTitle(), "file.mp4" + TEMPORARY_EXTENSION));
+
+        when(itemDownloadManager.getRootfolder()).thenReturn(ROOT_FOLDER);
+
+        /* When */
+        File targetFile = httpDownloader.getTagetFile(item);
+
+        /* Then */
+        assertThat(targetFile).isNotEqualTo(Paths.get(ROOT_FOLDER, podcast.getTitle(), "file.mp4" + TEMPORARY_EXTENSION).toFile());
+    }
 }