myshows 0.2.1 → 0.2.2

data/README.rdoc

@@ -30,11 +30,16 @@ And use
   pilot = tbbt.episode "the pilot episode"
   # or by season and episode number
   pilot = tbbt.episode 1, 1
+  # or by filename
+  pilot = search.episodes_by_filename('The.Big.Bang.Theory.S01E01.HDTV.XviD-(Kuraj-Bambey).avi')[0]
   pilot.title     # => "Pilot"
   pilot.show      # => tbbt
   pilot.air_date  # => "24.09.2007" (fields parsing would be done later)
   # and many other fields provided by API
 
+  # note that more than one episode could correspond to one filename
+  two_episodes = search.episodes_by_filename 'Star.Wars.The.Clone.Wars.s02e01e02.rus.LostFilm.TV.avi'
+
   # if you are authorized:
   pilot.uncheck!  # => this episode would be marked as 'unwatched'
   pilot.check!    # => this episode would be marked as 'watched'

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('myshows', '0.2.1') do |p|
+Echoe.new('myshows', '0.2.2') do |p|
   p.summary        = "MyShows API"
   p.description    = "Object-oriented wrapper over API of http://myshows.ru"
   p.url            = "http://github.com/cypok/myshows"

data/lib/myshows/api.rb

@@ -30,22 +30,6 @@ module MyShows
       self.class.cookies.add_cookies res.headers["set-cookie"]
     end
 
-    # Returns checked episode
-    #def check(name, season_number, episode_number)
-      #shows = search name, :only_user => true
-      #error "could not find show \"#{name}\" or it is not marked as 'watching'" if shows.count == 0
-      #error "ambiguous name \"#{name}\", looks like #{shows.take(2) * ', '}" if shows.count > 1
-
-      #show = shows.first
-      #episodes = show_episodes show
-      #episode = episodes.detect { |e| e.season_number == season_number && e.episode_number == episode_number }
-      #error "could not find episode #{season_number}x#{episode_number} of show #{show}" if episode.nil?
-
-      #check_episode episode
-
-      #episode
-    #end
-
     # Returns all user shows
     def user_shows
       res = get '/profile/shows/'
@@ -64,6 +48,15 @@ module MyShows
       found_shows = json2shows res.body
     end
 
+    # Returns array of episodes
+    def search_episode_by_filename(filename)
+      res = get '/shows/search/file/', :q => filename
+      return [] if res.code == 404
+      error "unknown error while searching by filename \"#{filename}\"" if res.code != 200
+
+      json2episode_with_show res.body
+    end
+
     # Returns episodes of given show
     def show_episodes(show)
       res = get "/shows/#{show.id}"
@@ -101,6 +94,14 @@ module MyShows
       JSON.parse(json)['episodes'].map {|id, data| MyShows::Episode.new id, data, show }
     end
 
+    def json2episode_with_show(json)
+      data = JSON.parse(json)
+      # TODO: process data['match']
+      episodes = data['show'].delete 'episodes'
+      show = MyShows::Show.new data['show']['id'], data['show']
+      episodes.map {|id, ep_data| MyShows::Episode.new id, ep_data, show }
+    end
+
     def error(msg)
       raise MyShows::Error.new msg
     end

data/lib/myshows/search.rb

@@ -12,5 +12,10 @@ module MyShows
     def show(name)
       @api.search_show name
     end
+
+    # Returns array of episodes that corresponds to the filename
+    def episodes_by_filename(filename)
+      @api.search_episode_by_filename filename
+    end
   end
 end

data/myshows.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{myshows}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Parfinenko"]
   s.cert_chain = ["/Users/cypok/.gem/gem-public_cert.pem"]
-  s.date = %q{2011-01-29}
+  s.date = %q{2011-01-30}
   s.description = %q{Object-oriented wrapper over API of http://myshows.ru}
   s.email = %q{vladimir.parfinenko@gmail.com}
   s.extra_rdoc_files = ["README.rdoc", "lib/myshows.rb", "lib/myshows/api.rb", "lib/myshows/episode.rb", "lib/myshows/item.rb", "lib/myshows/profile.rb", "lib/myshows/search.rb", "lib/myshows/show.rb", "lib/myshows/title_matcher.rb"]

data/spec/myshows_spec.rb

@@ -45,6 +45,22 @@ describe MyShows do
       found = @search.show 'Some unkown show'
       found.should == []
     end
+
+    it "should find episode by filename" do
+      found = @search.episodes_by_filename 'House.M.D.s07e10.rus.720p.LostFilm.TV.mkv'
+      e = found.first
+      e.show.title.should == 'House'
+      e.season_number.should == 7
+      e.episode_number.should == 10
+    end
+
+    it "should find two episodes by filename" do
+      found = @search.episodes_by_filename 'Star.Wars.The.Clone.Wars.s02e01e02.rus.LostFilm.TV.avi'
+      found.each {|e| e.show.title.should == 'Star Wars: The Clone Wars (2008)' }
+      found.each {|e| e.season_number.should == 2 }
+      found[0].episode_number.should == 1
+      found[1].episode_number.should == 2
+    end
   end
 
   describe MyShows::Show do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: myshows
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Vladimir Parfinenko
@@ -36,7 +36,7 @@ cert_chain:
   78F0qvtLjR0DAnN6uYs98PR+jHE+0ckLX3D9sw==
   -----END CERTIFICATE-----
 
-date: 2011-01-29 00:00:00 +06:00
+date: 2011-01-30 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency