Split accessing cache instance and processing data #3747

921850a62bfdaf3eceedc0cd4919786d555f04d2

Cohee <18619528+Cohee1207@users.noreply.github.com>

src/endpoints/characters.js+23 -17 Viewed

      * @returns {Promise<void>}
      */
     async verify(directoriesList) {
 -        if (!useDiskCache) {
 +        try {
 -            return;
 +            if (!useDiskCache) {
 -        }
 +                return;
 +            }
                     const cache = await this.instance();
                     const validKeys = new Set();
                     for (const dir of directoriesList) {
                             const files = fs.readdirSync(dir.characters, { withFileTypes: true });
                             for (const file of files.filter(f => f.isFile() && path.extname(f.name) === '.png')) {
                                     const filePath = path.join(dir.characters, file.name);
                                     const cacheKey = getCacheKey(filePath);
                                     validKeys.add(path.parse(cache.getDatumPath(cacheKey)).base);
 +                }
+            }
 -        }
 +            for (const key of this.hashedKeys) {
 -        for (const key of this.hashedKeys) {
 +                if (!validKeys.has(key)) {
 -            if (!validKeys.has(key)) {
 +                    await cache.removeItem(key);
 -                await cache.removeItem(key);
 +                }
+            }
 +        } catch (error) {
 +            console.error('Error while verifying disk cache:', error);
+        }
+    }

@@ -172,7 +176,8 @@ async function readCharacterData(inputFile, inputFormat = 'png') {
172	176	}
173	177	if (useDiskCache) {
174	178	try {
175	179	const cachedDatacache = await diskCache.instance().then(i => i.getItem(cacheKey));
	180	+ const cachedData = await cache.getItem(cacheKey);
176	181	if (cachedData) {
177	182	return cachedData;
178	183	}

     !isAndroid && memoryCache.set(cacheKey, result);
     if (useDiskCache) {
         try {
 -            await diskCache.instance().then(i => i.setItem(cacheKey, result));
 +            const cache = await diskCache.instance();
 +            await cache.setItem(cacheKey, result);
         } catch (error) {
             console.warn('Error while writing to disk cache:', error);
+        }