Merge pull request popcorn-official#2979 from popcorn-official/develo…

…pment

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,35 +11,34 @@ assignees: ''
 If you are asking a question rather than filing a bug, try one of these instead:
 - Wiki & FAQ (https://github.com/popcorn-official/popcorn-desktop/wiki)
 - Reddit /r/PopCornTimeApp (https://www.reddit.com/r/PopCornTimeApp/)
-- Popcorn Time Forum (https://discuss.popcorntime.app/)
 -->
 
-Operating System Version:
-<!-- OS X 10.11? Windows 10? Linux?-->
+#### Operating System Version:
+<!-- Windows? Linux? macOS? Version?-->
 
-Popcorn Time Version:
+#### Popcorn Time Version:
 <!-- What version of Popcorn Time are you running? -->
 
-Download date:
+#### Download date:
 <!-- When did you install Popcorn Time? -->
 
-Download url:
+#### 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
+#### Expected Behaviour:
 <!-- What did you think the app was going to do? -->
 ...
 
-#### Actual Behaviour
+#### Actual Behaviour:
 <!-- What does the app do instead? -->
 ...
 
-#### Steps to reproduce the behaviour
+#### Steps to reproduce the behaviour:
 <!-- What steps do we need to take to find the same bug that you found? -->
 
 1. ...
 2. ...
 3. ...
 
-#### Screenshot(s) of issue or error(s) logs of developer console (Windows/Linux: F12, MacOS: ⌘ + 0 ... then 'console' tab) (recommended)
+#### Screenshot(s) of issue or error(s) logs of developer console (Windows/Linux: F12, MacOS: ⌘ + 0 ... then 'console' tab) (recommended):
 <!-- Screenshot helps with finding why stuff breaks -->

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        nwjs: ['0.44.5', '0.82.0']
+        nwjs: ['0.44.5', '0.86.0']
 
     steps:
       - name: Context
@@ -51,26 +51,75 @@ jobs:
           key: "${{ matrix.os }}"
           map: |
             {
-              "ubuntu-latest": { "platform": "linux", "dist": "linux32,linux64" },
-              "macOS-latest": { "platform": "osx", "dist": "osx64" },
-              "windows-latest": { "platform": "win", "dist": "win32,win64" }
+              "ubuntu-latest": { "platform": "linux64" },
+              "macOS-latest": { "platform": "osx64" },
+              "windows-latest": { "platform": "win64" }
             }
 
       - name: Build info
-        run: echo Build ${{ env.dist }} on nw-v${{ matrix.nwjs }}
+        run: echo Build ${{ env.platform }} on nw-v${{ matrix.nwjs }}
 
       - name: Build App
         run: |
           yarn
-          yarn gulp dist --platforms=${{ env.platform == 'win' && '"' || '' }}${{ env.dist }}${{ env.platform == 'win' && '"' || '' }} --nwVersion=${{ matrix.nwjs }}
+          yarn gulp dist --platforms=${{ env.platform == 'win' && '"' || '' }}${{ env.platform }}${{ env.platform == 'win' && '"' || '' }} --nwVersion=${{ matrix.nwjs }}
       - name: Upload artifacts
         uses: actions/upload-artifact@master
         with:
           name: ${{ env.platform }}-${{ matrix.nwjs }}
           path: build
 
-  release:
+  packs:
     needs: build
+    name: Packs
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        nwjs: ['0.44.5', '0.86.0']
+
+    steps:
+      - name: Context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+
+      - uses: actions/checkout@v4
+        with:
+          path: repo
+          persist-credentials: false
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: linux64-${{ matrix.nwjs }}
+          path: .
+
+      - name: Install packages and appimagetool
+        run: |
+          sudo apt update
+          sudo apt install -y libfuse2
+          wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+          chmod +x appimagetool-x86_64.AppImage
+
+      - name: Build AppImage
+        run: |
+          VER=$(ls *-linux64*.zip | sed 's/-linux64.*//')
+          echo $VER
+          unzip -q *-linux64*.zip -d $VER.AppDir
+          cp repo/dist/linux/appimage/* $VER.AppDir/
+          ln -s Popcorn-Time $VER.AppDir/AppRun
+          mkdir build
+          ./appimagetool-x86_64.AppImage $VER.AppDir build/$VER-linux64${{ matrix.nwjs == '0.44.5' && '-0.44.5' || '' }}.AppImage
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@master
+        with:
+          name: linux64-${{ matrix.nwjs }}.AppImage
+          path: build
+
+
+  release:
+    needs: packs
     name: Release
     runs-on: ubuntu-latest
     steps:

CHANGELOG.md

@@ -1,7 +1,35 @@
+## 0.5.1 - Now.. Bring me that Horizon - 16 April 2024
+
+New Features:
+- Update NW.js runtime to 0.86.0 (0.44.5 still supported as an option for this release)
+- Add Always show bookmark over covers option
+- Improve local file support adding external players/cast devices
+- Add option to rescan external players/cast devices
+- Include PATH env. variable when scanning for external players
+- Improve Torrent Collection/Seedbox interaction
+- Add Linux AppImage
+
+Bug Fixes:
+- Fix native player UI issue when in fullscreen
+- Fix Favorites/Watched tabs Anime category
+- Fix issue with missing covers when TMDb is inaccessible
+- Fix issue with displaying incorrect filters in some instances
+- Fix issue with the settings/databases flushing functions
+- Tooltip fixes
+
+Other:
+- Replace the old Help screen with the online FAQ
+- Update the build system
+- Clean up obsolete/unnecessary code
+- Update torrent trackers
+- Update various modules/dependencies
+- Various other small fixes and optimizations
+
 ## 0.5.0 - Mischief Managed - 10 February 2024
 
 New Features:
 - Update NW.js runtime to 0.82.0 (0.44.5 still supported as an option for this release)
+- Add macOS build for Apple Silicon (NW.js 0.82.0 only)
 - Add working Anime tab
 - Add Watched tab
 - Add Seedbox option for exiting the app when downloads complete

README.md

@@ -1,6 +1,6 @@
 <h1 align="center">
   <br>
-  <a href="https://popcorntimeapp.netlify.app"><img src="https://avatars2.githubusercontent.com/u/7267937?s=200" alt="Popcorn Time" width="200"></a>
+  <a href="https://popcorn-time.site"><img src="https://avatars2.githubusercontent.com/u/7267937?s=200" alt="Popcorn Time" width="200"></a>
   <br>
   Popcorn Time
   <br>
@@ -14,29 +14,28 @@
   <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://github.com/popcorn-official/popcorn-desktop/actions"><img src="https://img.shields.io/github/actions/workflow/status/popcorn-official/popcorn-desktop/build.yml?branch=development&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://popcorntimeapp.netlify.app"><img src="https://img.shields.io/website?down_color=red&down_message=offline&label=popcorntimeapp.netlify.app&up_color=brightgreen&up_message=online&url=https%3A%2F%2Fpopcorntimeapp.netlify.app"></a>
+  <a href="https://github.com/popcorn-official/popcorn-desktop/actions"><img src="https://img.shields.io/github/actions/workflow/status/popcorn-official/popcorn-desktop/build.yml?branch=development&label=latest%20build"></a><br>
+  <a href="https://popcorn-time.site"><img src="https://img.shields.io/website?down_color=red&down_message=offline&label=popcorn-time.site&up_color=brightgreen&up_message=online&url=https%3A%2F%2Fpopcorn-time.site"></a>
+  <a href="https://github.com/popcorn-official"><img src="https://img.shields.io/website?down_color=red&down_message=offline&label=github&up_color=brightgreen&up_message=online&url=https%3A%2F%2Fgithub.com%2Fpopcorn-official"></a>
   <a href="https://www.reddit.com/r/PopCornTimeApp"><img src="https://img.shields.io/website?down_color=red&down_message=offline&label=reddit&up_color=brightgreen&up_message=online&url=https%3A%2F%2Fold.reddit.com%2Fr%2Fpopcorntimeapp%2F"></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>
   <a href="https://github.com/popcorn-official/popcorn-desktop/wiki/"><img src="https://img.shields.io/website?down_color=red&down_message=offline&label=wiki&up_color=brightgreen&up_message=online&url=https%3A%2F%2Fgithub.com%2Fpopcorn-official%2Fpopcorn-desktop%2Fwiki%2F"></a>
   <a href="https://github.com/popcorn-official/popcorn-desktop/wiki/FAQ"><img src="https://img.shields.io/website?down_color=red&down_message=offline&label=faq&up_color=brightgreen&up_message=online&url=https%3A%2F%2Fgithub.com%2Fpopcorn-official%2Fpopcorn-desktop%2Fwiki%2FFAQ"></a>
 
-<h4 align="center">Visit the project's website at <a href="https://popcorntimeapp.netlify.app">popcorntimeapp.netlify.app</a></h4>
+<h4 align="center">Visit the project's website at <a href="https://popcorn-time.site">popcorn-time.site</a></h4>
 
 ***
 
 ## Install
 
 ### Windows:
 Download and install:
-  * **Latest release**: check [popcorntimeapp.netlify.app](https://popcorntimeapp.netlify.app) or the repo's [releases page](https://github.com/popcorn-official/popcorn-desktop/releases)
+  * **Latest release**: check [popcorn-time.site](https://popcorn-time.site) 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)
 
 
 ### macOS:
 Download and install:
-  * **Latest release**: check [popcorntimeapp.netlify.app](https://popcorntimeapp.netlify.app) or the repo's [releases page](https://github.com/popcorn-official/popcorn-desktop/releases)
+  * **Latest release**: check [popcorn-time.site](https://popcorn-time.site) 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)):_
@@ -57,7 +56,7 @@ Also, if you keep a [_Brewfile_](https://github.com/Homebrew/homebrew-bundle#usa
 
 ### Linux - Debian/Ubuntu based distros:
 Download and install:
-  * **Latest release**: check [popcorntimeapp.netlify.app](https://popcorntimeapp.netlify.app) or the repo's [releases page](https://github.com/popcorn-official/popcorn-desktop/releases)
+  * **Latest release**: check [popcorn-time.site](https://popcorn-time.site) 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:
@@ -67,13 +66,13 @@ Via .deb package:
 
 Via archive and command line (tested on ubuntu 18.04 and 20.04):
   1. Download Popcorn Time archive from the github repo for the **latest release** :
-  `wget -c https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.5.0/Popcorn-Time-0.5.0-linux64.zip`
+  `wget -c https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.5.1/Popcorn-Time-0.5.1-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.5.0-linux64.zip -d /opt/popcorn-time`
+  `sudo unzip Popcorn-Time-0.5.1-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):  
@@ -111,7 +110,7 @@ If you encounter trouble with the above method, you can try:
 
 Optionally, you may simply run `./make_popcorn.sh` if you are on a linux or mac based operating system.
 
-Full instructions & troubleshooting tips can be found in the [Contributing Guide](CONTRIBUTING.md#contributing-to-popcorn-time).
+Full instructions & troubleshooting tips can be found in the [Contributing Guide](docs/Contributing.md#contributing-to-popcorn-time).
 
 #### Building redistribuable packages/installers:
 
@@ -127,15 +126,15 @@ Redistribuable packages are saved into `build/` subfolder.
 
 ## Getting Involved
 Want to report a bug, request a feature, contribute to or translate Popcorn Time?  
-Check out our in-depth guide to [Contributing to Popcorn Time](CONTRIBUTING.md#contributing-to-popcorn-time). We need all the help we can get!  
+Check out our in-depth guide to [Contributing to Popcorn Time](docs/Contributing.md#contributing-to-popcorn-time). We need all the help we can get!  
 You can also join our [community](README.md#community) to keep up-to-date and meet other developers.  
 
 
 <a name="community"></a>
 ## Community
 Keep track of Popcorn Time development and community activity.
   * Read and contribute to the official [Popcorn Time Wiki](https://github.com/popcorn-official/popcorn-desktop/wiki/).
-  * Join in discussions on the [Popcorn Time Forum](https://discuss.popcorntime.app) and [r/PopCornTimeApp](https://www.reddit.com/r/PopcornTimeApp).
+  * Join in discussions on [r/PopCornTimeApp](https://www.reddit.com/r/PopcornTimeApp).
 
 
 ## Screenshots

dist/linux/appimage/Popcorn-Time.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Comment=Watch Movies and TV Shows instantly
+Name=Popcorn-Time
+Exec=Popcorn-Time %U
+Icon=Popcorn-Time
+MimeType=application/x-bittorrent;x-scheme-handler/magnet;
+StartupNotify=false
+Categories=AudioVideo
+Type=Application
+X-Desktop-File-Install-Version=0.26
+