diff --git a/desktop/src/api/cache.ts b/desktop/src/api/cache.ts index 86ba4378c..bf7182fad 100644 --- a/desktop/src/api/cache.ts +++ b/desktop/src/api/cache.ts @@ -5,11 +5,7 @@ import { DiskCache } from "../services/diskCache"; const ENTE_CACHE_DIR_NAME = "ente"; -export const getCacheDirectory = async () => { - const customCacheDir = await getCustomCacheDirectory(); - if (customCacheDir && existsSync(customCacheDir)) { - return customCacheDir; - } +const getCacheDirectory = async () => { const defaultSystemCacheDir = await ipcRenderer.invoke("get-path", "cache"); return path.join(defaultSystemCacheDir, ENTE_CACHE_DIR_NAME); }; @@ -40,13 +36,3 @@ export async function deleteDiskCache(cacheName: string) { return false; } } - -export async function setCustomCacheDirectory( - directory: string, -): Promise { - await ipcRenderer.invoke("set-custom-cache-directory", directory); -} - -async function getCustomCacheDirectory(): Promise { - return await ipcRenderer.invoke("get-custom-cache-directory"); -} diff --git a/desktop/src/preload.ts b/desktop/src/preload.ts index f39dae098..ec9b0d997 100644 --- a/desktop/src/preload.ts +++ b/desktop/src/preload.ts @@ -28,12 +28,7 @@ */ import { contextBridge } from "electron"; -import { - deleteDiskCache, - getCacheDirectory, - openDiskCache, - setCustomCacheDirectory, -} from "./api/cache"; +import { deleteDiskCache, openDiskCache } from "./api/cache"; import { computeImageEmbedding, computeTextEmbedding } from "./api/clip"; import { getAppVersion, @@ -144,6 +139,4 @@ contextBridge.exposeInMainWorld("ElectronAPIs", { computeImageEmbedding, computeTextEmbedding, getPlatform, - getCacheDirectory, - setCustomCacheDirectory, }); diff --git a/desktop/src/services/userPreference.ts b/desktop/src/services/userPreference.ts index e3c6db290..8074ee4de 100644 --- a/desktop/src/services/userPreference.ts +++ b/desktop/src/services/userPreference.ts @@ -31,11 +31,3 @@ export function clearSkipAppVersion() { export function clearMuteUpdateNotificationVersion() { userPreferencesStore.delete("muteUpdateNotificationVersion"); } - -export function setCustomCacheDirectory(directory: string) { - userPreferencesStore.set("customCacheDirectory", directory); -} - -export function getCustomCacheDirectory(): string { - return userPreferencesStore.get("customCacheDirectory"); -} diff --git a/desktop/src/stores/userPreferences.store.ts b/desktop/src/stores/userPreferences.store.ts index e6fec425a..7e17182ad 100644 --- a/desktop/src/stores/userPreferences.store.ts +++ b/desktop/src/stores/userPreferences.store.ts @@ -11,9 +11,6 @@ const userPreferencesSchema: Schema = { muteUpdateNotificationVersion: { type: "string", }, - customCacheDirectory: { - type: "string", - }, }; export const userPreferencesStore = new Store({ diff --git a/desktop/src/types/index.ts b/desktop/src/types/index.ts index 208983826..87f724b58 100644 --- a/desktop/src/types/index.ts +++ b/desktop/src/types/index.ts @@ -58,7 +58,6 @@ export interface UserPreferencesType { hideDockIcon: boolean; skipAppVersion: string; muteUpdateNotificationVersion: string; - customCacheDirectory: string; } export interface AppUpdateInfo { diff --git a/desktop/src/utils/ipcComms.ts b/desktop/src/utils/ipcComms.ts index eec644aeb..c81b2b2ce 100644 --- a/desktop/src/utils/ipcComms.ts +++ b/desktop/src/utils/ipcComms.ts @@ -27,10 +27,6 @@ import { generateImageThumbnail, } from "../services/imageProcessor"; import { logErrorSentry } from "../services/sentry"; -import { - getCustomCacheDirectory, - setCustomCacheDirectory, -} from "../services/userPreference"; import { getPlatform } from "./common/platform"; import { createWindow } from "./createWindow"; import { generateTempFilePath } from "./temp"; @@ -183,12 +179,4 @@ export default function setupIpcComs( ipcMain.handle("get-platform", () => { return getPlatform(); }); - - ipcMain.handle("set-custom-cache-directory", (_, directory: string) => { - setCustomCacheDirectory(directory); - }); - - ipcMain.handle("get-custom-cache-directory", async () => { - return getCustomCacheDirectory(); - }); } diff --git a/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx b/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx index 5adc0361d..e854d70d6 100644 --- a/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx +++ b/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx @@ -16,7 +16,6 @@ import isElectron from "is-electron"; import { AppContext } from "pages/_app"; import { ClipExtractionStatus, ClipService } from "services/clipService"; import { formatNumber } from "utils/number/format"; -import CacheDirectory from "./Preferences/CacheDirectory"; export default function AdvancedSettings({ open, onClose, onRootClose }) { const appContext = useContext(AppContext); @@ -77,22 +76,19 @@ export default function AdvancedSettings({ open, onClose, onRootClose }) { {isElectron() && ( - <> - - - } + + } + /> + + } + onClick={openMlSearchSettings} + label={t("ML_SEARCH")} /> - - } - onClick={openMlSearchSettings} - label={t("ML_SEARCH")} - /> - - - + + )} diff --git a/web/apps/photos/src/components/Sidebar/Preferences/CacheDirectory.tsx b/web/apps/photos/src/components/Sidebar/Preferences/CacheDirectory.tsx deleted file mode 100644 index be23d9cbb..000000000 --- a/web/apps/photos/src/components/Sidebar/Preferences/CacheDirectory.tsx +++ /dev/null @@ -1,60 +0,0 @@ -import ElectronAPIs from "@ente/shared/electron"; -import { addLogLine } from "@ente/shared/logging"; -import { logError } from "@ente/shared/sentry"; -import Box from "@mui/material/Box"; -import { DirectoryPath } from "components/Directory"; -import { EnteMenuItem } from "components/Menu/EnteMenuItem"; -import { MenuItemGroup } from "components/Menu/MenuItemGroup"; -import MenuSectionTitle from "components/Menu/MenuSectionTitle"; -import { t } from "i18next"; -import isElectron from "is-electron"; -import { useEffect, useState } from "react"; -import DownloadManager from "services/download"; - -export default function CacheDirectory() { - const [cacheDirectory, setCacheDirectory] = useState(undefined); - - useEffect(() => { - const main = async () => { - if (isElectron()) { - const customCacheDirectory = - await ElectronAPIs.getCacheDirectory(); - setCacheDirectory(customCacheDirectory); - } - }; - main(); - }, []); - - const handleCacheDirectoryChange = async () => { - try { - if (!isElectron()) { - return; - } - const newFolder = await ElectronAPIs.selectDirectory(); - if (!newFolder) { - return; - } - addLogLine(`Export folder changed to ${newFolder}`); - await ElectronAPIs.setCustomCacheDirectory(newFolder); - setCacheDirectory(newFolder); - await DownloadManager.reloadCaches(); - } catch (e) { - logError(e, "handleCacheDirectoryChange failed"); - } - }; - - return ( - - - - - } - /> - - - ); -} diff --git a/web/apps/photos/src/services/download/index.ts b/web/apps/photos/src/services/download/index.ts index 3d71ed8ad..1d57d468f 100644 --- a/web/apps/photos/src/services/download/index.ts +++ b/web/apps/photos/src/services/download/index.ts @@ -130,11 +130,6 @@ class DownloadManagerImpl { this.progressUpdater = progressUpdater; } - async reloadCaches() { - this.thumbnailCache = await openThumbnailCache(); - this.diskFileCache = isElectron() && (await openDiskFileCache()); - } - private async getCachedThumbnail(fileID: number) { try { const cacheResp: Response = await this.thumbnailCache?.match( diff --git a/web/packages/shared/electron/types.ts b/web/packages/shared/electron/types.ts index 0273e7c65..01cfe4452 100644 --- a/web/packages/shared/electron/types.ts +++ b/web/packages/shared/electron/types.ts @@ -105,6 +105,4 @@ export interface ElectronAPIsType { ) => Promise; computeTextEmbedding: (model: Model, text: string) => Promise; getPlatform: () => Promise<"mac" | "windows" | "linux">; - setCustomCacheDirectory: (directory: string) => Promise; - getCacheDirectory: () => Promise; }