fix issue with LocalMediaStorageHandler not storing images in the correct folders

Author: anshooarora

src/main/java/com/aventstack/extentreports/ExtentTest.java

@@ -308,7 +308,7 @@ public synchronized ExtentTest log(Status status, String details, MediaEntityMod
     	return addLog(evt);
     }
 
-    private void addMedia(Log evt, MediaEntityModelProvider provider) {
+    private synchronized void addMedia(Log evt, MediaEntityModelProvider provider) {
     	if (provider != null) {
 	    	Class<? extends Media> clazz = provider.getMedia().getClass();
 

src/main/java/com/aventstack/extentreports/MediaEntityBuilder.java

@@ -12,7 +12,7 @@
  */
 public class MediaEntityBuilder {
 
-	private static ThreadLocal<Media> media;
+	private static ThreadLocal<Media> media = new ThreadLocal<Media>();
 
 	private static class MediaBuilderInstance {
         static final MediaEntityBuilder INSTANCE = new MediaEntityBuilder();
@@ -22,33 +22,33 @@ private MediaBuilderInstance() { }
 
     private MediaEntityBuilder() { }
 
-    private static MediaEntityBuilder getInstance() {
+    private static synchronized MediaEntityBuilder getInstance() {
     	return MediaBuilderInstance.INSTANCE;
     }
 
 	public MediaEntityModelProvider build() {
 		return new MediaEntityModelProvider(media.get());
 	}
 
-	public static MediaEntityBuilder createScreenCaptureFromPath(String path, String title) throws IOException {
+	public static synchronized MediaEntityBuilder createScreenCaptureFromPath(String path, String title) throws IOException {
         if (path == null || path.isEmpty())
             throw new IOException("ScreenCapture path cannot be null or empty.");
 
         return createScreenCapture(path, title, false);
     }
 
-    public static MediaEntityBuilder createScreenCaptureFromPath(String path) throws IOException {
+    public static synchronized MediaEntityBuilder createScreenCaptureFromPath(String path) throws IOException {
         return createScreenCaptureFromPath(path, null);
     }
 
-    public static MediaEntityBuilder createScreenCaptureFromBase64String(String base64String) throws IOException {
+    public static synchronized MediaEntityBuilder createScreenCaptureFromBase64String(String base64String) throws IOException {
         if (base64String == null || base64String.trim().equals(""))
             throw new IOException("Base64 string cannot be null or empty.");
 
         return createScreenCapture(base64String, null, true);
     }
 
-    private static MediaEntityBuilder createScreenCapture(String pathOrBase64String, String title, boolean isBase64String) {
+    private static synchronized MediaEntityBuilder createScreenCapture(String pathOrBase64String, String title, boolean isBase64String) {
         ScreenCapture sc = new ScreenCapture();
         sc.setMediaType(MediaType.IMG);
         if (isBase64String)
@@ -58,8 +58,7 @@ private static MediaEntityBuilder createScreenCapture(String pathOrBase64String,
 
         if (title != null)
             sc.setName(title);
-        
-        media = new ThreadLocal<Media>();
+
         media.set(sc);
 
         return getInstance();

src/main/java/com/aventstack/extentreports/mediastorage/LocalMediaStorageHandler.java

@@ -30,11 +30,16 @@ public void storeMedia(Media screenCapture) throws IOException {
     }
 
     private void mkDirs() {
-        String fileName = reporterGeneratedFilePath + ".";
+    	String ext = FileUtil.getExtension(reporterGeneratedFilePath);
+    	String archiveName = "";
+    	if (ext.equalsIgnoreCase("htm") || ext.equalsIgnoreCase("html")) {
+    		archiveName = FileUtil.getFileNameWithoutExtension(reporterGeneratedFilePath) + ".";
+    	}
         String absolutePath = new File(reporterGeneratedFilePath).getAbsolutePath().replace("\\", "/");
-        String basePath = new File(absolutePath).getParent().replace("\\", "/");
+        String basePath = archiveName.isEmpty() ? absolutePath : new File(absolutePath).getParent().replace("\\", "/");
+        archiveName = archiveName.isEmpty() ? archiveName = FileUtil.getFileNameWithoutExtension(reporterGeneratedFilePath) + "." : archiveName;
 
-        mkDirs(basePath, fileName, 0);
+        mkDirs(basePath, archiveName, 0);
     }
 
     private void mkDirs(String basePath, String fileName, int cnt) {

src/main/java/com/aventstack/extentreports/reporter/BasicFileReporter.java

@@ -55,7 +55,6 @@ public abstract class BasicFileReporter
 	private static final Logger logger = Logger.getLogger(BasicFileReporter.class.getName());
 
 	private static final String DEFAULT_MEDIA_SAVE_PROPERTY_NAME = "autoCreateRelativePathMedia";
-	private static final String DEFAULT_MEDIA_SAVE_PATH_NAME = "extent-media";
 	private static final String TEMPLATE_LOCATION = "view/";
 
 	private static String ENCODING = "UTF-8";
@@ -163,7 +162,7 @@ public void start() {
     }
 
     public synchronized void flush(ReportAggregates reportAggregates) {
-        super.flush(reportAggregates);
+    	super.flush(reportAggregates);
     	this.authorContext = reportAggregates.getAuthorContext();
     	this.categoryContext = reportAggregates.getCategoryContext();
     	this.deviceContext = reportAggregates.getDeviceContext();
@@ -251,6 +250,7 @@ private void mediaExists(Media m) throws IOException {
     }
 
     private void autoCreateRelativePathMedia(ScreenCapture screenCapture) throws IOException {
+    	// if user has not specific a configuration, exit
     	if (userConfig == null)
     		return;
 
@@ -259,7 +259,7 @@ private void autoCreateRelativePathMedia(ScreenCapture screenCapture) throws IOE
         if (autoCreateRelativePathMedia != null && Boolean.valueOf(autoCreateRelativePathMedia)) {
             if (media == null) {
                 media = new LocalMediaStorageHandler();
-                media.init(destination + DEFAULT_MEDIA_SAVE_PATH_NAME);
+                media.init(destination);
             }
             media.storeMedia(screenCapture);
         }