From 492fb16ee22010b62cdc4c99f83586c2252bf912 Mon Sep 17 00:00:00 2001
From: Roland <roland@learningselfreliance.com>
Date: Sun, 20 Aug 2023 18:50:30 -0600
Subject: [PATCH] Combining epub preview modal with iframe modal.  Simplifying
 getEpubViewerURL.

---
 app/src/components/Common.js      |  1 +
 app/src/components/FilePreview.js | 28 +++++++---------------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/app/src/components/Common.js b/app/src/components/Common.js
index 96725457..96bb52b6 100644
--- a/app/src/components/Common.js
+++ b/app/src/components/Common.js
@@ -1163,6 +1163,7 @@ export const encodeMediaPath = (path) => {
     path = path.replaceAll('%', '%25');
 
     path = path.replaceAll('&', '%26');
+    path = path.replaceAll('=', '%3d');
     path = path.replaceAll('#', '%23');
     path = path.replaceAll(' ', '%20');
     return path
diff --git a/app/src/components/FilePreview.js b/app/src/components/FilePreview.js
index bc8fe434..d532c6e7 100644
--- a/app/src/components/FilePreview.js
+++ b/app/src/components/FilePreview.js
@@ -26,15 +26,12 @@ function getDownloadPathURL(previewFile) {
 }
 
 function getEpubViewerURL(previewFile) {
-    if (previewFile['primary_path']) {
-        return `/epub/epub.html?url=/download/${encodeMediaPath(previewFile['primary_path'])}`;
-    } else {
-        return `/epub/epub.html?url=/download/${encodeMediaPath(previewFile['path'])}`;
-    }
+    let url = previewFile['primary_path'] ?? previewFile['path'];
+    return `/epub/epub.html?url=/media/${encodeMediaPath(url)}`
 }
 
-function getIframePreviewModal(previewFile) {
-    const url = getMediaPathURL(previewFile);
+function getIframePreviewModal(previewFile, url) {
+    url = url || getMediaPathURL(previewFile);
     return <ModalContent>
         <div className='full-height'>
             <iframe title='textModal' src={url}
@@ -64,19 +61,6 @@ function getImagePreviewModal(previewFile) {
     </React.Fragment>
 }
 
-function getEpubPreviewModal(previewFile) {
-    const downloadURL = getDownloadPathURL(previewFile);
-    const viewerUrl = `/epub/epub.html?url=${downloadURL}`;
-    return <ModalContent>
-        <div className='full-height'>
-            <iframe title='textModal' src={viewerUrl}
-                    style={{
-                        height: '100%', width: '100%', border: 'none', position: 'absolute', top: 0,
-                    }}/>
-        </div>
-    </ModalContent>
-}
-
 function getVideoPreviewModal(previewFile) {
     const url = getMediaPathURL(previewFile);
     const path = previewFile.primary_path ?? previewFile.path;
@@ -215,6 +199,8 @@ export function FilePreviewProvider({children}) {
             </ModalContent>
             : null;
         console.log('Previewing', path);
+        console.log('Preview Download URL', downloadURL);
+        console.log('Preview Open URL', url);
 
         setPreviewModal(<Modal closeIcon
                                size='fullscreen'
@@ -281,7 +267,7 @@ export function FilePreviewProvider({children}) {
                 setModalContent(getAudioPreviewModal(previewFile), url, downloadURL, path);
             } else if (mimetype.startsWith('application/epub')) {
                 const viewerURL = getEpubViewerURL(previewFile);
-                setModalContent(getEpubPreviewModal(previewFile), viewerURL, downloadURL, path);
+                setModalContent(getIframePreviewModal(previewFile, viewerURL), viewerURL, downloadURL, path);
             } else if (mimetype.startsWith('application/pdf')) {
                 setModalContent(getIframePreviewModal(previewFile), url, downloadURL, path);
             } else if (mimetype.startsWith('image/')) {