[FIX] firefox os race condition

kiwix · Oct 27, 2023 · 8049409 · 8049409
1 parent 512a99b
commit 8049409
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/www/js/app.js b/www/js/app.js
@@ -1257,8 +1257,11 @@ let webKitFileList = null
  * Displays the zone to select files from the archive
  */
 function displayFileSelect () {
+    const isFireFoxOsNativeFileApiAvailable = typeof navigator.getDeviceStorages === 'function';
+
     console.debug('File system api supported', params.isFileSystemApiSupported);
     console.debug('Webkit supported', params.isWebkitDirApiSupported);
+    console.debug('Firefox os native file support api', isFireFoxOsNativeFileApiAvailable)
 
     document.getElementById('openLocalFiles').style.display = 'block';
     if (params.isFileSystemApiSupported || params.isWebkitDirApiSupported) {
@@ -1281,25 +1284,26 @@ function displayFileSelect () {
         globalDropZone.addEventListener('drop', handleFileDrop);
     }
 
-    document.getElementById('archiveList').addEventListener('change', async function (e) {
-        // handle zim selection from dropdown if multiple files are loaded via webkitdirectory or filesystem api
-        if (params.isFileSystemApiSupported) {
-            const files = await abstractFilesystemAccess.getSelectedZimFromCache(e.target.value)
-            setLocalArchiveFromFileList(files);
-        } else {
-            const files = abstractFilesystemAccess.getSelectedZimFromWebkitList(webKitFileList, e.target.value)
-            setLocalArchiveFromFileList(files);
-        }
-    });
-
-    if (typeof window.showDirectoryPicker === 'function') {
+    if (!isFireFoxOsNativeFileApiAvailable) {
+        document.getElementById('archiveList').addEventListener('change', async function (e) {
+            // handle zim selection from dropdown if multiple files are loaded via webkitdirectory or filesystem api
+            if (params.isFileSystemApiSupported) {
+                const files = await abstractFilesystemAccess.getSelectedZimFromCache(e.target.value)
+                setLocalArchiveFromFileList(files);
+            } else {
+                const files = abstractFilesystemAccess.getSelectedZimFromWebkitList(webKitFileList, e.target.value)
+                setLocalArchiveFromFileList(files);
+            }
+        });
+    }
+    if (params.isFileSystemApiSupported && !isFireFoxOsNativeFileApiAvailable) {
         // Handles Folder selection when showDirectoryPicker is supported
         document.getElementById('folderSelect').addEventListener('click', async function (e) {
             e.preventDefault();
             await abstractFilesystemAccess.selectDirectoryFromPickerViaFileSystemApi()
         })
     }
-    if (params.isWebkitDirApiSupported && !params.isFileSystemApiSupported) {
+    if (params.isWebkitDirApiSupported && !params.isFileSystemApiSupported && !isFireFoxOsNativeFileApiAvailable) {
         // Handles Folder selection when webkitdirectory is supported but showDirectoryPicker is not
         document.getElementById('folderSelect').addEventListener('change', async function (e) {
             e.preventDefault();
@@ -1312,7 +1316,7 @@ function displayFileSelect () {
             await abstractFilesystemAccess.updateZimDropdownOptions(filenames, '');
         })
     }
-    if (params.isFileSystemApiSupported) {
+    if (params.isFileSystemApiSupported && !isFireFoxOsNativeFileApiAvailable) {
         // Handles File selection when showOpenFilePicker is supported and uses the filesystem api
         document.getElementById('archiveFiles').addEventListener('click', async function (e) {
             e.preventDefault();

diff --git a/www/js/lib/abstractFilesystemAccess.js b/www/js/lib/abstractFilesystemAccess.js
@@ -139,11 +139,12 @@ async function selectFileFromPickerViaFileSystemApi () {
     const fileHandles = await window.showOpenFilePicker({ multiple: false });
     const [selectedFile] = fileHandles;
     const file = await selectedFile.getFile();
-
+    const filenameList = [selectedFile.name];
+    localStorage.setItem('zimFilenames', filenameList.join('|'));
     cache.idxDB('zimFiles', selectedFile, function () {
         // file saved in DB
+        updateZimDropdownOptions(filenameList, selectedFile.name);
     });
-    updateZimDropdownOptions([selectedFile.name], selectedFile.name);
     return [file];
 }
 
@@ -155,6 +156,8 @@ async function selectFileFromPickerViaFileSystemApi () {
 function getSelectedZimFromCache (selectedFilename) {
     return new Promise((resolve, _reject) => {
         cache.idxDB('zimFiles', async function (fileOrDirHandle) {
+            // Left it here for debugging purposes as its sometimes asking for permission even when its granted
+            console.debug('FileHandle and Permission', fileOrDirHandle, fileOrDirHandle.queryPermission())
             if ((await fileOrDirHandle.queryPermission()) !== 'granted') await fileOrDirHandle.requestPermission();
 
             if (fileOrDirHandle.kind === 'directory') {
@@ -220,6 +223,7 @@ async function handleFolderDropViaFileSystemAPI (packet) {
     const fileInfo = packet.dataTransfer.items[0];
     const fileOrDirHandle = await fileInfo.getAsFileSystemHandle();
     if (fileOrDirHandle.kind === 'file') {
+        localStorage.setItem([fileOrDirHandle.name], [fileOrDirHandle.name].join('|'));
         cache.idxDB('zimFiles', fileOrDirHandle, function () {
             // save file in DB
             updateZimDropdownOptions([fileOrDirHandle.name], fileOrDirHandle.name);