Merge branch 'master' into linking-anh

1 files changed, 19 insertions, 14 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index a617571ae..7b83d09ef 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -56,12 +56,12 @@ export namespace DashUploadUtils {
     const size = "content-length";
     const type = "content-type";
 
-    const { imageFormats, videoFormats, applicationFormats, audioFormats } = AcceptableMedia;
+    const { imageFormats, videoFormats, applicationFormats, audioFormats } = AcceptableMedia; //TODO:glr 
 
     export function uploadYoutube(videoId: string): Promise<Upload.FileResponse> {
         console.log("UPLOAD " + videoId);
         return new Promise<Upload.FileResponse<Upload.FileInformation>>((res, rej) => {
-            exec('/usr/local/bin/youtube-dl -o ' + (videoId + ".mp4") + ' https://www.youtube.com/watch?v=' + videoId + ' -f `/usr/local/bin/youtube-dl https://www.youtube.com/watch?v=' + videoId + ' -F | grep "(best)" | sed -e "s/ .*//"`',
+            exec('youtube-dl -o ' + (videoId + ".mp4") + ' https://www.youtube.com/watch?v=' + videoId + ' -f "best[filesize<50M]"',
                 (error: any, stdout: any, stderr: any) => {
                     if (error) console.log(`error: ${error.message}`);
                     else if (stderr) console.log(`stderr: ${stderr}`);
@@ -242,18 +242,23 @@ export namespace DashUploadUtils {
         const { headers } = (await new Promise<any>((resolve, reject) => {
             request.head(resolvedUrl, (error, res) => error ? reject(error) : resolve(res));
         }).catch(error => console.error(error)));
-        // Compute the native width and height ofthe image with an npm module
-        const { width: nativeWidth, height: nativeHeight }: RequestedImageSize = await requestImageSize(resolvedUrl);
-        // Bundle up the information into an object
-        return {
-            source,
-            contentSize: parseInt(headers[size]),
-            contentType: headers[type],
-            nativeWidth,
-            nativeHeight,
-            filename,
-            ...results
-        };
+        try {
+            // Compute the native width and height ofthe image with an npm module
+            const { width: nativeWidth, height: nativeHeight } = await requestImageSize(resolvedUrl);
+            // Bundle up the information into an object
+            return {
+                source,
+                contentSize: parseInt(headers[size]),
+                contentType: headers[type],
+                nativeWidth,
+                nativeHeight,
+                filename,
+                ...results
+            };
+        } catch (e) {
+            console.log(e);
+            return e;
+        }
     };
 
     /**