merge

1 files changed, 27 insertions, 0 deletions

diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 0b6e18743..fe4c475c9 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -60,6 +60,18 @@ export default class UploadManager extends ApiManager {
                 return new Promise<void>(resolve => {
                     form.parse(req, async (_err, _fields, files) => {
                         const results: Upload.FileResponse[] = [];
+                        if (_err?.message) {
+                            results.push({
+                                source: {
+                                    size: 0,
+                                    path: 'none',
+                                    name: 'none',
+                                    type: 'none',
+                                    toJSON: () => ({ name: 'none', path: '' }),
+                                },
+                                result: { name: 'failed upload', message: `${_err.message}` },
+                            });
+                        }
                         for (const key in files) {
                             const f = files[key];
                             if (!Array.isArray(f)) {
@@ -96,6 +108,21 @@ export default class UploadManager extends ApiManager {
 
         register({
             method: Method.POST,
+            subscription: '/queryYoutubeProgress',
+            secureHandler: async ({ req, res }) => {
+                return new Promise<void>(async resolve => {
+                    req.addListener('data', args => {
+                        const payload = String.fromCharCode.apply(String, args);
+                        const videoId = JSON.parse(payload).videoId;
+                        _success(res, { progress: DashUploadUtils.QueryYoutubeProgress(videoId) });
+                        resolve();
+                    });
+                });
+            },
+        });
+
+        register({
+            method: Method.POST,
             subscription: new RouteSubscriber('youtubeScreenshot'),
             secureHandler: async ({ req, res }) => {
                 const { id, timecode } = req.body;