@stremio/stremio-video 0.0.25-rc.1 → 0.0.25-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stremio/stremio-video",
-    "version": "0.0.25-rc.1",
+    "version": "0.0.25-rc.2",
     "description": "Abstraction layer on top of different media players",
     "author": "Smart Code OOD",
     "main": "src/index.js",

package/src/TizenVideo/TizenVideo.js

@@ -204,7 +204,7 @@ function TizenVideo(options) {
                         try {
                             extra = JSON.parse(textTrack.extra_info);
                         } catch(e) {}
-                        var textTrackLang = (extra.track_lang || '').trim();
+                        var textTrackLang = typeof extra.track_lang === 'string' && extra.track_lang.length > 0 ? extra.track_lang.trim() : null;
                         textTracks.push({
                             id: textTrackId,
                             lang: textTrackLang,
@@ -291,7 +291,7 @@ function TizenVideo(options) {
                         try {
                             extra = JSON.parse(audioTrack.extra_info);
                         } catch(e) {}
-                        var audioTrackLang = extra.language || '';
+                        var audioTrackLang = typeof extra.language === 'string' && extra.language.length > 0 ? extra.language : null;
                         audioTracks.push({
                             id: audioTrackId,
                             lang: audioTrackLang,

package/src/WebOsVideo/WebOsVideo.js

@@ -15,12 +15,11 @@ function luna(params, call, fail, method) {
     window.webOS.service.request(method || 'luna://com.webos.media', params);
 }
 
-function runWebOS(params, failed) {
-    // console.log('run web os', params);
+function launchVideoApp(params, success, failure) {
     window.webOS.service.request('luna://com.webos.applicationManager', {
         method: 'launch',
         parameters: {
-            'id': params.need,
+            'id': params.id,
             'params': {
                 'payload':[
                     {
@@ -46,19 +45,17 @@ function runWebOS(params, failed) {
             }
         },
         onSuccess: function () {
-            // console.log('The app is launched');
+            success && success();
         },
-        onFailure: function () { // function(inError)
-            // console.log('Player', 'Failed to launch the app ('+params.need+'): ', '[' + inError.errorCode + ']: ' + inError.errorText);
-
-            if (params.need === 'com.webos.app.photovideo') {
-                params.need = 'com.webos.app.smartshare';
-                runWebOS(params);
-            } else if(params.need === 'com.webos.app.smartshare') {
-                params.need = 'com.webos.app.mediadiscovery';
-                runWebOS(params);
-            } else if (params.need === 'com.webos.app.mediadiscovery') {
-                failed();
+        onFailure: function () {
+            failure && failure(new Error('Failed to launch' + params.id));
+
+            if (params.id === 'com.webos.app.photovideo') {
+                params.id = 'com.webos.app.smartshare';
+                launchVideoApp(params, success, failure);
+            } else if(params.id === 'com.webos.app.smartshare') {
+                params.id = 'com.webos.app.mediadiscovery';
+                launchVideoApp(params, success, failure);
             }
         }
     });
@@ -599,21 +596,27 @@ function WebOsVideo(options) {
             }
             case 3: {
                 error = ERROR.HTML_VIDEO.MEDIA_ERR_DECODE;
-                runWebOS({
-                    need: 'com.webos.app.photovideo',
+                launchVideoApp({
+                    id: 'com.webos.app.photovideo',
                     url: stream.url,
                     name: 'Stremio',
                     position: -1,
+                }, null, function(e) {
+                    // eslint-disable-next-line no-console
+                    console.error(e);
                 });
                 break;
             }
             case 4: {
                 error = ERROR.HTML_VIDEO.MEDIA_ERR_SRC_NOT_SUPPORTED;
-                runWebOS({
-                    need: 'com.webos.app.photovideo',
+                launchVideoApp({
+                    id: 'com.webos.app.photovideo',
                     url: stream.url,
                     name: 'Stremio',
                     position: -1,
+                }, null, function(e) {
+                    // eslint-disable-next-line no-console
+                    console.error(e);
                 });
                 break;
             }