Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix thumbsGeneration2

Stanimir5124f711331c
diff --git a/app/components/RenderPerspective.tsx b/app/components/RenderPerspective.tsx
index eb12abff4..3e2b8144e 100644
--- a/app/components/RenderPerspective.tsx
+++ b/app/components/RenderPerspective.tsx
@@ -39,11 +39,11 @@ function GridPerspectiveAsync(props) {
return (
<React.Suspense fallback={<LoadingLazy />}>
<SortedDirContextProvider>
- <ThumbGenerationContextProvider>
- <PaginationContextProvider>
+ <PaginationContextProvider>
+ <ThumbGenerationContextProvider>
<GridPerspective {...props} />
- </PaginationContextProvider>
- </ThumbGenerationContextProvider>
+ </ThumbGenerationContextProvider>
+ </PaginationContextProvider>
</SortedDirContextProvider>
</React.Suspense>
);
diff --git a/app/hooks/DirectoryContentContextProvider.tsx b/app/hooks/DirectoryContentContextProvider.tsx
index 1f6b39002..cc147752a 100644
--- a/app/hooks/DirectoryContentContextProvider.tsx
+++ b/app/hooks/DirectoryContentContextProvider.tsx
@@ -584,9 +584,9 @@ export const DirectoryContentContextProvider = ({
currentDirectoryPath.current
);
} else {*/
- currentDirectoryPath.current = directoryPath;
//}
setCurrentDirectoryEntries(directoryContent);
+ currentDirectoryPath.current = directoryPath;
return directoryContent;
}
diff --git a/app/hooks/PaginationContextProvider.tsx b/app/hooks/PaginationContextProvider.tsx
index eee5a1590..1cb4459eb 100644
--- a/app/hooks/PaginationContextProvider.tsx
+++ b/app/hooks/PaginationContextProvider.tsx
@@ -22,18 +22,17 @@ import { defaultSettings } from '-/perspectives/grid-perspective';
import { useSortedDirContext } from '-/perspectives/grid-perspective/hooks/useSortedDirContext';
import { TS } from '-/tagspaces.namespace';
import { loadCurrentDirMeta } from '-/services/meta-loader';
-import { useThumbGenerationContext } from '-/hooks/useThumbGenerationContext';
type PaginationContextData = {
page: number;
pageFiles: TS.FileSystemEntry[];
- setCurrentPage: (page: number) => Promise<boolean>;
+ setCurrentPage: (page: number) => void;
};
export const PaginationContext = createContext<PaginationContextData>({
page: 1,
pageFiles: [],
- setCurrentPage: () => Promise.resolve(false)
+ setCurrentPage: undefined
});
export type PaginationContextProviderProps = {
@@ -49,7 +48,6 @@ export const PaginationContextProvider = ({
currentDirectoryEntries,
updateCurrentDirEntries
} = useDirectoryContentContext();
- const { generateThumbnails } = useThumbGenerationContext();
const { settings, sortedDirContent } = useSortedDirContext();
const [page, setPage] = useState<number>(initPage);
@@ -88,7 +86,7 @@ export const PaginationContextProvider = ({
function setCurrentPage(currentPage: number) {
setPage(currentPage);
- const entries = getPageFiles(currentPage, sortedDirContent);
+ /*const entries = getPageFiles(currentPage, sortedDirContent);
return generateThumbnails(entries).then(() => {
return loadCurrentDirMeta(
currentDirectoryPath,
@@ -98,7 +96,7 @@ export const PaginationContextProvider = ({
updateCurrentDirEntries(entries);
return true;
});
- });
+ });*/
}
const context = useMemo(() => {
diff --git a/app/hooks/ThumbGenerationContextProvider.tsx b/app/hooks/ThumbGenerationContextProvider.tsx
index 3785e2c41..d883d06ef 100644
--- a/app/hooks/ThumbGenerationContextProvider.tsx
+++ b/app/hooks/ThumbGenerationContextProvider.tsx
@@ -65,7 +65,7 @@ export const ThumbGenerationContextProvider = ({
updateCurrentDirEntries
} = useDirectoryContentContext();
const { currentLocation } = useCurrentLocationContext();
- const { pageFiles } = usePaginationContext();
+ const { pageFiles, page } = usePaginationContext();
const { setGeneratingThumbs } = useNotificationContext();
const useGenerateThumbnails = useSelector(getUseGenerateThumbnails);
const enableWS = useSelector(getEnableWS);
@@ -103,27 +103,19 @@ export const ThumbGenerationContextProvider = ({
isGeneratingThumbs.current === false
) {
generateThumbnails(entries).then(() => {
- if (!isMetaFolderExist) {
- // initial thumbnail generation without .ts folder
- loadCurrentDirMeta(
- currentDirectoryPath,
- currentDirectoryEntries
- ).then(entries => updateCurrentDirEntries(entries));
- /*PlatformIO.listMetaDirectoryPromise(currentDirectoryPath)
- .then(meta => {
- const thumbs = getThumbs(meta);
- return updateEntries(thumbs);
- })
- .catch(ex => {
- console.log(ex);
- return false;
- });*/
- }
+ //if (!isMetaFolderExist) {
+ // initial thumbnail generation without .ts folder
+ loadCurrentDirMeta(
+ currentDirectoryPath,
+ currentDirectoryEntries,
+ entries.filter(entry => entry.isFile)
+ ).then(entries => updateCurrentDirEntries(entries));
+ // }
return true;
});
}
}
- }, [currentDirectoryPath, isMetaFolderExist]);
+ }, [currentDirectoryPath, page]); //, isMetaFolderExist]);
function genThumbnailsEnabled(): boolean {
if (
@@ -216,28 +208,30 @@ export const ThumbGenerationContextProvider = ({
}
function thumbnailMainGeneration(mainEntries: string[]): Promise<boolean> {
- const maxExecutionTime = 5000;
- const timeoutPromise = new Promise((resolve, reject) => {
- setTimeout(() => {
- reject(
- new Error('Maximum execution time exceeded:' + maxExecutionTime)
- );
- }, maxExecutionTime);
- });
+ const maxExecutionTime = 3000;
const promises = mainEntries.map(tmbPath =>
getThumbnailURLPromise(tmbPath)
);
- return (
- Promise.race([Promise.allSettled(promises), timeoutPromise])
- //return Promise.allSettled(promises)
- .then(() => {
- return true;
- })
- .catch(e => {
- console.log('thumbnailMainGeneration', e);
- return false;
- })
- );
+ const promisesWithTimeout = promises.map(promise => {
+ const timeoutPromise = new Promise((resolve, reject) => {
+ setTimeout(() => {
+ reject(
+ new Error('Maximum execution time exceeded' + maxExecutionTime)
+ );
+ }, maxExecutionTime);
+ });
+
+ return Promise.race([promise, timeoutPromise]);
+ });
+
+ return Promise.allSettled(promisesWithTimeout)
+ .then(() => {
+ return true;
+ })
+ .catch(e => {
+ console.log('thumbnailMainGeneration', e);
+ return false;
+ });
}
const context = useMemo(() => {
diff --git a/app/perspectives/grid-perspective/components/GridPagination.tsx b/app/perspectives/grid-perspective/components/GridPagination.tsx
index 4b301864f..42b61799b 100644
--- a/app/perspectives/grid-perspective/components/GridPagination.tsx
+++ b/app/perspectives/grid-perspective/components/GridPagination.tsx
@@ -175,11 +175,10 @@ function GridPagination(props: Props) {
}, [currentDirectoryEntries]);
const handleChange = (event, value) => {
- setCurrentPage(value).then(() => {
- if (containerEl && containerEl.current) {
- containerEl.current.scrollTop = 0;
- }
- });
+ setCurrentPage(value);
+ if (containerEl && containerEl.current) {
+ containerEl.current.scrollTop = 0;
+ }
};
const folderName = extractDirectoryName(