Merge branch 'release/0.4.1-11'

captainyarr · Dec 6, 2017 · 703c5a4 · 703c5a4
2 parents 69d1d4e + e7d1505
commit 703c5a4
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 0.4.1-11 Beta - Now with some butter - 6 December 2017
+
+New Features: 
+
+- Watch movies and tv series directly in the PopcornTime player.
+
+BugFixes: 
+
+- Updated nw.js with ffmpeg fix from Butter Project (butterproject.org)
+
+OpenSubtitles:
+- Added error handling to OpenSubtitles search call, movie list will appear after a short time.
+
 ## 0.4.1-9 Beta - I have a need for speed - 10 October 2017
 
 New Features: 

diff --git a/gulpfile.js b/gulpfile.js
@@ -11,8 +11,9 @@ var package = require('./package.json');
 
 var nw = new NwBuilder({
     files: ['./src/**', './node_modules/**', './package.json','./install','LICENSE.txt','CHANGELOG.md','README.md'],
-    version: '0.20.0',
+    version: '0.20.1',
     zip: false,
+    downloadUrl: 'http://builds.butterproject.org/nw/',
     platforms: argv.p ? argv.p.split(',') : [detectCurrentPlatform()]
 }).on('log', console.log);
 

diff --git a/install b/install
@@ -23,7 +23,7 @@ fi
 func_error
 
 #Variables
-version="0.4.1-9"
+version="0.4.1-11"
 tos="http://popcorn-time.is/tos.html"
 $path="$HOME/.Popcorn-Time-CE"
 

diff --git a/package.json b/package.json
@@ -10,9 +10,9 @@
     },
     "license": "GPL-3.0",
     "main": "src/app/index.html",
-    "version": "0.4.1-9",
+    "version": "0.4.1-11",
     "node-remote": "*://*",
-    "releaseName": "I have a need for speed",
+    "releaseName": "Now with some butter",
     "scripts": {
         "start": "gulp run"
     },
@@ -52,7 +52,7 @@
         "node-webkit-fdialogs": "^0.2.7",
         "nodecast-js": "^1.0.3",
         "opensubtitles-ce": "^1.0.0",
-        "opensubtitles-api": "4.0.0-rc2",
+        "opensubtitles-api": "4.0.0",
         "os-name": "^2.0.1",
         "peerflix": "^0.36.2",
         "q": "2.0.3",
@@ -78,7 +78,7 @@
         "eslint-config-google": "^0.8.0",
         "gulp": "^3.9.1",
         "gulp-zip": "~4.0.0",
-        "nw-builder": "^3.2.3",
+        "nw-builder": "^3.5.1",
         "nw-gyp": "^3.4.0",
         "yargs": "^7.0.2"
     },

diff --git a/src/app/lib/providers/opensubtitlesmovies.js b/src/app/lib/providers/opensubtitlesmovies.js
@@ -5,7 +5,9 @@
     var request = require('request');
     var Q = require('q');
     var OpenSubtitlesApi = require('opensubtitles-api');
-    var OS = new OpenSubtitlesApi('Popcorn Time v1');
+    var OS = new OpenSubtitlesApi({
+        useragent: 'Popcorn Time v1'
+    });
 
     var TTL = 1000 * 60 * 60 * 8; // 8 hours
 
@@ -88,7 +90,9 @@
                         //subtitles is blank
                         deferred.resolve({});
                     }
-
+                }).catch(err => {
+                    win.error("OpenSubtitles API Error: " + err);
+                    deferred.resolve({});
                 });
                 return deferred.promise;
             })).then(data => {
@@ -98,7 +102,7 @@
 
             _.each(data, function (item) {
                 for (var name in item) {
-                    //win.debug("Subtitle IMDB ID: " + name);
+                    win.debug("Subtitle IMDB ID: " + name);
                     subtitleList.subs[name] = item[name];
                 }
             });