popcorntime_search 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49e7075c8bf5dbe93df96956e4b2fb99e8b36b54df480ee25bf93ff8d6cb3426
-  data.tar.gz: e328b6e57dccf5f9c8af9034280cca24864df05e5f3b68b5b18200326bb676fc
+  metadata.gz: b9ca6f0d13691ab7be8b7661491aa8fb8418a56ab61c0979d4deccb9cadedf05
+  data.tar.gz: 33b327b652761b235195d08d2c52981d1bb5fd46f244b4264bcd5580a4218b9d
 SHA512:
-  metadata.gz: 19e7546fc3ff15e8c5aaeaf339de9921af26e30bae41553fcaffb9064d1cb21d72ae0f9e7b6ee8107ad852d0935a004f82ae6c23ca97f24c04080f4a65024742
-  data.tar.gz: 4fd058f5a1a2b951b7507f18c9824d21c677baa466b5c1a6801a7b9c2061acc39df16bdeefb126e7a04e72eb1753a22828b24fe537cefd5df18755b07ac502cb
+  metadata.gz: 6e895eaa271d33949815d0b3ad6692e9aeeb0c76f2d0db26e2ac5f6e2e91b8d6832de25e283ea22a4b4db7482253461289586b290d0546a109a33eaa5589b76c
+  data.tar.gz: d3efa522f3a729b1736b8a2a58ac909202b771ee3f54b1aa6926c8386972f01e430d16b2359b843348a4e32ef19679ed03b71b0abd43286fac3a87bfc4bdd8b8

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'factory_girl'
+require 'factory_bot'
 require 'popcorntime_search'
 require 'pry'
 
@@ -11,6 +11,7 @@ FactoryBot.find_definitions
 
 # search = build(:search)
 # movie = build(:movie_result)
-show = build(:show_result)
+# show = build(:show_result)
+season = build(:show_result, :full_season)
 
 Pry.start

data/exe/popcorn

@@ -62,17 +62,20 @@ begin
 
   links = result.links.sort.reverse # Sort by number of seeds desc
 
-  if options[:auto]
-    link = links.first
+  if search.full_season?
+    say links.map(&:magnet).join("\n")
+  elsif options[:auto]
+    say links.first.magnet
   else
     say "Choose a link for #{result.to_s.blue}:".yellow
+
     link = choose(*links) do |menu|
       menu.default = '1'
       menu.select_by = :index_or_name
     end
-  end
 
-  say link.magnet
+    say link.magnet
+  end
 rescue Interrupt, EOFError
   say 'Interrupted!'.red
 rescue SocketError

data/lib/popcorntime_search/helpers.rb

@@ -1,5 +1,5 @@
 module PopcorntimeSearch
   BASE_URL = 'https://tv-v2.api-fetch.website'.freeze
-  SEASON_EPISODE_REGEXP = /s(?<season>\d{1,2})e(?<episode>\d{1,2})|(?<season>\d{1,2})x(?<episode>\d{1,2})/i
-  TITLE_REGEXP = /(?<showname>['\w\s\.]+?)[\s\.-]*?(#{SEASON_EPISODE_REGEXP}|$)/i
+  SEASON_EPISODE_REGEXP = /s(?<season>\d{1,2})(e(?<episode>\d{1,2}))?|(?<season>\d{1,2})x(?<episode>\d{1,2})/i.freeze
+  TITLE_REGEXP = /(?<showname>['\w\s\.]+?)[\s\.-]*?(#{SEASON_EPISODE_REGEXP}|$)/i.freeze
 end

data/lib/popcorntime_search/search.rb

@@ -15,7 +15,7 @@ module PopcorntimeSearch
       @season  = season.to_i if season
       @episode = episode.to_i if episode
 
-      @kind = @season && @episode ? :show : :movie
+      @kind = @season ? :show : :movie
     end
 
     def results
@@ -34,5 +34,9 @@ module PopcorntimeSearch
     rescue SocketError
       @results_found = false
     end
+
+    def full_season?
+      @season && !@episode
+    end
   end
 end

data/lib/popcorntime_search/show_result.rb

@@ -15,6 +15,10 @@ module PopcorntimeSearch
     private
 
     def build_links
+      @episode ? build_episode_links : build_season_links
+    end
+
+    def build_episode_links
       episode_links = self.class.get("/#{@imdb_id}")['episodes'].find do |episode|
         episode['season'] == @season && episode['episode'] == @episode
       end
@@ -22,7 +26,6 @@ module PopcorntimeSearch
       return [] unless episode_links
 
       episode_links['torrents'].each_with_object([]) do |(quality, info), links_list|
-        next if quality == '0'
         links_list << Link.new(title: "#{@title} #{@season}x#{@episode.to_s.rjust(2, '0')}",
                                imdb_id: imdb_id,
                                magnet: info['url'],
@@ -33,5 +36,28 @@ module PopcorntimeSearch
                                provider: info['provider'])
       end
     end
+
+    def build_season_links
+      season_links = self.class.get("/#{@imdb_id}")['episodes'].select do |episode|
+        episode['season'] == @season
+      end
+
+      return [] unless season_links
+
+      season_links.each_with_object([]) do |episode_info, links_list|
+        episode = episode_info['episode']
+
+        quality, info = episode_info['torrents'].max_by { |quality, _| quality.to_i }
+
+        links_list << Link.new(title: "#{@title} #{@season}x#{episode.to_s.rjust(2, '0')}",
+                               imdb_id: imdb_id,
+                               magnet: info['url'],
+                               seeders: info['seeds'],
+                               leechers: info['peers'],
+                               language: 'en',
+                               quality: quality,
+                               provider: info['provider'])
+      end
+    end
   end
 end

data/lib/popcorntime_search/version.rb

@@ -1,3 +1,3 @@
 module PopcorntimeSearch
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: popcorntime_search
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - David Marchante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Search the popcorn-api https://github.com/popcorn-official/popcorn-api