KinopoiskAPI 0.8.2 → 0.9.0

data/lib/KinopoiskAPI.rb

@@ -1,15 +1,23 @@
 require 'net/http'
+require 'KinopoiskAPI/api_error'
 require 'KinopoiskAPI/agent'
 require 'KinopoiskAPI/film'
-require 'KinopoiskAPI/staff'
-require 'KinopoiskAPI/gallery'
-require 'KinopoiskAPI/similar'
-require 'KinopoiskAPI/genres'
-require 'KinopoiskAPI/reviews'
+require 'KinopoiskAPI/people'
+require 'KinopoiskAPI/category'
+require 'KinopoiskAPI/today'
+require 'KinopoiskAPI/top'
 require 'KinopoiskAPI/global_search'
-require 'KinopoiskAPI/today_films'
+require 'KinopoiskAPI/film_search'
+require 'KinopoiskAPI/people_search'
+
+
+#require 'KinopoiskAPI/reviews'
+#require 'KinopoiskAPI/gallery'
+#require 'KinopoiskAPI/similar'
+
 require 'KinopoiskAPI/version'
 
+
 module KinopoiskAPI
   DOMAINS = {
       api: 'https://ext.kinopoisk.ru/ios/3.11.0',
@@ -31,8 +39,12 @@ module KinopoiskAPI
 
   METHODS = {
       get_film: {
-          method: 'getKPFilmDetailView',
-          id: 'filmID'
+        method: 'getKPFilmDetailView',
+        id: 'filmID'
+      },
+      get_staff: {
+        method: 'getStaffList',
+        id: 'filmID'
       },
       get_gallery: {
           method: 'getGallery',
@@ -43,16 +55,39 @@ module KinopoiskAPI
           type: 'kp_similar_films',
           id: 'filmID'
       },
-      get_name: {
-          method: 'getStaffList',
-          id: 'filmID'
+
+      navigator_filters:{
+        method: 'navigatorFilters'
+      },
+
+
+
+      get_top_100_popular: {
+        method: 'getKPTop',
+        type:   'kp_item_top_popular_films'
+      },
+
+      get_top_100_await: {
+        method: 'getKPTop',
+        type:   'kp_item_top_await'
       },
-      get_genres: {
-          method: 'getKPGenresView'
+
+      get_top_100_people: {
+        method: 'getKPTop',
+        type:   'kp_item_top_popular_people'
+      },
+
+      get_top_250_best:{
+        method: 'getKPTop',
+        type:  'kp_item_top_best_film'
       },
-      get_top_genre: {
-          method: 'getTopGenre'
+
+      get_top_100_gross:{
+        method: 'getKPTop',
+        type:   'kp_item_most_box_office',
       },
+
+
       get_reviews: {
           method: 'getKPReviews',
           id: 'filmID'
@@ -61,8 +96,11 @@ module KinopoiskAPI
           method: 'getReviewDetail',
           id: 'reviewID'
       },
-      get_people_detail: {
-          method: 'getPeopleDetail'
+
+      get_people: {
+          method: 'getKPPeopleDetailView',
+          id:     'peopleID'
+
       },
       get_today_films: {
           method: 'getKPTodayFilms'
@@ -94,24 +132,26 @@ module KinopoiskAPI
       get_dates_for_soon_dvd: {
           method: 'getDatesForSoonDVD'
       },
-      get_top: {
-          method: 'getTop'
-      },
+
       get_best_films: {
           method: 'getBestFilms'
       },
+
       search_global: {
           method: 'getKPGlobalSearch',
           keyword: 'keyword'
       },
-      search_films: {
+      search_film: {
           method: 'getKPSearchInFilms',
-          keyword: 'keyword'
+          keyword: 'keyword',
+          page:    'page'
       },
       search_people: {
-          method: 'searchPeople',
-          keyword: 'keyword'
+          method:  'getKPSearchInPeople',
+          keyword: 'keyword',
+          page:    'page'
       },
+
       search_cinemas: {
           method: 'searchCinemas',
           keyword: 'keyword'
@@ -137,9 +177,9 @@ module KinopoiskAPI
     raise ToDo
   end
 
-  def self.valid_json?(json)
+  def self.valid_json?(j)
     begin
-      JSON.parse(json)
+      JSON.parse(j)
       return true
     rescue JSON::ParserError => e
       return false

data/lib/KinopoiskAPI/agent.rb

@@ -2,21 +2,34 @@ module KinopoiskAPI
   class Agent
 
     def status
-      @json['resultCode'].nil? ? true : false
+      @json[:resultCode].nil? ? true : false
     end
 
-    def raw
+    def status2
+      @json[:resultCode].nil? ? true : false
+    end
+
+    def data
       @json
     end
 
+    def data2
+      @json2
+    end
+
     ####
     ####
     ####
 
     private
 
-      def json
-        uri       = URI(@url)
+      def json(url=nil)
+        if url.nil?
+          uri       = URI(@url)
+        else
+          uri       = URI(url)
+        end
+
         uuid      = Digest::MD5.hexdigest("--#{rand(10000)}--#{Time.now}--")
         query     = URI.decode_www_form(String(uri.query)) << ["uuid", uuid]
         uri.query = URI.encode_www_form(query)
@@ -27,21 +40,31 @@ module KinopoiskAPI
         query     = URI.decode_www_form(String(uri.query)) << ["key", key]
         uri.query = URI.encode_www_form(query)
 
-        puts "[GET] -> " + uri.to_s
+        print "[GET] -> " + uri.to_s
+        get_time = Time.now
+
+        http              = Net::HTTP.new(uri.host, uri.port)
+        http.read_timeout = 10
+        http.use_ssl      = true
+        response          = http.get(uri.request_uri, DOMAINS[:headers])
 
-        http         = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        response     = http.get(uri.request_uri, DOMAINS[:headers])
+        print " <- [#{(Time.now-get_time).round 3}s]\n"
 
         if KinopoiskAPI::valid_json?(response.body)
-          json = JSON.parse(response.body)
-          if json['resultCode'] == 0
-            json['data']
+          j = JSON.parse(response.body)
+          if j['resultCode'] == 0
+            j['data']
           else
-            json
+            j
           end
         else
-          {'resultCode'=> -1, "message"=> "Error method require", :data => { 'code'=> response.code, 'body'=> response.body} }
+          {:resultCode => -1, :message=> "Error method require", :data => { :code => response.code, :body => response.body} }
+        end
+      end
+
+      def json2
+        if @json2.nil?
+          @json2 = json(@url2)
         end
       end
 
@@ -54,5 +77,176 @@ module KinopoiskAPI
         end
       end
 
+      def int_data(data, name, none=0, type=Integer)
+        s = dn(data, name)
+
+        if s.nil?
+          none
+        else
+          r = s
+          if r.class == String
+            r = s.gsub(/[\ \%\$]/i, '')
+          end
+
+          if type == Integer
+            r.to_i == 0 ? none : r.to_i
+          elsif type == Float
+            r.to_f == 0 ? none : r.to_f
+          else
+            r
+          end
+        end
+      end
+
+      def year_data(data, name, point=:start)
+        s = dn(data, name)
+
+        if s.nil?
+          nil
+        else
+          if s.size == 4 && point == :start
+            s.to_i
+          else s.size == 9
+            arr = s.scan(/(\d{4})/).flatten
+            if point == :start
+              arr[0].to_i
+            elsif point == :end
+              arr[1].to_i
+            end
+          end
+        end
+      end
+
+      def time_data(data, name)
+        s = dn(data, name)
+        if !s.nil?
+
+          if s.size == 10
+            d=Date.parse(s) rescue nil
+            if d.nil?
+              s=s.gsub('00.', '01.')
+              d=Date.parse(s) rescue nil
+            end
+            d
+          else
+            year = s.scan(/\d{4}/)[0]
+            if !year.nil?
+              Date.parse("01.01.#{year}") #only year???
+            end
+          end
+
+        end
+      end
+
+      def arr_data(data, name)
+        s = dn(data, name)
+        if s.nil?
+          []
+        else
+          s.split(',').map { |genre| genre.strip }
+        end
+      end
+
+      def str_data(data, name)
+        s = dn(data, name)
+
+        if s.class == String
+          s
+        elsif s.class == NilClass
+          nil
+        else
+          s.to_s
+        end
+      end
+
+      def bool_data(data, name)
+        s = dn(data, name)
+
+        if s.class == String
+          s = s.to_i
+        end
+
+        if s.class == TrueClass || s.class == FalseClass
+          s
+        else
+          s.present? && s == 1 ? true : false
+        end
+      end
+
+      def min_data(data, name)
+        s = dn(data, name)
+        s.present? ? Time.parse(s).seconds_since_midnight.to_i / 60 : 0
+      end
+
+      def url_data(data, name, id, poster_name)
+        s = dn(data, name)
+        s.nil? ? nil : "#{DOMAINS[:kinopoisk][:poster][poster_name]}_#{id}.jpg"
+      end
+
+
+      def film_hash(h, id='filmID')
+        {
+          id:                     int_data(String,  h[id            ]),
+          kp_type:                str_data(String,  h['type'        ]),
+          name_ru:                str_data(String,  h['nameRU'      ]),
+          name_en:                str_data(String,  h['nameEN'      ]),
+          slogan:                 str_data(String,  h['slogan'      ]),
+          description:            str_data(String,  h['description' ]),
+          poster_url:             url_data(String,  h['posterURL'   ], h[id], :film),
+          year:                   year_data(String, h['year'        ], :start),
+          year_end:               year_data(String, h['year'        ], :end),
+          reviews_count:          int_data(String,  h['reviewsCount']),
+          duration:               min_data(String,  h['filmLength'  ]),
+          countries:              arr_data(String,  h['country'     ]),
+          genres:                 arr_data(String,  h['genre'       ]),
+          video:                  h['videoURL'],
+          is_sequel_or_prequel:   bool_data(String, h['hasSequelsAndPrequelsFilms']),
+          is_similar_films:       bool_data(String, h['hasRelatedFilms'           ]),
+          is_imax:                bool_data(String, h['isIMAX'                    ]),
+          is_3d:                  bool_data(String, h['is3D'                      ]),
+          rating_mpaa:            str_data(String,  h['ratingMPAA'                ]),
+          minimal_age:            int_data(String,  h['ratingAgeLimits'           ])
+        }
+      end
+
+      def people_hash(h)
+        {
+          :id          => int_data(String,      h['id'        ]),
+          :kp_type     => str_data(String,      h['type'      ]),
+          :name_ru     => str_data(String,      h['nameRU'    ]),
+          :name_en     => str_data(String,      h['nameEN'    ]),
+          :poster_url  => url_data(String,      h['posterURL' ], @id, :name),
+          :sex         => str_data(String,      h['sex'       ]),
+          :growth      => int_data(String,      h['growth'    ]),
+          :birthday    => time_data(String,     h['birthday'  ]),
+          :birthplace  => str_data(String,      h['sex'       ]),
+          :has_awards  => bool_data(String,     h['has_awards']),
+          :profession  => s2a(str_data(String,  h['profession']))
+        }
+      end
+
+
+
+
+
+
+      def dn(data, name)
+        if data.nil?
+          r = @json[name]
+        elsif data == String
+          r = name
+        else
+          if @json[data].nil?
+            r = nil
+          else
+            r = @json[data][name]
+          end
+        end
+        r
+      end
+
+
+
+
   end
 end

data/lib/KinopoiskAPI/api_error.rb

@@ -0,0 +1,21 @@
+module KinopoiskAPI
+  class APIerror < StandardError
+
+    def initialize(message, data)
+      super(message)
+      @data = data
+    end
+    attr_reader :data
+
+
+    def code
+      @data[:code]
+    end
+
+    def body
+      @data[:body]
+    end
+
+
+  end
+end

data/lib/KinopoiskAPI/category.rb

@@ -0,0 +1,31 @@
+module KinopoiskAPI
+  class Category < Agent
+    attr_accessor :url
+
+    def initialize
+      @url = "#{DOMAINS[:api]}/#{METHODS[:navigator_filters][:method]}"
+      @json = json
+    end
+
+    def genres
+      h(@json['genre'])
+    end
+
+    def countries
+      h(@json['country'])
+    end
+
+    private
+      def h(j)
+        j.map do |item|
+          {
+            id:       int_data(String, item["id"      ]),
+            name:     str_data(String, item["name"    ]),
+            popular:  bool_data(String, item["popular" ])
+          }
+        end
+      end
+
+    #private end
+  end
+end