Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/tvdb_party/episode.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
module TvdbParty
class Episode
attr_reader :client
attr_accessor :id, :season_number, :number, :name, :overview, :air_date, :thumb, :guest_stars, :director, :writer
attr_accessor :id, :imdb_id, :season_number, :number, :name, :overview, :air_date, :thumb, :guest_stars, :director, :writer

def initialize(client, options={})
@client = client
@id = options["id"]
@imdb_id = options["IMDB_ID"]
@season_number = options["SeasonNumber"]
@number = options["EpisodeNumber"]
@name = options["EpisodeName"]
Expand All @@ -31,4 +32,4 @@ def series
client.get_series_by_id(@series_id)
end
end
end
end
12 changes: 6 additions & 6 deletions lib/tvdb_party/search.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ def initialize(the_api_key, language = 'en', cache_options = {})

end

def search(series_name)
response = self.class.get("/GetSeries.php", {:query => {:seriesname => series_name, :language => @language}}).parsed_response
def search(series_name, language = self.language)
response = self.class.get("/GetSeries.php", {:query => {:seriesname => series_name, :language => language}}).parsed_response
return [] unless response["Data"]

case response["Data"]["Series"]
Expand Down Expand Up @@ -49,17 +49,17 @@ def get_episode_by_id(episode_id, language = self.language)
end
end

def get_episode(series, season_number, episode_number, language = self.language)
response = self.class.get("/#{@api_key}/series/#{series.id}/default/#{season_number}/#{episode_number}/#{language}.xml").parsed_response
def get_episode(series, season_number, episode_number)
response = self.class.get("/#{@api_key}/series/#{series.id}/default/#{season_number}/#{episode_number}/#{series.language}.xml").parsed_response
if response["Data"] && response["Data"]["Episode"]
Episode.new(self, response["Data"]["Episode"])
else
nil
end
end

def get_all_episodes(series, language = self.language)
response = self.class.get("/#{@api_key}/series/#{series.id}/all/#{language}.xml").parsed_response
def get_all_episodes(series)
response = self.class.get("/#{@api_key}/series/#{series.id}/all/#{series.language}.xml").parsed_response
return [] unless response["Data"] && response["Data"]["Episode"]
case response["Data"]["Episode"]
when Array
Expand Down
3 changes: 2 additions & 1 deletion lib/tvdb_party/series.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module TvdbParty
class Series
attr_reader :client
attr_accessor :id, :name, :overview, :seasons, :first_aired, :genres, :network, :rating, :runtime,
:actors, :banners, :air_time, :imdb_id
:actors, :banners, :air_time, :imdb_id, :language

def initialize(client, options={})
@client = client
Expand All @@ -11,6 +11,7 @@ def initialize(client, options={})
@overview = options["Overview"]
@network = options["Network"]
@runtime = options["Runtime"]
@language = options["Language"]
@air_time = options['Airs_Time'] if options['Airs_Time']
@imdb_id = options["IMDB_ID"]

Expand Down