From 58cc3d98544c9762b7313f2f2e98ad716b66feb5 Mon Sep 17 00:00:00 2001 From: Rafael Araujo Lehmkuhl Date: Wed, 29 Jan 2025 16:30:54 -0300 Subject: [PATCH 1/8] electron: Move code to src folder --- {electron => src/electron}/main.ts | 0 {electron => src/electron}/preload.ts | 0 {electron => src/electron}/services/auto-update.ts | 0 {electron => src/electron}/services/config-store.ts | 0 {electron => src/electron}/services/network.ts | 2 +- {electron => src/electron}/services/storage.ts | 0 vite.config.ts | 4 ++-- 7 files changed, 3 insertions(+), 3 deletions(-) rename {electron => src/electron}/main.ts (100%) rename {electron => src/electron}/preload.ts (100%) rename {electron => src/electron}/services/auto-update.ts (100%) rename {electron => src/electron}/services/config-store.ts (100%) rename {electron => src/electron}/services/network.ts (95%) rename {electron => src/electron}/services/storage.ts (100%) diff --git a/electron/main.ts b/src/electron/main.ts similarity index 100% rename from electron/main.ts rename to src/electron/main.ts diff --git a/electron/preload.ts b/src/electron/preload.ts similarity index 100% rename from electron/preload.ts rename to src/electron/preload.ts diff --git a/electron/services/auto-update.ts b/src/electron/services/auto-update.ts similarity index 100% rename from electron/services/auto-update.ts rename to src/electron/services/auto-update.ts diff --git a/electron/services/config-store.ts b/src/electron/services/config-store.ts similarity index 100% rename from electron/services/config-store.ts rename to src/electron/services/config-store.ts diff --git a/electron/services/network.ts b/src/electron/services/network.ts similarity index 95% rename from electron/services/network.ts rename to src/electron/services/network.ts index 4f56dbbf4..e0ae4084f 100644 --- a/electron/services/network.ts +++ b/src/electron/services/network.ts @@ -1,7 +1,7 @@ import { ipcMain } from 'electron' import { networkInterfaces } from 'os' -import { NetworkInfo } from '../../src/types/network' +import { NetworkInfo } from '../../types/network' /** * Get the network information * @returns {NetworkInfo} The network information diff --git a/electron/services/storage.ts b/src/electron/services/storage.ts similarity index 100% rename from electron/services/storage.ts rename to src/electron/services/storage.ts diff --git a/vite.config.ts b/vite.config.ts index 628b3a513..e32fb6d92 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -18,7 +18,7 @@ const baseConfig = { (isElectron || isBuilding) && electron([ { - entry: 'electron/main.ts', + entry: 'src/electron/main.ts', vite: { build: { outDir: 'dist/electron', @@ -34,7 +34,7 @@ const baseConfig = { }, }, { - entry: 'electron/preload.ts', + entry: 'src/electron/preload.ts', vite: { build: { outDir: 'dist/electron', From 4e64a946893592b65f55817cc333301790bc12f0 Mon Sep 17 00:00:00 2001 From: Rafael Araujo Lehmkuhl Date: Thu, 30 Jan 2025 13:40:19 -0300 Subject: [PATCH 2/8] video-library: Don't show download button on the Electron app The video is already in the disk and using this would cause the video to be loaded into memory unnecessarily. --- src/components/VideoLibraryModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/VideoLibraryModal.vue b/src/components/VideoLibraryModal.vue index a44575a30..b68d5349f 100644 --- a/src/components/VideoLibraryModal.vue +++ b/src/components/VideoLibraryModal.vue @@ -577,7 +577,7 @@ const fileActionButtons = computed(() => [ size: 28, tooltip: 'Download selected videos with logs', confirmAction: false, - show: true, + show: !isElectron(), disabled: showOnScreenProgress.value === true || isPreparingDownload.value === true, action: () => downloadVideoAndTelemetryFiles(), }, From e3c1f5afcee137a63a55dc4903547adec538aa0d Mon Sep 17 00:00:00 2001 From: Rafael Araujo Lehmkuhl Date: Thu, 30 Jan 2025 13:40:46 -0300 Subject: [PATCH 3/8] video-library: Fix app library showing buttons that were marked not to be shown --- src/components/VideoLibraryModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/VideoLibraryModal.vue b/src/components/VideoLibraryModal.vue index b68d5349f..2af30b772 100644 --- a/src/components/VideoLibraryModal.vue +++ b/src/components/VideoLibraryModal.vue @@ -314,7 +314,7 @@