TagSpaces is an offline, open source, document manager with tagging support
KanBan perspective fixes
stanimir2e50741c79e2
diff --git a/app/reducers/app.ts b/app/reducers/app.tsindex 8d0c5e571..bc0abf28a 100644--- a/app/reducers/app.ts+++ b/app/reducers/app.ts@@ -25,7 +25,8 @@ import {enhanceEntry,deleteFilesPromise,loadMetaDataPromise,- renameFilesPromise+ renameFilesPromise,+ enhanceDirectoryContent} from '../services/utils-io';import {extractFileExtension,@@ -1495,43 +1496,22 @@ function prepareDirectoryContent(dispatch,getState) {- const directoryContent = [];- const tmbGenerationPromises = [];- const tmbGenerationList = [];- const isWorkerAvailable = PlatformIO.isWorkerAvailable();const currentLocation: Location = getLocation(getState(),getState().app.currentLocationId);const isCloudLocation = currentLocation.type === locationType.TYPE_CLOUD;- dirEntries.map(entry => {- if (!settings.showUnixHiddenEntries && entry.name.startsWith('.')) {- return true;- }-- if (isCloudLocation) {- entry.url = PlatformIO.getURLforPath(entry.path);- }-- const enhancedEntry = enhanceEntry(entry);- directoryContent.push(enhancedEntry);- if (- // Enable thumb generation by- !AppConfig.isWeb && // not in webdav mode- !PlatformIO.haveObjectStoreSupport() && // not in object store mode- enhancedEntry.isFile && // only for files- settings.useGenerateThumbnails // enabled in the settings- ) {- const isPDF = enhancedEntry.path.endsWith('.pdf');- if (isWorkerAvailable && !isPDF) {- tmbGenerationList.push(enhancedEntry.path);- } else {- tmbGenerationPromises.push(getThumbnailURLPromise(enhancedEntry.path));- }- }- return true;- });+ const {+ directoryContent,+ tmbGenerationPromises,+ tmbGenerationList+ } = enhanceDirectoryContent(+ dirEntries,+ isCloudLocation,+ settings.showUnixHiddenEntries,+ settings.useGenerateThumbnails+ );function handleTmbGenerationResults(results) {// console.log('tmb results' + JSON.stringify(results));diff --git a/app/services/utils-io.ts b/app/services/utils-io.tsindex b73d31181..e2b8e9282 100644--- a/app/services/utils-io.ts+++ b/app/services/utils-io.ts@@ -32,6 +32,8 @@ import {// import { formatDateTime4Tag } from '../utils/misc';import versionMeta from '../version.json';import { Tag } from '../reducers/taglibrary';+import { getLocation, Location, locationType } from '-/reducers/locations';+import { getThumbnailURLPromise } from '-/services/thumbsgenerator';export interface FileSystemEntry {uuid?: string;@@ -60,6 +62,58 @@ export interface FileSystemEntryMeta {lastUpdated: string;}+export function enhanceDirectoryContent(+ dirEntries,+ isCloudLocation,+ showUnixHiddenEntries,+ useGenerateThumbnails,+ showDirs = true+) {+ const directoryContent = [];+ const tmbGenerationPromises = [];+ const tmbGenerationList = [];+ const isWorkerAvailable = PlatformIO.isWorkerAvailable();++ dirEntries.map(entry => {+ if (!showUnixHiddenEntries && entry.name.startsWith('.')) {+ return true;+ }++ if (!showDirs && !entry.isFile) {+ return true;+ }++ if (isCloudLocation) {+ // eslint-disable-next-line no-param-reassign+ entry.url = PlatformIO.getURLforPath(entry.path);+ }++ const enhancedEntry = enhanceEntry(entry);+ directoryContent.push(enhancedEntry);+ if (+ // Enable thumb generation by+ !AppConfig.isWeb && // not in webdav mode+ !PlatformIO.haveObjectStoreSupport() && // not in object store mode+ enhancedEntry.isFile && // only for files+ useGenerateThumbnails // enabled in the settings+ ) {+ const isPDF = enhancedEntry.path.endsWith('.pdf');+ if (isWorkerAvailable && !isPDF) {+ tmbGenerationList.push(enhancedEntry.path);+ } else {+ tmbGenerationPromises.push(getThumbnailURLPromise(enhancedEntry.path));+ }+ }+ return true;+ });++ return {+ directoryContent,+ tmbGenerationPromises,+ tmbGenerationList+ };+}+export function enhanceEntry(entry: any): FileSystemEntry {let fileNameTags = [];if (entry.isFile) {