Merge pull request #1322 from popcorn-official/development

Opensub Fix / Settings bump
popcorn-official · Apr 14, 2020 · ad3ff98 · ad3ff98
2 parents 14a90dd + b8e02b4
commit ad3ff98
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 17 deletions.
diff --git a/dist/mac/pkg-maker.sh b/dist/mac/pkg-maker.sh
@@ -1,10 +1,12 @@
 #!/bin/sh
-BUILD_PATH="Popcorn-Time/osx64/Popcorn-Time.app"
+APP_NAME="$(cat package.json | grep '\"name\"' | cut -d '"' -f 4)"
 APP_VER="$(cat package.json | grep version | cut -d '"' -f 4)"
+BUILD_PATH="${APP_NAME}/osx64/${APP_NAME}.app"
 CURRENT_DIR="$( dirname "${BASH_SOURCE[0]}" )"
 
 cd $CURRENT_DIR/../../build
+
 rm -Rf *.pkg
-pkgbuild --root $BUILD_PATH --version $APP_VER --ownership recommended --install-location /Applications/Popcorn-Time.app Build.pkg
-productbuild --resources ../dist/mac/resources/ --distribution ../dist/mac/resources/distribution.xml --version $APP_VER Popcorn-Time-$APP_VER.pkg
-rm -Rf Build.pkg
+pkgbuild --root $BUILD_PATH --version $APP_VER --ownership recommended --install-location /Applications/${APP_NAME}.app Build.pkg
+productbuild --resources ../dist/mac/resources/ --distribution ../dist/mac/resources/distribution.xml --version $APP_VER $APP_NAME-$APP_VER.pkg
+rm -Rf Build.pkg
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "bootstrap": "~3.3.7",
     "butter-provider": "0.11.0",
     "butter-sanitize": "^0.1.1",
-    "butter-settings-popcorntime.io": "0.0.3",
+    "butter-settings-popcorntime.io": "0.0.4",
     "chromecasts": "1.9.1",
     "defer-request": "0.0.3",
     "dlnacasts2": "0.1.2",

diff --git a/src/app/lib/providers/opensubtitles.js b/src/app/lib/providers/opensubtitles.js
@@ -4,12 +4,7 @@
         openSRT;
 
     var OpenSubtitles = function () {
-        openSRT = new OS({
-            useragent: 'Popcorn Time NodeJS',
-            username: Settings.opensubtitlesUsername,
-            password: Settings.opensubtitlesPassword,
-            ssl: true
-        });
+
     };
 
     OpenSubtitles.prototype.constructor = OpenSubtitles;
@@ -37,6 +32,11 @@
     };
 
     OpenSubtitles.prototype.fetch = function (queryParams) {
+      openSRT = new OS({
+          useragent: 'Butter V1',
+          username: AdvSettings.get('opensubtitlesUsername'),
+          password: AdvSettings.get('opensubtitlesPassword')
+      });
         queryParams.extensions = ['srt'];
 
         return openSRT.search(queryParams)
@@ -55,6 +55,11 @@
     };
 
     OpenSubtitles.prototype.upload = function (queryParams) {
+      openSRT = new OS({
+          useragent: 'Butter V1',
+          username: AdvSettings.get('opensubtitlesUsername'),
+          password: AdvSettings.get('opensubtitlesPassword')
+      });
         return openSRT.upload(queryParams);
     };
 

diff --git a/src/app/lib/providers/watchlist.js b/src/app/lib/providers/watchlist.js
@@ -228,13 +228,13 @@
 
     if (data.type === "movie") {
       return Database.getMovie(data.imdb_id).then(details => {
-        return Object.assign(data, details);
+        return Object.assign({}, data, details);
       });
     }
 
     var tvShowProvider = App.Config.getProviderForType("tvshow");
     return tvShowProvider[0].detail(data.imdb_id, data).then(details => {
-      return Object.assign(data, details);
+      return Object.assign({}, data, details);
     });
   };
 

diff --git a/src/app/lib/views/settings_container.js b/src/app/lib/views/settings_container.js
@@ -465,9 +465,12 @@
                 var OpenSubtitles = new OS({
                     useragent: Settings.opensubtitles.useragent + ' v' + (Settings.version || 1),
                     username: usn,
-                    password: Common.md5(pw)
+                    password: Common.md5(pw),
+                    ssl: true
                 });
-
+                function delay(ms) {
+                  return new Promise(resolve => setTimeout(resolve, ms));
+                };
                 OpenSubtitles.login()
                     .then(function (obj) {
                         if (obj.token) {
@@ -477,11 +480,11 @@
                             $('.opensubtitles-options .loading-spinner').hide();
                             $('.opensubtitles-options .valid-tick').show();
                             win.info('Setting changed: opensubtitlesAuthenticated - true');
-                            return;
+                            return new Promise(resolve => setTimeout(resolve, 1000));
                         } else {
                             throw new Error('no token returned by OpenSubtitles');
                         }
-                    }).delay(1000).then(function () {
+                    }).then(function () {
                         self.render();
                     }).catch(function (err) {
                         win.error('OpenSubtitles.login()', err);