From 844835f79756d89c9d2b652cc12cfd8277dccd6e Mon Sep 17 00:00:00 2001 From: oisumeko Date: Wed, 31 Jul 2024 18:36:43 +1200 Subject: [PATCH] Reverted change to loadExtensions, updated to remove SKIP_BINARIES_CHECK --- .devcontainer/dev.js | 5 ++--- index.js | 1 - server/Database.js | 2 -- server/managers/BinaryManager.js | 6 ------ 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.devcontainer/dev.js b/.devcontainer/dev.js index 28c0074b4..9132521a6 100644 --- a/.devcontainer/dev.js +++ b/.devcontainer/dev.js @@ -5,6 +5,5 @@ module.exports.config = { ConfigPath: Path.resolve('config'), MetadataPath: Path.resolve('metadata'), FFmpegPath: '/usr/bin/ffmpeg', - FFProbePath: '/usr/bin/ffprobe', - SkipBinariesCheck: true -} \ No newline at end of file + FFProbePath: '/usr/bin/ffprobe' +} diff --git a/index.js b/index.js index 141c5826e..4116ef194 100644 --- a/index.js +++ b/index.js @@ -9,7 +9,6 @@ if (isDev) { if (devEnv.MetadataPath) process.env.METADATA_PATH = devEnv.MetadataPath if (devEnv.FFmpegPath) process.env.FFMPEG_PATH = devEnv.FFmpegPath if (devEnv.FFProbePath) process.env.FFPROBE_PATH = devEnv.FFProbePath - if (devEnv.SkipBinariesCheck) process.env.SKIP_BINARIES_CHECK = '1' if (devEnv.BackupPath) process.env.BACKUP_PATH = devEnv.BackupPath process.env.SOURCE = 'local' process.env.ROUTER_BASE_PATH = devEnv.RouterBasePath || '' diff --git a/server/Database.js b/server/Database.js index e79370635..935ddc200 100644 --- a/server/Database.js +++ b/server/Database.js @@ -228,8 +228,6 @@ class Database { const db = await this.sequelize.dialect.connectionManager.getConnection() if (typeof db?.loadExtension !== 'function') throw new Error('Failed to get db connection for loading extensions') - extensions = extensions.filter(ext => ext !== undefined) - for (const ext of extensions) { Logger.info(`[Database] Loading extension ${ext}`) await new Promise((resolve, reject) => { diff --git a/server/managers/BinaryManager.js b/server/managers/BinaryManager.js index 63c87e7be..02285bee7 100644 --- a/server/managers/BinaryManager.js +++ b/server/managers/BinaryManager.js @@ -273,12 +273,6 @@ class BinaryManager { } async init() { - // Optional skip binaries check - if (process.env.SKIP_BINARIES_CHECK === '1') { - Logger.info('[BinaryManager] Skipping check for binaries') - return - } - if (this.initialized) return const missingBinaries = await this.findRequiredBinaries()