etvnet-seek 0.7.2 → 0.8.0

data/lib/etvnet_seek/core/media_item.rb

@@ -18,8 +18,16 @@ class MediaItem
     false
   end
 
-  def has_media_links?
-    Nokogiri::HTML(open(Page::BASE_URL + link)).css("b a.media_file").size > 0
+#  def has_media_links?
+#    page = Page.new link
+#
+#    page.document.css("b a.media_file").size > 0
+#  end
+
+  def access_page?
+    page = Page.new link
+
+    page.document.css(".start-video start-movie").size > 0
   end
 
   def ==(object)

data/lib/etvnet_seek/core/media_page.rb

@@ -1,41 +1,68 @@
-class MediaPage < BasePage
+require 'etvnet_seek/core/items_page'
+require 'etvnet_seek/core/browse_media_item'
+
+class MediaPage < ItemsPage
+
   def items
     list = []
 
     document.css(".conteiner table#table-onecolumn tr").each do |item|
-      showtime = item.css("td[1]").text.strip
-      name = item.css("td[2]").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 : ""
-      duration = item.css("td[5]") ? item.css("td[5]").text.strip : ""
-      year = item.css("td[6]") ? item.css("td[6]").text.strip : ""
-      channel = item.css("td[7]") ? item.css("td[7]").text.strip : ""
-
-      link = item.css("td[2] a").at(0).attributes['href'].value
-
-      additional_info = additional_info(item.css("td[2] a").at(0), 2)
-      
-      if additional_info.strip.size > 0
-        folder = true
-      else
+      unless item.css("td[1]").text.empty?
+        showtime = item.css("td[1]").text.strip
+        name = item.css("td[2]").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 : ""
+        duration = item.css("td[5]") ? item.css("td[5]").text.strip : ""
+        year = item.css("td[6]") ? item.css("td[6]").text.strip : ""
+        channel = item.css("td[7]") ? item.css("td[7]").text.strip : ""
+
+        link = item.css("td[2] a").at(0).attributes['href'].value
+
+        additional_info = additional_info(item.css("td[2] a").at(0), 2)
+
         folder = false
-      end
 
-      record = BrowseMediaItem.new(name, link)
-      record.folder = folder
-      record.showtime = showtime
-      record.year = year
-      record.duration = duration
-      record.channel = channel
-      record.rating_image = rating_image
-      record.rating = rating
+        if not additional_info.nil? and additional_info.strip.size > 0
+          if(additional_info.strip.scan(/\((\d*)(.*)\)/)).size > 0
+            folder = true
+          end
+        end
 
-      list << record
+        record = BrowseMediaItem.new(name, link)
+        record.folder = folder
+        record.showtime = showtime
+        record.year = year
+        record.duration = duration
+        record.channel = channel
+        record.rating_image = rating_image
+        record.rating = rating
+
+        list << record
+      end
     end
 
     list
-  end  
+  end
+
+  def info_movie_breadcrumbs
+    document.css(".path_movie_info_menu").inner_html
+  end
+
+  def info_movie_screenshots
+    collect_images ".all-inner-pages .screenshots"
+  end
+
+  def info_movie_descripton
+   document.css(".all-inner-pages .description")[0].children.at(0).text
+  end
+
+  def info_movie_additional_info
+    document.css(".all-inner-pages .description")[1].inner_html
+  end
 
+  def info_movie_additional_info2
+    document.css(".all-inner-pages .acc_container").inner_html
+  end
 end
 
 

data/lib/etvnet_seek/core/new_item.rb

@@ -1,3 +1,5 @@
+require 'etvnet_seek/core/media_item'
+
 class NewItem < MediaItem
 
   attr_accessor :image

data/lib/etvnet_seek/core/new_items_page.rb

@@ -1,4 +1,7 @@
-class NewItemsPage < BasePage
+require 'etvnet_seek/core/items_page'
+require 'etvnet_seek/core/browse_media_item'
+
+class NewItemsPage < ItemsPage
 
   def items
     list = []

data/lib/etvnet_seek/core/page.rb

@@ -1,5 +1,7 @@
 require 'nokogiri'
 
+require 'etvnet_seek/core/service_call'
+
 class Page < ServiceCall
   BASE_URL = "http://www.etvnet.com"
 

data/lib/etvnet_seek/core/premiere_page.rb

@@ -0,0 +1,7 @@
+require 'etvnet_seek/core/group_page'
+
+class PremierePage < GroupPage
+  def items
+    get_typical_items("ul.recomendation-list li")
+  end
+end

data/lib/etvnet_seek/core/radio_page.rb

@@ -0,0 +1,23 @@
+require 'etvnet_seek/core/items_page'
+require 'etvnet_seek/core/media_item'
+
+class RadioPage < ItemsPage
+  AUDIO_URL = BASE_URL + "/audio/"
+
+  def initialize url = AUDIO_URL
+    super(url)
+  end
+
+  def items
+    list = []
+
+    document.css("#sidebar #slideshow1 .active a").each do |item|
+      text = item.css("img").at(0).attributes["title"].value.strip
+      href = item['href']
+
+      list << MediaItem.new(text, href)
+    end
+
+    list
+  end
+end

data/lib/etvnet_seek/core/search_page.rb

@@ -1,42 +1,12 @@
 require 'cgi'
 
-class SearchPage < Page
+require 'etvnet_seek/core/catalog_page'
+
+class SearchPage < CatalogPage
   SEARCH_URL = BASE_URL + "/search/"
 
   def initialize(params)
     super("#{SEARCH_URL}?q=#{CGI.escape(*params)}")
   end
 
-  def items
-    list = []
-
-    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[2] img").at(0) ? item.css("td[2] img").at(0).attributes['src'].value.strip : ""
-      rating = item.css("td[3]") ? item.css("td[3]").text.strip : ""
-      name = item.css("td[4]").text.strip
-      duration = item.css("td[5]") ? item.css("td[5]").text.strip : ""
-      link = item.css("td[4] a").at(0)
-
-      href = link.attributes['href'].value
-
-      amount_expr = name.scan(%r{(.*)+\((\d*)+ (.*)+\)})[0]
-
-      folder = (not amount_expr.nil? and amount_expr.size > 1) ? true : false
-
-      record = BrowseMediaItem.new(name, href)
-      record.folder = folder
-      record.showtime = showtime
-      record.duration = duration
-      #record.channel = channel
-      record.rating_image = rating_image
-      record.rating = rating
-
-      list << record
-    end
-
-    list
-  end
 end

data/lib/etvnet_seek/core/service_call.rb

@@ -1,5 +1,19 @@
 require 'open-uri'
 
+require 'net/http'
+
+# Lengthen timeout in Net::HTTP
+module Net
+  class HTTP
+    alias old_initialize initialize
+
+    def initialize(*args)
+      old_initialize(*args)
+      @read_timeout = 3*60 # 3 minutes
+    end
+  end
+end
+
 class ServiceCall
   attr_reader :url
 
@@ -8,20 +22,34 @@ class ServiceCall
   end
 
   def get
-    open(url)
+    open(url, "User-Agent" => "Ruby/#{RUBY_VERSION}")
   end
 
-  def post params, headers
-    request = Net::HTTP::Post.new(url, headers)
-
+  def post params, headers, url = @url
+    request = Net::HTTP::Post.new(url, headers.merge({"User-Agent" => "Ruby/#{RUBY_VERSION}"}))
     request.set_form_data(params)
+    #request.basic_auth(un, pw)
+    #"Content-Type"=>"application/x-www-form-urlencoded",
+    #"Authorization" => "Basic " + Base64::encode64("account:password")
+    response = request(request, url)
 
-    request(request)
+    if response.class == Net::HTTPMovedPermanently
+      response = handle_redirect response['location'], params, headers
+    end
+
+    response
   end
 
   protected
 
-  def request request
+  def handle_redirect url, params, headers
+    request = Net::HTTP::Post.new(url, headers.merge({"User-Agent" => "Ruby/#{RUBY_VERSION}"}))
+    request.set_form_data(params)
+
+    request(request, url)
+  end
+
+  def request request, url
     uri = URI.parse(url)
 
     connection = Net::HTTP.new(uri.host, uri.port)

data/lib/etvnet_seek/core/top_this_week_page.rb

@@ -0,0 +1,20 @@
+require 'etvnet_seek/core/group_page'
+require 'etvnet_seek/core/group_media_item'
+
+class TopThisWeekPage < GroupPage
+  def items
+    parent = document.css(".conteiner .coming-soon").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/etvnet_seek.rb

@@ -3,8 +3,5 @@ require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'etvnet_seek/core/page_factory'
-
-require 'etvnet_seek/cookie_helper'
-require 'etvnet_seek/link_info'
+require 'etvnet_seek/main'
 

data/lib/etvnet_seek/main.rb

@@ -4,120 +4,149 @@ require 'date'
 
 require 'etvnet_seek/commander'
 require 'etvnet_seek/user_selection'
+require 'etvnet_seek/accessor'
 require 'runglish'
 
+require 'etvnet_seek/link_info'
+require 'etvnet_seek/core/items_page_factory'
+require 'etvnet_seek/core/items_page'
+
 class Main
   COOKIE_FILE_NAME = ENV['HOME'] + "/.etvnet-seek"
 
   def initialize
-    @cookie_helper = CookieHelper.new COOKIE_FILE_NAME
     @commander = Commander.new
+    @accessor = Accessor.new COOKIE_FILE_NAME, lambda { get_credentials }
   end
 
-  def seek *params
-    if @commander.search_mode?
-      params = read_keywords(*params)
-
-      puts "Keywords: #{params}" if @commander.runglish_mode?
+  def process *params
+    mode = @commander.get_initial_mode
+
+    case mode
+      when /(search|translit)/ then
+        keywords = read_keywords(*params)
+        puts "Keywords: #{keywords}" if @commander.translit_mode?
+
+        process_folder "search", keywords
+      when 'main' then
+        main
+      when 'channels' then
+        channels
+      when 'catalog' then
+        process_folder "catalog"
+      when 'best_hundred' then
+        best_hundred
+      when 'top_this_week' then
+        top_this_week
+      when 'premiere' then
+        process_folder "premiere"
+      when 'new_items' then
+        process_folder "new_items"
     end
-
-    process @commander.get_initial_mode, params
   end
 
-  def process mode, *params
-    page = PageFactory.create(mode, params)
+  def main
+    process_items "main" do |item, _|
+      case item.link
+        when /tv_channels/ then
+          channels
+        when /(aired_today|catalog)/ then
+          process_folder "media", item.link
+        when /audio/ then
+          audio item.link
+      end
+    end
+  end
 
-    if mode == 'access'
-      process_access page, params[0]
-    elsif mode == 'login'
-      item = params[0]
-      cookie = page.login(*get_credentials)
+  def channels
+    process_items "channels" do |item, user_selection|
+      link = user_selection.catalog? ? item.catalog_link : item.link
 
-      @cookie_helper.save_cookie cookie
+      process_folder "media", link
+    end
+  end
 
-      process("access", item)
-    else
-      items = page.items
-
-      if items.size > 0
-        display_items items
-        display_bottom_menu_part(mode)
-
-        user_selection = read_user_selection items
-
-        if not user_selection.quit?
-          current_item = items[user_selection.index]
-          if mode == 'main'
-            case current_item.link
-              when '/' then
-                process("main")
-              when /aired_today/ then
-                process('media', current_item.link)
-              when /catalog/ then
-                process('media', current_item.link)
-              when /tv_channels/ then
-                process('channels', current_item.link)
-            end
-          elsif mode == 'channels'
-            p user_selection.catalog?
-            if user_selection.catalog?
-              process('media', current_item.catalog_link)
-            else
-              process('media', current_item.link)
-            end
-          elsif mode == 'new_items'
-            process('access', current_item)
-          elsif mode == 'premiere'
-            process('access', current_item)
-          elsif mode == 'catalog'
-             p 'catalog'
-            process('media', current_item.link)
-          else # media
-            if current_item.folder? or current_item.link =~ /(catalog|tv_channel)/
-              process('media', current_item.link)
-            else
-              process("access", current_item)
-            end
-          end
-        end
-      end
+  def best_hundred
+    process_items "best_hundred" do |item, _|
+      process_group item, item.link =~ /best100/
     end
   end
 
-  def process_access page, item
-    cookie = @cookie_helper.load_cookie
+  def top_this_week
+    process_items "top_this_week" do |item, _|
+      process_group item, item.link =~ /top_this_week/
+    end
+  end
 
-    if cookie.nil?
-      process("login", item)
+  def process_group item, next_group
+    if next_group
+      process_items "media", item.link do |media_item, _|
+        access_or_media item, (folder?(media_item) or not media_item.access_page?)
+      end
     else
-      expires = CookieHelper.get_expires(cookie)
-      cookie_expire_date =  DateTime.strptime(expires, "%A, %d-%b-%Y %H:%M:%S %Z")
+      access_or_media item, (folder?(item) or not item.access_page?)
+    end
+  end
 
-      if cookie_expire_date < DateTime.now # cookie expired?
-        @cookie_helper.delete_cookie
+  def folder? item
+    item.link =~ /(catalog|tv_channel)/ || item.folder?
+  end
 
-        process("login", item)
-      else
-        media_info = page.request_media_info(item.media_file, cookie)
+  def process_folder name, *params
+    process_items name, *params do |item, _|
+      access_or_media item, folder?(item)
+    end
+  end
 
-        if media_info.session_expired?
-          @cookie_helper.delete_cookie
+  def audio root
+    process_items "audio", root do |item1, _|
+      process_items "radio", item1.link do |item2, _|
+        media_info = MediaInfo.new item2.link
+        LinkInfo.new(item2, media_info)
+      end
+    end
+  end
 
-          process("login", item)
-        else
-          LinkInfo.new(item, media_info)
-        end
+  def access_or_media item, folder
+    if folder
+      process_folder "media", item.link
+    else
+      result = @accessor.access item
+
+      while(@accessor.try_again? or result.nil?) do
+        result = @accessor.access item
       end
+
+      result
     end
   end
 
   def get_credentials
-    username = ask("Enter username :  " )
-    password = ask("Enter password : " ) { |q| q.echo = '*' }
+    username = ask("Enter username :  ")
+    password = ask("Enter password : ") { |q| q.echo = '*' }
 
     [username, password]
   end
 
+  def process_items mode, *params
+    page = ItemsPageFactory.create mode, *params
+
+    items = page.items
+
+    if items.size > 0
+      display_items items
+      display_bottom_menu_part(mode)
+
+      user_selection = read_user_selection items
+
+      if not user_selection.quit?
+        current_item = items[user_selection.index]
+
+        yield(current_item, user_selection) if block_given?
+      end
+    end
+  end
+
   def display_items items
     if items.size == 0
       puts "Empty search result."
@@ -146,13 +175,13 @@ class Main
   def read_keywords input
     keywords = input
 
-    if(keywords.strip.size == 0)
+    if (keywords.strip.size == 0)
       while keywords.strip.size == 0
         keywords = ask("Keywords: ")
       end
     end
 
-    if RUBY_PLATFORM =~ /mswin32/ or @commander.runglish_mode?
+    if RUBY_PLATFORM =~ /mswin32/ or @commander.translit_mode?
       keywords = Runglish::LatToRusConverter.new.transliterate(keywords)
     end
 
@@ -161,7 +190,7 @@ class Main
 
   def read_user_selection items
     user_selection = UserSelection.new
-    
+
     while true
       user_selection.parse(ask("Select the number: "))