kiwix/kiwix-js
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js.git synced 2025-09-22 12:01:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix localStorage keys by using settingsStore consistently #1171 (#1185)

Browse Source 
Signed off by @Greeshmanth1909
This commit is contained in:
Greeshmanth 2023-12-29 17:15:35 +05:30 committed by GitHub
parent 4403292a60
commit fbc5af79ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/js/app.js
View File

@ -1388,7 +1388,7 @@ function displayFileSelect () {
document.getElementById('archiveList').addEventListener('change', function (e) {
// handle zim selection from dropdown if multiple files are loaded via webkitdirectory or filesystem api
localStorage.setItem('previousZimFileName', e.target.value);
settingsStore.setItem('previousZimFileName', e.target.value, Infinity);
if (params.isFileSystemApiSupported) {
return abstractFilesystemAccess.getSelectedZimFromCache(e.target.value).then(function (files) {
setLocalArchiveFromFileList(files);
@ -1399,7 +1399,7 @@ function displayFileSelect () {
});
} else {
if (webKitFileList === null) {
const element = localStorage.getItem('zimFilenames').split('|').length === 1 ? 'archiveFiles' : 'archiveFolders';
const element = settingsStore.getItem('zimFilenames').split('|').length === 1 ? 'archiveFiles' : 'archiveFolders';
if ('showPicker' in HTMLInputElement.prototype) {
document.getElementById(element).showPicker();
return;
@ -1427,7 +1427,7 @@ function displayFileSelect () {
const filenames = [];
const previousZimFile = []
const lastFilename = localStorage.getItem('previousZimFileName') ?? '';
const lastFilename = settingsStore.getItem('previousZimFileName') ?? '';
const filenameWithoutExtension = lastFilename.replace(/\.zim\w\w$/i, '');
const regex = new RegExp(`\\${filenameWithoutExtension}.zim\\w\\w$`, 'i');
@ -1436,7 +1436,7 @@ function displayFileSelect () {
if (regex.test(file.name) || file.name === lastFilename) previousZimFile.push(file);
}
webKitFileList = e.target.files;
localStorage.setItem('zimFilenames', filenames.join('|'));
settingsStogare.setItem('zimFilenames', filenames.join('|'), Infinity);
// will load the old file if the selected folder contains the same file
if (previousZimFile.length !== 0) setLocalArchiveFromFileList(previousZimFile);
await abstractFilesystemAccess.updateZimDropdownOptions(filenames, previousZimFile.length !== 0 ? lastFilename : '');
@ -1472,7 +1472,7 @@ function useLegacyFilePicker () {
archiveFiles.addEventListener('change', async function (e) {
if (params.isWebkitDirApiSupported || params.isFileSystemApiSupported) {
const activeFilename = e.target.files[0].name;
localStorage.setItem('zimFilenames', [activeFilename].join('|'));
settingsStore.setItem('zimFilenames', [activeFilename].join('|'), Infinity);
await abstractFilesystemAccess.updateZimDropdownOptions([activeFilename], activeFilename);
}
setLocalArchiveFromFileSelect();

27
www/js/lib/abstractFilesystemAccess.js
View File

@ -1,4 +1,4 @@
/**
/**
* abstractFilesystemAccess.js: Abstraction layer for file access.
* This is currently only implemented for FirefoxOS and Standard browser (using File System Access API), but could be extended to
* Cordova, Electron or other ways to directly browse and read files from the
@ -27,6 +27,7 @@
import cache from './cache.js';
import translateUI from './translateUI.js';
import settingsStore from './settingsStore.js';
function StorageFirefoxOS (storage) {
this._storage = storage;
@ -137,20 +138,20 @@ async function selectDirectoryFromPickerViaFileSystemApi () {
const fileNames = [];
const previousZimFile = []
const lastZimNameWithoutExtension = (localStorage.getItem('previousZimFileName') ?? '').replace(/\.zim\w\w$/i, '');
const lastZimNameWithoutExtension = (settingsStore.getItem('previousZimFileName') ?? '').replace(/\.zim\w\w$/i, '');
const regex = new RegExp(`\\${lastZimNameWithoutExtension}.zim\\w\\w$`, 'i');
for await (const entry of handle.values()) {
fileNames.push(entry.name);
if (regex.test(entry.name) || entry.name === (localStorage.getItem('previousZimFileName') ?? '')) previousZimFile.push(await entry.getFile());
if (regex.test(entry.name) || entry.name === (settingsStore.getItem('previousZimFileName') ?? '')) previousZimFile.push(await entry.getFile());
}
localStorage.setItem('zimFilenames', fileNames.join('|'));
updateZimDropdownOptions(fileNames, previousZimFile.length !== 0 ? localStorage.getItem('previousZimFileName') : '');
settingsStore.setItem('zimFilenames', fileNames.join('|'), Infinity);
updateZimDropdownOptions(fileNames, previousZimFile.length !== 0 ? settingsStore.getItem('previousZimFileName') : '');
cache.idxDB('zimFiles', handle, function () {
// save file in DB
});
return previousZimFile;
return previousZimFile;
}
/**
@ -162,7 +163,7 @@ async function selectFileFromPickerViaFileSystemApi () {
const [selectedFile] = fileHandles;
const file = await selectedFile.getFile();
const filenameList = [selectedFile.name];
localStorage.setItem('zimFilenames', filenameList.join('|'));
settingsStore.setItem('zimFilenames', filenameList.join('|'));
cache.idxDB('zimFiles', selectedFile, function () {
// file saved in DB
updateZimDropdownOptions(filenameList, selectedFile.name);
@ -234,7 +235,7 @@ function loadPreviousZimFile () {
// It's a bit hacky but it works and I am not sure if there is any other way ATM
setTimeout(() => {
if (window.params.isFileSystemApiSupported || window.params.isWebkitDirApiSupported) {
const filenames = localStorage.getItem('zimFilenames');
const filenames = settingsStore.getItem('zimFilenames');
if (filenames) updateZimDropdownOptions(filenames.split('|'), '');
}
}, 200);
@ -252,12 +253,12 @@ async function handleFolderOrFileDropViaFileSystemAPI (packet) {
const fileInfo = packet.dataTransfer.items[0];
const fileOrDirHandle = await fileInfo.getAsFileSystemHandle();
if (fileOrDirHandle.kind === 'file') {
localStorage.setItem([fileOrDirHandle.name], [fileOrDirHandle.name].join('|'));
settingsStore.setItem([fileOrDirHandle.name], [fileOrDirHandle.name].join('|'), Infinity);
cache.idxDB('zimFiles', fileOrDirHandle, function () {
// save file in DB
updateZimDropdownOptions([fileOrDirHandle.name], fileOrDirHandle.name);
});
localStorage.setItem('zimFilenames', [fileOrDirHandle.name].join('|'));
settingsStore.setItem('zimFilenames', [fileOrDirHandle.name].join('|'), Infinity);
return true;
}
if (fileOrDirHandle.kind === 'directory') {
@ -265,7 +266,7 @@ async function handleFolderOrFileDropViaFileSystemAPI (packet) {
for await (const entry of fileOrDirHandle.values()) {
fileNames.push(entry.name);
}
localStorage.setItem('zimFilenames', fileNames.join('|'));
settingsStore.setItem('zimFilenames', fileNames.join('|'), Infinity);
cache.idxDB('zimFiles', fileOrDirHandle, function () {
updateZimDropdownOptions(fileNames, '');
// save file in DB
@ -284,7 +285,7 @@ async function handleFolderOrFileDropViaWebkit (event) {
var entry = dt.items[0].webkitGetAsEntry();
if (entry.isFile) {
localStorage.setItem('zimFilenames', [entry.name].join('|'));
settingsStore.setItem('zimFilenames', [entry.name].join('|'), Infinity);
await updateZimDropdownOptions([entry.name], entry.name);
return { loadZim: true, files: [entry.file] };
} else if (entry.isDirectory) {
@ -292,7 +293,7 @@ async function handleFolderOrFileDropViaWebkit (event) {
const files = await getFilesFromReader(reader);
const fileNames = [];
files.forEach((file) => fileNames.push(file.name));
localStorage.setItem('zimFilenames', fileNames.join('|'));
settingsStore.setItem('zimFilenames', fileNames.join('|'), Infinity);
await updateZimDropdownOptions(fileNames, '');
return { loadZim: false, files: files };
}