Merge branch 'release/0.4.1-15'

captainyarr · Mar 12, 2018 · cea0230 · cea0230
2 parents 4ba0984 + 8150b0a
commit cea0230
Show file tree

Hide file tree

Showing 41 changed files with 80,769 additions and 65,316 deletions.
diff --git a/.gitignore b/.gitignore
@@ -75,6 +75,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+dist/
 
 # Visual Studio 2015 cache/options directory
 .vs/

diff --git a/.jsbeautifyrc b/.jsbeautifyrc
@@ -8,7 +8,7 @@
 		"indent_with_tabs": false,
 		"indent_size": 4,
 		"indent_char": " ",
-		"jslint_happy": true,
+		"jslint_happy": false,
 		"keep_array_indentation": false,
 		"keep_function_indentation": false,
 		"max_preserve_newlines": 3,

diff --git a/.jshintrc b/.jshintrc
@@ -21,7 +21,6 @@
     "quotmark" : "single",
     "trailing" : true,
     "sub"      : true,
-    "trailing" : true,
     "undef"    : true,
     "laxbreak" : true,
     "loopfunc" : true,
@@ -85,8 +84,6 @@
         // Third party
         "Backbone": true,
         "Mousetrap": true,
-        "_": true,
-        "request": true,
         "videojs": true,
         "vjs": true
     }

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,7 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-    "javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": true,
+    // Defines space handling after function keyword for anonymous functions
+    "javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
     "eslint.enable": false,
     "jshint.enable": false
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.4.1-15 Beta - Ides of March  - 11 March 2018
+
+BugFixes: 
+- Bookmark and Seen button visual issue fixed for both Movie and TV Show
+- Fixed icon location in Themes for About screen
+- Fixed About and minor Theme issues
+- Remove tvApiServer copy from appearing incorrectly
+- Genre will default to 'N/A' when it can't be determined
+- Removed text referencing yts.ph
+- Streamer: Increased Buffer Stream
+- Webtorrent: Display torrent warning in the console
+
+Updated:
+- Updated various packages
+- Updated analytics calls
+
 ## 0.4.1-14 Beta - Lets start the New Year right... - 26 December 2017
 
 New Features: 

diff --git a/install b/install
@@ -23,7 +23,7 @@ fi
 func_error
 
 #Variables
-version="0.4.1-14"
+version="0.4.1-15"
 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-14",
+    "version": "0.4.1-15",
     "node-remote": "*://*",
-    "releaseName": "Lets start the New Year right...",
+    "releaseName": "Ides of March",
     "scripts": {
         "start": "gulp run"
     },
@@ -48,7 +48,7 @@
         "mv": "^2.0.3",
         "nedb": "1.8.0",
         "node-captions": "0.4.6",
-        "node-tvdb": "^3.1.1",
+        "node-tvdb": "^4.0.0",
         "node-webkit-fdialogs": "^0.2.7",
         "nodecast-js": "^1.0.3",
         "opensubtitles-ce": "^1.0.0",
@@ -64,7 +64,7 @@
         "semver": "^5.3.0",
         "send": "^0.16.1",
         "strike-api": "0.2.0",
-        "tar": "^4.1.1",
+        "tar": "^4.3.3",
         "temp": "^0.8.1",
         "torrent-tracker-health": "git+https://github.com/PTCE-Public/torrent-tracker-health.git",
         "underscore": "^1.8.3",
@@ -77,12 +77,12 @@
         "eslint": "^4.13.1",
         "eslint-config-google": "^0.9.1",
         "gulp": "^3.9.1",
-        "gulp-zip": "~4.0.0",
+        "gulp-zip": "~4.1.0",
         "gulp-gzip":"^1.4.0",
         "gulp-tar": "^2.0.0",
         "nw-builder": "^3.5.1",
         "nw-gyp": "^3.4.0",
-        "yargs": "^10.0.3"
+        "yargs": "^11.0.0"
     },
     "description": "",
     "author": ""

diff --git a/src/app/index.html b/src/app/index.html
@@ -2,6 +2,25 @@
 <html lang="en">
 
 <head>
+    <!-- Google Tag Manager -->
+    <script>
+        (function(w, d, s, l, i) {
+            w[l] = w[l] || [];
+            w[l].push({
+                'gtm.start': new Date().getTime(),
+                event: 'gtm.js'
+            });
+            var f = d.getElementsByTagName(s)[0],
+                j = d.createElement(s),
+                dl = l != 'dataLayer' ? '&l=' + l : '';
+            j.async = true;
+            j.src =
+                'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+            f.parentNode.insertBefore(j, f);
+        })(window, document, 'script', 'dataLayer', 'GTM-ML5LN34');
+    </script>
+    <!-- End Google Tag Manager -->
+
     <meta charset="UTF-8">
     <link rel="stylesheet" type="text/css" href="vendor/bootstrap/dist/css/bootstrap.css">
     <link rel="stylesheet" type="text/css" href="vendor/bootstrap/dist/css/bootstrap-theme.css">
@@ -11,6 +30,12 @@
 </head>
 
 <body>
+
+    <!-- Google Tag Manager (noscript) -->
+    <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-ML5LN34"
+    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+    <!-- End Google Tag Manager (noscript) -->
+
     <div class="main-window-region"></div>
 
     <script id="browser-tpl" src="templates/browser/browser.tpl" type="text/x-template"></script>
@@ -155,7 +180,7 @@
     <script src="bootstrap.js"></script>
 
     <script>
-        var tvApiServer = "TV API - Not Selected";
+        var tvApiServer = "";
     </script>
 
     <script>
@@ -173,9 +198,8 @@
         window.ga_debug = {
             trace: true
         }
-        ga('create', Settings.gaCode, {
-            //'cookieDomain': 'none'
-        });
+        ga('create', Settings.gaCode);
+
         ga('set', 'checkProtocolTask', function() { /* nothing */ });
 
         // Replace the following lines with the plugins you want to use.
@@ -187,14 +211,20 @@
         ga('require', 'impressionTracker', {
             attributePrefix: 'data-'
         });
-        ga('require', 'maxScrollTracker');
+        ga('require', 'maxScrollTracker', {
+            maxScrollMetricIndex: 1,
+        });
         ga('require', 'mediaQueryTracker');
-        ga('require', 'pageVisibilityTracker');
+        ga('require', 'pageVisibilityTracker', {
+            sendInitialPageview: true,
+        });
+        ga('require', 'urlChangeTracker');
     </script>
     <script async src="vendor/autotrack/autotrack.js"></script>
     <script>
         window.setInterval(function() {
             try {
+                tvApiServer = "";
                 document.getElementById('TVApi').setAttribute('data-original-title', tvApiServer);
             } catch (e) {}
         }, 100);

diff --git a/src/app/language/en.json b/src/app/language/en.json
@@ -504,7 +504,7 @@
 	"Peers:": "Peers:",
 	"Torrents-Time v2": "Torrents-Time v2",
 	"Torrents Time v2": "Torrents Time v2",
-	"YTS.ph Search": "YTS.ph Search",
+	"Movie Search": "Movie Search",
 	"This feature has a built-in kat.cr search, which allows you to stream any movies, series or anime torrents with automatic subtitle support. The casting option integrates features including Chromecast, Airplay and DLNA. This library also provides an Anti-Virus Scanner and a 'History' feature, that keeps track of all your downloaded KAT torrents": "This feature has a built-in kat.cr search, which allows you to stream any movies, series or anime torrents with automatic subtitle support. The casting option integrates features including Chromecast, Airplay and DLNA. This library also provides an Anti-Virus Scanner and a 'History' feature, that keeps track of all your downloaded KAT torrents",
 	"Plugins": "Plugins",
 	" Adventure": " Adventure",
@@ -526,6 +526,11 @@
 	" Musical": " Musical",
 	" Romance": " Romance",
 	" Horror": " Horror",
-	"comedy": "comedy",
-	"reality": "reality"
+	" Comedy": " Comedy",
+	" Reality": " Reality",
+	" Documentary": " Documentary",
+	" Action": " Action",
+	"comedy": " Comedy",
+	"western": " Western",
+	"YTS.ph Search": "YTS.ph Search"
 }
diff --git a/src/app/lib/providers/tvapi.js b/src/app/lib/providers/tvapi.js
@@ -53,8 +53,8 @@
                 json: true
             };
 
-			tvApiServer = Settings.tvAPI[index].url;
-			document.getElementById('TVApi').setAttribute('data-original-title', tvApiServer);
+			//tvApiServer = Settings.tvAPI[index].url;
+			//document.getElementById('TVApi').setAttribute('data-original-title', tvApiServer);
 
             var req = jQuery.extend(true, {}, Settings.tvAPI[index], options);
             win.info('Request to TVApi', req.url);
@@ -72,7 +72,7 @@
                     win.error('API error:', err);
                     return deferred.reject(err);
                 } else {
-					document.getElementById('TVApi').setAttribute('data-original-title', tvApiServer)
+					//document.getElementById('TVApi').setAttribute('data-original-title', tvApiServer)
                     data.forEach(function (entry) {
                         entry.type = 'show';
                     });
@@ -98,7 +98,7 @@
                     url: Settings.tvAPI[index].url + 'show/' + torrent_id,
                     json: true
                 };
-				document.getElementById('TVApi').setAttribute('data-original-title', tvApiServer);
+				//document.getElementById('TVApi').setAttribute('data-original-title', tvApiServer);
                 var req = jQuery.extend(true, {}, Settings.tvAPI[index], options);
                 win.info('Request to TVApi', req.url);
                 request(req, function (error, response, data) {