From 64da1cfa58ee677b8331465efe1bbf85a2832ab9 Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Fri, 14 Aug 2020 08:49:39 +0300
Subject: [PATCH] Fixed single file loading

Former-commit-id: 8f691a57b9aae2b6fe19c82e2b96ce0f6a6524b5 [formerly 0c1238e9c261dc3c13b9e7a30066d8b2573ea54b]
Former-commit-id: 04c95f7c798d15814d382dd7afc3883577875ef2
---
 www/js/app.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/www/js/app.js b/www/js/app.js
index 9d267228..22db9f42 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -911,9 +911,18 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'cook
             }
             if (typeof window.chooseFileSystemEntries !== 'undefined') {
                 getNativeFSHandle(function(handle) {
-                    if (handle.isFile) params.pickedFile = handle;
-                    if (handle.isDirectory) params.pickedFolder = handle;
-                    setLocalArchiveFromArchiveList(selected);
+                    if (handle.isDirectory) {
+                        params.pickedFolder = handle;
+                        setLocalArchiveFromArchiveList(selected);
+                    } else if (handle.isFile) {
+                        handle.getFile().then(function(file) {
+                            params.pickedFile = file;
+                            params.pickedFile.handle = handle;
+                            setLocalArchiveFromArchiveList(selected);
+                        }).catch(function(err) {
+                            console.error('Unable to read previously picked file!', err);
+                        });
+                    }
                 });
             } else {
                 setLocalArchiveFromArchiveList(selected);
@@ -1923,6 +1932,7 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'cook
                             } else if (params.pickedFile && typeof window.chooseFileSystemEntries !== 'undefined') {
                                 // Native FS API for single file
                                 setLocalArchiveFromFileList([params.pickedFile]);
+                                return;
                             }
                         }
                         //There was no picked file or folder, so we'll try setting the default localStorage