Merge pull request #2570 from popcorn-official/development

Merge dev branch to master
popcorn-official · Jul 16, 2022 · 9fed9bc · 9fed9bc
2 parents cf057c2 + d59a021
commit 9fed9bc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/casks/popcorn-time.rb b/casks/popcorn-time.rb
@@ -1,5 +1,5 @@
 cask "popcorn-time" do
-  version "0.4.7"
+  version "0.4.8"
 
   nwjs = "0.64.0"
   arch = "x64"
@@ -9,7 +9,7 @@
   homepage "https://#{token}.ga/"
 
   repo = "popcorn-official/popcorn-desktop"
-  zip = "#{name.first}-#{version}-Mac.zip"
+  zip = "#{name.first}-#{version}-osx64.zip"
 
   livecheck { url "https://github.com/#{repo}" }
 
@@ -22,7 +22,7 @@
   end
 
   if MacOS.version < :monterey || ENV["HOMEBREW_POPCORN_TIME_BUILD"] == "false"
-    sha256 "91cabf4b161e5b729fe0ace68b5c17cccec2a816fb22f7d0127c70ff1bccb62c"
+    sha256 "15930323f3c58f090e2d47f8d34a65457bb53ae03e948184702f045f6fad0cb3"
 
     url "#{homepage}/build/#{zip}"
   else

diff --git a/src/app/lib/views/torrent-list.js b/src/app/lib/views/torrent-list.js
@@ -64,10 +64,25 @@
             e.stopPropagation();
             const torrent = this.getTorrent(e.target);
             const download = !$(e.target).hasClass('item-play');
+            let imdb_id;
+            let subtitle;
+            let season;
+            let episode;
+            if (App.currentview === 'movies') {
+              imdb_id = App.MovieDetailView.model.get('imdb_id');
+              subtitle = $("#subs-dropdown .selected-lang")[0].classList[$("#subs-dropdown .selected-lang")[0].classList.length - 1];
+            } else if (App.currentview === 'shows') {
+              imdb_id = $('.list .items .item.selected')[0].dataset.imdbId;
+              season = $('.tab-episode.active')[0].attributes['data-season'].value;
+              episode = $('.tab-episode.active')[0].attributes['data-episode'].value;
+            }
             var torrentStart = new Backbone.Model({
                 torrent: torrent.url,
                 title: this.model.get('select') && !download ? null : torrent.title,
-                defaultSubtitle: Settings.subtitle_language,
+                defaultSubtitle: subtitle || Settings.subtitle_language,
+                imdb_id: imdb_id,
+                season: season,
+                episode: episode,
                 device: App.Device.Collection.selected,
                 // file_name: e.target.parentNode.firstChild.innerHTML
             });