peerflixrb 5.2.2 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f05196d64c582760467611d5748d579767a5981d
-  data.tar.gz: ea7d85e3a42883fb74a71b653bf018150831de84
+  metadata.gz: 601e90feab0054afdc5e67f5105ab704b7b7b0f7
+  data.tar.gz: d6eeffe48387fef754ed3ac4948a54a4cb79d016
 SHA512:
-  metadata.gz: b9453044a369dc7f78d8f8740623d227a061e636c4903a5bf51b26e17824eeb500a050bd85f78f1a3429d32ac43dc849520fbba1a4926819751f07d8fb4e07f6
-  data.tar.gz: 5e74301391183a32143a641f1ba05bff46e9de2ce7aa6ddecc088566813fe2fde9963b49fe0a4a4a266ef4c38860be9f3306495362ba8af58314c93aa5e4854f
+  metadata.gz: a2c051960245f97b5a75de7121c0a264fe237dec1c323c7c6e3954f647237e048d627c264e224e11c1844def866a1fb787aaf76757e81eb99c6255a8560640b1
+  data.tar.gz: 65aa8eca938b268425f7c9c9b2d53237085c06a3d347a205065852b7aa71e47a7851e4463a3e2d5b6e721eb444cf91b610af11c1558cff58b845559bde4e7c62

data/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in peerflixrb.gemspec
 gemspec

data/README.md

@@ -2,7 +2,7 @@
 
 # Peerflixrb
 
-Wrapper for [webtorrent-cli](https://github.com/feross/webtorrent-cli) with automatic search through [Zooqle](https://zooqle.com), [YifySubtitles](http://www.yifysubtitles.com/) and [Addic7ed](http://www.addic7ed.com/).
+Wrapper for [webtorrent-cli](https://github.com/feross/webtorrent-cli) with automatic search through [Popcorn Time](https://github.com/popcorn-official/popcorn-api), [YifySubtitles](http://www.yifysubtitles.com/) and [Addic7ed](http://www.addic7ed.com/).
 
 
 ## Installation

data/exe/peerflixrb

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 
+require 'highline/import'
 require 'optparse'
 require 'peerflixrb'
-require 'zooqle_search'
+require 'popcorntime_search'
 
 options = {
   language: 'en',
@@ -85,23 +86,40 @@ end
 # main program
 begin
   commands = Peerflixrb::Commands.new
-  cli = commands.cli
 
   # Check requirements
   webtorrent = commands.webtorrent
 
-  # Torrent Search
-  cli.say "Searching torrent for #{options[:search].blue}".yellow
-  torrent_search = ZooqleSearch::Search.new(options[:search])
+  # Search
+  say "Searching torrent for #{options[:search].blue}".yellow
+  search = PopcorntimeSearch::Search.new(options[:search])
 
   # Did it find results?
-  unless torrent_search.results_found?
-    cli.say "No results found for #{options[:search].blue}".red
+  unless search.results_found?
+    say "No results found for #{options[:search].blue}".red
+    exit
+  end
+
+  # If 'auto' or only one result, pick the first/only one
+  if options[:auto] || search.results.one?
+    search_result = search.results.first
+  else
+    # If there are several matches, choose the appropriate one
+    say "Search results for #{options[:search].blue}:".yellow
+    search_result = choose(*search.results) do |menu|
+      menu.default = '1'
+      menu.select_by = :index
+    end
+  end
+
+  if search_result.links.empty?
+    say 'No results found'.red
     exit
   end
 
   # Choose link and subtitles
-  link, sub_file = commands.choose_video_and_subtitles(torrent_search, options)
+  options[:kind] = search_result.kind
+  link, sub_file = commands.choose_video_and_subtitles(search_result, options)
 
   # Webtorrent command build
   command = "#{webtorrent} '#{link.magnet}'"
@@ -109,13 +127,13 @@ begin
   command << " --#{options[:video_player]}" if options[:video_player]
 
   # Execute webtorrent
-  cli.say "Executing webtorrent with #{link.filename.blue} ".yellow
-  cli.say "and #{sub_file.blue}".yellow if sub_file
+  say "Executing webtorrent with #{link.title.blue} ".yellow
+  say "and #{sub_file.blue}".yellow if sub_file
   system command
 rescue Interrupt, EOFError
-  cli.say 'Interrupted!'.red
+  say 'Interrupted!'.red
 rescue SocketError
-  cli.say "Couldn't perform action. Are you online?".red
+  say "Couldn't perform action. Are you online?".red
 ensure
   # Cleaning up
   if link
@@ -128,6 +146,6 @@ ensure
 
     video_file = Dir["#{cache_dir}/**/*.{mkv,mp4,avi,wmv,mpg,flv,mov}"].first
     FileUtils.mv(sub_file, File.dirname(video_file)) if sub_file && video_file
-    cli.say "Your downloads will be in #{cache_dir.blue} #{'for 3 days :)'.yellow}".yellow
+    say "Your downloads will be in #{cache_dir.blue} #{'for 3 days :)'.yellow}".yellow
   end
 end

data/lib/peerflixrb.rb

@@ -1,4 +1,3 @@
 require 'peerflixrb/commands'
-require 'peerflixrb/imdb'
 require 'peerflixrb/version'
 require 'peerflixrb/yify'

data/lib/peerflixrb/commands.rb

@@ -1,25 +1,22 @@
 require 'addic7ed_downloader'
-require 'highline'
+require 'highline/import'
 
 BINARY_PATH = File.join(File.dirname(__FILE__), %w(.. .. bin))
 
 module Peerflixrb
   class Commands
-    attr_reader :cli
-
     def initialize
-      @cli = HighLine.new
       HighLine.colorize_strings
     end
 
     def check_requirements
       unless system('node --version > /dev/null 2>&1')
-        cli.say 'Nodejs is required to make it work.'.red
+        say 'Nodejs is required to make it work.'.red
         exit
       end
 
       unless system('webtorrent --version > /dev/null 2>&1')
-        cli.say 'webtorrent is required. Type "npm install -g webtorrent-cli" in your shell to install it.'.red
+        say 'webtorrent is required. Type "npm install -g webtorrent-cli" in your shell to install it.'.red
         exit
       end
     end
@@ -29,26 +26,28 @@ module Peerflixrb
       return 'webtorrent' if check_requirements
     end
 
-    def choose_video_and_subtitles(torrent_search, options)
+    def choose_video_and_subtitles(search_result, options)
       # Proactively declare them because they would be lost in the block scope
-      link = nil
+      link     = nil
+      links    = search_result.links.sort.reverse
       sub_file = nil
 
       loop do
         # Choose file
-        link = options[:auto_select] ? torrent_search.links.first : select_link(torrent_search)
+        link = options[:auto_select] ? links.first : select_link(links)
 
         # Subtitle search
         sub_file = if options[:find_subtitles]
-                     cli.say "Searching subtitles for #{link.filename.blue}".yellow
-                     find_subtitles(link.filename, options)
+                     # TODO
+                     say "Searching subtitles for #{link.title.blue}".yellow
+                     find_subtitles(link, options)
                    elsif options[:subtitles]
                      options[:subtitles]
                    end
 
         # Was there a problem with the subtitle?
         if options[:find_subtitles] && sub_file.nil?
-          continue = cli.agree "Could not find subtitles. Do you want to continue? #{'[y/n]'.yellow}".blue
+          continue = agree "Could not find subtitles. Do you want to continue? #{'[y/n]'.yellow}".blue
 
           unless continue
             # If :auto_select, exit program
@@ -71,39 +70,33 @@ module Peerflixrb
 
     private
 
-    def select_link(torrent_search)
-      cli.say "Choose file (#{'seeders'.green}/#{'leechers'.red}):"
-
-      cli.choose(*torrent_search.links) do |menu|
+    def select_link(links)
+      say "Choose file (#{'seeders'.green}/#{'leechers'.red}):"
+      choose(*links) do |menu|
         menu.default = '1'
         menu.select_by = :index
       end
     end
 
-    def find_subtitles(video_file, options)
-      # Matches format 's06e02'? => TV Show
-      if options[:search][/s\d{1,2}e\d{1,2}/i]
-        find_tv_subtitles(video_file, options)
-      else
-        movie = Imdb.find(options[:search])
-        YifySubtitles.download(movie.imdb_id, 'english')
-      end
-    end
-
-    def find_tv_subtitles(video_file, options)
-      # TV Show search based on video filename
-      search = Addic7edDownloader::Search.by_filename options[:search],
-                                                      lang: options[:language]
-      search.extract_tags(video_file)
-      return search.download_best unless options[:choose_subtitles]
+    def find_subtitles(link, options)
+      case options[:kind]
+      when :movie
+        YifySubtitles.download(link.imdb_id, 'english')
+      when :show
+        filename = link.filename || link.title
+        search = Addic7edDownloader::Search.by_filename(filename, lang: options[:language])
+
+        return search.download_best unless options[:choose_subtitles]
+
+        # Choose subtitle
+        say "Choose subtitles for #{filename.blue}:".yellow
+        subtitle = choose(*search.results) do |menu|
+          menu.default = '1'
+          menu.select_by = :index
+        end
 
-      # Choose subtitle
-      subtitle = cli.choose(*search.results) do |menu|
-        menu.default = '1'
-        menu.select_by = :index
+        search.download_subtitle(subtitle)
       end
-
-      search.download_subtitle(subtitle)
     end
 
     def os

data/lib/peerflixrb/version.rb

@@ -1,3 +1,3 @@
 module Peerflixrb
-  VERSION = '5.2.2'.freeze
+  VERSION = '6.0.0'.freeze
 end

data/peerflixrb.gemspec

@@ -20,17 +20,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'addic7ed_downloader', '~> 1.0'
-  spec.add_runtime_dependency 'zooqle_search', '~> 1.0'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.6'
+  spec.add_runtime_dependency 'popcorntime_search', '~> 0.0'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.8'
   spec.add_runtime_dependency 'highline', '~> 1.7'
-  spec.add_runtime_dependency 'httparty', '~> 0.13'
+  spec.add_runtime_dependency 'httparty', '~> 0.15'
   spec.add_runtime_dependency 'rubyzip', '~> 1.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 11.3'
+  spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'guard-rspec', '~> 4.6'
-  spec.add_development_dependency 'pry', '~> 0.10'
-  spec.add_development_dependency 'pry-byebug', '~> 3.4'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'awesome_print'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peerflixrb
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 6.0.0
 platform: ruby
 authors:
 - David Marchante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-25 00:00:00.000000000 Z
+date: 2017-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addic7ed_downloader
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: zooqle_search
+  name: popcorntime_search
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -154,30 +154,30 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +218,6 @@ files:
 - exe/peerflixrb
 - lib/peerflixrb.rb
 - lib/peerflixrb/commands.rb
-- lib/peerflixrb/imdb.rb
 - lib/peerflixrb/version.rb
 - lib/peerflixrb/yify.rb
 - peerflixrb.gemspec
@@ -242,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Wrapper for peerflix with automatic search through KickAss Torrents, Yifysubtitles

data/lib/peerflixrb/imdb.rb

@@ -1,29 +0,0 @@
-require 'httparty'
-require 'json'
-
-module Peerflixrb
-  module Imdb
-    def self.find(title)
-      params = { 'json' => '1', 'nr' => 1, 'tt' => 'on', 'q' => title }
-      query = HTTParty.get('http://www.imdb.com/xml/find', query: params)
-      results = JSON.load(query)['title_popular']
-
-      # Return the most popular for that search
-      Movie.new(results.first) if results
-    end
-
-    class Movie
-      attr_accessor :imdb_id, :title, :year
-
-      def initialize(params)
-        @imdb_id = params['id']
-        @title = params['title']
-        @year = params['description'].match(/\A\d+/).to_s
-      end
-
-      def to_s
-        "#{title} (#{year})"
-      end
-    end
-  end
-end