sjunkieex 0.1.0 → 0.1.1

data/lib/sjunkieex/interface.rb

@@ -21,23 +21,20 @@ module Sjunkieex
     # Public: Looks for new episodes on the homepage
     #
     # Returns a Hash of links for sites that should be visited
-    def look_for_new_episodes
+    def look_for_new_episodes()
       links = Hash.new
 
       doc = Nokogiri::XML(get_page_data(@options[:url]))
       doc.css("div#content > div.post > div.post-content a").each do |link|
-        c = link.content
+        content = link.content
 
-        ####
         # skip links that are not suitable
-        next unless is_link_useful?(c)
+        next unless is_useful?(content)
 
-        next unless @index.is_series_in_index?(c)
+        series_name = Sindex::SeriesIndex.extract_seriesname(content)
+        language = get_language_from_link_data(content)
 
-        series_name = Sindex::SeriesIndex.extract_seriesname(c)
-        next unless series_name
-
-        next if @index.episode_existing?(series_name, c)
+        next if @index.episode_existing?(series_name, content, language)
 
         href = link[:href]
         next if links.include?(href)
@@ -62,11 +59,13 @@ module Sjunkieex
       doc.css("div#content > div.post div.post-content p").each do |paragraph|
 
         next if paragraph[:class]
-
         episode_data = paragraph.css("strong:first-child").text
-        next unless is_link_useful?(episode_data)
 
-        next if @index.episode_existing?(series_name, episode_data)
+        next unless is_useful?(episode_data)
+
+        language = get_language_from_link_data(episode_data)
+
+        next if @index.episode_existing?(series_name, episode_data, language)
 
         if id = Sindex::SeriesIndex.extract_episode_identifier(episode_data)
 
@@ -98,24 +97,43 @@ module Sjunkieex
     # link_data - data for the link
     #
     # Returns true if the link is useful or false if it can be skipped
-    def is_link_useful?(link_data)
+    def is_useful?(link_data)
 
-        return false unless link_data.match(/S\w+E\w+/i)
+        return false unless link_data.match(/S\d+E\d+/i)
 
-        # skip links depending on language
-        if @options[:german_only]
-          return false unless link_data.match(/German/i)
+        return false unless @index.is_series_in_index?(link_data)
 
-          unless @options[:subbed_allowed]
-            return false if link_data.match(/Subbed/i)
-          end
-        else
-          return false if link_data.match(/German/i)
+        language = get_language_from_link_data(link_data)
+        return false if language.nil?
+
+        series_name = Sindex::SeriesIndex.extract_seriesname(link_data)
+
+        return false unless
+            @index.is_series_in_this_language?(series_name, language)
+
+        if not @options[:subbed_allowed]
+          return false if link_data.match(/Subbed/i)
         end
 
         true
     end
 
+    # Private: determines the language the link is in
+    #
+    #   data - link data
+    #
+    # Returns either :de or :en
+    def get_language_from_link_data(data)
+
+        return nil unless data.match(/S\d+E\d+/i)
+
+        if data.match(/German/i)
+          :de
+        else
+          :en
+        end
+    end
+
     # Internal: get a page and do some stuff if the page is gzip encoded
     #
     # link - the link that is fetched

data/lib/sjunkieex/version.rb

@@ -1,3 +1,3 @@
 module Sjunkieex
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/sjunkieex.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency(%q<nokogiri>, [">= 1.5"])
   gem.add_runtime_dependency(%q<hashconfig>, [">= 0.0.1"])
-  gem.add_runtime_dependency(%q<sindex>, [">= 0.1.0"])
+  gem.add_runtime_dependency(%q<sindex>, [">= 0.1.1"])
 end