Fixing issue #15

zyxist · Jan 29, 2016 · 1440eaf · 1440eaf
1 parent cb12dbe
commit 1440eaf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Cantiga/Metamodel/FileRepository.php b/src/Cantiga/Metamodel/FileRepository.php
@@ -18,6 +18,7 @@
  */
 namespace Cantiga\Metamodel;
 
+use Cantiga\Metamodel\Exception\DiskAssetException;
 use LogicException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Response;
@@ -53,7 +54,7 @@ public function __construct($targetDirectory)
 	public function storeFile(UploadedFile $file)
 	{
 		$hashedName = sha1($file->getBasename().filemtime($file->getPath()));
-		$extension = $file->getClientOriginalExtension();
+		$extension = strtolower($file->getClientOriginalExtension());
 
 		$finalName = $hashedName.'.'.$extension;
 		while(file_exists($this->targetDirectory.DIRECTORY_SEPARATOR.$this->hashToLocation($finalName))) {
@@ -79,6 +80,15 @@ public function replaceFile($name, UploadedFile $file)
 			throw new DiskAssetException('Cannot replace a file that does not exist.');
 		}
 		$directory = dirname($fullPath);
+
+		$extension = strtolower($file->getClientOriginalExtension());
+		// extension changed, remove the old file and update the name accordingly
+		if (strpos($name, '.'.$extension) === false) {
+			unlink($fullPath);
+			$extStart = strrpos($name, '.');
+			$name = substr($name, 0, $extStart).'.'.$extension;
+		}
+
 		$file->move($directory, $name);
 		return $name;
 	}

diff --git a/src/WIO/EdkBundle/Entity/EdkRoute.php b/src/WIO/EdkBundle/Entity/EdkRoute.php
@@ -572,7 +572,7 @@ public function updateFiles(FileRepositoryInterface $fileRepository)
 			if(null === $this->mapFile) {
 				$this->mapFile = $fileRepository->storeFile($this->getMapFileUpload());
 			} else {
-				$fileRepository->replaceFile($this->mapFile, $this->getMapFileUpload());
+				$this->mapFile = $fileRepository->replaceFile($this->mapFile, $this->getMapFileUpload());
 			}
 		}
 		if (null !== $this->getGpsTrackFileUpload()) {