Treat hidden DOM elements before treating media files.

openzim · Feb 18, 2023 · e350e43 · e350e43
1 parent 993cdd9
commit e350e43
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/util/saveArticles.ts b/src/util/saveArticles.ts
@@ -433,6 +433,19 @@ async function processArticleHtml(
   let mediaDependencies: Array<{ url: string; path: string }> = []
   let subtitles: Array<{ url: string; path: string }> = []
   let doc = domino.createDocument(html)
+
+  const ruRet = await rewriteUrlsOfDoc(doc, articleId, redisStore, mw, dump)
+  doc = ruRet.doc
+  mediaDependencies = mediaDependencies.concat(
+    ruRet.mediaDependencies
+      .filter((a) => a)
+      .map((url) => {
+        const path = getMediaBase(url, false)
+        return { url, path }
+      }),
+  )
+  doc = applyOtherTreatments(doc, dump)
+
   const tmRet = await treatMedias(doc, mw, dump, articleId, webp, redisStore)
   doc = tmRet.doc
 
@@ -454,17 +467,6 @@ async function processArticleHtml(
         return { url, path }
       }),
   )
-  const ruRet = await rewriteUrlsOfDoc(doc, articleId, redisStore, mw, dump)
-  doc = ruRet.doc
-  mediaDependencies = mediaDependencies.concat(
-    ruRet.mediaDependencies
-      .filter((a) => a)
-      .map((url) => {
-        const path = getMediaBase(url, false)
-        return { url, path }
-      }),
-  )
-  doc = applyOtherTreatments(doc, dump)
 
   if (!dump.isMainPage(articleId) && dump.customProcessor?.preProcessArticle) {
     doc = await dump.customProcessor.preProcessArticle(articleId, doc)