fix: redownload files if actual file on Contentful changed

gatsbyjs · Nov 2, 2020 · 53909a2 · 53909a2
1 parent c61df86
commit 53909a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/gatsby-transformer-video/src/ffmpeg.js b/packages/gatsby-transformer-video/src/ffmpeg.js
@@ -106,15 +106,16 @@ export default class FFMPEG {
     }
 
     if (type === `ContentfulAsset`) {
-      path = await cacheContentfulVideo({
-        video,
-        cacheDir: this.cacheDirOriginal,
-      })
       contentDigest = createContentDigest([
         video.contentful_id,
         video.file.url,
         video.file.details.size,
       ])
+      path = await cacheContentfulVideo({
+        video,
+        contentDigest,
+        cacheDir: this.cacheDirOriginal,
+      })
     }
 
     if (!path) {

diff --git a/packages/gatsby-transformer-video/src/helpers.js b/packages/gatsby-transformer-video/src/helpers.js
@@ -1,6 +1,6 @@
 import fs from "fs"
 import { access } from "fs-extra"
-import { resolve } from "path"
+import { resolve, extname } from "path"
 
 import PQueue from "p-queue"
 import axios from "axios"
@@ -18,12 +18,12 @@ const downloadCache = {}
  * Retry is currently broken: https://github.com/gatsbyjs/gatsby/issues/22010
  * Downloaded files are not cached properly: https://github.com/gatsbyjs/gatsby/issues/8324 & https://github.com/gatsbyjs/gatsby/pull/8379
  */
-export async function cacheContentfulVideo({ video, cacheDir }) {
+export async function cacheContentfulVideo({ video, cacheDir, contentDigest }) {
   const {
     file: { url, fileName },
   } = video
 
-  const path = resolve(cacheDir, fileName)
+  const path = resolve(cacheDir, `${contentDigest}.${extname(fileName)}`)
 
   try {
     await access(path, fs.constants.R_OK)