peerflixrb 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '038469d53f6bf8fb13d7e2395aec03366266623f'
-  data.tar.gz: 3590a2fdaf30b2742342b489bdb8d288ae1cdfba
+  metadata.gz: bfac2d0e23e7f8cedbf7b36f1453f9912b9645f5
+  data.tar.gz: 5975ecbb732372f750f722b7ea44083345e98f14
 SHA512:
-  metadata.gz: d89862f29e198b0bff01be9c85e4abad173c5ad66761ccebbc1f50eac6e9e9d162dabb2efc6ce0c7678728a28594d8eb1c4062f68b37f76964f3d1d29e8c41ef
-  data.tar.gz: 2da246b6947ef648289599a66f6aba05b890c836abdadf66a681b6df54c6384e9f34c4b86ce0862870d5ccf35bd1d2210e13be1b6f8fc161455ca0021911fa25
+  metadata.gz: fc9fb70e3e861cce8f2256a0522c64328d5b50946dd0149b658e5aee7b2ab4e1fa596b5de5f727743cb3cf81c0245e5e7a09021818f1238c49469a800f80e804
+  data.tar.gz: c83008d59990916ad17ca524528aec587e9c27febd98c1e5785e89959615c9ea3811eba928ab0db6fdc36e164b6a1220fcd27c9849563a787b9bd75d9f8076a5

data/exe/peerflixrb

@@ -2,12 +2,11 @@
 
 require 'optparse'
 require 'peerflixrb'
-require 'peerflixrb/commands'
-require 'tpb_search'
+require 'zooqle_search'
 
 options = {
   language: 'en',
-  video_player: 'vlc'
+  video_player: 'mpv'
 }
 
 optparse = OptionParser.new do |opts|
@@ -25,7 +24,7 @@ optparse = OptionParser.new do |opts|
     options[:video_player] = 'mplayer'
   end
 
-  opts.on('-k', '--mpv', 'Autoplay in mpv*') do
+  opts.on('-k', '--mpv', 'Autoplay in mpv* (Default)') do
     options[:video_player] = 'mpv'
   end
 
@@ -37,6 +36,10 @@ optparse = OptionParser.new do |opts|
     options[:video_player] = 'dlna'
   end
 
+  opts.on('-V', '--vlc', 'Autoplay in vlc*') do
+    options[:video_player] = 'vlc'
+  end
+
   opts.on('-s', '--find-subtitles', 'Find subtitles') do
     options[:find_subtitles] = true
   end
@@ -85,11 +88,11 @@ begin
   cli = commands.cli
 
   # Check requirements
-  commands.check_requirements
+  webtorrent = commands.webtorrent
 
   # Torrent Search
   cli.say "Searching torrent for #{options[:search].blue}".yellow
-  torrent_search = TpbSearch::Search.new(options[:search])
+  torrent_search = ZooqleSearch::Search.new(options[:search])
 
   # Did it find results?
   unless torrent_search.results_found?
@@ -101,7 +104,7 @@ begin
   link, sub_file = commands.choose_video_and_subtitles(torrent_search, options)
 
   # Webtorrent command build
-  command = "webtorrent '#{link.magnet}'"
+  command = "#{webtorrent} '#{link.magnet}'"
   command << " --subtitles \"#{sub_file}\"" if sub_file
   command << " --#{options[:video_player]}" if options[:video_player]
 

data/lib/peerflixrb.rb

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

data/lib/peerflixrb/commands.rb

@@ -3,7 +3,7 @@ require 'highline'
 
 module Peerflixrb
   class Commands
-    attr_accessor :cli
+    attr_reader :cli
 
     def initialize
       @cli = HighLine.new
@@ -22,6 +22,11 @@ module Peerflixrb
       end
     end
 
+    def webtorrent
+      return "bin/webtorrent-cli-#{os}" if os
+      return 'webtorrent' if check_requirements
+    end
+
     def choose_video_and_subtitles(torrent_search, options)
       # Proactively declare them because they would be lost in the block scope
       link = nil
@@ -29,7 +34,7 @@ module Peerflixrb
 
       loop do
         # Choose file
-        link = (options[:auto_select]) ? torrent_search.links.first : select_link(torrent_search)
+        link = options[:auto_select] ? torrent_search.links.first : select_link(torrent_search)
 
         # Subtitle search
         sub_file = if options[:find_subtitles]
@@ -79,13 +84,14 @@ module Peerflixrb
         find_tv_subtitles(video_file, options)
       else
         movie = Imdb.find(options[:search])
-        find_movie_subtitles(movie, 'english')
+        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 = Addic7edDownloader::Search.by_filename options[:search],
+                                                      lang: options[:language]
       search.extract_tags(video_file)
       return search.download_best unless options[:choose_subtitles]
 
@@ -98,9 +104,15 @@ module Peerflixrb
       search.download_subtitle(subtitle)
     end
 
-    def find_movie_subtitles(movie, language)
-      sub_file = YifySubtitles.download(movie.imdb_id, language)
-      return sub_file unless sub_file.nil?
+    def os
+      case RbConfig::CONFIG['host_os'].downcase
+      when /linux/
+        'linux'
+      when /darwin/
+        'macos'
+      when /mswin|mingw/
+        'win.exe'
+      end
     end
   end
 end

data/lib/peerflixrb/version.rb

@@ -1,3 +1,3 @@
 module Peerflixrb
-  VERSION = '5.1.0'.freeze
+  VERSION = '5.2.0'.freeze
 end

data/peerflixrb.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'addic7ed_downloader', '~> 1.0'
-  spec.add_runtime_dependency 'tpb_search'
+  spec.add_runtime_dependency 'zooqle_search', '~> 1.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'
   spec.add_runtime_dependency 'highline', '~> 1.7'
   spec.add_runtime_dependency 'httparty', '~> 0.13'
@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   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 'awesome_print'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peerflixrb
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - David Marchante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addic7ed_downloader
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: tpb_search
+  name: zooqle_search
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: With peerflixrb you can search for movies and TV shows and stream them
   directly on your favorite video player! You can choose the torrent and the subtitles
   file or you can let it choose the best for you.
@@ -198,6 +212,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bin/webtorrent-cli-linux
+- bin/webtorrent-cli-macos
+- bin/webtorrent-cli-win.exe
 - exe/peerflixrb
 - lib/peerflixrb.rb
 - lib/peerflixrb/commands.rb
@@ -225,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Wrapper for peerflix with automatic search through KickAss Torrents, Yifysubtitles