feat(Video): Group videos into year folder

BREAKING CHANGE: Previously all videos were in the videos folder, now per year
danactive · Feb 20, 2021 · 92a11d1 · 92a11d1
1 parent 2e837bc
commit 92a11d1
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 5 deletions.
diff --git a/...ries/demo/media/videos/2012-fireplace.mp4 → ...demo/media/videos/2012/2012-fireplace.mp4 b/...ries/demo/media/videos/2012-fireplace.mp4 → ...demo/media/videos/2012/2012-fireplace.mp4
diff --git a/...ies/demo/media/videos/2012-fireplace.webm → ...emo/media/videos/2012/2012-fireplace.webm b/...ies/demo/media/videos/2012-fireplace.webm → ...emo/media/videos/2012/2012-fireplace.webm
diff --git a/ui/app/containers/InfiniteThumbs/saga.js b/ui/app/containers/InfiniteThumbs/saga.js
@@ -40,9 +40,16 @@ export const argsPhotoXmlPath = ({ gallery, filename }) => {
 };
 
 export const argsVideoXmlPath = ({ gallery, filename }) => ({
-  path: `/galleries/${gallery}/media/videos/${filename}`,
+  path: `/galleries/${gallery}/media/videos/${getYear(filename)}/${filename}`,
 });
 
+export const replaceThumbToVideo = (thumbLink, videoFilename) => {
+  const paths = thumbLink.replace('thumbs', 'videos').split('/');
+  const pathsWithoutThumb = paths.slice(0, 8); // delete thumb JPG path
+  const videoLink = `${pathsWithoutThumb.join('/')}/${videoFilename}`;
+  return videoLink;
+};
+
 // saga WORKER for CHOOSE_MEMORY for Dropbox gallery
 export function* getPhotoPathsOnDropbox({
   memory,
@@ -117,9 +124,7 @@ export function* getPhotoPathsOnCdn({
     }),
   );
 
-  const paths = memory.thumbLink.replace('thumbs', 'videos').split('/');
-  paths.splice(7, 2); // delete year folder and JPG
-  const videoLink = `${paths.join('/')}/${memory.filename}`;
+  const videoLink = replaceThumbToVideo(memory.thumbLink, memory.filename);
   yield put(
     loadVideoSuccess({
       id,

diff --git a/ui/app/containers/InfiniteThumbs/tests/saga.test.js b/ui/app/containers/InfiniteThumbs/tests/saga.test.js
@@ -1,7 +1,50 @@
-import { determineAdjacentInCarousel } from '../saga';
+import {
+  determineAdjacentInCarousel,
+  argsPhotoXmlPath,
+  argsVideoXmlPath,
+  replaceThumbToVideo,
+} from '../saga';
 
 /* eslint-disable default-case, no-param-reassign */
 describe('InfiniteThumbs Saga', () => {
+  describe('argsPhotoXmlPath', () => {
+    test('JPG', () => {
+      const gallery = 'demo';
+      const filename = '2021-02-20-50.jpg';
+      const expected = {
+        path: '/galleries/demo/media/photos/2021/2021-02-20-50.jpg',
+      };
+      expect(argsPhotoXmlPath({ gallery, filename })).toEqual(expected);
+    });
+
+    test('Video', () => {
+      const gallery = 'demo';
+      const filename = '2021-02-20-50.mp4';
+      const expected = {
+        path: '/galleries/demo/media/photos/2021/2021-02-20-50.jpg',
+      };
+      expect(argsPhotoXmlPath({ gallery, filename })).toEqual(expected);
+    });
+  });
+
+  describe('Video paths', () => {
+    test('argsVideoXmlPath', () => {
+      const gallery = 'demo';
+      const filename = '2021-02-20-50.mp4';
+      const expected = {
+        path: '/galleries/demo/media/videos/2021/2021-02-20-50.mp4',
+      };
+      expect(argsVideoXmlPath({ gallery, filename })).toEqual(expected);
+    });
+
+    test('replaceThumbToVideo', () => {
+      const thumbPath = 'https://cdn/galleries/demo/media/thumbs/2021/2021-02-20-50.jpg';
+      const videoFilename = '2021-02-20-50.mp4';
+      const expected = 'https://cdn/galleries/demo/media/videos/2021/2021-02-20-50.mp4';
+      expect(replaceThumbToVideo(thumbPath, videoFilename)).toEqual(expected);
+    });
+  });
+
   describe('determineAdjacentInCarousel', () => {
     describe('Single use input', () => {
       const testState = {