From a3086918d823c2bdd042410219b703516167a45d Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 15 Dec 2023 13:29:34 +0530 Subject: [PATCH 01/17] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 94b23ac19..687726fc4 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 94b23ac194d9a51cb68242e859b4be8006fbb75d +Subproject commit 687726fc45be980f6fbe24f4159e8d23977f700d From e9830dfba4abd9c0540c7c065122ea19b47460d5 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 15 Dec 2023 13:38:50 +0530 Subject: [PATCH 02/17] v1.6.59-alpha.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index efbba5084..2d584e4e8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.58", + "version": "1.6.59-alpha.3", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From 78487aa64fdcd6a6b89f19b460eea6b8a86528e6 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 15 Dec 2023 14:53:37 +0530 Subject: [PATCH 03/17] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 687726fc4..3a010915c 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 687726fc45be980f6fbe24f4159e8d23977f700d +Subproject commit 3a010915cab1f49dc40008f9ef6fc451ff1de686 From 90497651f414854530d347fb797dba44cff074d0 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 15 Dec 2023 14:53:51 +0530 Subject: [PATCH 04/17] v1.6.59-alpha.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2d584e4e8..22576f24f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.59-alpha.3", + "version": "1.6.59-alpha.4", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From 6c9a3d6897983e7fc97335b1dbc3f12d728ede1b Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 15 Dec 2023 14:59:00 +0530 Subject: [PATCH 05/17] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 3a010915c..e071c6bc8 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 3a010915cab1f49dc40008f9ef6fc451ff1de686 +Subproject commit e071c6bc870d11cd94dc205584391476715cec1a From 8f9ef6fce12fde16096261c6b8d0ce9c82e42f19 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 15 Dec 2023 14:59:07 +0530 Subject: [PATCH 06/17] v1.6.59-alpha.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 22576f24f..48f9244bf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.59-alpha.4", + "version": "1.6.59-alpha.5", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From 260292f981f20f50367c21453041a6be0a53fb4c Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 15 Dec 2023 16:30:39 +0530 Subject: [PATCH 07/17] remove logging --- src/services/diskCache.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/services/diskCache.ts b/src/services/diskCache.ts index 32a8885d6..fbcf66144 100644 --- a/src/services/diskCache.ts +++ b/src/services/diskCache.ts @@ -5,7 +5,7 @@ import path from 'path'; import { LimitedCache } from '../types/cache'; import { logError } from './logging'; import { getFileStream, writeStream } from './fs'; -import log from 'electron-log'; +// import log from 'electron-log'; const DEFAULT_CACHE_LIMIT = 1000 * 1000 * 1000; // 1GB @@ -29,13 +29,13 @@ export class DiskCache implements LimitedCache { { sizeInBytes }: { sizeInBytes?: number } = {} ): Promise { const cachePath = path.join(this.cacheBucketDir, cacheKey); - log.info(`Checking cache key: ${cacheKey}`); + // log.info(`Checking cache key: ${cacheKey}`); if (existsSync(cachePath)) { - log.info(`Cache key exists: ${cacheKey}`); + // log.info(`Cache key exists: ${cacheKey}`); const fileStats = await stat(cachePath); - log.info( - `Cache key size: ${fileStats.size} , expected: ${sizeInBytes}` - ); + // log.info( + // `Cache key size: ${fileStats.size} , expected: ${sizeInBytes}` + // ); if (sizeInBytes && fileStats.size !== sizeInBytes) { logError( Error(), @@ -44,18 +44,18 @@ export class DiskCache implements LimitedCache { unlink(cachePath); return undefined; } - log.info(`Cache key size matches: ${cacheKey}`); + // log.info(`Cache key size matches: ${cacheKey}`); DiskLRUService.touch(cachePath); return new Response(await getFileStream(cachePath)); } else { - log.info(`Cache key does not exist: ${cacheKey}`); + // log.info(`Cache key does not exist: ${cacheKey}`); // add fallback for old cache keys const oldCachePath = getOldAssetCachePath( this.cacheBucketDir, cacheKey ); if (existsSync(oldCachePath)) { - log.info(`Old cache key exists: ${cacheKey}`); + // log.info(`Old cache key exists: ${cacheKey}`); const fileStats = await stat(oldCachePath); if (sizeInBytes && fileStats.size !== sizeInBytes) { logError( @@ -66,7 +66,7 @@ export class DiskCache implements LimitedCache { return undefined; } const match = new Response(await getFileStream(oldCachePath)); - log.info(`Old cache key size matches: ${cacheKey}`); + // log.info(`Old cache key size matches: ${cacheKey}`); void migrateOldCacheKey(oldCachePath, cachePath); return match; } From 9f6009c2f66465a2e20ed6ec73fce8d343c13ede Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 15 Dec 2023 16:48:03 +0530 Subject: [PATCH 08/17] v1.6.59-alpha.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48f9244bf..67de4e1d2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.59-alpha.5", + "version": "1.6.59-alpha.6", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From 7f4f54c2ee383efa43fbd73becc1f8df2f00fa54 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 15 Dec 2023 17:09:40 +0530 Subject: [PATCH 09/17] v1.6.59-alpha.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 67de4e1d2..8bb560739 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.59-alpha.6", + "version": "1.6.59-alpha.7", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From 7bdd2797c759741bea7fdb4cdf2d6982fdd89ba3 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 15 Dec 2023 18:17:23 +0530 Subject: [PATCH 10/17] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index e071c6bc8..6892b0390 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit e071c6bc870d11cd94dc205584391476715cec1a +Subproject commit 6892b039052c5ad8b5424da6eb1742203f210eb3 From 4965af8d8adfd1a9136b0066de75f9e7fb4afccc Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 15 Dec 2023 18:17:32 +0530 Subject: [PATCH 11/17] v1.6.59-alpha.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8bb560739..294167f62 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.59-alpha.7", + "version": "1.6.59-alpha.9", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From ebc65741a46bb88fc08017f24d4063d2dd6b1b3a Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sat, 16 Dec 2023 10:13:45 +0530 Subject: [PATCH 12/17] remove logging slowing down operation --- src/services/diskCache.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/services/diskCache.ts b/src/services/diskCache.ts index fbcf66144..9f4213778 100644 --- a/src/services/diskCache.ts +++ b/src/services/diskCache.ts @@ -5,7 +5,6 @@ import path from 'path'; import { LimitedCache } from '../types/cache'; import { logError } from './logging'; import { getFileStream, writeStream } from './fs'; -// import log from 'electron-log'; const DEFAULT_CACHE_LIMIT = 1000 * 1000 * 1000; // 1GB @@ -29,13 +28,8 @@ export class DiskCache implements LimitedCache { { sizeInBytes }: { sizeInBytes?: number } = {} ): Promise { const cachePath = path.join(this.cacheBucketDir, cacheKey); - // log.info(`Checking cache key: ${cacheKey}`); if (existsSync(cachePath)) { - // log.info(`Cache key exists: ${cacheKey}`); const fileStats = await stat(cachePath); - // log.info( - // `Cache key size: ${fileStats.size} , expected: ${sizeInBytes}` - // ); if (sizeInBytes && fileStats.size !== sizeInBytes) { logError( Error(), @@ -44,18 +38,15 @@ export class DiskCache implements LimitedCache { unlink(cachePath); return undefined; } - // log.info(`Cache key size matches: ${cacheKey}`); DiskLRUService.touch(cachePath); return new Response(await getFileStream(cachePath)); } else { - // log.info(`Cache key does not exist: ${cacheKey}`); // add fallback for old cache keys const oldCachePath = getOldAssetCachePath( this.cacheBucketDir, cacheKey ); if (existsSync(oldCachePath)) { - // log.info(`Old cache key exists: ${cacheKey}`); const fileStats = await stat(oldCachePath); if (sizeInBytes && fileStats.size !== sizeInBytes) { logError( @@ -66,7 +57,6 @@ export class DiskCache implements LimitedCache { return undefined; } const match = new Response(await getFileStream(oldCachePath)); - // log.info(`Old cache key size matches: ${cacheKey}`); void migrateOldCacheKey(oldCachePath, cachePath); return match; } From 0dd6dadd12d9f5e381954e53b7cb5c966f7dd0b7 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sat, 16 Dec 2023 10:27:11 +0530 Subject: [PATCH 13/17] fix unhandled runtime error, and ignore doesn't exist error --- src/services/diskCache.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/services/diskCache.ts b/src/services/diskCache.ts index 9f4213778..09be221f9 100644 --- a/src/services/diskCache.ts +++ b/src/services/diskCache.ts @@ -35,7 +35,10 @@ export class DiskCache implements LimitedCache { Error(), 'Cache key exists but size does not match. Deleting cache key.' ); - unlink(cachePath); + unlink(cachePath).catch((e) => { + if (e.code === 'ENOENT') return; + logError(e, 'Failed to delete cache key'); + }); return undefined; } DiskLRUService.touch(cachePath); @@ -53,7 +56,10 @@ export class DiskCache implements LimitedCache { Error(), 'Old cache key exists but size does not match. Deleting cache key.' ); - unlink(oldCachePath); + unlink(oldCachePath).catch((e) => { + if (e.code === 'ENOENT') return; + logError(e, 'Failed to delete cache key'); + }); return undefined; } const match = new Response(await getFileStream(oldCachePath)); From d2b051fd5872aa394384b8b99156efbb55e7de79 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sat, 16 Dec 2023 13:49:47 +0530 Subject: [PATCH 14/17] update ui --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 6892b0390..0dc1d138a 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 6892b039052c5ad8b5424da6eb1742203f210eb3 +Subproject commit 0dc1d138aa97dc4c89071baf2a28759cb5e399ba From e15e40bc200dcdfd9c4324d5366984f10176376b Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sat, 16 Dec 2023 13:52:56 +0530 Subject: [PATCH 15/17] added changelog v1.6.59 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5d2a25d8..410781dbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG +## v1.6.59 + +### Bug Fixes + +- Fix Editor file not loading issue +- Fix ML results missing thumbnail issue + ## v1.6.58 ### Bug Fixes From 5b177fac54e598d2c87ad5e17c67b72b7b607f6f Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sat, 16 Dec 2023 14:13:37 +0530 Subject: [PATCH 16/17] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 410781dbc..8e9aaa695 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v1.6.59 +### New + +- Added arm64 builds for linux + ### Bug Fixes - Fix Editor file not loading issue From e82aae841a9d9ef2255bc17771c810846c371027 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sat, 16 Dec 2023 14:14:41 +0530 Subject: [PATCH 17/17] v1.6.59 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 57143a2b6..001b26c96 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.59-alpha.9", + "version": "1.6.59", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js",