p3-eztv 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ab92a3ca25bec774bd2a32f97959abcb970c134
-  data.tar.gz: f12a355129da5d3f8a09c077103190bf71704c12
+  metadata.gz: e4480264b0c1597a37559516c5ba634eceb20bba
+  data.tar.gz: 331827992168075c378fbd13dba768ac844927a7
 SHA512:
-  metadata.gz: eaad6c86a40a0c63d484a3da0fabd2a54a6c1ece7915d399ccd7484a7593b372f8fcb6af32682347ae084fdd0df4d3d5da7e5e48b0e6124ba99adfa5e00408cd
-  data.tar.gz: 61f1fa16b72a608c19d0f460840e98a9ce824470498b256fe4339b8eb7d469920d97328d4c4867c8c217548deef8f6d0d2ae05505c8e8919058ba4b266d9ac9d
+  metadata.gz: 3b8ac22816c14befd05e688a159d96ba6324be571677605163c7cd66475a188c981fac1607686de0761d3d1d4f21608425623b30f3fe641a9c1dd2ca70a0fd1b
+  data.tar.gz: acad7f0d02c396969362e68d9163a740351c86cc67926d5bc38f85eab8c971806b827face6da94fe4ebdcb74a89a1ccd76f6f1f5ec863a26dff52cf8f7e653ee

data/lib/p3-eztv.rb

@@ -4,33 +4,39 @@ require 'uri'
 
 module P3
     module Eztv
-        SE_FORMAT = /S(\d{1,2})E(\d{1,2})/
-        X_FORMAT = /(\d{1,2})x(\d{1,2})/
+        SE_FORMAT = "S(\\d{1,2})E(\\d{1,2})"
+        X_FORMAT = "(\\d{1,2})x(\\d{1,2})"
 
         class SeriesNotFoundError < StandardError
             def initialize(series)
-                msg = "Unable to find '#{series.name}' on https://eztv.ag."
+                msg = "Unable to find '#{series.search_string()}' on https://eztv.ag."
                 super(msg)
             end
         end
 
         class Series
             include HTTParty
-            attr_reader :name
+            attr_reader :name, :high_def
             EPISODES_XPATH = '//*[@id="header_holder"]/table[5]'
 
             base_uri 'http://eztv.ag'
 
             def initialize(name)
-                @name = URI::escape( name )
+                @name = name
+                @high_def = false
             end
 
             def high_def!
-                @name = "#{@name}%20720p"
+                @high_def = true
+            end
+
+            def search_string
+                search =  @high_def ? "#{@name} 720p" : @name
+                return URI::escape( search )
             end
 
             def episodes
-                @episodes ||= EpisodeFactory.create( fetch_episodes() )
+                @episodes ||= EpisodeFactory.create( name, fetch_episodes() )
             end
 
             def episode(season, episode_number)
@@ -40,7 +46,7 @@ module P3
             end
 
             def get(s01e01_format)
-                season_episode_match_data = s01e01_format.match( SE_FORMAT )
+                season_episode_match_data = s01e01_format.match( /#{SE_FORMAT}/ )
                 season  = season_episode_match_data[1].to_i
                 episode_number = season_episode_match_data[2].to_i
                 return episode(season, episode_number)
@@ -59,7 +65,7 @@ module P3
             def fetch_episodes
 
                 # 'get' method comes from httparty
-                result = Series::get("/search/#{name}")
+                result = Series::get("/search/#{self.search_string()}")
 
                 document = Nokogiri::HTML(result)
 
@@ -75,12 +81,16 @@ module P3
         end
 
         module EpisodeFactory
-            def self.create( episodes_array )
+            def self.create( name, episodes_node_array )
                 episodes = []
-                episodes_array.reverse.collect do |episode|
+                episodes_node_array.reverse.collect do |episode_node|
                     begin
-                        # Episode will throw if it can't parse
-                        episodes << Episode.new( episode )
+                        e = Episode.new( episode_node )
+
+                        if( ( e.raw_title.match( /#{name} #{SE_FORMAT}/i ) ) or ( e.raw_title.match( /#{name} #{X_FORMAT}/i ) ) )
+                            # Episode will throw if it can't parse
+                            episodes << e
+                        end
                     rescue
                     end
                 end
@@ -112,8 +122,8 @@ module P3
 
             def set_season_and_episode_number(episode_node)
                 @raw_title = episode_node.css('td.forum_thread_post a.epinfo').first.inner_text
-                season_episode_match_data = @raw_title.match( SE_FORMAT ) || @raw_title.match( X_FORMAT )
-                raise unless season_episode_match_data
+                season_episode_match_data = @raw_title.match( /#{SE_FORMAT}/ ) || @raw_title.match( /#{X_FORMAT}/ )
+                raise "no match" unless season_episode_match_data
                 @season = season_episode_match_data[1].to_i
                 @episode_number = season_episode_match_data[2].to_i
             end

data/p3-eztv.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "p3-eztv"
-  spec.version       = "0.0.7"
+  spec.version       = "0.0.8"
   spec.authors       = ["Damir Svrtan", "Poul Hornsleth"]
   spec.email         = ["poulh@umich.edu"]
   spec.summary       = "EZTV Search API"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: p3-eztv
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Damir Svrtan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri