etvnet_seek 0.1.0 → 0.2.0

data/CHANGES

@@ -4,3 +4,7 @@
 == Version 0.1.0
 
 * Initial release.
+
+== Version 0.2.0
+
+* Bug fixes, code for Windows

data/bin/etvnet_seek

@@ -1,30 +1,26 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
 require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
 
 $:.unshift(File::join(File::dirname(File::dirname(__FILE__)), "lib"))
 
-require 'etvnet_seek'
+$KCODE='u'
 
-client = EtvnetSeek.new
+require 'main'
 
-items = client.search ARGV.join(' ')
+client = Main.new
 
-client.display_search_items items
+movie_link = client.search_and_grab_link ARGV.join(' ')
 
-title_number = ask("Select title : ")
+if movie_link
+  puts "Link: #{movie_link}"
+  
+  if RUBY_PLATFORM =~ /(win|w)32$/
+    `wmplayer #{movie_link}`
+  elsif RUBY_PLATFORM =~ /darwin/
+    `open #{movie_link}`
+  end
 
-dot_index = title_number.index('.')
-
-if not dot_index.nil?
-  pos1 = title_number[0..dot_index-1].to_i
-  pos2 = title_number[dot_index+1..-1].to_i
-
-  movie_link = client.grab_movie_link items[pos1-1][:container][pos2-1][:link]
-else
-  movie_link = client.grab_movie_link items[title_number.to_i-1][:link]
 end
 
-puts "Link: #{movie_link}"
-
-`open #{movie_link}`

data/etvnet_seek.gemspec

@@ -4,7 +4,7 @@ require "rake"
 
 Gem::Specification.new do |s|
   s.name = %q{etvnet_seek}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
  

data/lib/cookie_helper.rb

@@ -7,7 +7,7 @@ module CookieHelper
     conn = Net::HTTP.new(uri.host, uri.port)
 
     headers = { "Content-Type" => "application/x-www-form-urlencoded" }
-    resp, data = conn.post("/cgi-bin/video/login.fcgi",
+    resp, data = conn.post(uri.path,
       "action=login&username=#{username}&pwd=#{password}&skip_notice=&redirect=", headers)
 
     cookie = resp.response['set-cookie']

data/lib/main.rb

@@ -0,0 +1,94 @@
+require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
+
+#require "readline"
+require "highline/import"
+
+require 'cookie_helper'
+require 'url_seeker'
+
+class Main
+  include CookieHelper
+
+  BASE_URL = "http://www.etvnet.ca"
+  SEARCH_URL = BASE_URL + "/cgi-bin/video/eitv_browse.fcgi?action=search"
+  ACCESS_URL = BASE_URL + "/cgi-bin/video/access.fcgi"
+  LOGIN_URL =  BASE_URL + "/cgi-bin/video/login.fcgi"
+
+  attr_reader :cookie
+
+  def initialize
+    @cookie = get_cookie
+  end
+
+  def self.search_url keywords, order_direction='-'
+    SEARCH_URL + "&keywords=#{CGI.escape(keywords)}&order_direction=#{order_direction}"
+  end
+
+  def search_and_grab_link keywords
+    if(keywords.strip.size == 0)
+      while keywords.strip.size == 0
+        keywords = ask("Keywords: ")
+      end
+    end
+
+    url_seeker = UrlSeeker.new
+
+    items = url_seeker.search Main.search_url(keywords)
+
+    if items.size == 0
+      say "Empty search result."
+      link = nil
+    else
+      url_seeker.display_results items
+
+      title_number = ask("Select title number: ")
+      while not title_number =~ /(\d+)(\.?)(\d*)/
+        title_number = ask("Select title number: ")
+      end
+
+      dot_index = title_number.index('.')
+
+      if not dot_index.nil?
+        pos1 = title_number[0..dot_index-1].to_i
+        pos2 = title_number[dot_index+1..-1].to_i
+
+        link = url_seeker.grab_movie_link items[pos1-1][:container][pos2-1][:link], cookie, ACCESS_URL
+      else
+        link = url_seeker.grab_movie_link items[title_number.to_i-1][:link], cookie, ACCESS_URL
+      end
+    end
+
+    link
+  end
+
+  private
+
+  def get_cookie
+    file_name = ENV['HOME'] + "/.etvnet-seek"
+
+    if File.exist? file_name
+      cookie = read_user_file file_name
+    else
+      username = ask("Enter username :  " )
+      password = ask("Enter password : " ) { |q| q.echo = '*' }
+
+      cookie = retrieve_cookie LOGIN_URL, username, password
+
+      write_user_file file_name, cookie
+   end
+
+    cookie
+  end
+
+  def read_user_file file_name
+    File.open(file_name, 'r') do |file|
+      return file.gets
+    end
+  end
+
+  def write_user_file file_name, cookie
+    File.open(file_name, 'w') do |file|
+      file.puts cookie
+    end
+  end
+end

data/lib/runglish.rb

@@ -0,0 +1,44 @@
+# Converts file names in directory recursively from Russian to Runglish.
+#
+# Runglish stands for Russian text in Latin letters.
+
+class Runglish
+  RUSSIAN_TABLE = [
+    '\u0430', '\u0431', '\u0432', '\u0433', '\u0434', '\u0435', '\u0436', '\u0437',
+    '\u0438', '\u0439', '\u043a', '\u043b', '\u043c', '\u043d', '\u043e', '\u043f',
+    '\u0440', '\u0441', '\u0442', '\u0443', '\u0444', '\u0445', '\u0446', '\u0447',
+    '\u0448', '\u0449', '\u044a', '\u044b', '\u044c', '\u044d', '\u044e', '\u044f',
+    '\u0451',
+    '\u0401',
+    '\u0410', '\u0411', '\u0412', '\u0413', '\u0414', '\u0415', '\u0416', '\u0417',
+    '\u0418', '\u0419', '\u041a', '\u041b', '\u041c', '\u041d', '\u041e', '\u041f',
+    '\u0420', '\u0421', '\u0422', '\u0423', '\u0424', '\u0425', '\u0426', '\u0427',
+    '\u0428', '\u0429', '\u042a', '\u042b', '\u042c', '\u042d', '\u042e', '\u042f'
+  ]
+
+
+  ENGLISH_TABLE = [
+    "a", "b", "v", "g", "d", "e", "zh", "z", "i", "y", "k", "l", "m", "n", "o", "p", "r",
+    "s", "t", "u", "f", "h", "c", "ch", "sh", "s'h", "''", "yi", "'", "ye", "yu", "ya",
+    "yo",
+    "YO",
+    "A", "B", "V", "G", "D", "E", "Zh", "Z", "I", "Y", "K", "L", "M", "N", "O", "P", "R",
+    "S", "T", "U", "F", "H", "C", "Ch", "Sh", "S'h", "''", "Yi", "'", "Ye", "Yu", "Ya"
+  ]
+
+  ENGLISH_RUSSIAN_MAP = Hash[*ENGLISH_TABLE.zip(RUSSIAN_TABLE).flatten]
+
+  def translate(old_text)
+    new_text = ""
+
+    old_text.each_char do |ch|
+       new_ch = ENGLISH_RUSSIAN_MAP[ch].nil? ? ch : ENGLISH_RUSSIAN_MAP[ch]
+
+      new_text += new_ch
+    end
+
+    new_text
+  end
+end
+
+

data/lib/{etvnet_seek.rb → url_seeker.rb}

@@ -1,31 +1,11 @@
-require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
-
 require 'nokogiri'
 require 'open-uri'
-#require "readline"
-require "highline/import"
 require 'cgi'
 require 'json'
 
-require 'cookie_helper'
-
-class EtvnetSeek
-  include CookieHelper
-  
-  BASE_URL = "http://www.etvnet.ca"
-  SEARCH_URL = BASE_URL + "/cgi-bin/video/eitv_browse.fcgi?action=search"
-  ACCESS_URL = BASE_URL + "/cgi-bin/video/access.fcgi"
-  LOGIN_URL =  BASE_URL + "/cgi-bin/video/login.fcgi"
-
-  def cookie
-    @cookie ||= get_cookie
-  end
-
-  def search keywords, order_direction = '-'
-    search_items SEARCH_URL + "&keywords=#{CGI.escape(keywords)}&order_direction=#{order_direction}"
-  end
+class UrlSeeker
 
-  def search_items url
+  def search url
     doc = Nokogiri::HTML(open(url))
 
     list = []
@@ -48,7 +28,7 @@ class EtvnetSeek
             }
 
             if href =~ /action=browse_container/
-              record[:container] = search_items(href)
+              record[:container] = search(href)
             else
               result = href.match(/(\w*)\/(\w*)\/(\w*)\/([\w|-]*)/)
 
@@ -65,7 +45,7 @@ class EtvnetSeek
     list
   end
 
-  def display_search_items items
+  def display_results items
     items.each_with_index do |item1, index1|
 
       if item1[:container].nil?
@@ -80,49 +60,20 @@ class EtvnetSeek
     end
   end
 
-  def grab_movie_link link
+  def grab_movie_link link, cookie, url
     result = link.match(/(\w*)\/(\w*)\/(\w*)\/([\w|-]*)/)
 
     media_file = (not result.nil? and result.size > 2) ? result[3] : ""
 
-    media_info = request_media_info media_file, cookie
+    media_info = request_media_info media_file, cookie, url
 
     mms_link(media_info)
   end
   
   private
 
-  def get_cookie
-    file_name = ENV['HOME'] + "/.etvnet-seek"
-
-    if File.exist? file_name
-      cookie = read_user_file file_name
-    else
-      username = ask("Enter username :  " )
-      password = ask("Enter password : " ) { |q| q.echo = '*' }
-
-      cookie = retrieve_cookie LOGIN_URL, username, password
-
-      write_user_file file_name, cookie
-   end
-
-    cookie
-  end
-
-  def read_user_file file_name
-    File.open(file_name, 'r') do |file|
-      return file.gets
-    end
-  end
-
-  def write_user_file file_name, cookie
-    File.open(file_name, 'w') do |file|
-      file.puts cookie
-    end
-  end
-
-  def request_media_info media_file, cookie
-    url = URI.parse(ACCESS_URL)
+  def request_media_info media_file, cookie, url
+    url = URI.parse(url)
     conn = Net::HTTP.new(url.host, url.port)
     
     headers = { 'Cookie' => cookie }

data/spec/etvnet_seek_spec.rb

@@ -4,20 +4,30 @@ require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
 
 #require 'spec'
 
-require 'etvnet_seek'
+require 'main'
+require 'url_seeker'
+require 'runglish'
 
-describe EtvnetSeek do
+describe UrlSeeker do
 
   before :each do
-    @client = EtvnetSeek.new
+    @client = UrlSeeker.new
   end
 
   it "should return search menu items" do
     keywords = "красная шапочка"
 
-    @client.search(keywords).size.should > 0
-    items = @client.search(keywords)
-    @client.display_search_items items
+    #@client.search(keywords).size.should > 0
+
+    items = @client.search(Main.search_url(keywords))
+    @client.display_results items
   end
 
 end
+
+describe Runglish do
+  it "should return translation" do
+    Runglish.new.translate("kak dela?").size.should > 0
+    p Runglish.new.translate("kak dela?")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: etvnet_seek
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alexander Shvets
@@ -74,7 +74,9 @@ files:
 - bin/etvnet_seek
 - bin/etvnet_seek.bat
 - lib/cookie_helper.rb
-- lib/etvnet_seek.rb
+- lib/main.rb
+- lib/runglish.rb
+- lib/url_seeker.rb
 - spec/etvnet_seek_spec.rb
 - spec/spec.opts
 - CHANGES