peerflixrb 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecd842be46cd8c610100394084b572f3a2b30e7a
-  data.tar.gz: 9323654ec6e8fa53c1145f674484e3665486650b
+  metadata.gz: 7f72fe14a2b2bd54ce3302ac31e79d9a20f2dbc5
+  data.tar.gz: a7f4ed3e378c3b3ca7aaf88565b2e9ccb2eac3fc
 SHA512:
-  metadata.gz: 6fc3279083411f97554e670daaf94c2b9e2a3891decc6a909ab47e70d8ecc351f99a76ac4a6000c1add86c33f774196a4ca9314bcf0d1040749ef3e506de0eb8
-  data.tar.gz: 6d3e85cabcb11806c7e6f23d7034227a7fa61a176f81d00b1fa4a8e403fb2b0e7b3815c145f06c5a5970b4d7b1f07afadd8a2718fe521099ecb0a2959dedb3bb
+  metadata.gz: 7234667bc7be33ab9aab85b7fc961d4dadadbb546795ee0a8c60f8ece60649790201fc28230bcb6a3358d13be10c464b2211d869701d1c3020d19afa7b2a1d90
+  data.tar.gz: 40c64762f88130eb69a4746f4307f3293fd9aebd5889af6480ab932800711f59b4cd4f9f309812483491f2785789e34d5d1ffa7b0f48bca7a175179494a552eb

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)).
+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)).
 
 
 ## Requirements
@@ -23,16 +23,18 @@ Install the gem:
 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 The Godfather II
 
 If you prefer to autoplay the first matched result, use the ```-y``` flag:
 
-    $ peerflixrb -y Archer s07e02
+    $ peerflixrb -y Archer s07e02 1080p
 
-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/).
+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.
 
-    $ peerflixrb -s Game Of Thrones S05E01 1080p
+    $ peerflixrb -s Birdman
+    $ peerflixrb -s The Wire s04e05
 
-Choose the language with ```-l LANGUAGE``` ([Available Languages](https://github.com/michaelbaudino/addic7ed-ruby/blob/master/lib/addic7ed/common.rb))
+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
 

data/bin/peerflixrb

@@ -63,12 +63,11 @@ end
 
 # main program
 begin
-  system 'clear'
-  cli = Commands::cli
+  cli = Peerflixrb::Commands::cli
 
   # KAT Search
   cli.say "Searching KAT for #{options[:search].blue}".yellow
-  kat_search = KAT.new(options[:search])
+  kat_search = Peerflixrb::KAT.new(options[:search])
 
   # Did it find results?
   if not kat_search.results_found
@@ -77,7 +76,7 @@ begin
   end
 
   # Choose link and subtitles
-  link, sub_file = Commands.choose_video_and_subtitles(options, kat_search)
+  link, sub_file = Peerflixrb::Commands.choose_video_and_subtitles(kat_search, options)
 
   # Peerflix command build
   command = "peerflix '#{link.magnet}'"

data/lib/peerflixrb.rb

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

data/lib/peerflixrb/commands.rb

@@ -1,72 +1,94 @@
 require 'addic7ed'
 require 'highline'
 
-module Commands
-  class << self
-    attr_accessor :cli
-  end
+module Peerflixrb
+  module Commands
+    class << self
+      attr_accessor :cli
+    end
 
-  self.cli = HighLine.new
-  HighLine.colorize_strings
+    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
+    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
-  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
+    def self.choose_video_and_subtitles(kat_search, options)
+      # 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)
+      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
+        # Subtitle search
+        sub_file = if options[:find_subtitles]
+                     cli.say "Searching subtitles for #{link.filename.blue}".yellow
+                     find_subtitles(link.filename, options)
+                   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
+        # 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
+          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
 
-      # If the loop got here then it found subtitles
-      break
+      [link, sub_file]
     end
 
-    [link, sub_file]
+    # Helper methods (private)
+    def self.find_subtitles(video_file, options)
+      # Imdb search based on initial command input
+      movie = Imdb.find(options[:search])
+
+      if movie
+        # TODO Choose language
+        find_movie_subtitles(movie, 'english')
+      else
+        find_tv_subtitles(video_file, options[:language])
+      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
+    end
+
+    def self.find_tv_subtitles(video_file, language)
+      # 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
+    end
   end
 end

data/lib/peerflixrb/imdb.rb

@@ -0,0 +1,29 @@
+require 'httparty'
+require 'json'
+
+module Peerflixrb
+  module Imdb
+    def self.find(title)
+      params = { 'json' => '1', 'nr' => 1, 'tt' => 'on', 'q' => title }
+      query = HTTParty.get('http://www.imdb.com/xml/find', query: params)
+      results = JSON.load(query)['title_popular']
+
+      # Return the most popular for that search
+      Movie.new(results.first) if results
+    end
+
+    class Movie
+      attr_accessor :imdb_id, :title, :year
+
+      def initialize(params)
+        @imdb_id = params['id']
+        @title = params['title']
+        @year = params['description'].match(/\A\d+/).to_s
+      end
+
+      def to_s
+        "#{title} (#{year})"
+      end
+    end
+  end
+end

data/lib/peerflixrb/kat.rb

@@ -2,39 +2,43 @@ 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
+module Peerflixrb
+  ##
+  # Extract a list of results from your search
+  # KAT.new("Suits s05e16 1080p")
+  class KAT
+    NUMBER_OF_LINKS = 5
 
-  attr_accessor :url
+    attr_accessor :url
 
-  def initialize(search)
-    @url = "https://kat.cr/usearch/#{ERB::Util.url_encode(search)}/"
-  end
+    def initialize(search)
+      @url = "https://kat.cr/usearch/#{ERB::Util.url_encode(search)}/"
+    end
 
-  def page
-    @page ||= Nokogiri::HTML(open(@url))
-  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 results_found
+      @results_found ||= page.at('p:contains("did not match any documents")').nil?
+    rescue OpenURI::HTTPError
+      @results_found = false
+    end
 
-  def links
-    @links ||= generate_links
-  end
+    def links
+      @links ||= generate_links
+    end
 
-  private
+    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
+    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
+      return links
+    end
   end
 end

data/lib/peerflixrb/link.rb

@@ -1,34 +1,36 @@
 require 'cgi'
 require 'open-uri'
 
-##
-# Object that contains the info for a torrent file
-class Link
-  def initialize(params)
-    @params = params
-  end
+module Peerflixrb
+  ##
+  # Object that contains the info for a torrent file
+  class Link
+    def initialize(params)
+      @params = params
+    end
 
-  def to_s
-    filename
-  end
+    def to_s
+      filename
+    end
 
-  def filename
-    @filename ||= "#{CGI.unescape(@params['name'])}.#{@params['extension']}"
-  end
+    def filename
+      @filename ||= "#{CGI.unescape(@params['name'])}.#{@params['extension']}"
+    end
 
-  def magnet
-    @magnet ||= @params['magnet']
-  end
+    def magnet
+      @magnet ||= @params['magnet']
+    end
 
-  def info_hash
-    @info_hash ||= extract_hash
-  end
+    def info_hash
+      @info_hash ||= extract_hash
+    end
 
-  private
+    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
+    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.5.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/peerflixrb/yify.rb

@@ -0,0 +1,48 @@
+require 'httparty'
+require 'zip'
+
+module Peerflixrb
+  module YifySubtitles
+    API_URL  = 'http://api.yifysubtitles.com/subs/'.freeze
+    BASE_URL = 'http://www.yifysubtitles.com'.freeze
+
+    def self.download(imdb_id, language = 'english')
+      url = get_subtitles_url(imdb_id, language)
+      return if url.nil?
+
+      zip = download_subtitles(url)
+      extract_zip(zip)
+    end
+
+    # Helper methods (private)
+    def self.get_subtitles_url(imdb_id, language)
+      results = HTTParty.get(API_URL + imdb_id)
+
+      if results['success'] && results['subtitles'] > 0
+        BASE_URL + results['subs'][imdb_id][language][0]['url']
+      end
+    end
+
+    def self.download_subtitles(url)
+      HTTParty.get(url).body
+    end
+
+    def self.extract_zip(zip_body)
+      sub_file = nil
+
+      Zip::InputStream.open(StringIO.new(zip_body)) do |io|
+        while (entry = io.get_next_entry)
+          # Don't extract if not a subtitle file
+          next unless entry.name =~ /\.(srt|sub|ass)\z/
+
+          sub_file = entry.name
+          open(sub_file, 'w') do |f|
+            f << io.read
+          end
+        end
+      end
+
+      sub_file
+    end
+  end
+end

data/peerflixrb.gemspec

@@ -22,6 +22,8 @@ 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_runtime_dependency 'httparty', '~> 0.13'
+  spec.add_runtime_dependency 'rubyzip', '~> 1.2'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peerflixrb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - David Marchante
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -183,9 +211,11 @@ files:
 - bin/peerflixrb
 - lib/peerflixrb.rb
 - lib/peerflixrb/commands.rb
+- lib/peerflixrb/imdb.rb
 - lib/peerflixrb/kat.rb
 - lib/peerflixrb/link.rb
 - lib/peerflixrb/version.rb
+- lib/peerflixrb/yify.rb
 - peerflixrb.gemspec
 homepage: https://github.com/iovis9/peerflixrb
 licenses: