etvnet-seek 0.7.2 → 0.8.0

data/lib/etvnet_seek/core/access_page.rb

@@ -1,5 +1,11 @@
+require 'json'
+
+require 'etvnet_seek/core/page'
+require 'etvnet_seek/core/media_info'
+require 'etvnet_seek/core/service_call'
+
 class AccessPage < ServiceCall
-  ACCESS_URL = Page::BASE_URL + "/watch_new/"
+  ACCESS_URL = Page::BASE_URL + "/watch/"
 
   def initialize
     super(ACCESS_URL)
@@ -7,13 +13,24 @@ class AccessPage < ServiceCall
 
   def request_media_info media_file, cookie
     params = { 'bitrate' => '2', 'view' => 'submit'}
-    headers = { 'Cookie' => cookie }
 
-    @url += "#{media_file}/"
-    
-    response = post(params, headers)
+    if true
+      params['high_quality'] = ""
+    end
+
+    headers = { 'Cookie' => cookie, 'X-Requested-With' =>	'XMLHttpRequest' }
+
+    response = post(params, headers, url + "#{media_file}/")
+
+    # MediaInfo.new Nokogiri::HTML(response.body).css("ref").at(0).attributes["href"].text
+
+    json = JSON.parse(response.body)
 
-    MediaInfo.new Nokogiri::HTML(response.body).css("ref").at(0).attributes["href"].text
+    if response.kind_of? Net::HTTPOK
+      MediaInfo.new json["url"]
+    else
+      raise "Problem getting url: #{response.class.name}: #{json['msg']} "
+    end
   end
 
 end

data/lib/etvnet_seek/core/audio_page.rb

@@ -0,0 +1,26 @@
+require 'etvnet_seek/core/items_page'
+require 'etvnet_seek/core/media_item'
+
+class AudioPage < ItemsPage
+  AUDIO_URL = BASE_URL + "/audio/"
+
+  def initialize url = AUDIO_URL
+    super(url)
+  end
+
+  def items
+    list = []
+
+    document.css("#nav a").each do |item|
+      text = item.css("span").text.strip
+      href = item['href']
+
+      unless href == '/' or href =~ /(press|register|persons)/
+        list << MediaItem.new(text, href)
+      end
+    end
+
+    list
+  end
+
+end

data/lib/etvnet_seek/core/best_hundred_page.rb

@@ -0,0 +1,20 @@
+require 'etvnet_seek/core/group_page'
+require 'etvnet_seek/core/media_item'
+
+class BestHundredPage < GroupPage
+  def items
+    parent = document.css(".conteiner .best").at(0).parent
+    parent.css("ul.best-list li")
+
+    list = get_typical_items("ul.best-list li", parent)
+
+    node = parent.css("ul.best-list").at(0).next
+
+    unless node.nil?
+      link = node.attributes['href'].value
+      text = node.children.at(0).content
+
+      list << GroupMediaItem.new(text, link)
+    end
+  end
+end

data/lib/etvnet_seek/core/browse_media_item.rb

@@ -10,6 +10,7 @@ class BrowseMediaItem < MediaItem
   end
 
   def to_s
+    #buffer = ""
     if folder?
       buffer = "*** Folder *** "
     else

data/lib/etvnet_seek/core/catalog_page.rb

@@ -1,4 +1,4 @@
-class CatalogPage < MediaPage
+class CatalogPage < ItemsPage
   CATALOG_URL = BASE_URL + "/catalog/"
 
   def initialize url = CATALOG_URL
@@ -8,19 +8,31 @@ class CatalogPage < MediaPage
   def items
     list = []
 
-    document.css("#table-onecolumn tr").each do |item|
-      links = item.css("td a")
-
-      href = links[0]
-      catalog_href = links[1]
-
-      link = href.attributes['href'].value
-      text = href.attributes['title'].value
-      catalog_link = catalog_href.attributes['href'].value
-
-      item = CatalogItem.new(text, link, catalog_link)
-
-      list << item
+    document.css(".conteiner #results #table-onecolumn tr").each_with_index do |item, index|
+      next if index == 0
+
+      showtime = item.css("td[1]").text.strip
+      rating_image = item.css("td[3] img").at(0) ? item.css("td[3] img").at(0).attributes['src'].value.strip : ""
+      rating = item.css("td[4]") ? item.css("td[4]").text.strip : ""
+      name = item.css("td[2]").text.strip
+      duration = item.css("td[5]") ? item.css("td[5]").text.strip : ""
+      link = item.css("td[2] a").at(0)
+
+      unless link.nil?
+        href = link.attributes['href'].value
+        digit_scan = name.scan(/\((\d*).*\)/)[0]
+        amount_expr = digit_scan.nil? ? 0 : digit_scan[0].to_i
+        folder = (amount_expr > 1) ? true : false
+
+        record = BrowseMediaItem.new(name, href)
+        record.folder = folder
+        record.showtime = showtime
+        record.duration = duration
+        record.rating_image = rating_image
+        record.rating = rating
+
+        list << record
+      end
     end
 
     list

data/lib/etvnet_seek/core/channels_page.rb

@@ -1,5 +1,9 @@
-class ChannelsPage < MediaPage
-  CHANNELS_URL = BASE_URL + "/tv_channels/"
+require 'etvnet_seek/core/page'
+require 'etvnet_seek/core/items_page'
+require 'etvnet_seek/core/channel_media_item'
+
+class ChannelsPage < ItemsPage
+  CHANNELS_URL = Page::BASE_URL + "/tv_channels/"
 
   def initialize url = CHANNELS_URL
     super(url)

data/lib/etvnet_seek/core/group_media_item.rb

@@ -1,3 +1,5 @@
+require 'etvnet_seek/core/media_item'
+
 class GroupMediaItem < MediaItem
 
   def to_s

data/lib/etvnet_seek/core/group_page.rb

@@ -1,10 +1,16 @@
-class GroupPage < BasePage
+require 'etvnet_seek/core/items_page'
+require 'etvnet_seek/core/group_media_item'
+
+class GroupPage < ItemsPage
+
   protected
 
-  def get_typical_items tag_name
+  def get_typical_items tag_name, parent=nil
     list = []
 
-    document.css(tag_name).each do |item|
+    root = parent.nil? ? document : parent
+
+    root.css(tag_name).each do |item|
       href = item.css("a").at(0)
       
       unless href.nil?
@@ -19,24 +25,4 @@ class GroupPage < BasePage
   end
 end
 
-class BestHundredPage < GroupPage
-  def items
-    list = get_typical_items("ul.best-list li")
-
-    node = document.css("ul.best-list").at(0).next
-
-    unless node.nil?
-      link = node.attributes['href'].value
-      text = node.children.at(0).content
-
-      list << GroupMediaItem.new(text, link)
-    end
-  end
-end
-
-class PremierePage < GroupPage
-  def items
-    get_typical_items("ul.recomendation-list li")
-  end
-end
 

data/lib/etvnet_seek/core/home_page.rb

@@ -1,4 +1,7 @@
-class HomePage < Page
+require 'etvnet_seek/core/items_page'
+require 'etvnet_seek/core/media_item'
+
+class HomePage < ItemsPage
 
   def items
     list = []
@@ -7,7 +10,7 @@ class HomePage < Page
       text = item.css("span").text.strip
       href = item['href']
       
-      unless href == '/' or href =~ /(person|help|register)/
+      unless href == '/' or href =~ /(person|help|register|press)/
         list << MediaItem.new(text, href)
       end
     end

data/lib/etvnet_seek/core/items_page.rb

@@ -0,0 +1,140 @@
+require 'etvnet_seek/core/page'
+require 'etvnet_seek/core/media_item'
+
+class ItemsPage < Page
+  def items
+    []
+  end
+
+  def title
+    document.css("title").text
+  end
+
+  def page_title
+    document.css(".conteiner h1").text
+  end
+
+  def navigation_menu
+    list = collect_links "#nav"
+
+    list.select { |element| not element =~ /(press|register|persons)/}
+  end
+
+  def category_breadcrumbs
+    collect_links ".info_menu-onecolumn .path_movie_menu"
+  end
+
+  def categories
+    list = []
+
+    document.css(".movie_menu-onecolumn ul li").each do |item|
+      href = item.css("a").at(0).attributes['href'].value
+      text = item.css("a").at(0).text
+      additional_info = item.css("span.small-text-movie-menu")
+
+      list << MediaItem.new(text, href, additional_info)
+    end
+
+    list
+  end
+
+  def title_items
+    list = []
+
+    document.css("#table-onecolumn th").each do |item|
+      link = item.css("a").at(0)
+
+      if link
+        href = link.attributes['href'].value
+        text = link.text
+      else
+        href = nil
+        text = item.text
+      end
+
+      list << MediaItem.new(text, href)
+    end
+
+    #    root = nil
+    #    document.css("table-onecolumn").each do |item|
+    #      link = item.attributes['href']
+    #
+    #      if link.value =~ /order_by/
+    #        root = link.parent.parent.parent.parent.parent.parent
+    #        break
+    #      end
+    #    end
+    #
+    #    if root
+    #      root.css("td").each do |item|
+    #        node1 = item.search("table/tr/td")
+    #        node2 = item.search("table/tr/td[2]")
+    #        if node1.search("a").size > 0
+    #          link = node1.css("a").first
+    #
+    #          text = link.text
+    #          href = link.attributes['href'].value
+    #
+    #          if node2.search("#SPAN_all_letters").size > 0
+    #            additional_info = node2.search("#SPAN_all_letters").at(0).inner_html
+    #            index = additional_info.index('<a href="#"')
+    #            additional_info = additional_info[0..index-2].strip + "]"
+    #          else
+    #            additional_info = nil
+    #          end
+    #
+    #          list << MediaItem.new(text, href, additional_info)
+    #        end
+    #      end
+    #    end
+
+    list
+  end
+
+  def see_too_items
+    collect_links ".description .all_next_prev_movie ul li"
+  end
+
+  def page_browser
+    node = document.css(".paging .holder").first
+
+    node.nil? ? nil : node.inner_html
+  end
+
+  def description
+    document.css(".description-container").inner_html
+  end
+
+  protected
+
+  def collect_links path
+    list = []
+
+    document.css("#{path} a").each do |item|
+      href = item.attributes['href'].value
+      text = item.text
+
+      list << MediaItem.new(text, href)
+    end
+
+    list
+  end
+
+  def collect_images path
+    list = []
+
+    document.css("#{path} img").each do |item|
+      list << item.attributes['src'].value.strip
+    end
+
+    list
+  end
+
+  def additional_info node, index
+    children = node.parent.children
+    if children.size > 0
+      element = children.at(index)
+      element.text if element
+    end
+  end
+end

data/lib/etvnet_seek/core/items_page_factory.rb

@@ -0,0 +1,47 @@
+require 'etvnet_seek/core/home_page'
+require 'etvnet_seek/core/channels_page'
+require 'etvnet_seek/core/catalog_page'
+require 'etvnet_seek/core/media_page'
+require 'etvnet_seek/core/search_page'
+require 'etvnet_seek/core/best_hundred_page'
+require 'etvnet_seek/core/top_this_week_page'
+require 'etvnet_seek/core/premiere_page'
+require 'etvnet_seek/core/new_items_page'
+require 'etvnet_seek/core/audio_page'
+require 'etvnet_seek/core/radio_page'
+
+class ItemsPageFactory
+  def self.create mode, params = []
+    url = (mode == 'search') ? nil : (params.class == String ? params : params[0])
+
+    case mode
+      when 'main' then
+        page = HomePage.new
+      when 'channels' then
+        page = ChannelsPage.new
+      when 'catalog' then
+        page = CatalogPage.new
+      when 'media' then
+        page = MediaPage.new url
+      when 'search' then
+        page = SearchPage.new *params
+      when 'best_hundred' then
+        page = BestHundredPage.new
+      when 'top_this_week' then
+        page = TopThisWeekPage.new
+      when 'premiere' then
+        page = PremierePage.new
+      when 'new_items' then
+        page = NewItemsPage.new
+      when 'audio' then
+        page = AudioPage.new url
+      when 'radio' then
+        page = RadioPage.new
+      else
+        page = nil
+    end
+
+    page
+  end
+
+end

data/lib/etvnet_seek/core/login_page.rb

@@ -1,5 +1,7 @@
 require 'stringio'
 
+require 'etvnet_seek/core/service_call'
+
 class LoginPage < ServiceCall
   LOGIN_URL = "#{Page::BASE_URL}/login/"
 
@@ -14,7 +16,7 @@ class LoginPage < ServiceCall
 
     cookie = response.response['set-cookie']
 
-    p cookie
+   # p cookie
 
 #    unless cookie.nil?
 #      cookie = cleanup_cookie(cookie)

data/lib/etvnet_seek/core/media_info.rb

@@ -1,23 +1,8 @@
-require 'json'
-
 class MediaInfo
-  attr_reader :name, :link, :description, :description_production, :rtsp_link, :speech_lang,
-              :file_length, :channel, :datetime, :popularity, :duration, :rating
+  attr_reader :link
 
-  def initialize params
-    @link = params
-#    @session_expired = (params["error_session_expire"] == 1)
-#    @description_production = params["description_production"]
-#    @rtsp_link = params["REDIRECT_URL_RTSP"]
-#    @speech_lang = params["speech_lang"]
-#    @name = params["name"]
-#    @description = params["description"]
-#    @file_length = params["file_length"]
-#    @channel = params["channel"]
-#    @datetime = params["datetime"]
-#    @popularity = params["popularity_24h"]
-#    @duration = params["duration"]
-#    @rating = params["rating"]
+  def initialize link
+    @link = link
   end
 
   def resolved?