Skip to content

Commit

Permalink
fix(snapcraft): use the correct config folder for image cache (#3302)
Browse files Browse the repository at this point in the history
  • Loading branch information
sct committed Jan 30, 2023
1 parent d954328 commit c93467b
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions server/lib/imageproxy.ts
Expand Up @@ -18,14 +18,14 @@ type ImageResponse = {
imageBuffer: Buffer;
};

const baseCacheDirectory = process.env.CONFIG_DIRECTORY
? `${process.env.CONFIG_DIRECTORY}/cache/images`
: path.join(__dirname, '../../config/cache/images');

class ImageProxy {
public static async clearCache(key: string) {
let deletedImages = 0;
const cacheDirectory = path.join(
__dirname,
'../../config/cache/images/',
key
);
const cacheDirectory = path.join(baseCacheDirectory, key);

const files = await promises.readdir(cacheDirectory);

Expand Down Expand Up @@ -57,11 +57,7 @@ class ImageProxy {
public static async getImageStats(
key: string
): Promise<{ size: number; imageCount: number }> {
const cacheDirectory = path.join(
__dirname,
'../../config/cache/images/',
key
);
const cacheDirectory = path.join(baseCacheDirectory, key);

const imageTotalSize = await ImageProxy.getDirectorySize(cacheDirectory);
const imageCount = await ImageProxy.getImageCount(cacheDirectory);
Expand Down Expand Up @@ -263,7 +259,7 @@ class ImageProxy {
}

private getCacheDirectory() {
return path.join(__dirname, '../../config/cache/images/', this.key);
return path.join(baseCacheDirectory, this.key);
}
}

Expand Down

0 comments on commit c93467b

Please sign in to comment.