merge?

1 files changed, 29 insertions, 15 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index e5e15ce99..19cb3f240 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -135,35 +135,39 @@ export namespace DashUploadUtils {
         };
     }
 
-    export function QueryYoutubeProgress(videoId: string) {
-        return uploadProgress.get(videoId) ?? 'failed';
+    export function QueryYoutubeProgress(videoId: string, user?: Express.User) {
+        // console.log(`PROGRESS:${videoId}`, (user as any)?.email);
+        return uploadProgress.get(videoId) ?? 'pending data upload';
     }
 
-    let uploadProgress = new Map<string, string>();
+    export let uploadProgress = new Map<string, string>();
 
-    export function uploadYoutube(videoId: string): Promise<Upload.FileResponse> {
+    export function uploadYoutube(videoId: string, overwriteId: string): Promise<Upload.FileResponse> {
         return new Promise<Upload.FileResponse<Upload.FileInformation>>((res, rej) => {
             const name = videoId;
             const path = name.replace(/^-/, '__') + '.mp4';
             const finalPath = serverPathToFile(Directory.videos, path);
             if (existsSync(finalPath)) {
-                uploadProgress.set(videoId, 'computing duration');
+                uploadProgress.set(overwriteId, 'computing duration');
                 exec(`yt-dlp -o ${finalPath} "https://www.youtube.com/watch?v=${videoId}" --get-duration`, (error: any, stdout: any, stderr: any) => {
                     const time = Array.from(stdout.trim().split(':')).reverse();
                     const duration = (time.length > 2 ? Number(time[2]) * 1000 * 60 : 0) + (time.length > 1 ? Number(time[1]) * 60 : 0) + (time.length > 0 ? Number(time[0]) : 0);
                     res(resolveExistingFile(name, finalPath, Directory.videos, 'video/mp4', duration, undefined));
                 });
             } else {
-                uploadProgress.set(videoId, 'starting download');
+                uploadProgress.set(overwriteId, 'starting download');
                 const ytdlp = spawn(`yt-dlp`, ['-o', path, `https://www.youtube.com/watch?v=${videoId}`, '--max-filesize', '100M', '-f', 'mp4']);
 
-                ytdlp.stdout.on('data', (data: any) => !uploadProgress.get(videoId)?.includes('Aborting.') && uploadProgress.set(videoId, data.toString()));
+                ytdlp.stdout.on('data', (data: any) => uploadProgress.set(overwriteId, data.toString()));
 
                 let errors = '';
-                ytdlp.stderr.on('data', (data: any) => (errors = data.toString()));
+                ytdlp.stderr.on('data', (data: any) => {
+                    uploadProgress.set(overwriteId, 'error:' + data.toString());
+                    errors = data.toString();
+                });
 
                 ytdlp.on('exit', function (code: any) {
-                    if (code || uploadProgress.get(videoId)?.includes('Aborting.')) {
+                    if (code) {
                         res({
                             source: {
                                 size: 0,
@@ -175,7 +179,7 @@ export namespace DashUploadUtils {
                             result: { name: 'failed youtube query', message: `Could not archive video.  ${code ? errors : uploadProgress.get(videoId)}` },
                         });
                     } else {
-                        uploadProgress.set(videoId, 'computing duration');
+                        uploadProgress.set(overwriteId, 'computing duration');
                         exec(`yt-dlp-o ${path} "https://www.youtube.com/watch?v=${videoId}" --get-duration`, (error: any, stdout: any, stderr: any) => {
                             const time = Array.from(stdout.trim().split(':')).reverse();
                             const duration = (time.length > 2 ? Number(time[2]) * 1000 * 60 : 0) + (time.length > 1 ? Number(time[1]) * 60 : 0) + (time.length > 0 ? Number(time[0]) : 0);
@@ -280,6 +284,7 @@ export namespace DashUploadUtils {
         const fileKey = (await md5File(file.path)) + '.pdf';
         const textFilename = `${fileKey.substring(0, fileKey.length - 4)}.txt`;
         if (fExists(fileKey, Directory.pdfs) && fExists(textFilename, Directory.text)) {
+            fs.unlink(file.path, () => {});
             return new Promise<Upload.FileResponse>(res => {
                 const textFilename = `${fileKey.substring(0, fileKey.length - 4)}.txt`;
                 const readStream = createReadStream(serverPathToFile(Directory.text, textFilename));
@@ -385,7 +390,7 @@ export namespace DashUploadUtils {
             const resolved = (filename = `upload_${Utils.GenerateGuid()}.${ext}`);
             if (usingAzure()) {
                 const response = await AzureManager.UploadBase64ImageBlob(resolved, data);
-                source =  `${AzureManager.BASE_STRING}/${resolved}`;
+                source = `${AzureManager.BASE_STRING}/${resolved}`;
             } else {
                 const error = await new Promise<Error | null>(resolve => {
                     writeFile(serverPathToFile(Directory.images, resolved), data, 'base64', resolve);
@@ -596,11 +601,20 @@ export namespace DashUploadUtils {
             const outputPath = path.resolve(outputDirectory, (writtenFiles[suffix] = InjectSize(outputFileName, suffix)));
             await new Promise<void>(async (resolve, reject) => {
                 const source = streamProvider();
-                let readStream: Stream = source instanceof Promise ? await source : source;
+                let readStream = source instanceof Promise ? await source : source;
+                let error = false;
                 if (resizer) {
-                    readStream = readStream.pipe(resizer.withMetadata());
+                    readStream = readStream.pipe(resizer.withMetadata()).on('error', async args => {
+                        error = true;
+                        if (error) {
+                            const source2 = streamProvider();
+                            let readStream2: Stream | undefined;
+                            readStream2 = source2 instanceof Promise ? await source2 : source2;
+                            readStream2?.pipe(createWriteStream(outputPath)).on('error', resolve).on('close', resolve);
+                        }
+                    });
                 }
-                readStream.pipe(createWriteStream(outputPath)).on('close', resolve).on('error', reject);
+                !error && readStream?.pipe(createWriteStream(outputPath)).on('error', resolve).on('close', resolve);
             });
         }
         return writtenFiles;
@@ -628,7 +642,7 @@ export namespace DashUploadUtils {
                     initial = undefined;
                 }
                 return {
-                    resizer: initial,
+                    resizer: suffix === '_o' ? undefined : initial,
                     suffix,
                 };
             }),