yify group plans 'community coup'

.gitignore

@@ -45,3 +45,7 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
+
+node_modules/
+build/
+cache/

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.3.9 Beta - The one with CE - 30 November 2015
+
+Bug Fixes:
+
+- Added secondary tvapi, eztv
+- Changed movie api to yts.ag (don't listen to those .is guys)
+- Fixed episode/season mixup (mitjacotic | issue #1)
+- Updated naming
+- Updated icons
+- Various improvements
+- Verified some missing dependencies we lost with .io
+- Updated some ui stuff
+- Changed loading help link on init to wait a bit longer
+
+new api coming soon
+
 ## 0.3.8 Beta - There's nothing on TV - 09 July 2015
 
 BugFixes: 
@@ -285,4 +301,4 @@ release notes:
 - Rotten-Tomato
 - Yify Subtitles
 - Manual input torrent / subtitles files
-- Multi-language App support
+- Multi-language App support

LICENSE.txt

@@ -1,5 +1,5 @@
 Popcorn Time - Streaming video through torrents
-Copyright © 2014 - 2015  Popcorn Time and the contributors (popcorntime.io)
+Copyright © 2014 - 2015  Popcorn Time and the contributors (popcorntime.ml)
 
 If you distribute a copy or make a fork of the project, you have to credit this project as source.
 
@@ -16,11 +16,11 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see http://www.gnu.org/licenses/ .
 
-If you want to contact us : hello@popcorntime.io
+If you want to contact us : hello@popcorntime.ml
 
 
 Popcorn Time - Streaming video through torrents
-Copyright © 2014 - 2015  Popcorn Time and the contributors (popcorntime.io)
+Copyright © 2014 - 2015  Popcorn Time and the contributors (popcorntime.ml)
 Popcorn Time is released under the GPL
 
 Last update: May 4, 2014
@@ -652,4 +652,4 @@ END OF TERMS AND CONDITIONS
 The source code for any program binaries or compressed scripts that are
 included with Popcorn Time can be freely obtained at the following URL:
 
-https://git.popcorntime.io/
+https://git.popcorntime.ml/

README.md

@@ -1,11 +1,13 @@
-# [Popcorn Time CE](https://github.com/PopcornTimeCE/popcorntimece)
+# [Popcorn Time CE](https://github.com/PopcornTimeCE/desktop)
 
-Allow any computer user to watch movies easily streaming from torrents, without any particular knowledge.
+Allow anyone to easily watch their favorite movies, shows, and anime.
 
-![Popcorn Time](http://popcorntime.ml/wp-content/uploads/2015/11/poppy-ce-256.png)
+![Popcorn Time](src/app/images/icon.png)
 
 Visit the project's website at <http://popcorntime.ml>.
 
+This project would absolutely **not** be possible without the original developer's hard work into making Popcorn Time what it is today. All credit should go to them, we're just trying to help the community :)
+
 ***
 
 ## Getting Involved
@@ -16,31 +18,32 @@ Want to report a bug, request a feature, contribute or translate Popcorn Time? W
 
 If you're comfortable getting up and running from a `git clone`, this method is for you.
 
-If you clone the GitLab repository, you will need to build a number of assets using grunt.
+If you clone the GitLab repository, you will need to build a number of assets with npm.
 
-The [master](https://github.com/PopcornTimeCE/popcorntimece) branch which contains the latest release.
+The [master](https://github.com/PopcornTimeCE/desktop/tree/master) branch which contains the latest release.
 
-#### Quickstart:
 
-1. `npm install -g grunt-cli bower`
-1. `npm install`
-1. `grunt build`
-1. `grunt start`
+#### Requirements
+
+1. You must have git installed
+2. You must have npm installed
+
+#### Running
+*Runs the app without building, useful for testing*
 
-If you encounter trouble with the above method, you can try:
 
-1. `npm install -g bower grunt-cli` (Linux: you may need to run with `sudo`)
-1. `cd desktop`
 1. `npm install`
-1. `bower install`
-1. `grunt lang`
-1. `grunt nodewebkit`
-1. `grunt css`
-1. `grunt start`
+1. `npm start`
 
-Optionally, you may simply run `./make_popcorn.sh` if you are on a linux or mac based operating system.
+#### Building
+*Builds the app for a packaged, runnable app*
 
 
+1. `npm install`
+1. `gulp build` **OR** `node_modules/.bin/gulp build` depending whether you have gulp installed globally or not. 
+  2. You can also build for different platforms by passing them with the `-p` argument as a comma-seperated list (For example: `gulp build -p osx64,win32`
+1. There should be a `build/` directory containing the built files 
+
 <a name="community"></a>
 ## Community
 
@@ -78,6 +81,10 @@ You should have received a copy of the GNU General Public License along with thi
 
 ***
 
+**This project and the distribution of this project is not illegal, nor does it violate *any* DMCA laws. The use of this project, however, may be illegal in your area. Check your local laws and regulations regarding the use of torrents to watch potentially copyrighted content. The maintainers of this project do not condone the use of this project for anything illegal, in any state, region, country, or planet. *Please use at your own risk*.**
+
+***
+
 If you want to contact us : [hello@popcorntime.ml](mailto:hello@popcorntime.ml) or [use the form](http://popcorntime.ml/contact/) on our website.
 
-Copyright (c) 2015 Popcorn Time CE - Released under the [GPL v3 license](LICENSE.txt).
+Copyright (c) 2015 Popcorn Time CE - Released under the [GPL v3 license](LICENSE.txt).

gulpfile.js

@@ -0,0 +1,30 @@
+var gulp = require('gulp');
+var NwBuilder = require('nw-builder');
+var os = require('os');
+var argv = require('yargs')
+    .alias('p', 'platforms')
+    .argv;
+var del = require('del');
+var detectCurrentPlatform = require('nw-builder/lib/detectCurrentPlatform.js');
+var nw = new NwBuilder({
+    files: ['./src/**', './node_modules/**', './package.json'],
+    version: '0.12.3',
+    platforms: argv.p ? argv.p.split(',') : [detectCurrentPlatform()]
+}).on('log', console.log);
+
+gulp.task('run', function() {
+    nw.options.files = './**';
+    return nw.run().catch(function(error) {
+        console.error(error);
+    });
+});
+
+gulp.task('build', ['clean'], function() {
+    return nw.build().catch(function(error) {
+        console.error(error);
+    });
+});
+
+gulp.task('clean', function() {
+    return del('build/');
+});

package.json

@@ -1,89 +1,76 @@
 {
-    "name": "Popcorn-Time",
-    "homepage": "https://popcorntime.io",
-    "bugs": "https://git.popcorntime.io/popcorntime/desktop/issues",
-    "repository": {
-        "type": "git",
-        "url": "https://git.popcorntime.io/popcorntime/desktop.git"
-    },
-    "license": "GPL-3.0",
-    "main": "app://host/src/app/index.html",
-    "version": "0.3.8-5",
-    "node-remote": "client.vpn.ht",
-"releaseName": "There's nothing on TV (0.12.2)",
-    "scripts": {
-        "postinstall": "node_modules/.bin/bower install --config.interactive=false && grunt setup",
-        "postupdate": "node_modules/.bin/bower update --config.interactive=false && grunt setup",
-        "test": "grunt --verbose"
-    },
-    "window": {
-        "title": "Popcorn Time",
-        "icon": "src/app/images/icon.png",
-        "toolbar": false,
-        "frame": false,
-        "min_width": 960,
-        "min_height": 520,
-        "resizable": true,
-        "show": false,
-        "position": "center"
-    },
-    "dependencies": {
-        "adm-zip": "0.4.7",
-        "airplay-js": "git+https://git.popcorntime.io/mirrors/node-airplay-js.git",
-        "async": "0.9.0",
-        "chromecast-js": "git+https://git.popcorntime.io/mirrors/chromecast-js.git",
-        "gitlab": "1.3.0",
-        "i18n": "0.5.0",
-        "iconv-lite": "^0.4.7",
-        "jschardet": "1.1.1",
-        "json-rpc2": "^0.8.1",
-        "kat-api": "^0.0.3",
-        "markdown": "~0.5.0",
-        "memoizee": "^0.3.8",
-        "mkdirp": "*",
-        "moment": "^2.10.2",
-        "mv": "^2.0.3",
-        "nedb": "1.1.2",
-        "node-captions": "0.3.8",
-        "nodecast-js": "git+https://git.popcorntime.io/mirrors/nodecast-js.git",
-        "node-tvdb": "1.3.1",
-        "node-webkit-fdialogs": "latest",
-        "os-name": "^1.0.3",
-        "peerflix": "git+https://git.popcorntime.io/mirrors/peerflix.git",
-        "opensubtitles-api": "^0.0.3",
-        "q": "2.0.3",
-        "read-torrent": "1.3.0",
-        "readdirp": "*",
-        "request": "^2.55.0",
-        "rimraf": "2.2.8",
-        "sanitizer": "^0.1.2",
-        "semver": "^4.3.3",
-        "send": "0.12.2",
-        "strike-api": "0.2.0",
-        "tar": "^1.0.3",
-        "temp": "^0.8.1",
-        "torrent-tracker-health": "^0.1.4",
-        "underscore": "^1.8.3",
-        "upnp-mediarenderer-client": "^1.2.1",
-        "URIjs": "^1.15.0",
-        "xmlbuilder": "^2.6.2"
-    },
-    "devDependencies": {
-        "bower": "1.4.1",
-        "grunt": "0.4.5",
-        "grunt-bower-clean": "^0.2.2",
-        "grunt-contrib-clean": "^0.6.0",
-        "grunt-contrib-compress": "^0.13.0",
-        "grunt-contrib-jshint": "^0.11.1",
-        "grunt-contrib-stylus": "0.21.0",
-        "grunt-contrib-watch": "0.6.x",
-        "grunt-exec": "0.4.x",
-        "grunt-githooks": "^0.3.1",
-        "grunt-jsbeautifier": "*",
-        "grunt-node-webkit-builder": "0.1.x",
-        "grunt-shell": "^1.1.2",
-        "load-grunt-tasks": "3.2.0",
-        "nw-gyp": "^0.12.4",
-        "stylus": "0.50.0"
-    }
+  "name": "Popcorn-Time-CE",
+  "homepage": "http://popcorntime.ml",
+  "bugs": "https://github.com/PopcornTimeCE/desktop/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/PopcornTimeCE/desktop.git"
+  },
+  "license": "GPL-3.0",
+  "main": "app://host/src/app/index.html",
+  "version": "0.3.9-11",
+  "node-remote": "client.vpn.ht",
+  "releaseName": "The one with CE",
+  "scripts": {
+    "start": "gulp run"
+  },
+  "window": {
+    "title": "Popcorn Time CE",
+    "icon": "src/app/images/icon.png",
+    "toolbar": false,
+    "frame": false,
+    "min_width": 960,
+    "min_height": 520,
+    "resizable": true,
+    "show": false,
+    "position": "center"
+  },
+  "dependencies": {
+    "urijs": "^1.17.0",
+    "adm-zip": "0.4.7",
+    "airplay-js": "^0.2.16",
+    "async": "0.9.0",
+    "chromecast-js": "^0.1.7",
+    "gitlab": "1.3.0",
+    "i18n": "0.5.0",
+    "iconv-lite": "^0.4.7",
+    "jschardet": "1.1.1",
+    "json-rpc2": "^0.8.1",
+    "kat-api": "git+https://github.com/PopcornTimeCE/kat-api.git",
+    "markdown": "~0.5.0",
+    "memoizee": "^0.3.8",
+    "mkdirp": "*",
+    "moment": "^2.10.2",
+    "mv": "^2.0.3",
+    "nedb": "1.1.2",
+    "node-captions": "0.3.8",
+    "node-tvdb": "1.3.1",
+    "node-webkit-fdialogs": "latest",
+    "nodecast-js": "^0.1.2",
+    "opensubtitles-api": "^2.3.0",
+    "os-name": "^1.0.3",
+    "peerflix": "^0.32.2",
+    "q": "2.0.3",
+    "read-torrent": "1.3.0",
+    "readdirp": "*",
+    "request": "^2.55.0",
+    "rimraf": "2.2.8",
+    "sanitizer": "^0.1.2",
+    "semver": "^4.3.3",
+    "send": "0.12.2",
+    "strike-api": "0.2.0",
+    "tar": "^1.0.3",
+    "temp": "^0.8.1",
+    "torrent-tracker-health": "git+https://github.com/PopcornTimeCE/torrent-tracker-health.git",
+    "underscore": "^1.8.3",
+    "upnp-mediarenderer-client": "^1.2.1",
+    "xmlbuilder": "^2.6.2"
+  },
+  "devDependencies": {
+    "del": "^2.2.0",
+    "gulp": "^3.9.0",
+    "nw-builder": "^2.0.2",
+    "nw-gyp": "^0.12.4",
+    "yargs": "^3.31.0"
+  }
 }

src/app/lib/providers/trakttv.js

@@ -2,7 +2,7 @@
     'use strict';
 
     var request = require('request'),
-        URI = require('URIjs'),
+        URI = require('urijs'),
         Q = require('q'),
         _ = require('underscore'),
         inherits = require('util').inherits;

src/app/lib/providers/tvshowtime.js

@@ -2,7 +2,7 @@
     'use strict';
 
     var request = require('request'),
-        URI = require('URIjs'),
+        URI = require('urijs'),
         Q = require('q'),
         _ = require('underscore'),
         inherits = require('util').inherits,