addic7ed_downloader 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcc85a21ccc66665f2bf28228748d05d60a4339f
-  data.tar.gz: 6be27f833387ee0233d30ebe0e42bfd8605c5d55
+  metadata.gz: 6d5010c8960bd6a47416839f748b667d317ca962
+  data.tar.gz: e8457ab07b0a71d956ddf1bb0930b879b4b098ab
 SHA512:
-  metadata.gz: 7021f4a337497712c2869a395d48cde95c3db6e780f672d98db798dce9ab84ae5590f15dbb3a24e4cb2bde8e3301a00934c509373600db66bb004c85c5b344eb
-  data.tar.gz: d64063f420440ad2e1b614587e347d8459830d36c9673584ad7bf8498213acd94fb2c95bd6c2610a7e0e8c507ae34e76eb4b9f478f49a4b9599b9384dbc6cc9e
+  metadata.gz: 9c3e8788e8906148eb9aa9d1b5e8103d2b3070477a5534283098eeb0d85e3c0120f7c4e4991b272aaf1953c677cef9f5f2b586ee3affc7e6000d15b929372f2c
+  data.tar.gz: a98a926cc5a8ab0a3d0f6adf9500c1e1135cf593df09a1b4c7943452f58c07fa6f5af2b29e74122e0fb3010eb119fe2c6e4c46126331902b4463a22010913714

data/bin/console

@@ -5,6 +5,9 @@ require 'addic7ed_downloader'
 
 # 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.
+filename = "frasier s01e01 Pilot.mkv"
+filename = 'Game.of.Thrones.S06E03.Oathbreaker.1080p.WEB-DL.DD5.1.H264-NTb[rartv].mkv'
+search = Addic7edDownloader::Search.by_filename(filename)
 
 # (If you use this, don't forget to add pry to your Gemfile!)
 require 'pry'

data/exe/addic7ed

@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby -w
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
+
+require 'addic7ed_downloader'
+require 'fileutils'
+require 'highline'
+require 'optparse'
+
+options = {
+  rename: true,
+  language: 'en',
+  path: './'
+}
+
+optparse = OptionParser.new do |opts|
+  opts.banner = 'Usage: addic7ed [options] <search or video file>'
+
+  opts.on('-y', '--auto-download', 'Download best result without confirmation') do
+    options[:auto] = true
+  end
+
+  opts.on('-L', '--list', 'List languages.') do
+    puts 'Available languages:'
+    Addic7edDownloader::LANGUAGES.each { |key, value| puts "#{key}:\t#{value[:name]}" }
+    exit
+  end
+
+  opts.on('-l LANGUAGE', '--language LANGUAGE', 'Language code to look subtitles for (default: English)') do |l|
+    options[:language] = l
+  end
+
+  opts.on('-n', '--no-rename', "Don't automatically rename subtitles if the file exists") do
+    options[:rename] = false
+  end
+
+  opts.on('-p PATH', '--path PATH', 'Path to save the file') do |p|
+    options[:path] = p
+  end
+
+  opts.on('-v', '--version', 'Print version and exit') do
+    puts "addic7ed v#{Addic7edDownloader::VERSION}"
+    exit
+  end
+
+  opts.on_tail('-h', '--help', 'Show this message') do
+    puts opts
+    exit
+  end
+end.parse!
+
+# Join arguments to create the search term
+options[:search] = optparse.join(' ')
+
+# main program
+begin
+  cli = HighLine.new
+  HighLine.colorize_strings # Monkey patch String for cli colors
+
+  # Valid search?
+  if options[:search].empty?
+    cli.say 'Please choose a file or type a search'.red
+    exit
+  end
+
+  # Search subtitle
+  search = Addic7edDownloader::Search.by_filename(options[:search], lang: options[:language])
+
+  # Results found?
+  if search.nil?
+    cli.say 'Error parsing the file or search'.red
+    exit
+  elsif search.results.empty?
+    cli.say 'No subtitles found'.red
+    exit
+  end
+
+  # Choose
+  if options[:auto]
+    subtitles = search.find_best_subtitle
+  else
+    cli.say "Search results for #{search}. Choose the file:"
+    subtitles = cli.choose(*search.results) do |menu|
+      menu.default = '1'
+      menu.select_by = :index
+    end
+  end
+
+  # Download subtitle
+  sub_file = search.download_subtitle(subtitles, options[:path])
+
+  # Rename file to match the video if it exists
+  if options[:rename] && File.exist?(options[:search])
+    # Extract video filename without extension
+    filename = File.basename(options[:search], File.extname(options[:search]))
+    FileUtils.mv(sub_file, "#{filename}#{File.extname(sub_file)}")
+  end
+
+  cli.say 'Subtitle downloaded successfully!'.green
+rescue Interrupt, EOFError
+  cli.say 'Interrupted!'.red
+rescue SocketError
+  cli.say "Couldn't perform action. Are you online?".red
+end

data/lib/addic7ed_downloader/common.rb

@@ -1,9 +1,9 @@
 module Addic7edDownloader
-  SHOWNAME_REGEXP = /([\w\s]+?) s\d{1,2}e\d{1,2}/i
-  SEASON_REGEXP = /s(\d{1,2})e\d{1,2}/i
-  EPISODE_REGEXP = /s\d{1,2}e(\d{1,2})/i
-  TAGS_REGEXP = /s\d{1,2}e\d{1,2} (.*)/i
-  TAGS_FILTER_REGEXP = /(?<!WEB)-(?!DL)|[\.\s\(\)\[\]]+/ # Filter '-', but not 'WEB-DL'
+  # Assuming: "SHOWNAME - SEASON&EPISODE - TAGS"
+  SEASON_EPISODE_REGEXP = /s(?<season>\d{1,2})e(?<episode>\d{1,2})|(?<season>\d{1,2})x(?<episode>\d{1,2})/i
+  SHOWNAME_REGEXP = /(?<showname>[\w\s\.]+?)[\s\.-]*?#{SEASON_EPISODE_REGEXP}/i
+  TAGS_REGEXP = /#{SEASON_EPISODE_REGEXP}[\s\.-]?(?<tags>.*)/i  # Get the end of file
+  TAGS_FILTER_REGEXP = /(?<!WEB)-(?!DL)|[\.\s\(\)\[\]]+/i       # Filter '-', but not 'WEB-DL'
 
   # Ripped from gem addic7ed (Check them out!)
   LANGUAGES = {

data/lib/addic7ed_downloader/search.rb

@@ -6,37 +6,34 @@ module Addic7edDownloader
     BASE_URL = 'http://www.addic7ed.com'.freeze
     DEFAULTS = {
       lang: 'en',
-      tags: [],
-      path: './'
+      tags: []
     }.freeze
 
     attr_accessor :showname, :season, :episode, :lang, :tags, :path
 
     def self.by_filename(filename, options = {})
-      showname = filename[SHOWNAME_REGEXP, 1].strip
-      season   = filename[SEASON_REGEXP, 1].to_i
-      episode  = filename[EPISODE_REGEXP, 1].to_i
-      options[:tags] = filename[TAGS_REGEXP, 1].split(TAGS_FILTER_REGEXP)
-
-      new(showname, season, episode, options)
-    end
-
-    def self.by_string(search_string, options = {})
-      showname = search_string[SHOWNAME_REGEXP, 1].strip
-      season   = search_string[SEASON_REGEXP, 1].to_i
-      episode  = search_string[EPISODE_REGEXP, 1].to_i
-      options[:tags] = options[:filename][TAGS_REGEXP, 1].split(TAGS_FILTER_REGEXP) if options[:filename]
+      showname = filename[SHOWNAME_REGEXP, :showname].strip
+      season   = filename[SEASON_EPISODE_REGEXP, :season].to_i
+      episode  = filename[SEASON_EPISODE_REGEXP, :episode].to_i
+      options[:tags] = filename[TAGS_REGEXP, :tags].split(TAGS_FILTER_REGEXP)
 
       new(showname, season, episode, options)
+    rescue NoMethodError
+      # Failed to parse
+      nil
     end
 
     def initialize(showname, season, episode, options = {})
-      @showname = showname
+      @showname = showname.tr('.', ' ')
       @season = season.to_i
       @episode = episode.to_i
 
       opts = DEFAULTS.merge(options)
-      @lang, @tags, @path = opts.values_at(:lang, :tags, :path)
+      @lang, @tags = opts.values_at(:lang, :tags)
+    end
+
+    def to_s
+      "#{@showname.split.map(&:capitalize).join(' ')} #{sprintf('%02dx%02d', @season, @episode)}"
     end
 
     def results
@@ -57,11 +54,11 @@ module Addic7edDownloader
       results.first
     end
 
-    def download_best
-      download_subtitle(find_best_subtitle)
+    def download_best(path = './')
+      download_subtitle(find_best_subtitle, path)
     end
 
-    def download_subtitle(subtitle)
+    def download_subtitle(subtitle, path = './')
       return unless subtitle
 
       # Addic7ed needs the correct Referer to be set
@@ -72,8 +69,9 @@ module Addic7edDownloader
 
       raise unless response.headers['content-type'].include? 'text/srt'
 
+      # Get file name from headers
       filename = response.headers['content-disposition'][/filename=\"(.+?)\"/, 1]
-      open(filename, 'w') { |f| f << response }
+      open(File.join(path, filename), 'w') { |f| f << response }
 
       # return subtitle filename
       filename
@@ -86,7 +84,7 @@ module Addic7edDownloader
     end
 
     def url
-      @url ||= URI.encode("#{BASE_URL}/serie/#{@showname}/#{@season}/#{@episode}/#{LANGUAGES[@lang][:id]}")
+      @url ||= "#{BASE_URL}/serie/#{CGI.escape(@showname)}/#{@season}/#{@episode}/#{LANGUAGES[@lang][:id]}"
     end
 
     def build_subtitles_list
@@ -102,7 +100,6 @@ module Addic7edDownloader
       end
 
       # We return the completed subtitles, ordered by downloads desc
-      # Using bang methods for memory performance
       subtitles.select(&:completed?).sort!.reverse!
     end
   end

data/lib/addic7ed_downloader/version.rb

@@ -1,3 +1,3 @@
 module Addic7edDownloader
-  VERSION = '0.2.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: addic7ed_downloader
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - David Marchante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -167,7 +167,8 @@ dependencies:
 description: 
 email:
 - davidmarchan@gmail.com
-executables: []
+executables:
+- addic7ed
 extensions: []
 extra_rdoc_files: []
 files:
@@ -182,6 +183,7 @@ files:
 - addic7ed_downloader.gemspec
 - bin/console
 - bin/setup
+- exe/addic7ed
 - lib/addic7ed_downloader.rb
 - lib/addic7ed_downloader/common.rb
 - lib/addic7ed_downloader/search.rb