Skip to content

Commit

Permalink
Merge pull request #2457 from popcorn-official/development
Browse files Browse the repository at this point in the history
  • Loading branch information
kiriles90 committed Mar 2, 2022
2 parents 59d5e20 + 221a36d commit 31c109b
Show file tree
Hide file tree
Showing 62 changed files with 1,564 additions and 705 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

28 changes: 28 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,31 @@
## 0.4.7 - Just Keep Swimming - 02 March 2022

New Features:
- Add API Server urls update/auto-update options
- Add API Server url(s) tooltip on tabs
- Add play/download functions to the Seedbox and various other right pane fixes, additions and optimizations
- Add player controls for zoom, contrast, brightness, hue and saturation
- Adjustable next episode preload time including disable preloading while keeping Play next episode automatically enabled
- Add concurrent DHT UDP requests limit option
- Add always expanded search field option
- Add an undo prompt when removing a bookmark
- Add links for contributing media information to TMDB
- Add more languages

Bug Fixes:
- Fix the Rebuild bookmarks database function
- Fix bookmarks sorting/filtering bug when more than 50 entries
- Fix DLNA media controls bug when subtitles are enabled
- Fix DLNA issue with Samsung devices
- Fix disabling automatic updates
- Fix some layout issues when native frame option enabled
- Watchlist fixes

Other:
- Update torrent trackers
- Update various modules/dependencies
- Various other small fixes and optimizations

## 0.4.6 - The Good Variant - 11 October 2021

New Features:
Expand Down
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Expand Up @@ -77,8 +77,7 @@ Any other information you want to share that is relevant to the issue being repo

Feature requests are welcome. Before you submit one be sure to have:

1. Read the [Roadmap](https://github.com/popcorn-official/popcorn-desktop/tree/master/docs/RoadMap.md) and
[Planned Features](https://github.com/popcorn-official/popcorn-desktop/tree/master/docs/Planned-Features.md) listing, **use the Github Issues search** and check the feature hasn't already been requested.
1. Check [existing feature requests](https://github.com/popcorn-official/popcorn-desktop/issues?q=is%3Aopen+is%3Aissue+label%3Afeature) and verify the feature hasn't already been requested.
2. Take a moment to think about whether your idea fits with the scope and aims of the project, or if it might
better fit being an app/plugin.
3. Remember, it's up to *you* to make a strong case to convince the project's leaders of the merits of this
Expand Down
Empty file removed Jenkinsfile
Empty file.
10 changes: 5 additions & 5 deletions README.md
Expand Up @@ -66,17 +66,17 @@ Download and install:
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.6-linux64.zip`
`wget -c https://get.popcorntime.app/repo/build/Popcorn-Time-0.4.7-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.6/Popcorn-Time-0.4.6-linux64.zip`_
`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.6_linux64.zip -O Popcorn-Time-0.4.6-linux64.zip`
`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`
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.6-linux64.zip -d /opt/popcorn-time`
`sudo unzip Popcorn-Time-0.4.7-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 @@ -172,4 +172,4 @@ You should have received a copy of the GNU General Public License along with thi

***

Copyright © 2021 Popcorn Time Project - Released under the [GPL v3 license](LICENSE.txt).
Copyright © 2022 Popcorn Time Project - Released under the [GPL v3 license](LICENSE.txt).
24 changes: 13 additions & 11 deletions casks/popcorn-time.rb
@@ -1,6 +1,6 @@
cask "popcorn-time" do
version "0.4.6"
sha256 "cacf8ed13b427bceb481ba88ff97ff297f7e9e0487f1411f8d20ff87dd674ddb"
version "0.4.7"
sha256 "cddc2f156dd3cd4fbc7ccd3b3a02c00d3546886dcad183cd1f5dcd984b609c2c"

server = "popcorn-ru.tk"
homepage = "http://#{server}"
Expand Down Expand Up @@ -28,17 +28,19 @@

db = "#{app_support}/Popcorn-Time/Default/data/settings.db"

%w[Movies Series].each do |medium|
setting = {
key: "custom#{medium}Server",
value: "https://#{server}/",
_id: SecureRandom.alphanumeric,
}
settings = File.read(db).lines
if File.exists?(db)
%w[Movies Series].each do |medium|
setting = {
key: "custom#{medium}Server",
value: "https://#{server}/",
_id: SecureRandom.alphanumeric,
}
settings = File.read(db).lines

next if settings.grep(/#{setting[:key]}/).any?
next if settings.grep(/#{setting[:key]}/).any?

`echo '#{setting.to_json}' >> '#{db}'`
`echo '#{setting.to_json}' >> '#{db}'`
end
end
end

Expand Down
120 changes: 0 additions & 120 deletions dist/package.json

This file was deleted.

1 change: 0 additions & 1 deletion docs/Planned-Features.md

This file was deleted.

1 change: 0 additions & 1 deletion docs/RoadMap.md

This file was deleted.

0 comments on commit 31c109b

Please sign in to comment.