Merge pull request #1245 from popcorn-official/development

Merge to master

.appveyor.yml

@@ -0,0 +1,32 @@
+skip_commits:
+  files:
+    - .travis.yml
+
+environment:
+  matrix:
+    - nodejs_version: STABLE
+
+cache:
+  - node_modules -> package.json
+
+build_script:
+  - yarn config set yarn-offline-mirror ./node_modules/
+  - yarn install --ignore-engines --ignore-scripts
+  - yarn build
+
+after_build:
+  - yarn gulp compress
+
+artifacts:
+  - path: build\*.zip
+    name: PopcornTime
+
+deploy:
+  description: 'Windows Release'
+  provider: GitHub
+  auth_token:
+    secure: wKYGmYxyZoGANT1qraz3HzsUN9tiYx9pvF3KpILJZ/UQtC+EC5XHsnxKNtCjDUhb # your encrypted token from GitHub
+  artifact: /build/.*\.zip/
+  on:
+    branch: master
+    appveyor_repo_tag: false      

.github/workflows/build.yml

@@ -0,0 +1,294 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+    name: Build
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+
+    steps:
+      - name: Context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+
+      - uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+
+      - name: Prepare NSIS
+        if: matrix.os == 'windows-latest'
+        id: prep_nsis
+        uses: joncloud/makensis-action@v1
+        with:
+          just-include: true
+
+      - name: Use Node.js 12.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+
+      - name: yarn version
+        run: |
+          yarn version
+
+      - name: node version
+        run: |
+          node --version
+
+      - name: Build App [macOS]
+        if: matrix.os == 'macOS-latest'
+        run: |
+          yarn
+          yarn gulp dist
+
+      - name: Build App [ubuntu]
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          yarn
+          yarn gulp dist --platforms=linux32,linux64
+
+      - name: Build App [windows]
+        if: matrix.os == 'windows-latest'
+        run: |
+          yarn
+          yarn gulp dist --platforms=win32
+          yarn gulp dist --platforms=win64
+        env:
+          NSIS_PATH: ${{ steps.prep_nsis.outputs.nsis-path }}
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@master
+        with:
+          name: ${{ matrix.os }}
+          path: build
+
+  release:
+    needs: build
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Context
+        if: startsWith(github.ref, 'refs/tags/v')
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+
+      - name: Get the version
+        id: get_version
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
+
+      - uses: actions/download-artifact@v1
+        if: startsWith(github.ref, 'refs/tags/v')
+        with:
+          name: ubuntu-latest
+
+      - uses: actions/download-artifact@v1
+        if: startsWith(github.ref, 'refs/tags/v')
+        with:
+          name: windows-latest
+
+      - uses: actions/download-artifact@v1
+        if: startsWith(github.ref, 'refs/tags/v')
+        with:
+          name: macOS-latest
+
+      - run: find . -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
+
+      - name: Create Release
+        if: startsWith(github.ref, 'refs/tags/v')
+        id: create_release
+        uses: actions/create-release@v1.0.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: false
+          prerelease: false
+
+      - name: Upload Release Asset [macOS-zip]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./macOS-latest/Popcorn-Time-${{ steps.get_version.outputs.VERSION }}_osx64.zip
+          asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-Mac.zip
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [macOS-pkg]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./macOS-latest/Popcorn-Time-${{ steps.get_version.outputs.VERSION }}.pkg
+          asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}.pkg
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [macOS-update]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./macOS-latest/update-${{ steps.get_version.outputs.VERSION }}_osx64.zip
+          asset_name: update-${{ steps.get_version.outputs.VERSION }}_osx64.zip
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [ubuntu-deb-amd64]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./ubuntu-latest/popcorn-time_${{ steps.get_version.outputs.VERSION }}-amd64.deb
+          asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-amd64.deb
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [ubuntu-zip-x64]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./ubuntu-latest/Popcorn-Time-${{ steps.get_version.outputs.VERSION }}_linux64.zip
+          asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-linux64.zip
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [ubuntu-update-x64]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./ubuntu-latest/update-${{ steps.get_version.outputs.VERSION }}_linux64.zip
+          asset_name: update-${{ steps.get_version.outputs.VERSION }}_linux64.zip
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [ubuntu-deb-i386]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./ubuntu-latest/popcorn-time_${{ steps.get_version.outputs.VERSION }}-i386.deb
+          asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-i386.deb
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [ubuntu-zip-x32]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./ubuntu-latest/Popcorn-Time-${{ steps.get_version.outputs.VERSION }}_linux32.zip
+          asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-linux32.zip
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [ubuntu-update-x32]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./ubuntu-latest/update-${{ steps.get_version.outputs.VERSION }}_linux32.zip
+          asset_name: update-${{ steps.get_version.outputs.VERSION }}_linux32.zip
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [windows-zip-x64]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./windows-latest/Popcorn-Time-${{ steps.get_version.outputs.VERSION }}_win64.zip
+          asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-win64.zip
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [windows-zip-ia32]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./windows-latest/Popcorn-Time-${{ steps.get_version.outputs.VERSION }}_win32.zip
+          asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-win32.zip
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [windows-setup-x64]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./windows-latest/Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-win64-Setup.exe
+          asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-win64-Setup.exe
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [windows-setup-ia32]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./windows-latest/Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-win32-Setup.exe
+          asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-win32-Setup.exe
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [window-update-x64]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./windows-latest/update-${{ steps.get_version.outputs.VERSION }}_win64.zip
+          asset_name: update-${{ steps.get_version.outputs.VERSION }}_win64.zip
+          asset_content_type: application/octet-stream
+
+      - name: Upload Release Asset [window-update-ia32]
+        if: startsWith(github.ref, 'refs/tags/v')
+        continue-on-error: true
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./windows-latest/update-${{ steps.get_version.outputs.VERSION }}_win32.zip
+          asset_name: update-${{ steps.get_version.outputs.VERSION }}_win32.zip
+          asset_content_type: application/octet-stream

.gitignore

@@ -1,6 +1,5 @@
 # build files
 node_modules/
-src/app/vendor
 src/app/themes
 build/
 cache/

.jshintrc

@@ -78,12 +78,14 @@
         "request": true,
         "querystring": true,
         "URI": true,
-        "peerflix": true,
         "child": true,
-        "trakt": true,
+        "WebTorrent": true,
+        "torrentCollection": true,
+        "Trakt": true,
 
         // Third party
         "Backbone": true,
+        "Marionette": true,
         "Mousetrap": true,
         "_": true,
         "request": true,

.travis.yml

@@ -1,10 +1,32 @@
+os:
+  - linux
+  - osx
+
 language: node_js
 node_js:
-  - "4"
+  - stable
+cache:
+  yarn: true
+  directories:
+  - node_modules
 before_install:
-  - if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
-  - npm install -g gulp-cli
-after_success : gulp build
+  - yarn config set yarn-offline-mirror ./node_modules/
+  - yarn install --ignore-engines
+  - yarn build
+install:
+  - yarn gulp compress
+after_success:
+  - ls -ltr ./build/
+deploy:
+  provider: releases
+  file_glob: true
+  file: build/Popcorn-Time*.zip
+  name: Build $(date +'%d.%m.%Y %R')
+  skip_cleanup: true
+  on:
+    branch: development
+    tags: false
+  api-key:
+    secure: "IxNjbYB5ptBG6yvdTVV5otXxOYUO6L31VRxHAL/3A939MukMM6GUBlr0jcJ2mWzxvhHoo90r3RWT/81qCPH0Mf7oDCWthwuAsX1RtOVC7LinbEeLEX4Lp/To0kC2gn0dBwXSJhakkQZ4alZywRxLzV+TxiF/HYlOLuF+6ZZ5mtv6vNIylxkmaQy/KHV43LYLw7weEHafj3TSpLsKFZw0/Rqw/rKKWCMzMY750HmN0rNb54Hbu9+5zVdNpnfa4ovmdTiB7aOjrr2/Z8LVYdw9+MTipwpYq4Kb2syYjkZiduUshI+ttsyw6T5Hgg0hrAnW3pVZ+HLnxQUw75BnUOoF3rFFEdLA3tGQ1BGf2zRoN10JQae/hBAvagY5Y+55m02IUE1qnOCJ6vrAfMb2a1i4Eu+JUCViMw/ITKEYnGkHWyvZ1uhT3M8WqEUAZWCnNlRz2+UjZD4dXOwQwvYzBG5smDW2H1/Z0XRUJjCGU+G5Gvol4qa7Dsb97d6ezQvtqs//DI80Af0IgQawiBVwMboLlgqUCra6+1WqlwzVk22OznkBR3zJDTqJwNkBrXhzmpy6/y2MiqcsctgMsJHClHHy4CD3PK4LplO1IHs0Ix/QZEN6gBUN3vsJsgZjhUuiPD8p0rsnxeCC8XF7GnhJOnnh6RpzF7ZOs1FjcQ+iEixgMGY="
 notifications:
   email: false
-  irc: "chat.freenode.net#butterdev"

.vscode/config.json

@@ -0,0 +1,3 @@
+{
+    "git.ignoreLimitWarning": true
+}