From 88fdb2fcc102c4315924495d045b931a1e67d24b Mon Sep 17 00:00:00 2001 From: diced Date: Mon, 29 May 2023 17:55:39 -0700 Subject: [PATCH] fix: unecessary stuff --- .../20230523025656_thumbnails/migration.sql | 2 -- .../migration.sql | 8 ------- src/worker/thumbnail.ts | 22 +++++++++---------- 3 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 prisma/migrations/20230529041004_remove_thumbnailid/migration.sql diff --git a/prisma/migrations/20230523025656_thumbnails/migration.sql b/prisma/migrations/20230523025656_thumbnails/migration.sql index 859d62f0..f0e9824c 100644 --- a/prisma/migrations/20230523025656_thumbnails/migration.sql +++ b/prisma/migrations/20230523025656_thumbnails/migration.sql @@ -1,5 +1,3 @@ --- AlterTable -ALTER TABLE "File" ADD COLUMN "thumbnailId" INTEGER; -- CreateTable CREATE TABLE "Thumbnail" ( diff --git a/prisma/migrations/20230529041004_remove_thumbnailid/migration.sql b/prisma/migrations/20230529041004_remove_thumbnailid/migration.sql deleted file mode 100644 index 54e9f41b..00000000 --- a/prisma/migrations/20230529041004_remove_thumbnailid/migration.sql +++ /dev/null @@ -1,8 +0,0 @@ -/* - Warnings: - - - You are about to drop the column `thumbnailId` on the `File` table. All the data in the column will be lost. - -*/ --- AlterTable -ALTER TABLE "File" DROP COLUMN "thumbnailId"; diff --git a/src/worker/thumbnail.ts b/src/worker/thumbnail.ts index ac628fec..9fcb0f7f 100644 --- a/src/worker/thumbnail.ts +++ b/src/worker/thumbnail.ts @@ -1,16 +1,14 @@ -import Logger from 'lib/logger'; -import { isMainThread, workerData } from 'worker_threads'; -// import ffmpeg from 'ffmpeg-static'; - -import prisma from 'lib/prisma'; -import datasource from 'lib/datasource'; -import config from 'lib/config'; -import { spawn } from 'child_process'; -import { join } from 'path'; -import { createWriteStream } from 'fs'; import { File } from '@prisma/client'; +import { spawn } from 'child_process'; import ffmpeg from 'ffmpeg-static'; +import { createWriteStream } from 'fs'; import { rm } from 'fs/promises'; +import config from 'lib/config'; +import datasource from 'lib/datasource'; +import Logger from 'lib/logger'; +import prisma from 'lib/prisma'; +import { join } from 'path'; +import { isMainThread, workerData } from 'worker_threads'; const { id } = workerData as { id: number }; @@ -26,12 +24,12 @@ async function loadThumbnail(path) { const child = spawn(ffmpeg, args, { stdio: ['ignore', 'pipe', 'ignore'] }); - const data = await new Promise((resolve, reject) => { + const data: Promise = new Promise((resolve, reject) => { child.stdout.once('data', resolve); child.once('error', reject); }); - return data as unknown as Buffer; + return data; } async function loadFileTmp(file: File) {