niconico 1.7.0 → 1.8.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e974da09ccd8ca51489f33e40cb8cee03492e8c
-  data.tar.gz: cd9f2c241c322cac652d47c82ba2461e9aae46ce
+  metadata.gz: 8f3cecdf7d7a1219ecc232673b957e18b42fcf8f
+  data.tar.gz: 4e1e775aa2ef787e937b1ab6381d5bf81d72bd22
 SHA512:
-  metadata.gz: 83d692cf58272878c31836fcb8fd22cf76e11e063117a337d42aa7b62e9145bdf986d783b8fe611d4bcbd3e62c7c1cc088c17023ce5f2c0d93e325a59bdf37e8
-  data.tar.gz: e7527167a1871dbde1c74fe965b90a35456282be8171da7ce5faf1a52ed042d31b4ae028fbc744f84551f850ba32a923941a52fcd006f36e1edfed2bd4bb9837
+  metadata.gz: 33f67d8e48081a9ca33c56a9ddfd8b0fa105ac0dbd02570f2482606d6fc2aa68b399e542085a4c1603cdf72e270a936e36ca4eb445bd44ff4ce08ba62291b633
+  data.tar.gz: 73773ad3629e2dd89b24618f0464050a39df504ad6c7a42d5355deaf0f92545038aaac0c6fbb7fa68a8284a517a74511e381a5b8b84e6ba55dee6c14d121dd58

data/README.mkd

@@ -12,7 +12,7 @@ Wrapper of `Mechanize`, optimized for <http://www.nicovideo.jp/>.
 
 ## Requirements
 
-* Ruby 1.9+ (1.9.2+ is supported)
+* Ruby 2.0.0+ (2.1+ is supported)
 
 ## Install
 

data/lib/niconico.rb

@@ -114,4 +114,6 @@ require 'niconico/mylist'
 require 'niconico/ranking'
 require 'niconico/channel'
 require 'niconico/live'
+require 'niconico/live/client'
+require 'niconico/live/mypage'
 require 'niconico/nico_api'

data/lib/niconico/deferrable.rb

@@ -16,6 +16,25 @@ class Niconico
       def deferred_methods
         @deferred_methods ||= []
       end
+
+      def lazy(key, &block)
+        define_method(key) do
+          case
+          when fetched?
+            self.instance_eval &block
+          when @preload[key]
+            @preload[key]
+          else
+            get()
+            self.instance_eval &block
+          end
+        end
+        self.lazy_methods.push key
+      end
+
+      def lazy_methods
+        @lazy_methods ||= []
+      end
     end
 
     def self.included(klass)
@@ -31,9 +50,14 @@ class Niconico
     private
 
     def preload_deffered_values(vars={})
+      @preload ||= {}
       vars.each do |k,v|
-        next unless self.class.deferred_methods.include?(k)
-        instance_variable_set "@#{k}", v
+        case
+        when self.class.deferred_methods.include?(k)
+          instance_variable_set "@#{k}", v
+        when self.class.lazy_methods.include?(k)
+          @preload[k] = v
+        end
       end
     end
   end

data/lib/niconico/live.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require 'niconico/deferrable'
 require 'niconico/live/api'
 
 class Niconico
@@ -7,6 +8,8 @@ class Niconico
   end
 
   class Live
+    include Niconico::Deferrable
+
     class ReservationOutdated < Exception; end
     class ReservationNotAccepted < Exception; end
     class TicketRetrievingFailed < Exception; end
@@ -28,13 +31,17 @@ class Niconico
       end
     end
 
-    def initialize(parent, live_id)
+    def initialize(parent, live_id, preload = nil)
       @parent = parent
       @agent = parent.agent
       @id = @live_id = live_id
       @client = Niconico::Live::API.new(@agent)
 
-      get()
+      if preload
+        preload_deffered_values(preload)
+      else
+        get
+      end
     end
 
     attr_reader :id, :live, :ticket
@@ -79,27 +86,27 @@ class Niconico
     end
 
     def inspect
-      "#<Niconico::Live: #{id}, #{title}>"
+      "#<Niconico::Live: #{id}, #{title}#{fetched? ? '': ' (deferred)'}>"
     end
 
-    def title
-      get.live[:title]
+    lazy :title do
+      live[:title]
     end
 
-    def description
-      get.live[:description]
+    lazy :description do
+      live[:description]
     end
 
-    def opens_at
-      get.live[:opens_at]
+    lazy :opens_at do
+      live[:opens_at]
     end
 
-    def starts_at
-      get.live[:starts_at]
+    lazy :starts_at do
+      live[:starts_at]
     end
 
-    def status
-      get.live[:status]
+    lazy :status do
+      live[:status]
     end
 
     def scheduled?
@@ -114,32 +121,36 @@ class Niconico
       status == :closed
     end
 
+    lazy :reservation do
+      live[:reservation]
+    end
+
     def reserved?
-      get.live.key? :reservation
+      !!reservation
+    end
+
+    def reservation_available?
+      reserved? && reservation[:available]
     end
 
     def reservation_unaccepted?
-      reserved? && live[:reservation][:status] == :reserved
+      reservation_available? && reservation[:status] == :reserved
     end
 
     def reservation_accepted?
-      reserved? && live[:reservation][:status] == :accepted
+      reserved? && reservation[:status] == :accepted
     end
 
     def reservation_outdated?
-      reserved? && live[:reservation][:status] == :outdated
-    end
-
-    def reservation_available?
-      reservation_unaccepted? || reservation_accepted?
+      reserved? && reservation[:status] == :outdated
     end
 
     def reservation_expires_at
-      reserved? ? live[:reservation][:expires_at] : nil
+      reserved? ? reservation[:expires_at] : nil
     end
 
-    def channel
-      get.live[:channel]
+    lazy :channel do
+      live[:channel]
     end
 
     def premium?

data/lib/niconico/live/api.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 require 'time'
 require 'openssl'
+require 'niconico/live/util'
 
 class Niconico
   class Live
@@ -16,8 +17,43 @@ class Niconico
 
       attr_reader :agent
 
+      def self.parse_reservation_message(message)
+        valid_until_message = message.match(/(?:使用|利用)?期限: (.+?)まで|(?:期限中、何度でも視聴できます|視聴権(?:利用|使用)期限が切れています|タイムシフト利用期間は終了しました)\s*\[(.+?)まで\]/)
+        valid_message = message.match(/\[視聴期限未定\]/)
+
+        case
+        when message.match(/予約中\s*\[/)
+          {status: :reserved, available: false}
+        when valid_until_message || valid_message
+          {}.tap do |reservation|
+            if valid_until_message
+              reservation[:expires_at] = Time.parse("#{valid_until_message[1] || valid_until_message[2]} +0900")
+            end
+
+            if message.include?('視聴権を使用し、タイムシフト視聴を行いますか？')
+              reservation[:status] = :reserved
+              reservation[:available] = true
+            elsif message.include?('本番組は、タイムシフト視聴を行う事が可能です。') \
+                  || message.include?('期限中、何度でも視聴できます')
+              reservation[:status] = :accepted
+              reservation[:available] = true
+            elsif message.include?('タイムシフト視聴をこれ以上行う事は出来ません。') \
+                  || message.include?('視聴権の利用期限が過ぎています。') \
+                  || message.include?('視聴権利用期限が切れています') \
+                  || message.include?('視聴権使用期限が切れています') \
+                  || message.include?('タイムシフト利用期間は終了しました') \
+                  || message.include?('アーカイブ公開期限は終了しました。')
+              reservation[:status] = :outdated
+              reservation[:available] = false
+            end
+          end
+        else
+          nil
+        end
+      end
+
       def get(id)
-        id = normalize_id(id)
+        id = Util::normalize_id(id)
 
         page = agent.get("http://live.nicovideo.jp/gate/#{id}")
 
@@ -41,20 +77,9 @@ class Niconico
           result[:closed_at] = Time.parse("#{close_message[1]} +0900")
         end
 
-        reservation_valid_until_message = comment_area.match(/使用期限: (.+?)まで/)
-        if reservation_valid_until_message 
-          result[:reservation] = {}
-          result[:reservation][:expires_at] = Time.parse("#{reservation_valid_until_message[1]} +0900")
-
-          if comment_area.include?('視聴権を使用し、タイムシフト視聴を行いますか？')
-            result[:reservation][:status] = :reserved
-            result[:reservation][:available] = true
-          elsif comment_area.include?('本番組は、タイムシフト視聴を行う事が可能です。')
-            result[:reservation][:status] = :accepted
-            result[:reservation][:available] = true
-          elsif comment_area.include?('タイムシフト視聴をこれ以上行う事は出来ません。') || comment_area.include?('視聴権の利用期限が過ぎています。')
-            result[:reservation][:status] = :outdated
-          end
+        result[:reservation] = self.class.parse_reservation_message(comment_area)
+        if !result[:reservation] && page.search(".watching_reservation_reserved").any? { |_| _['onclick'].include?(id) }
+          result[:reservation] = {status: :reserved, available: false}
         end
 
         channel = page.at('div.chan')
@@ -74,7 +99,7 @@ class Niconico
       end
 
       def get_player_status(id, public_key = nil)
-        id = normalize_id(id)
+        id = Util::normalize_id(id)
         page = agent.get("http://ow.live.nicovideo.jp/api/getplayerstatus?locale=GLOBAL&lang=ja%2Djp&v=#{id}&seat%5Flocale=JP")
         if page.body[0] == 'c' # encrypted
           page = Nokogiri::XML(decrypt_encrypted_player_status(page.body, public_key))
@@ -157,18 +182,21 @@ class Niconico
 
       def watching_reservations
         page = agent.get(URL_WATCHINGRESERVATION_LIST)
-        page.search('vid').map(&:inner_text).map{ |_| normalize_id(_) }
+        page.search('vid').map(&:inner_text).map{ |_| Util::normalize_id(_) }
       end
 
       def accept_watching_reservation(id_)
-        id = normalize_id(id_, with_lv: false)
-        page = agent.get("http://live.nicovideo.jp/api/watchingreservation?mode=confirm_watch_my&vid=#{id}&next_url&analytic")
-        token = page.at('#reserve img')['onclick'].scan(/'(.+?)'/)[1][0]
+        id = Util::normalize_id(id_, with_lv: false)
 
+        page = agent.get("http://live.nicovideo.jp/api/watchingreservation?mode=watch_num&vid=#{id}&next_url&analytic")
+
+        token = Util::fetch_token(@agent)
         page = agent.post("http://live.nicovideo.jp/api/watchingreservation",
-                          accept: 'true', mode: 'use', vid: id, token: token)
+                          mode: 'auto_register', vid: id, token: token, '_' => '')
 
-        page.at('nicolive_video_response')['status'] == 'ok'
+        token = Util::fetch_token(@agent)
+        page = agent.post("http://live.nicovideo.jp/api/watchingreservation",
+                          accept: 'true', mode: 'use', vid: id, token: token)
       end
 
       def decrypt_encrypted_player_status(body, public_key)
@@ -195,18 +223,6 @@ class Niconico
         body = cipher.update(encrypted_body) + cipher.final
         body.force_encoding('utf-8')
       end
-
-      private
-
-      def normalize_id(id, with_lv: true)
-        id = id.to_s
-
-        if with_lv
-          id.start_with?('lv') ? id : "lv#{id}"
-        else
-          id.start_with?('lv') ? id[2..-1] : id
-        end
-      end
     end
   end
 end

data/lib/niconico/live/client.rb

@@ -0,0 +1,59 @@
+require 'niconico/live/client/search_result'
+require 'niconico/live/client/search_filters'
+
+class Niconico
+  def live_client
+    Live::Client.new(self.agent)
+  end
+
+  class Live
+    class Client
+
+      def initialize(agent)
+        @agent = agent
+        @api = API.new(agent)
+      end
+
+      def remove_timeshifts(ids)
+        post_body = "delete=timeshift&confirm=#{Util::fetch_token(@agent)}"
+        if ids.size == 0
+          return
+        end
+        ids.each do |id|
+          id = Util::normalize_id(id, with_lv: false)
+          # mechanize doesn't support multiple values for the same key in query.
+          post_body += "&vid%5B%5D=#{id}"
+        end
+        @agent.post(
+          'http://live.nicovideo.jp/my.php',
+          post_body,
+          'Content-Type' => 'application/x-www-form-urlencoded'
+        )
+      end
+
+      def search(keyword, filters = [])
+        filter = filters.join('+')
+        page = @agent.get(
+          'http://live.nicovideo.jp/search',
+          track: '',
+          sort: 'recent',
+          date: '',
+          kind: '',
+          keyword: keyword,
+          filter: filter
+        )
+        results_dom = page.at('.result_list')
+        items = results_dom.css('.result_item')
+        search_results = items.map do |item|
+          title_dom = item.at('.search_stream_title a')
+          next nil unless title_dom
+          id = title_dom.attr(:href).scan(/lv[\d]+/).first
+          title = title_dom.text.strip
+          description = item.at('.search_stream_description').text.strip
+          SearchResult.new(id, title, description)
+        end
+        search_results.compact
+      end
+    end
+  end
+end

data/lib/niconico/live/client/search_filters.rb

@@ -0,0 +1,21 @@
+class Niconico
+  class Live
+    class Client
+      module SearchFilters
+        ONAIR = ':onair:' # 放送中
+        RESERVED = ':reserved:' # 放送予定
+        CLOSED = ':closed:' # 放送終了
+
+        # joined by 'OR'
+        OFFICIAL = ':official:' # 公式
+        CHANNEL = ':channel:' # チャンネル
+        COMMUNITY = ':community:' # コミュニティ
+
+        HIDE_TS_EXPIRED = ':hidetsexpired:' # タイムシフトが視聴できない番組を表示しない
+        NO_COMMUNITY_GROUP = ':nocommunitygroup:' # 同一コミュニティをまとめて表示しない
+        HIDE_COM_ONLY = ':hidecomonly:' # コミュニティ限定番組を表示しない
+      end
+    end
+  end
+end
+

data/lib/niconico/live/client/search_result.rb

@@ -0,0 +1,8 @@
+class Niconico
+  class Live
+    class Client
+      class SearchResult < Struct.new(:id, :title, :description)
+      end
+    end
+  end
+end

data/lib/niconico/live/mypage.rb

@@ -0,0 +1,67 @@
+# coding: utf-8
+require 'niconico/live'
+require 'niconico/live/api'
+
+class Niconico
+  def live_mypage
+    Niconico::Live::Mypage.new(self)
+  end
+
+  class Live
+    class Mypage
+      class UnknownStatus < Exception; end
+      URL = 'http://live.nicovideo.jp/my'.freeze
+
+      def initialize(client)
+        @client = client
+      end
+
+      attr_reader :client
+
+      def agent
+        client.agent
+      end
+
+      def page
+        @page ||= agent.get(URL)
+      end
+
+      def reservations
+        return @reservations if @reservations
+        lists = page.search("form[name=timeshift_list] .liveItems")
+        @reservations = lists.flat_map do |list|
+          list.search('.column').map do |column|
+            link = column.at('.name a')
+            id = link[:href].sub(/\A.*\//,'').sub(/\?.*\z/,'')
+            status = column.at('.status').inner_text 
+            watch_button = column.at('.timeshift_watch a')
+
+            preload = {}
+
+            preload[:title] = link[:title]
+
+            preload[:reservation] = Live::API.parse_reservation_message(status)
+            raise UnknownStatus, "BUG, there's unknown message for reservation status: #{status.inspect}" unless preload[:reservation]
+
+            # (試聴する) [試聴期限未定]
+            if watch_button && watch_button[:onclick] && watch_button[:onclick].include?('confirm_watch_my')
+              preload[:reservation][:status] = :reserved
+              preload[:reservation][:available] = true
+            end
+
+            Niconico::Live.new(client, id, preload)
+          end
+        end
+      end
+      alias timeshift_list reservations
+
+      def available_reservations
+        reservations.select { |_| _.reservation_available? }
+      end
+
+      def unaccepted_reservations
+        reservations.select { |_| _.reservation_unaccepted? }
+      end
+    end
+  end
+end

data/lib/niconico/live/util.rb

@@ -0,0 +1,22 @@
+class Niconico
+  class Live
+    class Util
+      class << self
+        def normalize_id(id, with_lv: true)
+          id = id.to_s
+
+          if with_lv
+            id.start_with?('lv') ? id : "lv#{id}"
+          else
+            id.start_with?('lv') ? id[2..-1] : id
+          end
+        end
+
+        def fetch_token(agent)
+          page = agent.get('http://live.nicovideo.jp/my')
+          page.at('#confirm').attr('value')
+        end
+      end
+    end
+  end
+end

data/lib/niconico/nico_api.rb

@@ -2,8 +2,16 @@ require 'json'
 
 class Niconico
   class NicoAPI
-    class ApiError < Exception; end
     class AcquiringTokenError < Exception; end
+    class ApiError < Exception
+      def initialize(error)
+        @description = error['description']
+        @code = error['code']
+        super "#{@code}: #{@description.inspect}"
+      end
+
+      attr_reader :code, :description
+    end
 
     MYLIST_ITEM_TYPES = {video: 0, seiga: 5}
 
@@ -33,7 +41,6 @@ class Niconico
           item_type: MYLIST_ITEM_TYPES[item_type],
           item_id: item_id,
           description: description,
-          token: token
         }
       )
     end
@@ -41,12 +48,25 @@ class Niconico
     private
 
     def post(path, params)
-      uri = URI.join(Niconico::URL[:top], path)
-      page = agent.post(uri, params)
-      json = JSON.parse(page.body)
-      raise ApiError, json unless json['status'] == 'ok'
-      json
-    end
+      retried = false
+      begin
+        params = params.merge(token: token)
+        uri = URI.join(Niconico::URL[:top], path)
+        page = agent.post(uri, params)
+        json = JSON.parse(page.body)
 
+        raise ApiError.new(json['error']) unless json['status'] == 'ok'
+
+        json
+      rescue ApiError => e
+        if (e.code == 'INVALIDTOKEN' || e.code == 'EXPIRETOKEN') && !retried
+          retried = true
+          @token = nil
+          retry
+        else
+          raise e
+        end
+      end
+    end
   end
 end

data/lib/niconico/version.rb

@@ -1,3 +1,3 @@
 class Niconico
-  VERSION = "1.7.0"
+  VERSION = "1.8.0.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: niconico
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0.beta1
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -55,6 +55,11 @@ files:
 - lib/niconico/deferrable.rb
 - lib/niconico/live.rb
 - lib/niconico/live/api.rb
+- lib/niconico/live/client.rb
+- lib/niconico/live/client/search_filters.rb
+- lib/niconico/live/client/search_result.rb
+- lib/niconico/live/mypage.rb
+- lib/niconico/live/util.rb
 - lib/niconico/mylist.rb
 - lib/niconico/nico_api.rb
 - lib/niconico/ranking.rb
@@ -75,12 +80,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: wrapper of Mechanize, optimized for nicovideo.