peerflixrb 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6bfdb5bcbdb1527015606cc4773e711ef704e85
-  data.tar.gz: b99f8dfec68f877917e4856099f087e785bf41f9
+  metadata.gz: ecd842be46cd8c610100394084b572f3a2b30e7a
+  data.tar.gz: 9323654ec6e8fa53c1145f674484e3665486650b
 SHA512:
-  metadata.gz: 24482a1282f2d8907cac9b86f2bc9240298e01584ee81021b44796176ba9bf06b3305ccc97705302fdee93c16f1264fb6cf8c0a05f12ed6565419de2afad998c
-  data.tar.gz: b987b081bc33bdb1ba487226c2473a9fce2e5f946315c1c631f39c4609637bcc2dca3b0f1b67d6491b1183c07623832fc56a5177121c8944f1ad3fe9b391076a
+  metadata.gz: 6fc3279083411f97554e670daaf94c2b9e2a3891decc6a909ab47e70d8ecc351f99a76ac4a6000c1add86c33f774196a4ca9314bcf0d1040749ef3e506de0eb8
+  data.tar.gz: 6d3e85cabcb11806c7e6f23d7034227a7fa61a176f81d00b1fa4a8e403fb2b0e7b3815c145f06c5a5970b4d7b1f07afadd8a2718fe521099ecb0a2959dedb3bb

data/README.md

@@ -20,9 +20,13 @@ Install the gem:
 
 ## Usage
 
-Pass a string with what you want to watch and it will try to fetch the file and play it through peerflix:
+Pass a string with what you want to watch and it will search KAT with your query and present you with the first 5 results for you to choose. The file selected will then be sent to **peerflix**.
 
-    $ peerflixrb suits s05e12
+    $ peerflixrb Suits s05e12
+
+If you prefer to autoplay the first matched result, use the ```-y``` flag:
+
+    $ peerflixrb -y Archer s07e02
 
 You can play the video with subtitles with the ```-s``` option (Default: English). It will try and find the best match in [Addic7ed](http://www.addic7ed.com/).
 
@@ -34,11 +38,11 @@ Choose the language with ```-l LANGUAGE``` ([Available Languages](https://github
 
 If you prefer to use your own subtitles file, you can do that with the ```-t SUBTITLE_FILE``` option.
 
-    $ peerflixrb better call saul s02e04 -t subtitle_file.srt
+    $ peerflixrb Better Call Saul s02e04 -t subtitle_file.srt
 
 You can autoplay in VLC or MPlayer with the corresponding option (Default: VLC).
 
-    $ peerflixrb --mplayer the big bang theory s09e16 hdtv
+    $ peerflixrb --mplayer The Big Bang Theory s09e16 HDTV
 
 Or you can just let it download without autoplaying with ```-n``` or ```--no-player```.
 

data/bin/peerflixrb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
 
 require 'optparse'
 require 'peerflixrb'
+require 'peerflixrb/commands'
 
 options = {
   language: 'en',
@@ -12,14 +13,18 @@ options = {
 optparse = OptionParser.new do |opts|
   opts.banner = 'Usage: peerflixrb [options] <search>'
 
-  opts.on('-s', '--find-subtitles', 'Find subtitles on Addic7ed') do |s|
-    options[:find_subtitles] = s
+  opts.on('-s', '--find-subtitles', 'Find subtitles on Addic7ed') do
+    options[:find_subtitles] = true
   end
 
   opts.on('-n', '--no-player', "Don't autoplay") do
     options[:video_player] = nil
   end
 
+  opts.on('-y', '--auto-select', 'Select first match') do
+    options[:auto_select] = true
+  end
+
   opts.on('-m', '--mplayer', 'Autoplay in mplayer*') do
     options[:video_player] = 'mplayer'
   end
@@ -56,40 +61,42 @@ if options[:search].empty?
   exit
 end
 
-# main
-# TODO: handle failing and invalid searches
-kat = Peerflixrb::KAT.new(options[:search])
-cache_dir = "/tmp/torrent-stream/#{kat.info_hash}"
-
-# Subtitle search
-sub_file = if options[:find_subtitles]
-             Peerflixrb.find_subtitles(kat.filename, options[:language])
-           elsif options[:subtitles]
-             options[:subtitles]
-           end
-
-# Was there a problem with the subtitle?
-if options[:find_subtitles] && sub_file.nil?
-  puts 'Do you want to continue? [Y/n]'
-  response = $stdin.gets.chomp.downcase
-  exit if response == 'n' || response == 'no'
-end
+# main program
+begin
+  system 'clear'
+  cli = Commands::cli
 
-# Peerflix command build
-command = "peerflix '#{kat.magnet}'"
-command << " --subtitles '#{sub_file}'" if sub_file
-command << " --#{options[:video_player]}" if options[:video_player]
-command << ' -- --fullscreen'
+  # KAT Search
+  cli.say "Searching KAT for #{options[:search].blue}".yellow
+  kat_search = KAT.new(options[:search])
+
+  # Did it find results?
+  if not kat_search.results_found
+    cli.say "No results found for #{options[:search].blue}".red
+    exit
+  end
+
+  # Choose link and subtitles
+  link, sub_file = Commands.choose_video_and_subtitles(options, kat_search)
+
+  # Peerflix command build
+  command = "peerflix '#{link.magnet}'"
+  command << " --subtitles '#{sub_file}'" if sub_file
+  command << " --#{options[:video_player]}" if options[:video_player]
+  command << ' -- --fullscreen'
 
-begin
   # Execute peerflix
+  cli.say "Executing peerflix with #{link.filename.blue} ".yellow
+  cli.say "and #{sub_file.blue}".yellow if sub_file
   system command
-rescue Interrupt
-  puts
-  puts 'Interrupted!'
+rescue Interrupt, EOFError
+  cli.say 'Interrupted!'.red
 ensure
   # Cleaning up
-  video_file = Dir["#{cache_dir}/**/*.{mkv,mp4,avi,wmv,mpg,flv,mov}"].first
-  FileUtils.mv(sub_file, File.dirname(video_file)) if sub_file
-  puts "Your downloads will be in #{cache_dir} for 3 days :)"
+  if link
+    cache_dir = "/tmp/torrent-stream/#{link.info_hash}"
+    video_file = Dir["#{cache_dir}/**/*.{mkv,mp4,avi,wmv,mpg,flv,mov}"].first
+    FileUtils.mv(sub_file, File.dirname(video_file)) if sub_file
+    cli.say "Your downloads will be in #{cache_dir.blue} #{'for 3 days :)'.yellow}".yellow
+  end
 end

data/lib/peerflixrb.rb

@@ -1,61 +1,3 @@
-require 'addic7ed'
-require 'cgi'
-require 'erb'
-require 'nokogiri'
-require 'open-uri'
 require 'peerflixrb/version'
-require 'yaml'
-
-module Peerflixrb
-  def self.find_subtitles(video_file, language)
-    episode = Addic7ed::Episode.new(video_file)
-    return File.basename episode.download_best_subtitle!(language)
-  rescue Addic7ed::EpisodeNotFound
-    puts "Episode not found on Addic7ed : #{episode.video_file.filename}."
-  rescue Addic7ed::ShowNotFound
-    puts "Show not found on Addic7ed : #{episode.video_file.filename}."
-  rescue Addic7ed::NoSubtitleFound
-    puts "No (acceptable) subtitle has been found on Addic7ed for #{episode.video_file.filename}."
-  rescue Addic7ed::InvalidFilename
-    puts "Addic7ed gem doesn't like the format passed. Skipping subtitles."
-  end
-
-  ##
-  # Extract file info and magnet link from the first match of your search
-  # KAT.new("Suits s05e16 1080p")
-  class KAT
-    attr_accessor :url
-
-    def initialize(search)
-      @url = "https://kat.cr/usearch/#{ERB::Util.url_encode(search)}/"
-    end
-
-    def page
-      @page ||= Nokogiri::HTML(open(@url))
-    end
-
-    def filename
-      @filename ||= "#{CGI.unescape(params['name'])}.#{params['extension']}"
-    end
-
-    def magnet
-      @magnet ||= params['magnet']
-    end
-
-    def info_hash
-      @info_hash ||= extract_hash
-    end
-
-    private
-
-    def params
-      @params ||= YAML.load page.at_css('.iaconbox > div')['data-sc-params']
-    end
-
-    def extract_hash
-      # Extract magnet properties to a Hash
-      magnet_params = CGI.parse(URI.parse(magnet).query)
-      magnet_params['xt'].first.match(/[0-9A-F]+/).to_s.downcase
-    end
-  end
-end
+require 'peerflixrb/kat'
+require 'peerflixrb/link'

data/lib/peerflixrb/commands.rb

@@ -0,0 +1,72 @@
+require 'addic7ed'
+require 'highline'
+
+module Commands
+  class << self
+    attr_accessor :cli
+  end
+
+  self.cli = HighLine.new
+  HighLine.colorize_strings
+
+  def self.select_link(kat_search)
+    cli.choose(*kat_search.links) do |menu|
+      menu.header = 'Choose which file'.yellow
+      menu.default = '1'
+      menu.select_by = :index
+    end
+  end
+
+  def self.find_subtitles(video_file, language)
+    episode = Addic7ed::Episode.new(video_file)
+    return File.basename episode.download_best_subtitle!(language)
+  rescue Addic7ed::EpisodeNotFound
+    cli.say 'Episode not found on Addic7ed'.red
+  rescue Addic7ed::ShowNotFound
+    cli.say 'Show not found on Addic7ed'.red
+  rescue Addic7ed::NoSubtitleFound
+    cli.say 'No (acceptable) subtitle has been found on Addic7ed'.red
+  rescue Addic7ed::InvalidFilename
+    cli.say 'Addic7ed gem could not parse the filename correctly'.red
+  end
+
+  def self.choose_video_and_subtitles(options, kat_search)
+    # Proactively declare them because they would be lost in the block scope
+    link = nil
+    sub_file = nil
+
+    loop do
+      # Choose file
+      link = (options[:auto_select]) ? kat_search.links.first : select_link(kat_search)
+
+      # Subtitle search
+      sub_file = if options[:find_subtitles]
+                   cli.say "Searching Addic7ed for subtitles for #{link.filename.blue}".yellow
+                   find_subtitles(link.filename, options[:language])
+                 elsif options[:subtitles]
+                   options[:subtitles]
+                 end
+
+      # Was there a problem with the subtitle?
+      if options[:find_subtitles] && sub_file.nil?
+        continue = cli.agree "Do you want to continue? #{'[y/n]'.yellow}".green
+
+        unless continue
+          # If :auto_select, exit program
+          # If video chosen, choose video again
+          if options[:auto_select]
+            exit
+          else
+            system 'clear'
+            next
+          end
+        end
+      end
+
+      # If the loop got here then it found subtitles
+      break
+    end
+
+    [link, sub_file]
+  end
+end

data/lib/peerflixrb/kat.rb

@@ -0,0 +1,40 @@
+require 'erb'
+require 'nokogiri'
+require 'yaml'
+
+##
+# Extract a list of results from your search
+# KAT.new("Suits s05e16 1080p")
+class KAT
+  NUMBER_OF_LINKS = 5
+
+  attr_accessor :url
+
+  def initialize(search)
+    @url = "https://kat.cr/usearch/#{ERB::Util.url_encode(search)}/"
+  end
+
+  def page
+    @page ||= Nokogiri::HTML(open(@url))
+  end
+
+  def results_found
+    @results_found ||= page.at('p:contains("did not match any documents")').nil?
+  end
+
+  def links
+    @links ||= generate_links
+  end
+
+  private
+
+  def generate_links
+    links = []
+    crawled_links = page.css('.iaconbox > div')
+    crawled_links[0..NUMBER_OF_LINKS - 1].each do |link|
+      links << Link.new(YAML.load(link['data-sc-params']))
+    end
+
+    return links
+  end
+end

data/lib/peerflixrb/link.rb

@@ -0,0 +1,34 @@
+require 'cgi'
+require 'open-uri'
+
+##
+# Object that contains the info for a torrent file
+class Link
+  def initialize(params)
+    @params = params
+  end
+
+  def to_s
+    filename
+  end
+
+  def filename
+    @filename ||= "#{CGI.unescape(@params['name'])}.#{@params['extension']}"
+  end
+
+  def magnet
+    @magnet ||= @params['magnet']
+  end
+
+  def info_hash
+    @info_hash ||= extract_hash
+  end
+
+  private
+
+  def extract_hash
+    # Extract magnet properties to a Hash
+    magnet_params = CGI.parse(URI.parse(magnet).query)
+    magnet_params['xt'].first.match(/[0-9A-F]+/).to_s.downcase
+  end
+end

data/lib/peerflixrb/version.rb

@@ -1,3 +1,3 @@
 module Peerflixrb
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/peerflixrb.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'
   spec.add_runtime_dependency 'addic7ed', '~> 2.0'
+  spec.add_runtime_dependency 'highline', '~> 1.7'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peerflixrb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - David Marchante
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +182,9 @@ files:
 - Rakefile
 - bin/peerflixrb
 - lib/peerflixrb.rb
+- lib/peerflixrb/commands.rb
+- lib/peerflixrb/kat.rb
+- lib/peerflixrb/link.rb
 - lib/peerflixrb/version.rb
 - peerflixrb.gemspec
 homepage: https://github.com/iovis9/peerflixrb
@@ -190,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Wrapper for peerflix with automatic search through KAT and Addic7ed.