merged with master

1 files changed, 41 insertions, 7 deletions

diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index ebc9deab7..ea5d8cb33 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -64,6 +64,17 @@ export default class UploadManager extends ApiManager {
             subscription: '/uploadFormData',
             secureHandler: async ({ req, res }) => {
                 const form = new formidable.IncomingForm();
+                let fileguids = '';
+                let filesize = '';
+                form.on('field', (e: string, value: string) => {
+                    if (e === 'fileguids') {
+                        (fileguids = value).split(';').map(guid => DashUploadUtils.uploadProgress.set(guid, 'reading file'));
+                    }
+                    if (e === 'filesize') {
+                        filesize = value;
+                    }
+                });
+                form.on('progress', e => fileguids.split(';').map(guid => DashUploadUtils.uploadProgress.set(guid, `read:(${Math.round((100 * +e) / +filesize)}%) ${e} of ${filesize}`)));
                 form.keepExtensions = true;
                 form.uploadDir = pathToDirectory(Directory.parsed_files);
                 return new Promise<void>(resolve => {
@@ -102,11 +113,10 @@ export default class UploadManager extends ApiManager {
                 //req.readableBuffer.head.data
                 return new Promise<void>(async resolve => {
                     req.addListener('data', async args => {
-                        console.log(args);
                         const payload = String.fromCharCode.apply(String, args);
-                        const videoId = JSON.parse(payload).videoId;
+                        const { videoId, overwriteId } = JSON.parse(payload);
                         const results: Upload.FileResponse[] = [];
-                        const result = await DashUploadUtils.uploadYoutube(videoId);
+                        const result = await DashUploadUtils.uploadYoutube(videoId, overwriteId ?? videoId);
                         result && results.push(result);
                         _success(res, results);
                         resolve();
@@ -123,7 +133,7 @@ export default class UploadManager extends ApiManager {
                     req.addListener('data', args => {
                         const payload = String.fromCharCode.apply(String, args);
                         const videoId = JSON.parse(payload).videoId;
-                        _success(res, { progress: DashUploadUtils.QueryYoutubeProgress(videoId) });
+                        _success(res, { progress: DashUploadUtils.QueryYoutubeProgress(videoId, req.user) });
                         resolve();
                     });
                 });
@@ -252,9 +262,33 @@ export default class UploadManager extends ApiManager {
                                         zip.extractEntryTo(entry.entryName, publicDirectory, true, false);
                                         createReadStream(pathname).pipe(createWriteStream(targetname));
                                         if (extension !== '.pdf') {
-                                            createReadStream(pathname).pipe(createWriteStream(targetname.replace('_o' + extension, '_s' + extension)));
-                                            createReadStream(pathname).pipe(createWriteStream(targetname.replace('_o' + extension, '_m' + extension)));
-                                            createReadStream(pathname).pipe(createWriteStream(targetname.replace('_o' + extension, '_l' + extension)));
+                                            const { pngs, jpgs } = AcceptableMedia;
+                                            const resizers = [
+                                                { resizer: sharp().resize(100, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Small },
+                                                { resizer: sharp().resize(400, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Medium },
+                                                { resizer: sharp().resize(900, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Large },
+                                            ];
+                                            let isImage = false;
+                                            if (pngs.includes(extension)) {
+                                                resizers.forEach(element => {
+                                                    element.resizer = element.resizer.png();
+                                                });
+                                                isImage = true;
+                                            } else if (jpgs.includes(extension)) {
+                                                resizers.forEach(element => {
+                                                    element.resizer = element.resizer.jpeg();
+                                                });
+                                                isImage = true;
+                                            }
+                                            if (isImage) {
+                                                resizers.forEach(resizer => {
+                                                    createReadStream(pathname)
+                                                        .on('error', e => console.log('Resizing read:' + e))
+                                                        .pipe(resizer.resizer)
+                                                        .on('error', e => console.log('Resizing write: ' + e))
+                                                        .pipe(createWriteStream(targetname.replace('_o' + extension, resizer.suffix + extension)).on('error', e => console.log('Resizing write: ' + e)));
+                                                });
+                                            }
                                         }
                                         unlink(pathname, () => {});
                                     } catch (e) {