peerflixrb 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d5bfd2e6e48a703fab7ab9eff2e8c9d4960275b
-  data.tar.gz: bb4a9d85db39f8a1ee04f73e64d7ff0c3f1c261f
+  metadata.gz: f0cb0f583c7db883a7ef20d98d274ccb5a6ee2e1
+  data.tar.gz: fa20922a85386110a328491309384981b382c684
 SHA512:
-  metadata.gz: b8410d0412899e51698842a27cdb90eb4fc0304d37dfbc1fa16f01783f3722a5c85185fa32a05e6e784337e1feab509eea1f719c9ebee74b834ac6113c0e26b9
-  data.tar.gz: fff747bbe765928ab2569aeeb6f307f9542e9d508e7b350a9da277e7c55115dba05340ce64c11216cd9f42040c476fe0d2c8f88cfe1312a85bf62616a24b8efe
+  metadata.gz: 421edc242e606f3fbc959470b672fc46775773676199b7a4545d73f898b84581a9c1545cb3c9e86115459020d997cca2343c2091376df820cd9e629899d87e8e
+  data.tar.gz: a4540f142630c2df0fb95703627224ee4c3ec4d735a4fe097fcbfac1e975d731d580bb25574471cf6e26f8349619149b1686614093f1be877d8d1720a8b81c71

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.3.1
 before_install: gem install bundler -v 1.11.2

data/README.md

@@ -2,7 +2,7 @@
 
 # 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](https://github.com/michaelbaudino/addic7ed-ruby)).
+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)).
 
 
 ## Requirements
@@ -20,7 +20,7 @@ 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**.
+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.
 
     $ peerflixrb Suits s05e12
     $ peerflixrb The Godfather II
@@ -34,6 +34,8 @@ You can play the video with subtitles with the ```-s``` option (Default: English
     $ peerflixrb -s Birdman
     $ peerflixrb -s The Wire s04e05
 
+You can choose from a list which subtitle file to use with TV Shows with the option ```-S```.
+
 Choose the language with ```-l LANGUAGE``` ([Available Languages](https://github.com/michaelbaudino/addic7ed-ruby/blob/master/lib/addic7ed/common.rb)). Currently only for TV Shows (Choosing movie subtitles language will come soon!)
 
     $ peerflixrb -sl es-es Breaking Bad s05e03
@@ -42,9 +44,9 @@ If you prefer to use your own subtitles file, you can do that with the ```-t SUB
 
     $ peerflixrb Better Call Saul s02e04 -t subtitle_file.srt
 
-You can autoplay in VLC or MPlayer with the corresponding option (Default: VLC).
+You can autoplay in VLC or mpv with the corresponding option (Default: VLC).
 
-    $ peerflixrb --mplayer The Big Bang Theory s09e16 HDTV
+    $ peerflixrb --mpv The Big Bang Theory s09e16 HDTV
 
 Or you can just let it download without autoplaying with ```-n``` or ```--no-player```.
 

data/bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'peerflixrb'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+require 'pry'
+Pry.start

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/{bin → exe}/peerflixrb

@@ -13,10 +13,15 @@ options = {
 optparse = OptionParser.new do |opts|
   opts.banner = 'Usage: peerflixrb [options] <search>'
 
-  opts.on('-s', '--find-subtitles', 'Find subtitles on Addic7ed') do
+  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
+  end
+
   opts.on('-n', '--no-player', "Don't autoplay") do
     options[:video_player] = nil
   end
@@ -38,6 +43,7 @@ optparse = OptionParser.new do |opts|
   end
 
   opts.on('-l LANGUAGE', '--language LANGUAGE', 'Language code to look subtitles for (default: English)') do |l|
+    options[:find_subtitles] = true
     options[:language] = l
   end
 
@@ -67,7 +73,8 @@ end
 
 # main program
 begin
-  cli = Peerflixrb::Commands::cli
+  commands = Peerflixrb::Commands.new
+  cli = commands.cli
 
   # KAT Search
   cli.say "Searching KAT for #{options[:search].blue}".yellow
@@ -80,7 +87,7 @@ begin
   end
 
   # Choose link and subtitles
-  link, sub_file = Peerflixrb::Commands.choose_video_and_subtitles(kat_search, options)
+  link, sub_file = commands.choose_video_and_subtitles(kat_search, options)
 
   # Peerflix command build
   command = "peerflix '#{link.magnet}'"

data/lib/peerflixrb/commands.rb

@@ -1,25 +1,16 @@
-require 'addic7ed'
+require 'addic7ed_downloader'
 require 'highline'
 
 module Peerflixrb
-  module Commands
-    class << self
-      attr_accessor :cli
-    end
-
-    self.cli = HighLine.new
-    HighLine.colorize_strings
-
-    def self.select_link(kat_search)
-      cli.say "Choose file (#{'seeders'.green}/#{'leechers'.red}):"
+  class Commands
+    attr_accessor :cli
 
-      cli.choose(*kat_search.links) do |menu|
-        menu.default = '1'
-        menu.select_by = :index
-      end
+    def initialize
+      @cli = HighLine.new
+      HighLine.colorize_strings
     end
 
-    def self.choose_video_and_subtitles(kat_search, options)
+    def choose_video_and_subtitles(kat_search, options)
       # Proactively declare them because they would be lost in the block scope
       link = nil
       sub_file = nil
@@ -38,7 +29,7 @@ module Peerflixrb
 
         # 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}".blue
+          continue = cli.agree "Could not find subtitles. Do you want to continue? #{'[y/n]'.yellow}".blue
 
           unless continue
             # If :auto_select, exit program
@@ -59,37 +50,44 @@ module Peerflixrb
       [link, sub_file]
     end
 
-    # Helper methods (private)
-    def self.find_subtitles(video_file, options)
-      # Imdb search based on initial command input
-      movie = Imdb.find(options[:search])
+    private
 
-      if movie
-        # TODO Choose language
-        find_movie_subtitles(movie, 'english')
-      else
-        find_tv_subtitles(video_file, options[:language])
+    def select_link(kat_search)
+      cli.say "Choose file (#{'seeders'.green}/#{'leechers'.red}):"
+
+      cli.choose(*kat_search.links) do |menu|
+        menu.default = '1'
+        menu.select_by = :index
       end
     end
 
-    def self.find_movie_subtitles(movie, language)
-      sub_file = YifySubtitles.download(movie.imdb_id, language)
-      return sub_file unless sub_file.nil?
-      cli.say "Could not find subtitles for #{movie}".red
+    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])
+        find_movie_subtitles(movie, 'english')
+      end
     end
 
-    def self.find_tv_subtitles(video_file, language)
+    def find_tv_subtitles(video_file, options)
       # TV Show search based on video filename
-      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
+      search = Addic7edDownloader::Search.by_string(options[:search], lang: options[:language], filename: video_file)
+      return search.download_best unless options[:choose_subtitles]
+
+      # Choose subtitle
+      subtitle = cli.choose(*search.results) do |menu|
+        menu.default = '1'
+        menu.select_by = :index
+      end
+
+      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?
     end
   end
 end

data/lib/peerflixrb/version.rb

@@ -1,3 +1,3 @@
 module Peerflixrb
-  VERSION = '1.2.2'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/peerflixrb/yify.rb

@@ -44,6 +44,7 @@ module Peerflixrb
         end
       end
 
+      # return subtitle filename
       sub_file
     end
   end

data/lib/peerflixrb.rb

@@ -1,5 +1,5 @@
-require 'peerflixrb/version'
+require 'peerflixrb/imdb'
 require 'peerflixrb/kat'
 require 'peerflixrb/link'
-require 'peerflixrb/imdb'
+require 'peerflixrb/version'
 require 'peerflixrb/yify'

data/peerflixrb.gemspec

@@ -15,17 +15,17 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'bin'
+  spec.bindir        = 'exe'
   spec.executables   = 'peerflixrb'
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'addic7ed_downloader', '~> 0.1'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'
-  spec.add_runtime_dependency 'addic7ed', '~> 2.0'
   spec.add_runtime_dependency 'highline', '~> 1.7'
   spec.add_runtime_dependency 'httparty', '~> 0.13'
   spec.add_runtime_dependency 'rubyzip', '~> 1.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'guard-rspec', '~> 4.6'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: peerflixrb
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - David Marchante
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: addic7ed_downloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: addic7ed
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/peerflixrb
+- bin/console
+- bin/setup
+- exe/peerflixrb
 - lib/peerflixrb.rb
 - lib/peerflixrb/commands.rb
 - lib/peerflixrb/imdb.rb