From 472d07c46799cf0520465bd2b6462f5488a5b1ed Mon Sep 17 00:00:00 2001
From: Franzz <francois@lutran.fr>
Date: Sat, 19 Oct 2019 19:47:33 +0200
Subject: [PATCH] Improve media retrieval performance

---
 inc/media.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/media.php b/inc/media.php
index 69d633f..f3b5d66 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -180,9 +180,9 @@ class Media extends PhpObject {
 	{
 		$sMediaPath = self::getMediaPath($sMediaName);
 		$sThumbPath = self::getMediaPath($sMediaName, 'thumbnail');
-		$sType = self::getMediaType($sMediaName);
 		
 		if(!file_exists($sThumbPath)) {
+			$sType = self::getMediaType($sMediaName);
 			switch($sType) {
 				case 'image':
 					$asThumbInfo = ToolBox::createThumbnail($sMediaPath, self::THUMB_MAX_WIDTH, 0, $sThumbPath);
@@ -192,10 +192,10 @@ class Media extends PhpObject {
 					$sTempPath = self::getMediaPath(uniqid('temp_').'.png');
 					$asResult = array();
 					$sParams = implode(' ', array(
-						'-i "'.$sMediaPath.'"', //input file
-						'-ss 00:00:01.000', //Image taken after x seconds
-						'-vframes 1', //number of video frames to output
-						'"'.$sTempPath.'"', //output file
+						'-i "'.$sMediaPath.'"',	//input file
+						'-ss 00:00:01.000',		//Image taken after x seconds
+						'-vframes 1',			//number of video frames to output
+						'"'.$sTempPath.'"',		//output file
 					));
 					exec('ffmpeg '.$sParams, $asResult);
 					
@@ -211,7 +211,7 @@ class Media extends PhpObject {
 	}
 	
 	private static function getMediaPath($sMediaName, $sFileType='media') {
-		if($sFileType=='thumbnail') return self::THUMB_FOLDER.$sMediaName.(self::getMediaType($sMediaName)=='video'?'.png':'');
+		if($sFileType=='thumbnail') return self::THUMB_FOLDER.$sMediaName.(strtolower(substr($sMediaName, -3))=='mov'?'.png':'');
 		else return self::MEDIA_FOLDER.$sMediaName;
 	}