fix: revert media folder changes

Author: KaneFreeman

packages/core/src/lib/util/__tests__/media.util.spec.ts

@@ -245,7 +245,7 @@ describe('media.util', () => {
             .fields[3] as FileOrImageField;
 
           expect(selectMediaFolder(mockConfig, mockCollection, mockBaseEntry, mockImageField)).toBe(
-            '/path/to/some/other/media/folder',
+            'path/to/some/other/media/folder',
           );
         });
 
@@ -273,7 +273,7 @@ describe('media.util', () => {
 
             expect(
               selectMediaFolder(mockConfig, mockCollection, mockBaseEntry, mockImageField),
-            ).toBe('/path/to/some/other/media/i-am-a-title');
+            ).toBe('path/to/some/other/media/i-am-a-title');
           });
 
           it('should substitute slug', () => {
@@ -309,7 +309,7 @@ describe('media.util', () => {
             });
 
             expect(selectMediaFolder(mockConfig, mockCollection, mockEntry, mockImageField)).toBe(
-              '/path/to/some/other/media/i-am-a-title-fish',
+              'path/to/some/other/media/i-am-a-title-fish',
             );
           });
 
@@ -345,7 +345,7 @@ describe('media.util', () => {
             });
 
             expect(selectMediaFolder(mockConfig, mockCollection, mockEntry, mockImageField)).toBe(
-              '/path/to/media/folder/i-am-a-title-fish',
+              'path/to/media/folder/i-am-a-title-fish',
             );
           });
 
@@ -383,7 +383,7 @@ describe('media.util', () => {
             });
 
             expect(selectMediaFolder(mockConfig, mockCollection, mockEntry, mockImageField)).toBe(
-              '/path/to/some/other/media/',
+              'path/to/some/other/media',
             );
           });
         });

packages/core/src/lib/util/media.util.ts

@@ -1,3 +1,4 @@
+import trim from 'lodash/trim';
 import { dirname } from 'path';
 
 import { basename, isAbsolutePath } from '.';
@@ -245,7 +246,7 @@ export function selectMediaFolder<EF extends BaseField>(
   } else if (hasCustomFolder('media_folder', collection, entryMap?.slug, field)) {
     const folder = evaluateFolder('media_folder', config, collection!, entryMap, field);
     if (folder.startsWith('/')) {
-      mediaFolder = folder;
+      mediaFolder = folder.replace(/^[/]*/g, '');
     } else {
       const entryPath = entryMap?.path;
       mediaFolder = entryPath
@@ -258,7 +259,7 @@ export function selectMediaFolder<EF extends BaseField>(
     }
   }
 
-  return mediaFolder;
+  return trim(mediaFolder, '/');
 }
 
 export function selectMediaFilePublicPath<EF extends BaseField>(
@@ -296,7 +297,7 @@ export function selectMediaFilePublicPath<EF extends BaseField>(
     const mediaFolder = customMediaFolder
       ? evaluateFolder('media_folder', config, collection!, entryMap, field)
       : config['media_folder'];
-    selectedPublicFolder = currentFolder.replace(mediaFolder!, publicFolder);
+    selectedPublicFolder = trim(currentFolder, '/').replace(trim(mediaFolder!, '/'), publicFolder);
   }
 
   const finalPublicPath = joinUrlPath(selectedPublicFolder, basename(mediaPath));
@@ -321,14 +322,17 @@ export function selectMediaFilePath(
 
   let mediaFolder = selectMediaFolder(config, collection, entryMap, field, currentFolder);
   if (!currentFolder) {
-    let publicFolder = config['public_folder'] ?? mediaFolder;
-    let mediaPathDir = dirname(mediaPath);
+    let publicFolder = trim(config['public_folder'] ?? mediaFolder, '/');
+    let mediaPathDir = trim(dirname(mediaPath), '/');
     if (mediaPathDir === '.') {
       mediaPathDir = '';
     }
 
     if (hasCustomFolder('public_folder', collection, entryMap?.slug, field)) {
-      publicFolder = evaluateFolder('public_folder', config, collection!, entryMap, field);
+      publicFolder = trim(
+        evaluateFolder('public_folder', config, collection!, entryMap, field),
+        '/',
+      );
     }
 
     if (mediaPathDir.startsWith(publicFolder) && mediaPathDir != mediaFolder) {