nicovideo 0.1.1 → 0.1.2

data/ChangeLog

@@ -1,3 +1,10 @@
+2008-03-15  version 0.1.2
+
+	* removed outputs for debug
+	* fixed internal search parameters
+	* fixed xpath for sp1
+	*
+
 2008-02-25  version 0.1.1
 
 	* fixed typo in Nicovideo::Ranking#url

data/lib/nicovideo/mylist.rb

@@ -26,7 +26,7 @@ module Nicovideo
     private
     def parse(page)
       @rss = RSS::Parser.parse(page.body)
-      @title = rss.channel.title.sub(/#{BASE_TITLE+NICO_MYLIST} /, '')
+      @title = rss.channel.title.sub(/#{BASE_TITLE2+NICO_MYLIST} /, '')
       @user  = rss.channel.managingEditor
       @description = rss.channel.description
 

data/lib/nicovideo/openlist.rb

@@ -7,7 +7,7 @@ module Nicovideo
   class OpenList < Page
     include Enumerable
     
-    def initialize agent, video_id, pagenum=1, sort='c', order='d'
+    def initialize agent, video_id, sort='c', order='d', pagenum=1
       super(agent)
       @video_id = video_id
       @pagenum  = pagenum
@@ -46,34 +46,42 @@ module Nicovideo
 
     def page=(pagenum)
       self.pagenum = pagenum
+      self
     end
 
     def next
       self.pagenum = @pagenum + 1
+      self
     end
 
     def prev
       self.pagenum = @pagenum - 1
+      self
     end
 
     protected
     def parse(page)
-      if page.body =~ /<strong>#{@video_id}<\/strong> を含む公開マイリストはありません。/
-          @not_found = true
-          raise NotFound
+      if page.body =~ /<strong>#{@video_id}<\/strong>を含む公開マイリストはありません。/
+        @not_found = true
+        raise NotFound
       end
 
-      @total_size = page.search('form[@name="sort"]//td[@class="TXT12"]//strong').first.inner_html.to_i
-      if (page/'a//img[@src="http://res.nicovideo.jp/img/common/pager_next_on.gif"]').size > 0
-        @has_next = true
-      else
-        @has_next = false
-      end
-
-      if (page/'a//img[@src="http://res.nicovideo.jp/img/common/pager_back_on.gif"]').size > 0
-        @has_prev = true
-      else 
-        @has_prev = false
+      @total_size = page.search('//form[@name="sort"]//td[@class="TXT12"]//strong').first.inner_html.sub(/,/,'').to_i
+
+      @has_next = false
+      @has_prev = false
+      respages = page/'//div[@class="mb16p4"]//p[@class="TXT12"]//a'
+      puts_info respages.size
+      respages.each {|r| puts_info r.inner_html }
+      if respages.size > 0
+        respages.each {|text|
+          if text.inner_html =~ /前のページ/
+            @has_prev = true
+          end
+          if text.inner_html =~ /次のページ/
+            @has_next = true
+          end
+        }
       end
 
       scanpattern = /<a href=\"#{BASE_URL}\/mylist\/(\d+)\">(.+?)<\/a>/ou

data/lib/nicovideo/page.rb

@@ -6,7 +6,8 @@ module Nicovideo
     NV_DEBUG_LEVEL = 0
 
     BASE_URL = 'http://www.nicovideo.jp'
-    BASE_TITLE  = 'ニコニコ動画\(RC\)‐'.toutf8
+    BASE_TITLE1  = '‐ニコニコ動画\(SP1\)'.toutf8
+    BASE_TITLE2  = 'ニコニコ動画\(SP1\)‐'.toutf8
 
     def initialize agent
       @agent = agent

data/lib/nicovideo/search.rb

@@ -7,19 +7,27 @@ module Nicovideo
     def initialize agent, keyword, sort=nil, order=nil, pagenum=1
       super(agent)
       @search_type = 'search'
-      @keyword = CGI.escape(CGI.escape(keyword)) # なぜか2回エスケープが必要？
+      #@keyword = CGI.escape(CGI.escape(keyword))
+      @keyword = CGI.escape(keyword)
+      @sort    = sort
       @order   = order
+      @pagenum = pagenum
 
       params = ["videos", "total_size", "has_next?", "has_prev?"]
       self.register_getter params
 
       @url = url()
+
+      puts_info "url = #{@url}"
+      puts_info "sort=#{@sort},order=#{@order},pagenum=#{@pagenum}"
     end
 
     def url
-      url = "#{BASE_URL}/#{@search_type}?ref=top&s=#{@keyword}"
+      url = "#{BASE_URL}/#{@search_type}/#{@keyword}"
+      url += '?' if (@sort || @order || @pagenum)
       url += '&sort='  + @sort  if @sort
       url += '&order=' + @order if @order
+      url += '&page=' + @pagenum.to_s if @pagenum
       url
     end
 
@@ -45,10 +53,12 @@ module Nicovideo
 
     def next
       self.pagenum = @pagenum + 1
+      self
     end
 
     def prev
       self.pagenum = @pagenum - 1
+      self
     end
 
     protected
@@ -58,28 +68,32 @@ module Nicovideo
           raise NotFound
       end
 
-      @total_size = page.search('form[@name="sort"]//td[@class="TXT12"]//strong').first.inner_html.to_i
-
-      if (page/'a//img[@src="http://res.nicovideo.jp/img/common/pager_next_on.gif"]').size > 0
-        @has_next = true
-      else
-        @has_next = false
+      @total_size = page.search('form[@name="sort"]//td[@class="TXT12"]//strong').first.inner_html.sub(/,/,'').to_i
+
+      @has_next = false
+      @has_prev = false
+      respages = page/'//div[@class="mb16p4"]//p[@class="TXT12"]//a'
+      puts_info respages.size
+      respages.each {|r| puts_info r.inner_html }
+      if respages.size > 0
+        respages.each {|text|
+          if text.inner_html =~ /前のページ/
+            @has_prev = true
+          end
+          if text.inner_html =~ /次のページ/
+            @has_next = true
+          end
+        }
       end
 
-      if (page/'a//img[@src="http://res.nicovideo.jp/img/common/pager_back_on.gif"]').size > 0
-        @has_prev = true
-      else 
-        @has_prev = false
-      end
+      result_xpath = page/'//div[@class="cmn_thumb_R"]//p[@class="TXT12"]/a[@class="video"]'
       
-      result_xpath = page/'div[@class="thumb_R"]/p[@class="TXT12"]/a[@class="video"]'
-      puts result_xpath.size.to_s
+      puts_info result_xpath.size.to_s
       @videos = result_xpath.inject([]) {|arr, v|
         vp = VideoPage.new(@agent, v.attributes['href'].sub(/watch\/(\w+)$/,'\1'))
         vp.title = v.inner_html
         arr << vp
       }
-
     end
     
   end

data/lib/nicovideo/version.rb

@@ -2,7 +2,7 @@ module Nicovideo #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/nicovideo/videopage.rb

@@ -59,7 +59,7 @@ module Nicovideo
     private
     def parse(page)
       # title
-      @title = page.title.toutf8.sub(/^#{BASE_TITLE}/ou, '')
+      @title = page.title.toutf8.sub(/#{BASE_TITLE1}$/ou, '')
 
       # tags
       div = page.parser.search("div#video_tags")

data/test/test_ranking.rb

@@ -15,7 +15,8 @@ class TestNicovideoRanking < Test::Unit::TestCase
     }
 
     rv.each {|v|
-      puts v.id + ':' + v.published_at.to_s + ':' + v.title
+#      puts v.id + ':' + v.published_at.to_s + ':' + v.title
+      puts v.id + ':' + v.title
       sleep 1
     }
 

data/test/test_search.rb

@@ -8,40 +8,70 @@ class TestNicovideoSearch < Test::Unit::TestCase
     @nv.login
   end
 
-  def test_search_testing0
-    result = @nv.search("aaa")
+  def output_results result
     puts result.total_size
     result.each {|v|
-      puts v.title
+      puts v.id + ':' + v.title
     }
-    sleep 1
+  end
+=begin    
+  def test_search_testing0
+    result = @nv.search("aaa")
+    output_results result
+    sleep 3
   end
 
   def test_search_testing1
     result = @nv.search("ミク")
-    result.each {|v|
-      puts v.title
-    }
-    sleep 1
+    output_results result
+    sleep 3
   end
+=end
 
+  def test_search_next
+    result = @nv.search("ミク", 'n')
+    output_results result
+    i = 1
+    sleep 5
+    while result.has_next? && i < 5
+      output_results result.next
+      i += 1
+      sleep 5
+    end
+    
+    sleep 3
+  end
+  def test_search_prev
+    result = @nv.search("ミク", 'n', nil, 5)
+    output_results result
+    i = 5
+    sleep 5
+    while result.has_prev? && i > 0
+      output_results result.prev
+      i -= 1
+      sleep 5
+    end
+  end
+    
+=begin
   def test_search_testing2
     result = @nv.search("ミク", 'n')
-    result.each {|v|
+    puts result.total_size
+    result.each { |v|
       puts v.title
     }
-    sleep 1
+    sleep 3
   end
 
   def test_search_testing3
     result = @nv.search("ミク", 'n', 'd')
+    puts result.total_size
     result.each {|v|
       puts v.title
     }
-    sleep 1
+    sleep 3
   end
-  
-  
+=end
 =begin  
   def test_search_valid
     rv = nil

data/test/test_videopage.rb

@@ -19,10 +19,10 @@ class TestNicovideoVideoPage < Test::Unit::TestCase
     assert_nothing_raised {
       vp = @nv.watch(@vid_valid)
     }
-    assert_nothing_raised { vp.flv }
+#    assert_nothing_raised { vp.flv }
     sleep 5
   end
-=begin
+
   def test_watch_valid
     vp = nil
     assert_nothing_raised {
@@ -37,10 +37,10 @@ class TestNicovideoVideoPage < Test::Unit::TestCase
     puts vp.tags
     puts vp.title
     puts vp.published_at
-    assert_nothing_raised { vp.flv }
+ #   assert_nothing_raised { vp.flv }
     #assert_instance_of(String, vp.flv)
     #assert_instance_of(String, vp.video)
-    File.open("#{@vid_valid}.flv", "wb") {|f| f.write vp.flv }
+#    File.open("#{@vid_valid}.flv", "wb") {|f| f.write vp.flv }
 
     sleep 1
   end
@@ -93,5 +93,4 @@ class TestNicovideoVideoPage < Test::Unit::TestCase
 
     sleep 1
   end
-=end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: nicovideo
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2008-02-25 00:00:00 +09:00
+  version: 0.1.2
+date: 2008-03-15 00:00:00 +09:00
 summary: utils for nicovideo
 require_paths: 
 - lib