TagSpaces is an offline, open source, document manager with tagging support
chore: hardening navigation to read-only folders
Ilian Sapundshievf68a69aeab03
diff --git a/src/renderer/hooks/IOActionsContextProvider.tsx b/src/renderer/hooks/IOActionsContextProvider.tsxindex 81e6dd699..d1a6c51a4 100644--- a/src/renderer/hooks/IOActionsContextProvider.tsx+++ b/src/renderer/hooks/IOActionsContextProvider.tsx@@ -1810,7 +1810,13 @@ export const IOActionsContextProvider = ({);const metaExist = await location.getPropertiesPromise(metaFolder);if (!metaExist) {- await createDirectoryPromise(metaFolder, location.uuid);+ try {+ await createDirectoryPromise(metaFolder, location.uuid);+ } catch (err) {+ // e.g. EPERM inside macOS .app bundles or other protected folders+ console.log('Cannot create meta folder ' + metaFolder + ': ' + err);+ return undefined;+ }}} else {// check and create meta folder if not exist@@ -1822,7 +1828,19 @@ export const IOActionsContextProvider = ({const metaDirectoryProperties =await location.getPropertiesPromise(metaDirectoryPath);if (!metaDirectoryProperties) {- await createDirectoryPromise(metaDirectoryPath, location.uuid, false);+ try {+ await createDirectoryPromise(+ metaDirectoryPath,+ location.uuid,+ false,+ );+ } catch (err) {+ // e.g. EPERM inside macOS .app bundles or other protected folders+ console.log(+ 'Cannot create meta folder ' + metaDirectoryPath + ': ' + err,+ );+ return undefined;+ }}metaFilePath = getMetaFileLocationForDir(diff --git a/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx b/src/renderer/hooks/PerspectiveSettingsContextProvider.tsxindex 5ca9a604f..cfda1e645 100644--- a/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx+++ b/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx@@ -202,10 +202,29 @@ export const PerspectiveSettingsContextProvider = ({currentDirectoryPath,currentPerspective,cleanSettings,- ).then((updatedFsEntryMeta: TS.FileSystemEntryMeta) => {- saveCurrentLocationMetaData(currentDirectoryPath, updatedFsEntryMeta);- setDirectoryMeta(updatedFsEntryMeta);- });+ )+ .then((updatedFsEntryMeta: TS.FileSystemEntryMeta) => {+ saveCurrentLocationMetaData(+ currentDirectoryPath,+ updatedFsEntryMeta,+ ).catch((err) => {+ console.log(+ 'saveCurrentLocationMetaData failed for ' ++ currentDirectoryPath ++ ': ' ++ err,+ );+ });+ setDirectoryMeta(updatedFsEntryMeta);+ })+ .catch((err) => {+ console.log(+ 'setPerspectiveSettings failed for ' ++ currentDirectoryPath ++ ': ' ++ err,+ );+ });} else {if (Pro &&@@ -218,9 +237,28 @@ export const PerspectiveSettingsContextProvider = ({currentDirectoryPath,currentPerspective,undefined,- ).then((updatedFsEntryMeta: TS.FileSystemEntryMeta) =>- saveCurrentLocationMetaData(currentDirectoryPath, updatedFsEntryMeta),- );+ )+ .then((updatedFsEntryMeta: TS.FileSystemEntryMeta) =>+ saveCurrentLocationMetaData(+ currentDirectoryPath,+ updatedFsEntryMeta,+ ).catch((err) => {+ console.log(+ 'saveCurrentLocationMetaData failed for ' ++ currentDirectoryPath ++ ': ' ++ err,+ );+ }),+ )+ .catch((err) => {+ console.log(+ 'setPerspectiveSettings cleanup failed for ' ++ currentDirectoryPath ++ ': ' ++ err,+ );+ });}const defaultSettings = getDefaultPerspectiveSettings(currentPerspective);localStorage.setItem(