peerflixrb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7923defe877bc6dad1ea6698fbf022b33d5a60fd
-  data.tar.gz: 7cf7ceffaa4f693828bc581c8e804fd8d2932073
+  metadata.gz: 6be0fd92f01b850ea44badcb38422e6c68c4e6c5
+  data.tar.gz: 866101d388447ad1b22034a39980854625398ad5
 SHA512:
-  metadata.gz: 0e87cfba2ff48d72d4329e5a08c301e1461ca8cdef580ea6a60b6c2496fb0708d0485987a89b834f38130f29d1decb21e56a03ea893426f55b5c6b1b188fb038
-  data.tar.gz: bc124155b7804678a142ec38d81fe64b47cb7b3f5407f011ad6bc9826558b7af60e887c189c60805776ea7420b02920ab383d0785280043859b42a08657148a9
+  metadata.gz: b219e41fa771fcca740a82e682c1435e787d0027242d592bc36e8af310007818bb86a8318773ffd73017bafc624727c1e9e01c976bbf5e14ed49fa2637564bd0
+  data.tar.gz: 9609223d1a4b787afff08c045b1fca142d059263ff27491a37261fec1750c1fda3145e01ccf25b033adcfca535aa32310720e24132746e219e02c83c70801f5e

data/README.md

@@ -2,7 +2,7 @@
 
 # Peerflixrb
 
-Wrapper for [peerflix](https://github.com/mafintosh/peerflix) with automatic search through [Kickass Torrents](kat.cr) and [Addic7ed](http://www.addic7ed.com/) (with [gem addic7ed](https://github.com/michaelbaudino/addic7ed-ruby)). It currently uses [VLC](http://www.videolan.org/vlc/index.html) as the player.
+Wrapper for [peerflix](https://github.com/mafintosh/peerflix) with automatic search through [Kickass Torrents](kat.cr) and [Addic7ed](http://www.addic7ed.com/) (with [gem addic7ed](https://github.com/michaelbaudino/addic7ed-ruby)).
 
 
 ## Requirements
@@ -11,8 +11,6 @@ Make sure you have **peerflix** installed:
 
     $ npm install -g peerflix
 
-It currently supports VLC only as the media player (more to come in future releases).
-
 
 ## Installation
 Install the gem:
@@ -28,7 +26,7 @@ Pass a string with what you want to watch and it will try to fetch the file and
 
 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/).
 
-    $ peerflixrb -s Game Of Thrones S05E01
+    $ peerflixrb -s Game Of Thrones S05E01 1080p
 
 Choose the language with ```-l LANGUAGE``` ([Available Languages](https://github.com/michaelbaudino/addic7ed-ruby/blob/master/lib/addic7ed/common.rb))
 
@@ -36,14 +34,17 @@ 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.
 
-    $ peerflix 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.
 
+    $ peerflixrb --vlc the big bang theory s09e16 hdtv
 
-## Future plans
 
-- Use cache if any.
-- Choose player (currently VLC).
+## Cache
 
+The original peerflix takes care of cache so you can resume your downloads or watch them again.
+peerflixrb will tell you where they are located so you can do as you like or leave them there till your OS takes care of it (it's stored in /tmp).
 
 ## Contributing
 

data/bin/peerflixrb

@@ -1,18 +1,25 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -w
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
 
-require 'addic7ed'
 require 'optparse'
 require 'peerflixrb'
 
 options = {}
-OptionParser.new do |opts|
+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
   end
 
+  opts.on('-m', '--mplayer', 'Autoplay in mplayer*') do
+    options[:video_player] = 'mplayer'
+  end
+
+  opts.on('-v', '--vlc', 'Autoplay in vlc*') do
+    options[:video_player] = 'vlc'
+  end
+
   opts.on('-t SUBTITLE_FILE', '--subtitles SUBTITLE_FILE', 'Use local subtitles') do |t|
     options[:subtitles] = t
   end
@@ -23,47 +30,44 @@ OptionParser.new do |opts|
 
   opts.on_tail('-h', '--help', 'Show this message') do
     puts opts
+    puts '* Autoplay can take several seconds to start since it needs to wait for the first piece'
     exit
   end
-end.parse!
+end
 
-# Default language: English
-options[:language] ||= 'en'
+optparse.parse!
 
 # Join arguments to create the search term
-options[:search] = ARGV.join ' '
-exit if options[:search].empty?
+options[:search] = ARGV.join(' ')
+if options[:search].empty?
+  puts optparse # Show usage if no search
+  exit
+end
+
+# Default language: English
+options[:language] ||= 'en'
 
 # main
 # TODO: handle failing and invalid searches
 kat = Peerflixrb::KAT.new(options[:search])
+cache_dir = "/tmp/torrent-stream/#{kat.info_hash}"
 
 # Subtitle search
-if options[:find_subtitles]
-  begin
-    ep = Addic7ed::Episode.new(kat.filename)
-    sub_file = File.basename(ep.download_best_subtitle!(options[:language]))
-  rescue Addic7ed::EpisodeNotFound
-    puts "Episode not found on Addic7ed : #{ep.video_file.filename}."
-  rescue Addic7ed::ShowNotFound
-    puts "Show not found on Addic7ed : #{ep.video_file.filename}."
-  rescue Addic7ed::NoSubtitleFound
-    puts "No (acceptable) subtitle has been found on Addic7ed for #{ep.video_file.filename}."
-  rescue Addic7ed::InvalidFilename
-    puts "Addic7ed gem doesn't like the format passed. Skipping subtitles."
-  end
-end
+sub_file = if options[:find_subtitles]
+             Peerflixrb.find_subtitles(kat.filename, options[:language])
+           elsif options[:subtitles]
+             options[:subtitles]
+           end
 
 # Peerflix command build
 command = "peerflix '#{kat.magnet}'"
-command << " --subtitles '#{sub_file}'" unless sub_file.nil?
-command << " --subtitles '#{options[:subtitles]}'" if options[:subtitles]
-# TODO: choose video player (default: VLC)
-command << ' --vlc'
-# TODO: pipe options and leave these as default
+command << " --subtitles '#{sub_file}'" if sub_file
+command << " --#{options[:video_player]}" if options[:video_player]
 command << ' -- --fullscreen'
 
 system command
 
 # Cleaning up
-FileUtils.rm sub_file unless sub_file.nil?
+video_file = Dir["#{cache_dir}/**/*.{mkv,mp4,avi,wmv,mpg,flv,mov}"].first
+FileUtils.cp(sub_file, File.dirname(video_file)) if sub_file
+puts "Your downloads will be in #{cache_dir} for 3 days :)"

data/lib/peerflixrb.rb

@@ -1,15 +1,30 @@
-require 'peerflixrb/version'
+require 'addic7ed'
+require 'cgi'
+require 'erb'
 require 'nokogiri'
 require 'open-uri'
-require 'erb'
+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, :page, :filename, :magnet
+    attr_accessor :url
 
     def initialize(search)
       @url = "https://kat.cr/usearch/#{ERB::Util.url_encode(search)}/"
@@ -20,17 +35,27 @@ module Peerflixrb
     end
 
     def filename
-      @filename ||= CGI.unescape(params['name']) + '.' + params['extension']
+      @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

data/lib/peerflixrb/version.rb

@@ -1,3 +1,3 @@
 module Peerflixrb
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peerflixrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - David Marchante