get-addic7ed 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d5ff8f9da39da43045c9cad1deb440fa6a54d8c
-  data.tar.gz: bad8feb10529aebe17e1507fd30b7db2f77d7c01
+  metadata.gz: e0aa248ebc4fcafb170fae075a92411a680dc0d6
+  data.tar.gz: 15f47c43f826b6c36e766174da212a974f9e0739
 SHA512:
-  metadata.gz: f76e8571f9d431a8ce5fbaa6b958ae334e6fb2a88210ba5fe3a5964f0e07723fa32648aa557507e35ee9e8e44c0100a7b1c6b66d7b6f89ac6c6bf63792074b80
-  data.tar.gz: 5d5241b0f9a27a839eff5f1cbbf47112fd83932e136bfa9d629b9cfad1ea62dc89c1ef432158281b21927b31b9a7063a71509c85af7e86c7b596accb0aec105f
+  metadata.gz: 40c27a33fe83c0c872f2e9c1ae58f80bf146c074df9a788ae741c84a111be5fa4f91b9f218c934419f1dbca9a56fcf568aa57956b625dda30103976faa8114d3
+  data.tar.gz: 1f2eedc563450c9f068f914f171dc9dc2fecb1672683e64a165053bb4e6995f32896af60fca4a0832dc93779f8202c62f253e6c3d9c1f6987e16594912b7b739

data/lib/addic7ed/subtitle.rb

@@ -5,38 +5,57 @@ require 'net/http'
 
 module GetAddic7ed
   class Subtitle
-    attr_reader :episode, :lang, :link, :page_link
+    attr_reader :episode, :lang, :page_link, :all, :link, :group
 
     def initialize episode, lang = 'fr'
       @episode  = episode # Episode instance
       @lang     = lang
       @page     = get_page_link
-      @link     = get_subtitle_link
+
+      @all = get_subtitles
+      if @all.length == 1
+        @link   = @all.first[:link]
+        @group  = @all.first[:group]
+      end
+
     end
 
     def inspect
-      puts "Sub Lang".ljust(20) + ": #{GetAddic7ed::LANGUAGES[@lang][:name]}"
-      puts "Hearing Impaired".ljust(20) + ": #{@hi}"
-      puts "Page Link".ljust(20) + ": #{@page}"
-      puts "Download Link".ljust(20) + ": #{@link}"
+      puts "Sub Lang".ljust(25) + ": #{GetAddic7ed::LANGUAGES[@lang][:name]}"
+      #TODO puts "Hearing Impaired".ljust(25) + ": #{@hi}"
+      puts "Page Link".ljust(25) + ": #{@page}"
+      unless @link == nil
+        puts "Group".ljust(25) + ": #{@group}"
+        puts "Download Link".ljust(25) + ": #{@link}"
+      else
+        puts "#{@all.length} subtitles available"
+=begin
+        @all.each do |item|
+          print "\n-".ljust(3)
+          print "#{item[:group]}".ljust(25)
+          print "#{item[:lang]}".ljust(25)
+          print "#{item[:completed]}".ljust(20)
+        end
+        print "\n"
+=end
+      end
+
     end
 
     def get_page_link
       return "http://www.addic7ed.com/ajax_loadShow.php?show=#{@episode.id}&season=#{@episode.season}&langs=&hd=undeENDed&hi=#{@hi}"
     end
 
-    def get_subtitle_link
+    def get_subtitles
       puts "Searching for <#{GetAddic7ed::LANGUAGES[@lang][:name]}> subtitles..." unless GetAddic7ed::OPT_QUIET
 
       # sub list
       sub_list = get_sub_list
 
-      if sub_list.length == 1
-        return sub_list.first[:link]
-      elsif sub_list.length == 0
+      if sub_list.length == 0
         raise NoSubtitleFound
       else
-        return sub_list[choose_sub(sub_list)][:link]
+        return sub_list
       end
     end
 
@@ -134,6 +153,12 @@ module GetAddic7ed
     end
 
     def download_sub
+
+      if @link == nil
+        the_one = @all[choose_sub(@all)]
+        @link   = the_one[:link]
+      end
+
       dir_path = File.dirname(@episode.filepath)
       sub_name = File.basename(@episode.filepath, '.*')
 

data/lib/addic7ed/version.rb

@@ -1,3 +1,3 @@
 module GetAddic7ed
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/addic7ed/videofile.rb

@@ -4,12 +4,7 @@ module GetAddic7ed
 
     def initialize(file)
       @filepath = File.expand_path(file)
-
-      if self.class.file? (@filepath)
-        @filename = File.basename(@filepath)
-      else
-        raise InvalidVideoFile
-      end
+      @filename = File.basename(@filepath)
     end
 
     def inspect
@@ -17,24 +12,5 @@ module GetAddic7ed
       puts "Filepath".ljust(10) + ": #{@filepath}"
     end
 
-    def self.file? filepath
-      if File.file? (filepath)
-        return true
-      else
-        raise InvalidFile
-      end
-    end
-
-    def self.video? filepath
-      if File.file? (filepath)
-=begin
-     TODO : Find a way to make it work on windows, mac os x and linux
-=end
-        return mimetype(filepath).start_with?("video") || File.extname(filepath) == ".mkv"
-      else
-        raise WrongArgument
-      end
-    end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: get-addic7ed
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Nicolas Vergoz