niconico 1.0.0 → 1.0.1

data/lib/niconico.rb

@@ -8,7 +8,7 @@ class Niconico
   URL = {
     login: 'https://secure.nicovideo.jp/secure/login?site=niconico',
     watch: 'http://www.nicovideo.jp/watch/',
-    getflv: 'http://www.nicovideo.jp/api/getflv'
+    getflv: 'http://flapi.nicovideo.jp/api/getflv'
   }
 
   TEST_VIDEO_ID = "sm9"

data/lib/niconico/version.rb

@@ -1,3 +1,3 @@
 class Niconico
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/niconico/video.rb

@@ -7,10 +7,10 @@ class Niconico
   end
 
   class Video
-    DEFFERABLES = [:id, :title, :url, :video_url, :type]
-    DEFFERABLES_VAR = DEFFERABLES.map{|k| :"@#{k}" }
+    DEFERRABLES = [:id, :title, :url, :video_url, :type]
+    DEFERRABLES_VAR = DEFERRABLES.map{|k| :"@#{k}" }
 
-    DEFFERABLES.zip(DEFFERABLES_VAR).each do |(k,i)|
+    DEFERRABLES.zip(DEFERRABLES_VAR).each do |(k,i)|
       define_method(k) do
         instance_variable_get(i) || (get && instance_variable_get(i))
       end
@@ -19,12 +19,12 @@ class Niconico
     def initialize(parent, video_id, defer=nil)
       @parent = parent
       @agent = parent.agent
-      @id = video_id
+      @thread_id = @id = video_id
       @url = "#{Niconico::URL[:watch]}#{@id}"
 
       if defer
         defer.each do |k,v|
-          next unless DEFFERABLES.include?(k)
+          next unless DEFERRABLES.include?(k)
           instance_variable_set :"@#{k}", v
         end
         @page = nil
@@ -42,7 +42,12 @@ class Niconico
         raise NotFound, "#{@id} not found" if e.message == "404 => Net::HTTPNotFound"
         raise e
       end
-      getflv = Hash[@agent.get_file("#{Niconico::URL[:getflv]}?v=#{@id}").scan(/([^&]+)=([^&]+)/).map{|(k,v)| [k.to_sym,CGI.unescape(v)] }]
+
+      if /^so/ =~ @id
+        sleep 5
+        @thread_id = @agent.get("#{Niconico::URL[:watch]}#{@id}").uri.path.sub(/^\/watch\//,"")
+      end
+      getflv = Hash[@agent.get_file("#{Niconico::URL[:getflv]}?v=#{@thread_id}").scan(/([^&]+)=([^&]+)/).map{|(k,v)| [k.to_sym,CGI.unescape(v)] }]
 
       @title = @page.at("#video_title").inner_text
       @video_url = getflv[:url]
@@ -61,7 +66,7 @@ class Niconico
     end
 
     def get_video_by_other
-      {cookie: @agent.cookie_jar.cookies(URI.parse(@video_url)).join(";"),
+      {cookie: @agent.cookie_jar.cookies(URI.parse(@video_url)),
        url: @video_url}
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: niconico
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00.000000000 Z
+date: 2011-10-14 00:00:00.000000000 Z
 dependencies: []
 description: wrapper of Mechanize, optimized for nicovideo. :)
 email: