etvnet_seek 0.4.0 → 0.5.0

data/CHANGES

@@ -15,4 +15,8 @@
 
 == Version 0.4.0
 
+* Bug fixes, adding support for main menu
+
+== Version 0.5.0
+
 * Bug fixes, adding support for main menu

data/README

@@ -8,4 +8,12 @@
 
 == Usage
 
-etvnet_seek movie_title
+Usage: etvnet_seek [options] keywords
+    -s, --search                     Display Search Menu
+    -r, --runglish                   Enter russian keywords in translit
+    -b, --best-ten                   Display Best 10 Menu
+    -p, --popular                    Display Popular Menu
+    -w, --we-recommend               Display We recommend Menu
+    -c, --channels                   Display Channels Menu
+    -m, --main                       Display Main Menu
+    -h, --help                       Display this screen

data/bin/etvnet_seek

@@ -17,9 +17,10 @@ link_info = client.seek ARGV.join(' ')
 
 if not link_info.nil? and link_info.resolved?
   puts "Link #{link_info.text} [#{link_info.name} (#{link_info.media_file})]: #{link_info.link}"
+  puts "#{link_info.rtsp_link}"
 
   launch = ask("Launch link (y/n)?")
 
-  client.launch_link link_info.link unless launch =~ /n/i
+  client.launch_link link_info.link if launch =~ /y/i
 end
 

data/etvnet_seek.gemspec

@@ -4,7 +4,7 @@ require "rake"
 
 Gem::Specification.new do |s|
   s.name = %q{etvnet_seek}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
  
@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/shvets/etvnet_seek}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{etvnet_seek}
-  s.rubygems_version = %q{1.3.2}
-  s.summary = %q{Command line tool for getting mms urls from etvnet service.}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Accessing etvnet service from command line.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 2

data/lib/etvnet_seek/cookie_helper.rb

@@ -1,6 +1,3 @@
-require 'net/http'
-require 'uri'
-
 class CookieHelper
   
   def initialize cookie_file_name

data/lib/etvnet_seek/core/archive_media_item.rb

@@ -0,0 +1,38 @@
+class ArchiveMediaItem < MediaItem
+  attr_accessor :folder, :showtime, :duration, :year, :rating_image, :rating, :channel
+
+  def folder?
+    folder == true
+  end
+
+  def to_s
+    if folder?
+      buffer = "*** Folder *** "
+    else
+      buffer = ""
+    end
+
+    buffer += text
+
+    unless folder?
+      if underscore_name
+        buffer += ": #{underscore_name}"
+      else
+        buffer += ": #{link}"
+      end
+    end
+
+    buffer += " --- #{showtime}" if showtime
+
+    buffer += " (#{media_file})" if not media_file.nil? and media_file.size > 0
+    buffer += " --- #{duration}" if not duration.nil? and duration.size > 0
+    buffer += " --- #{year}" if not year.nil? and year.size > 2
+
+    buffer += " --- #{channel}" if channel    
+    buffer += " --- #{rating_image}" if rating_image
+    buffer += " --- #{rating}" if rating
+
+    buffer
+  end
+
+end

data/lib/etvnet_seek/core/archive_media_page.rb

@@ -0,0 +1,49 @@
+class ArchiveMediaPage < BasePage
+  def items
+    list = []
+
+    document.css("b a.media_file").each do |item|
+      link = item.attributes['href'].value
+      new_link = list.select {|l| l.link == link}.empty?
+
+      if new_link
+        text = item.content.strip
+        additional_info = additional_info(item, 1)
+
+        text += additional_info unless additional_info.nil?
+
+        tr = item.parent.parent.parent
+        showtime = tr.css("td[1]").text.strip
+        rating_image = tr.css("td[2] img").at(0) ? tr.css("td[2] img").at(0).attributes['src'].value.strip : ""
+        rating = tr.css("td[3]").text.strip
+
+        year = tr.css("td[6]") ? tr.css("td[6]").text.strip : ""
+        duration = tr.css("td[7]").text.strip ? tr.css("td[7]").text.strip : ""
+        channel = tr.css("td[8]") ? tr.css("td[8]").text.strip : ""
+
+        if link =~ /action=browse_container/
+          folder = true
+          link = link[Page::BASE_URL.size..link.size]
+        else
+          folder = false
+        end
+
+        record = ArchiveMediaItem.new(text, link)
+        record.folder = folder
+        record.rating_image = rating_image
+        record.rating = rating
+        record.showtime = showtime
+        record.duration = duration
+        record.year = year
+        record.channel = channel
+
+        list << record
+      end
+    end
+
+    list
+  end
+
+end
+
+

data/lib/etvnet_seek/core/base_page.rb

@@ -1,4 +1,5 @@
 class BasePage < Page
+
   def items
     list = []
 
@@ -6,12 +7,16 @@ class BasePage < Page
       text = item.css("img").at(0).attributes['alt'].value
       href = item['href']
 
-      list << MediaItem.new(text, href)
+       unless href =~ /(forum|action=browse_persons|valentines2010)/
+        list << MediaItem.new(text, href)
+       end
     end
 
+    list.delete_at(0)
+
     list
   end
-
+  
   def title
     document.css("title").text
   end
@@ -20,103 +25,6 @@ class BasePage < Page
     document.css(".global_content .global_content h1").text
   end
 
-  def navigation_menu
-    list = []
-
-    document.css("table tr td .navigation").first.parent.parent.parent.css("tr td a").each do |item|
-      text = item.children.at(0).content
-      href = item['href']
-
-      list <<  MediaItem.new(text, href) unless href =~ /(login|signup)/
-    end
-
-    list
-  end
-
-  def category_breadcrumbs
-    list = []
-
-    document.css("table tr td table tr td table tr td strong").each_with_index do |item, index|
-      if index == 0
-        item.children.each do |child|
-          text = child.text
-          link = child.attributes['href']
-          href = link.nil? ? nil : link.value
-
-          list << MediaItem.new(text, href)
-        end
-      end
-    end
-
-    list
-  end
-
-  def categories
-    list = []
-
-    document.css("table").each_with_index do |table1, index1|
-      if index1 == 5
-        table1.css("tr/td/table/tr/td/table").each_with_index do |table2, index2|
-          if index2 == 2
-            table2.css("tr[2]/td[2]/table").each_with_index do |table3, index3|
-
-            #if index2 > 1
-              table2.css("tr td a").each_with_index do |item2, index4|
-                link = item2.attributes['href'].value
-
-                if index4 > 0
-                  text = item2.text
-                  href = link
-
-                  additional_info = additional_info(item2, 2)
-
-                  list << MediaItem.new(text, href, additional_info)
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-
-    list
-  end
-
-  def title_items
-    list = []
-
-    root = nil
-    document.css("a").each do |item|
-      link = item.attributes['href']
-
-      unless link.value =~ /login.fcgi/
-        if link.value =~ /order_by/
-          root = link.parent.parent.parent.parent.parent.parent
-          break
-        end
-      end
-    end
-
-    if root
-      root.css("td").each do |item|
-        if item.search("table/tr/td/a").size > 0
-          link = item.css("table tr td a").first
-
-          text = link.text
-          href = link.attributes['href'].value
-
-          list << MediaItem.new(text, href)
-        elsif item.children.size == 1
-          if list.all? { |e| e.text != item.text }
-            list << MediaItem.new(item.text, nil)
-          end
-        end
-      end
-    end
-
-    list
-  end
-
   protected
 
   def additional_info node, index

data/lib/etvnet_seek/core/browse_media_item.rb

@@ -1,5 +1,5 @@
 class BrowseMediaItem < MediaItem
-  attr_accessor :folder, :showtime, :year, :duration, :rating_image, :image
+  attr_accessor :folder, :showtime, :year, :duration, :image, :rating_image, :channel
 
   def initialize(text, link)
     super(text, link)
@@ -31,6 +31,7 @@ class BrowseMediaItem < MediaItem
     buffer += " (#{media_file})" if not media_file.nil? and media_file.size > 0
     buffer += " --- #{year}" if not year.nil? and year.size > 2
     buffer += " --- #{duration}" if not duration.nil? and duration.size > 0
+    buffer += " --- #{channel}" if channel 
     buffer += " --- #{image}" if image
     buffer += " --- #{rating_image}" if rating_image
 

data/lib/etvnet_seek/core/channel_media_item.rb

@@ -10,4 +10,8 @@ class ChannelMediaItem < MediaItem
   def channel
     link[link.index("channel=") + "channel=".size, link.size-1]
   end
+
+  def to_s
+    super + " (#{channel})"
+  end
 end

data/lib/etvnet_seek/core/channels_page.rb

@@ -9,7 +9,7 @@ class ChannelsPage < MediaPage
   def items
     list = []
 
-    document.css("table table table.rounded_white table tr").each_with_index do |item, index|
+    document.css("table table table.rounded_white table tr").each do |item|
       links = item.css("table tr td a")
 
       text = item.children.at(0).text.strip
@@ -27,7 +27,7 @@ class ChannelsPage < MediaPage
           archive_link = archive_href.attributes['href'].value unless archive_href.nil?
         end
 
-        list << ChannelMediaItem.new(text, link, archive_link)
+        list << ChannelMediaItem.new(text, link, archive_link) unless link.nil?
       end
     end
 

data/lib/etvnet_seek/core/media_page.rb

@@ -12,17 +12,18 @@ class MediaPage < BasePage
 
         text += additional_info unless additional_info.nil?
 
-        showtime = item.parent.parent.parent.css('td[1]').text.strip
-        year = item.parent.parent.next.next.content.strip
-        duration = ""
+        tr = item.parent.parent.parent
+
+        showtime = tr.css("td[1]").text.strip
+        year = tr.css("td[4]") ? tr.css("td[4]").text.strip : ""
+        duration = tr.css("td[5]").text.strip ? tr.css("td[5]").text.strip : ""
+        channel = tr.css("td[6]") ? tr.css("td[6]").text.strip : ""
 
         if link =~ /action=browse_container/
           folder = true
           link = link[Page::BASE_URL.size..link.size]
         else
           folder = false
-          duration = item.parent.parent.next.next.next.next.content.strip unless
-            item.parent.parent.next.next.next.next.nil?
         end
 
         record = BrowseMediaItem.new(text, link)
@@ -30,7 +31,8 @@ class MediaPage < BasePage
         record.showtime = showtime
         record.year = year
         record.duration = duration
-
+        record.channel = channel
+        
         list << record
       end
     end

data/lib/etvnet_seek/core/page_factory.rb

@@ -1,5 +1,6 @@
 
 require 'etvnet_seek/core/media_item'
+require 'etvnet_seek/core/archive_media_item'
 require 'etvnet_seek/core/media_info'
 require 'etvnet_seek/core/browse_media_item'
 require 'etvnet_seek/core/channel_media_item'
@@ -9,6 +10,7 @@ require 'etvnet_seek/core/service_call'
 require 'etvnet_seek/core/page'
 require 'etvnet_seek/core/base_page'
 require 'etvnet_seek/core/media_page'
+require 'etvnet_seek/core/archive_media_page'
 require 'etvnet_seek/core/main_page'
 require 'etvnet_seek/core/search_page'
 require 'etvnet_seek/core/freetv_page'
@@ -26,7 +28,7 @@ class PageFactory
       when 'search' then
         SearchPage.new *params
       when 'main' then
-        MainPage.new
+        BasePage.new
       when 'channels' then
         ChannelsPage.new
       when 'best_ten' then
@@ -41,6 +43,8 @@ class PageFactory
         FreetvPage.new
       when 'media' then
         MediaPage.new url
+      when 'archive_media' then
+        ArchiveMediaPage.new url
       when 'access' then
         AccessPage.new
       when 'login' then

data/lib/etvnet_seek/core/search_page.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 class SearchPage < MediaPage
   SEARCH_URL = BASE_URL + "/cgi-bin/video/eitv_browse.fcgi?action=search"
 

data/lib/etvnet_seek/link_info.rb

@@ -30,4 +30,8 @@ class LinkInfo
     media_info.link
   end
 
+  def rtsp_link
+    media_info.rtsp_link
+  end
+
 end

data/lib/etvnet_seek/main.rb

@@ -65,12 +65,17 @@ class Main
             end
           elsif mode == 'channels'
             if user_selection.archive?
-              process('media', current_item.archive_link)
+              process('archive_media', current_item.archive_link)
             else
               process('media', current_item.link)
             end
           else # media : announces, freetv, category
-            if current_item.folder? or current_item.link =~ /action=view_recommended/
+            require 'nokogiri'
+            require 'open-uri'
+
+            size = Nokogiri::HTML(open(Page::BASE_URL + current_item.link)).css("b a.media_file").size
+
+            if current_item.folder? or current_item.link =~ /action=view_recommended/ or size > 0
               process('media', current_item.link)
             else
               process("access", current_item)
@@ -126,7 +131,7 @@ class Main
   end
 
   def display_bottom_menu_part mode
-    puts "<number> => today; <number>.a => archive" if mode == 'channels'
+    puts "<number> => today; <number> a => archive" if mode == 'channels'
     puts "q. to exit"
   end
 

data/lib/etvnet_seek/user_selection.rb

@@ -8,22 +8,6 @@ class UserSelection
 
     @index = result[0].to_i-1
     @quit = (result & ['q', 'Q']).empty? ? false : true
-    @archive = (result & ['a', 'A']).empty? ? false : true
-
-#    @quit = (['q', 'Q'].include? text) ? true : false
-#    @blank = text.strip.size == 0
-#    dot_index = text.index('.')
-#
-#    if not dot_index.nil?
-#      part1 = text[0..dot_index-1]
-#      part2 = text[dot_index+1..-1]
-#
-#      @index = (part1.to_i)-1
-#
-#      @archive = (['a', 'A'].include? part2) ? true : false
-#    else
-#      @index = text.to_i-1
-#    end
   end
 
   def quit?
@@ -38,8 +22,4 @@ class UserSelection
     @archive
   end
 
-  def item items
-    items[index]
-  end
-
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: etvnet_seek
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Alexander Shvets
@@ -14,104 +19,136 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 3
         version: 1.1.3
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 1
         version: 1.4.1
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 7
         version: 0.9.7
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: metric_fu
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: reek
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: roodi
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: googlecharts
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id010
 description: Command line tool for getting mms urls from etvnet service.
 email: alexander.shvets@gmail.com
 executables: 
@@ -127,6 +164,8 @@ files:
 - lib/etvnet_seek/cookie_helper.rb
 - lib/etvnet_seek/core/access_page.rb
 - lib/etvnet_seek/core/announces_page.rb
+- lib/etvnet_seek/core/archive_media_item.rb
+- lib/etvnet_seek/core/archive_media_page.rb
 - lib/etvnet_seek/core/base_page.rb
 - lib/etvnet_seek/core/browse_media_item.rb
 - lib/etvnet_seek/core/channel_media_item.rb
@@ -135,7 +174,6 @@ files:
 - lib/etvnet_seek/core/group_media_item.rb
 - lib/etvnet_seek/core/group_page.rb
 - lib/etvnet_seek/core/login_page.rb
-- lib/etvnet_seek/core/main_page.rb
 - lib/etvnet_seek/core/media_info.rb
 - lib/etvnet_seek/core/media_item.rb
 - lib/etvnet_seek/core/media_page.rb
@@ -166,20 +204,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - none
 rubyforge_project: etvnet_seek
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
-summary: Command line tool for getting mms urls from etvnet service.
+summary: Accessing etvnet service from command line.
 test_files: 
 - spec/etvnet_seek_spec.rb

data/lib/etvnet_seek/core/main_page.rb

@@ -1,20 +0,0 @@
-class MainPage < BasePage
-
-  def items
-    list = []
-
-    document.css("#tblCategories a").each do |item|
-      text = item.css("img").at(0).attributes['alt'].value
-      href = item['href']
-
-       unless href =~ /forum.etvnet.ca/ or href =~ /action=browse_persons/ or href =~ /valentines2010/
-        list << MediaItem.new(text, href)
-       end
-    end
-
-    list.delete_at(0)
-
-    list
-  end
-
-end