peerflixrb 3.3.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28dee26c7121a4b77a4a83672de1b12f8b0424d9
-  data.tar.gz: f3f91e3577da7447ca3de368ed7062b4393cb3cf
+  metadata.gz: 02f23b780d206d3dbdc937234452e66a8d8a5ea6
+  data.tar.gz: 1644ccc35b738127247d8dfc5390861461b00ba0
 SHA512:
-  metadata.gz: b104f64a4f651c4e59eb28599f3ddeacaf173eb1b6ed628a79b1e9e0e6763cb65dc2d441af9d472ec99d1b7e58c9d5476b1470f3fd2e35d6df14b8061fb244ee
-  data.tar.gz: 47f59fb6b875063ec9d9242185076c373b4bdbe196b31c26426277259b80697cd2574d04c0706d8b73632a4e367a04715b6ce3dd22be101cb60566ed906252d7
+  metadata.gz: 233e13c5afc8ea8f1d58bb0f82146d5ecd80e4a3f276fb410540ed874fe0818e2777233913ee5cc398d4c24df769874f513ee848a4e89efd0e6f7794d77cc87e
+  data.tar.gz: b5bbebdf67d944f4a4f88baf9a3166ceeb13bb2c99f25f018484857ef756e9ae44c02da83c5a0b99a0788497774642f5b51e6ac9b836659d03dcd61cecc98753

data/README.md

@@ -2,14 +2,14 @@
 
 # Peerflixrb
 
-Wrapper for [peerflix](https://github.com/mafintosh/peerflix) with automatic search through [Kickass Torrents](kat.cr), [YifySubtitles](http://www.yifysubtitles.com/) and [Addic7ed](http://www.addic7ed.com/) (with [gem addic7ed_downloader](https://github.com/iovis9/addic7ed_downloader)).
+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/) (with [gem addic7ed_downloader](https://github.com/iovis9/addic7ed_downloader)).
 
 
 ## Requirements
 
-Make sure you have my fork of **peerflix** installed:
+Make sure you have **webtorrent-cli** installed:
 
-    $ npm install -g iovis9/peerflix
+    $ npm install -g webtorrent-cli
 
 
 ## Installation
@@ -20,16 +20,16 @@ Install the gem:
 
 ## Usage
 
-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**. For **TV Shows** use the format S01E01.
+Pass a string with what you want to watch and it will search Zooqle with your query and present you with the first 5 results for you to choose. The file selected will then be sent to **webtorrent**. For **TV Shows** use the format S01E01.
 
     $ peerflixrb Suits s05e12
     $ peerflixrb The Godfather II
 
 If you prefer to autoplay the first matched result, use the ```-y``` flag:
 
-    $ peerflixrb -y Archer s07e02 1080p
+    $ 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 [YifySubtitles](http://www.yifysubtitles.com/) if it's a movie and if [Addic7ed](http://www.addic7ed.com/) if it's a TV Show.
+You can play the video with subtitles with the ```-s``` option (Default: English). It will try and find the best match in [YifySubtitles](http://www.yifysubtitles.com/) if it's a movie, and in [Addic7ed](http://www.addic7ed.com/) if it's a TV Show.
 
     $ peerflixrb -s Birdman
     $ peerflixrb -s The Wire s04e05
@@ -46,7 +46,7 @@ If you prefer to use your own subtitles file, you can do that with the ```-t SUB
 
 You can autoplay in VLC or mpv with the corresponding option (Default: VLC).
 
-    $ peerflixrb --mpv The Big Bang Theory s09e16 HDTV
+    $ peerflixrb --mpv The Big Bang Theory s09e16
 
 It works with DLNA too with the ```-u``` option (subtitles too!).
 
@@ -55,8 +55,8 @@ Or you can just let it download without autoplaying with ```-n``` or ```--no-pla
 
 ## 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).
+Webtorrent 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). When downloading with ```-n``` the output folder is the same peerflixrb was run.
 
 ## Contributing
 

data/exe/peerflixrb

@@ -14,23 +14,14 @@ options = {
 optparse = OptionParser.new do |opts|
   opts.banner = 'Usage: peerflixrb [options] <search>'
 
-  opts.on('-s', '--find-subtitles', 'Find subtitles') do
-    options[:find_subtitles] = true
-  end
-
-  opts.on('-S', '--choose-subtitles', 'Choose subtitles from Addic7ed') do
-    options[:find_subtitles] = true
-    options[:choose_subtitles] = true
+  opts.on('-y', '--auto-select', 'Select first match') do
+    options[:auto_select] = true
   end
 
-  opts.on('-n', '--no-player', "Don't autoplay") do
+  opts.on('-n', '--no-player', "Don't autoplay (just download)") 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
@@ -47,8 +38,13 @@ optparse = OptionParser.new do |opts|
     options[:video_player] = 'dlna'
   end
 
-  opts.on('-t SUBTITLE_FILE', '--subtitles SUBTITLE_FILE', 'Use local subtitles') do |t|
-    options[:subtitles] = t
+  opts.on('-s', '--find-subtitles', 'Find subtitles') do
+    options[:find_subtitles] = true
+  end
+
+  opts.on('-S', '--choose-subtitles', 'Choose subtitles (only Addic7ed)') do
+    options[:find_subtitles] = true
+    options[:choose_subtitles] = true
   end
 
   opts.on('-l LANGUAGE', '--language LANGUAGE', 'Language code to look subtitles for (default: English)') do |l|
@@ -56,6 +52,10 @@ optparse = OptionParser.new do |opts|
     options[:language] = l
   end
 
+  opts.on('-t SUBTITLE_FILE', '--subtitles SUBTITLE_FILE', 'Use local subtitles') do |t|
+    options[:subtitles] = t
+  end
+
   opts.on('-v', '--version', 'Print version and exit') do
     puts "Peerflixrb v#{Peerflixrb::VERSION}"
     exit
@@ -101,14 +101,13 @@ begin
   # Choose link and subtitles
   link, sub_file = commands.choose_video_and_subtitles(torrent_search, options)
 
-  # Peerflix command build
-  command = "peerflix '#{link.magnet}'"
+  # Webtorrent command build
+  command = "webtorrent '#{link.magnet}'"
   command << " --subtitles \"#{sub_file}\"" if sub_file
   command << " --#{options[:video_player]}" if options[:video_player]
-  command << ' -- --fullscreen' if %w(vlc mpv).include? options[:video_player]
 
-  # Execute peerflix
-  cli.say "Executing peerflix with #{link.filename.blue} ".yellow
+  # Execute webtorrent
+  cli.say "Executing webtorrent with #{link.filename.blue} ".yellow
   cli.say "and #{sub_file.blue}".yellow if sub_file
   system command
 rescue Interrupt, EOFError
@@ -118,7 +117,13 @@ rescue SocketError
 ensure
   # Cleaning up
   if link
-    cache_dir = "/tmp/torrent-stream/#{link.info_hash}"
+    cache_dir = if options[:video_player]
+                  "/tmp/webtorrent/#{link.info_hash}"
+                else
+                  # Current directory if download only
+                  Dir.pwd
+                end
+
     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

data/lib/peerflixrb/commands.rb

@@ -16,8 +16,8 @@ module Peerflixrb
         exit
       end
 
-      unless system('peerflix --version > /dev/null 2>&1')
-        cli.say 'peerflix is required. Type "npm install -g iovis9/peerflix" in your shell to install it.'.red
+      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
         exit
       end
     end

data/lib/peerflixrb/version.rb

@@ -1,3 +1,3 @@
 module Peerflixrb
-  VERSION = '3.3.1'.freeze
+  VERSION = '4.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peerflixrb
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 4.0.0
 platform: ruby
 authors:
 - David Marchante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addic7ed_downloader