Merge pull request #2567 from popcorn-official/development

Merge dev branch to master
popcorn-official · Jul 14, 2022 · cf057c2 · cf057c2
2 parents 31c109b + f8e09f3
commit cf057c2
Show file tree

Hide file tree

Showing 73 changed files with 3,586 additions and 2,834 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -23,7 +23,7 @@ Popcorn Time Version:
 Download date:
 <!-- When did you install Popcorn Time? -->
 
-Download url (optional):
+Download url:
 <!-- Since there are pre-release builds and it's difficult to track if download is a release or just random build from jenkins. -->
 
 #### Expected Behaviour

diff --git a/.github/ISSUE_TEMPLATE/missing_content.md b/.github/ISSUE_TEMPLATE/missing_content.md
@@ -7,6 +7,6 @@ assignees: ''
 
 ---
 
-The app don't manage the content. Results comes from third parties APIs.
+The app doesn't manage the content, it uses third-party sources.
 
-This is useless to open an issue here for those kind of issues.
+Its not of much use opening an issue here for those kind of issues.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -124,8 +124,8 @@ jobs:
           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_path: ./macOS-latest/Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-osx64.zip
+          asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-osx64.zip
           asset_content_type: application/octet-stream
 
       - name: Upload Release Asset [macOS-pkg]
@@ -148,8 +148,8 @@ jobs:
           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_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]
@@ -160,7 +160,7 @@ jobs:
           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_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
 
@@ -172,7 +172,7 @@ jobs:
           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_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
 
@@ -184,8 +184,8 @@ jobs:
           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_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]
@@ -196,7 +196,7 @@ jobs:
           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_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
 
@@ -208,7 +208,7 @@ jobs:
           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_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
 
@@ -220,8 +220,8 @@ jobs:
           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_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]
@@ -232,7 +232,7 @@ jobs:
           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_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
 
@@ -244,7 +244,7 @@ jobs:
           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_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
 
@@ -280,8 +280,8 @@ jobs:
           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_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]
@@ -292,6 +292,6 @@ jobs:
           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_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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 0.4.8 - Who Crossed the Streams ? - 15 July 2022
+
+New Features:
+- Add multiple torrent support
+- Add provider icons throughout the app
+- Add option for Audio Passthrough
+- Add external player support for NixOS
+
+Bug Fixes:
+- Fix Homebrew Cask installation
+- Fix an XSS to RCE vulnerability (CVE-2022-25229)
+- Fix fallback when source and TMDb with language other than English fail to fetch synopsis
+- Fix scroll wheel volume adjust
+- Fix .torrent file support
+
+Other:
+- Automatic subtitles / OpenSubtitles support redesign due to login now being required for use of their API
+- Watchlist / Trakt implementation redesign
+- Many more Settings, Torrent Collection, Seedbox and File selector UI changes/updates
+- Update Torrent Collection providers
+- Update torrent trackers
+- Update various modules/dependencies
+- Various other small fixes and optimizations
+
 ## 0.4.7 - Just Keep Swimming - 02 March 2022
 
 New Features:

diff --git a/README.md b/README.md
@@ -14,14 +14,13 @@
   <a href="https://github.com/popcorn-official/popcorn-desktop/releases/latest"><img src="https://img.shields.io/github/release-date/popcorn-official/popcorn-desktop?label="></a>
   <a href="https://github.com/popcorn-official/popcorn-desktop/compare/master...development"><img src="https://img.shields.io/github/commits-since/popcorn-official/popcorn-desktop/latest?label=commits%20since"></a>
   <a href="https://github.com/popcorn-official/popcorn-desktop/commit/development"><img src="https://img.shields.io/github/last-commit/popcorn-official/popcorn-desktop?label=latest%20commit"></a>
-  <a href="https://ci.popcorntime.app/job/Popcorn-Time-Desktop/"><img src="https://img.shields.io/badge/latest%20build-%23458-brightgreen"></a>
-  <a href="https://ci.popcorntime.app/job/Popcorn-Time-Desktop/"><img src="https://img.shields.io/badge/-passing-brightgreen"></a>
+  <a href="https://github.com/popcorn-official/popcorn-desktop/actions"><img src="https://img.shields.io/github/workflow/status/popcorn-official/popcorn-desktop/CI?label=latest%20build"></a>
   <a href="https://david-dm.org/popcorn-official/popcorn-desktop"><img src="https://img.shields.io/david/popcorn-official/popcorn-desktop?label=deps"></a><br>
   <a href="https://popcorntime.app"><img src="https://img.shields.io/website?down_color=red&down_message=offline&label=popcorntime.app&up_color=brightgreen&up_message=online&url=https%3A%2F%2Fpopcorntime.app"></a>
   <a href="https://ci.popcorntime.app"><img src="https://img.shields.io/website?down_color=red&down_message=offline&label=ci.popcorntime.app&up_color=brightgreen&up_message=online&url=https%3A%2F%2Fci.popcorntime.app"></a>
   <a href="https://blog.popcorntime.app"><img src="https://img.shields.io/website?down_color=red&down_message=offline&label=blog&up_color=brightgreen&up_message=online&url=https%3A%2F%2Fblog.popcorntime.app"></a>
-  <a href="https://www.reddit.com/r/PopCornTimeApp"><img src="https://img.shields.io/reddit/subreddit-subscribers/PopCornTimeApp?color=red&label=reddit&style=flat"></a>
-  <a href="https://discuss.popcorntime.app"><img src="https://img.shields.io/discourse/posts?color=blue&label=forum&server=https%3A%2F%2Fdiscuss.popcorntime.app&style=flat"></a>
+  <a href="https://www.reddit.com/r/PopCornTimeApp"><img src="https://img.shields.io/reddit/subreddit-subscribers/PopCornTimeApp?color=e84722&label=reddit&style=flat"></a>
+  <a href="https://discuss.popcorntime.app"><img src="https://img.shields.io/website?down_color=red&down_message=offline&label=forum&up_color=brightgreen&up_message=online&url=https%3A%2F%2Fdiscuss.popcorntime.app"></a>
 
 <h4 align="center">Visit the project's website at <a href="https://popcorntime.app">popcorntime.app</a></h4>
 
@@ -32,51 +31,57 @@
 ### Windows:
 Download and install:
   * **Latest release**: check [popcorntime.app](https://popcorntime.app/#get-app) or the repo's [releases page](https://github.com/popcorn-official/popcorn-desktop/releases)
-  * Or **latest dev build (for testers)**: check the [latest successful build on ci.popcorntime.app](https://ci.popcorntime.app/job/Popcorn-Time-Desktop/lastSuccessfulBuild/)
+  * Or **latest dev build (for testers)**: check the repo's [actions page](https://github.com/popcorn-official/popcorn-desktop/actions)
 
 
 ### MacOS:
+Download and install:
+  * **Latest release**: check [popcorntime.app](https://popcorntime.app/#get-app) or the repo's [releases page](https://github.com/popcorn-official/popcorn-desktop/releases)
+  * Or **latest dev build (for testers)**: check the repo's [actions page](https://github.com/popcorn-official/popcorn-desktop/actions)
+
 Easily install Popcorn Time via _[Homebrew](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_
   ~~~ rb
   brew tap popcorn-official/popcorn-desktop https://github.com/popcorn-official/popcorn-desktop.git
-  brew install --cask popcorn-time
+  #export HOMEBREW_POPCORN_TIME_BUILD=false
+  brew install --cask popcorn-time #--no-quarantine
   ~~~
 
+By default, this will build the app from source using the latest version of [NW.js](https://nwjs.io) on macOS 10.12 (Monterey) or later, else revert to the [latest](https://github.com/popcorn-official/popcorn-desktop/releases/latest) stable build on previous versions of macOS. This behaviour can also be forced by `export`ing a `HOMEBREW_POPCORN_TIME_BUILD=false` [environment variable](https://en.wikipedia.org/wiki/Environment_variable), for example in `~/.bashrc` or `~/.zshrc`.
+
 Also, if you keep a [_Brewfile_](https://github.com/Homebrew/homebrew-bundle#usage), you can add something like this:
   ~~~ rb
   repo = "popcorn-official/popcorn-desktop"
   tap repo, "https://github.com/#{repo}.git"
-  cask "popcorn-time"
+  #ENV["HOMEBREW_POPCORN_TIME_BUILD"] = "false"
+  cask "popcorn-time" #, args: { "no-quarantine": true }
   ~~~
 
 Update from _zip_ file:  
   * Unpack the contents of the zip file. This should leave you with a file named `update.tar`. Unpacking the .tar file should get you a folder named `Content`. Navigate to your `Application` folder, right click on Popcorn Time and press `Show Package Content` then replace the `Content` folder there with the `Content` folder from the `update.zip`
 
 
 ### Linux - Debian/Ubuntu based distros:
+Download and install:
+  * **Latest release**: check [popcorntime.app](https://popcorntime.app/#get-app) or the repo's [releases page](https://github.com/popcorn-official/popcorn-desktop/releases)
+  * Or **latest dev build (for testers)**: check the repo's [actions page](https://github.com/popcorn-official/popcorn-desktop/actions)
+
 Via .deb package:
 
   _**Firstly, be aware** in some cases, missings dependencies packages (libatomic1, libgconf-2-4, libcanberra-gtk-module) were reported to be required for the app to works.  
   **If the app don't start for you too**, in this case, **try `sudo apt update && sudo apt install libatomic1 libgconf-2-4 libcanberra-gtk-module`** to be sure your system have the required dependencies._
 
-Download and install:
-  * **Latest release**: check [popcorntime.app](https://popcorntime.app/#get-app) or the repo's [releases page](https://github.com/popcorn-official/popcorn-desktop/releases)
-  * Or **latest dev build (for testers)**: check the [latest successful build on ci.popcorntime.app](https://ci.popcorntime.app/job/Popcorn-Time-Desktop/lastSuccessfulBuild/)
-
 Via archive and command line (tested on ubuntu 18.04 and 20.04):
   1. Download Popcorn Time archive:  
       * For the **latest release**:  
-      `wget -c https://get.popcorntime.app/repo/build/Popcorn-Time-0.4.7-linux64.zip`  
+      `wget -c https://get.popcorntime.app/repo/build/Popcorn-Time-0.4.8-linux64.zip`  
   _if eventually you get issue with popcorntime.app website you can try to download from the github repo  
-  `wget -c https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.4.7/Popcorn-Time-0.4.7-linux64.zip`_
-      * Or for the **latest dev build (for testers)**:  
-      `wget -c https://ci.popcorntime.app/job/Popcorn-Time-Desktop/lastSuccessfulBuild/artifact/build/Popcorn-Time-0.4.7_linux64.zip -O Popcorn-Time-0.4.7-linux64.zip`
+  `wget -c https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.4.8/Popcorn-Time-0.4.8-linux64.zip`_
   2. Create popcorn-time folder in /opt/:  
   `sudo mkdir /opt/popcorn-time`  
   3. Install unzip && dependencies (they should not be always required but some users needed them to make Popcorn Time working):  
   `sudo apt update && sudo apt install unzip libcanberra-gtk-module libgconf-2-4 libatomic1`  
   4. Extract the zip in /opt/popcorn-time:  
-  `sudo unzip Popcorn-Time-0.4.7-linux64.zip -d /opt/popcorn-time`  
+  `sudo unzip Popcorn-Time-0.4.8-linux64.zip -d /opt/popcorn-time`  
   5. Create symlink of Popcorn-Time in /usr/bin:  
   `sudo ln -sf /opt/popcorn-time/Popcorn-Time /usr/bin/popcorn-time`  
   6. Create .desktop file (so the launcher):