Skip to content

Commit

Permalink
Merge pull request #2630 from popcorn-official/development
Browse files Browse the repository at this point in the history
  • Loading branch information
@kiriles90
kiriles90 committed Sep 4, 2022
2 parents 4d4fc35 + 81b11f6 commit 64553fa
Show file tree
Hide file tree
Showing 59 changed files with 2,754 additions and 1,548 deletions.
64 changes: 2 additions & 62 deletions .github/workflows/build.yml
View file
Expand Up @@ -28,10 +28,10 @@ jobs:
with:
just-include: true

- name: Use Node.js 12.x
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x

- name: yarn version
run: |
Expand Down Expand Up @@ -140,18 +140,6 @@ jobs:
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
Expand All @@ -176,18 +164,6 @@ jobs:
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
Expand All @@ -212,18 +188,6 @@ jobs:
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
Expand Down Expand Up @@ -271,27 +235,3 @@ jobs:
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
25 changes: 25 additions & 0 deletions CHANGELOG.md
View file
@@ -1,3 +1,28 @@
## 0.4.9 - Ogres are not like cakes - 04 September 2022

New Features:
- Add right-click to copy support to the majority of UI elements
- Add update notification option
- Add disable Favorites tab option
- Add ability to filter Torrent Collection results by right-clicking providers
- Make the Torrent Collection directory a part of the database also adding the ability to import/export it

Bug Fixes:
- Fix cover resize
- Fix some overlapping UI elements
- Fix Show all available subtitles for the default language option
- Fix issue with peers not being resolved when resuming stream/download
- Fix stream/download resuming when modifying file selection bug
- Fix undefined download/upload speed issue

Other:
- Clean up obsolete/unnecessary code
- Many more Settings, Torrent Collection, Seedbox and File selector UI changes/updates
- Update Torrent Collection providers
- Update various icons
- Update various modules/dependencies
- Various other small fixes and optimizations

## 0.4.8 - Who Crossed the Streams ? - 15 July 2022

New Features:
Expand Down
17 changes: 7 additions & 10 deletions README.md
View file
Expand Up @@ -17,10 +17,10 @@
<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=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>
<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://popcorntime.app">popcorntime.app</a></h4>

Expand All @@ -46,7 +46,7 @@ Easily install Popcorn Time via _[Homebrew](https://brew.sh) ([Cask](https://doc
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`.
By default, this will build the app from source using the latest version of [NW.js](https://nwjs.io) on macOS 12.x (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
Expand All @@ -56,9 +56,6 @@ Also, if you keep a [_Brewfile_](https://github.com/Homebrew/homebrew-bundle#usa
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:
Expand All @@ -73,15 +70,15 @@ Via .deb package:
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.8-linux64.zip`
`wget -c https://get.popcorntime.app/repo/build/Popcorn-Time-0.4.9-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.8/Popcorn-Time-0.4.8-linux64.zip`_
`wget -c https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.4.9/Popcorn-Time-0.4.9-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.8-linux64.zip -d /opt/popcorn-time`
`sudo unzip Popcorn-Time-0.4.9-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):
Expand Down Expand Up @@ -142,7 +139,7 @@ You can also join our [community](README.md#community) to keep up-to-date and me
<a name="community"></a>
## Community
Keep track of Popcorn Time development and community activity.
* Read and subscribe to [The Official Popcorn Time Blog](https://blog.popcorntime.app/).
* 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).


Expand Down
4 changes: 2 additions & 2 deletions casks/popcorn-time.rb
View file
@@ -1,5 +1,5 @@
cask "popcorn-time" do
version "0.4.8"
version "0.4.9"

nwjs = "0.64.0"
arch = "x64"
Expand All @@ -22,7 +22,7 @@
end

if MacOS.version < :monterey || ENV["HOMEBREW_POPCORN_TIME_BUILD"] == "false"
sha256 "97cc4984614f87285edc4afe98ee82ac2b1ba7879b5561a497cff8401f4ba0ec"
sha256 "7fd9fb25734f7587d60349c29b8a7d425e677f08cb0e981452e98e7a2db4a942"

url "#{homepage}/build/#{zip}"
else
Expand Down
5 changes: 0 additions & 5 deletions gulpfile.js
View file
Expand Up @@ -710,12 +710,7 @@ gulp.task(
'deb',
'mac-pkg',
'nsis',
'prepareUpdater',
'prepareUpdater:win',
'compressUpdater',
'cleanForDist',
'clean:updater',
'clean:updater:win',
function(done) {
// default task code here
done();
Expand Down
6 changes: 6 additions & 0 deletions i18n-unused.config.js
View file
@@ -0,0 +1,6 @@
module.exports = {
localesPath: 'src/app/language',
srcPath: 'src/app',
srcExtensions: ['js', 'tpl'],
flatTranslations: true
};
9 changes: 5 additions & 4 deletions package.json
View file
Expand Up @@ -11,8 +11,8 @@
},
"license": "GPL-3.0",
"main": "src/app/index.html",
"version": "0.4.8",
"releaseName": "Who Crossed the Streams?",
"version": "0.4.9",
"releaseName": "Ogres are not like cakes",
"scripts": {
"build": "gulp build",
"clean": "gulp clean",
Expand Down Expand Up @@ -44,7 +44,7 @@
"butter-provider/yts.js"
],
"dependencies": {
"@fortawesome/fontawesome-free": "^5.14.0",
"@fortawesome/fontawesome-free": "^6.1",
"@vpnht/sdk": "^1.0.10",
"adm-zip": "0.4.16",
"airplayer": "2.0.0",
Expand Down Expand Up @@ -90,7 +90,7 @@
"socks-proxy-agent": "^6.0.0",
"srt-to-vtt": "^1.1",
"tar": "4.4.18",
"torrentcollection5": "1.0.4",
"torrentcollection5": "1.0.6",
"trakt.tv": "7.x.x",
"trakt.tv-images": "5.x.x",
"trakt.tv-matcher": "7.x.x",
Expand All @@ -116,6 +116,7 @@
"gulp-tar": "^2.1.0",
"gulp-zip": "^4.2.0",
"guppy-pre-commit": "^0.4.0",
"i18n-unused": "^0.8.0",
"jshint": "^2.9.6",
"jshint-stylish": "^2.2.1",
"nib": "^1.1.2",
Expand Down
1 change: 1 addition & 0 deletions src/app/bootstrap.js
View file
Expand Up @@ -29,6 +29,7 @@
script.src = 'lib/providers/' + file;

script.onload = function() {
this.onload = null;
win.info('loaded', file);
q.resolve(file);
};
Expand Down
17 changes: 8 additions & 9 deletions src/app/database.js
View file
Expand Up @@ -346,10 +346,10 @@ var Database = {
dhtInfo.s ? Settings.statusUrl = dhtInfo.site.split('//')[0] + '//status.' + dhtInfo.site.split('//')[1] : null;
}
if (dhtInfo.keys) {
if (dhtInfo.keys.os) Settings.opensubtitles.useragent = dhtInfo.keys.os;
if (dhtInfo.keys.fanart) Settings.fanart.api_key = dhtInfo.keys.fanart;
if (dhtInfo.keys.tvdb) Settings.tvdb.api_key = dhtInfo.keys.tvdb;
if (dhtInfo.keys.tmdb) Settings.tmdb.api_key = dhtInfo.keys.tmdb;
if (dhtInfo.keys.os) { Settings.opensubtitles.useragent = dhtInfo.keys.os; }
if (dhtInfo.keys.fanart) { Settings.fanart.api_key = dhtInfo.keys.fanart; }
if (dhtInfo.keys.tvdb) { Settings.tvdb.api_key = dhtInfo.keys.tvdb; }
if (dhtInfo.keys.tmdb) { Settings.tmdb.api_key = dhtInfo.keys.tmdb; }
if (dhtInfo.keys.trakttv && dhtInfo.keys.trakttv.id && dhtInfo.keys.trakttv.s) {
Settings.trakttv.client_id = dhtInfo.keys.trakttv.id;
Settings.trakttv.client_secret = dhtInfo.keys.trakttv.s;
Expand Down Expand Up @@ -435,21 +435,17 @@ var Database = {
})
.then(function () {
App.Trakt = App.Config.getProviderForType('metadata');

if (Settings.automaticUpdating === false) {
return;
}

// check update
var updater = new App.Updater();

updater.update()
.catch(function (err) {
win.error('updater.update()', err);
});

})
.then(function() {
.then(function () {
if (Settings.protocolEncryption) {
// enable secure after load options
require('webtorrent/lib/peer.js').enableSecure();
Expand All @@ -462,6 +458,9 @@ var Database = {
.then(function () {
if (AdvSettings.get('disclaimerAccepted')) {
App.DhtReader.updateOld();
if (Settings.updateNotification) {
App.Updater.onlyNotification();
}
}
})
.catch(function (err) {
Expand Down
4 changes: 2 additions & 2 deletions src/app/dht.js
View file
Expand Up @@ -97,9 +97,9 @@ class DhtReader {
if (e) {
let tmpclass = e === 'success' ? 'valid-tick' : 'invalid-cross';
$('.update-dht').removeClass('fa-spin fa-spinner').addClass(tmpclass);
setTimeout(function() { $('.update-dht').removeClass(tmpclass).addClass('fa-redo');}, 6000);
setTimeout(function() { $('.update-dht').removeClass(tmpclass).addClass('fa-rotate');}, 6000);
} else {
$('.update-dht').removeClass('fa-redo').removeClass('valid-tick').removeClass('invalid-cross').addClass('fa-spin fa-spinner');
$('.update-dht').removeClass('fa-rotate valid-tick invalid-cross').addClass('fa-spin fa-spinner');
}
}

Expand Down
Binary file added src/app/images/icons/nyaa.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 64553fa

Please sign in to comment.