Unify regexes matching image URLs, fixes case sensitivity causing som…

…e images to not be fetched for EPUB archive (Re: #141)
danburzo · Mar 7, 2023 · 2667b44 · 2667b44
1 parent 6315c15
commit 2667b44
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/constants/regex.js b/src/constants/regex.js
@@ -0,0 +1,4 @@
+/*
+	Regex to match URLs pointing to image files in the most common formats.
+*/
+export const REGEX_IMAGE_URL = /\.(jpe?g|png|svg|gif|bmp|webp|avif|tiff?)$/i;
diff --git a/src/enhancements.js b/src/enhancements.js
@@ -1,5 +1,6 @@
 import { parseSrcset, stringifySrcset } from 'srcset';
 import replaceElementType from './replace-element-type.js';
+import { REGEX_IMAGE_URL } from './constants/regex.js';
 
 /* 
 	Convert AMP markup to HMTL markup
@@ -51,7 +52,7 @@ function fixLazyLoadedImages(doc) {
 		<img src='original-size.png'/>
 */
 function imagesAtFullSize(doc) {
-	let include_pattern = /\.(png|jpg|jpeg|gif|svg|webp|avif|bmp|tiff?)$/i;
+	let include_pattern = REGEX_IMAGE_URL;
 	let exclude_patterns = [
 		/*
 			Exclude Wikipedia links to image file pages

diff --git a/src/remote-resources.js b/src/remote-resources.js
@@ -1,5 +1,6 @@
 import { randomUUID as uuid } from 'node:crypto';
 import { parseSrcset, stringifySrcset } from 'srcset';
+import { REGEX_IMAGE_URL } from './constants/regex.js';
 
 export default function remoteResources(doc) {
 	let srcs = new Map();
@@ -15,7 +16,7 @@ export default function remoteResources(doc) {
 		} catch (err) {
 			// no-op, probably due to bad `doc.baseURI`.
 		}
-		let match = pathname.match(/\.(gif|jpe?g|bmp|png|svg|webp)$/);
+		let match = pathname.match(REGEX_IMAGE_URL);
 		if (!match) {
 			return src;
 		}