subdb 0.1.5 → 0.1.6

data/README.textile

@@ -1,13 +1,13 @@
-h1. Ruby SubDB
+h1. Ruby SubDB "!http://travis-ci.org/wilkerlucio/subdb.png!":http://travis-ci.org/wilkerlucio/subdb
 
-This project aims to provide a simple API for accessing "SubBD":http://thesubdb.com/
+This project aims to provide a simple API for accessing "SubDB":http://thesubdb.com/
 
 h2. GUI client
 
 We are proud to annouce now we have a GUI client to make it easy for anyone to use SubDB, you can download client with following links:
 
-"Mac Version":https://github.com/downloads/wilkerlucio/subdb/subdb-0.1.4.dmg
-"Windows / Linux version (requires Java)":https://github.com/downloads/wilkerlucio/subdb/subdb-0.1.4.jar
+"Mac Version":https://github.com/downloads/wilkerlucio/subdb/subdb-0.1.6.dmg
+"Windows / Linux version (requires Java)":https://github.com/downloads/wilkerlucio/subdb/subdb-0.1.6.jar
 
 Just download, open, and drag your files on program window. It will work in same way as Command Line tool.
 
@@ -29,9 +29,21 @@ If you plan to use on your project, SubDB gem also provides a simple interface f
 
 bc.. require 'subdb'
 
-file = Subdb.new("path_to_your_movie.mp4")
+file = Subdb::Video.new("path_to_your_movie.mp4")
 file.search                         # will retrieve a string with available languages (ex: "pt,en") or nil if don't have anyone
 file.download(["en", "pt"])         # will download the subtitle for given language, it tries in order of array
 file.upload("path_to_subtitle.str") # will upload a subtitle for this movie
 
 p. It's only this :)
+
+h2. Development
+
+If you are looking to help with project code, please checkout the @develop@ branch, the edge stuff is there.
+
+h2. Changelog
+
+h3. 0.1.6
+
+* Main class @Subdb@ was moved to @Subdb::Video@
+* Ability to drop files direct on Dock Icon (Mac Only)
+* Display a list of downloaded subtitles at end of sync process

data/lib/subdb.rb

@@ -19,139 +19,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'net/http'
-require 'uri'
-require 'cgi'
-require 'digest/md5'
-require 'net/http/post/multipart'
-
 require 'subdb/version'
+require 'subdb/video'
 require 'subdb/client_utils'
 require 'subdb/upload_cache'
-
-class Subdb
-  API     = "http://api.thesubdb.com/"
-  SANDBOX = "http://sandbox.thesubdb.com/"
-
-  class << self
-    attr_accessor :test_mode
-
-    def api_url
-      test_mode ? SANDBOX : API
-    end
-  end
-
-  self.test_mode = false
-
-  attr_reader :hash, :path
-
-  def initialize(path)
-    fail "#{path} is not a file" unless File.exists?(path)
-
-    @path = path
-    @hash = build_hash
-  end
-
-  def search
-    res = request("search")
-    check_get(res)
-  end
-
-  def download(languages = ["en"])
-    res = request("download", :language => languages.join(","))
-    check_get(res)
-  end
-
-  def upload(path)
-    fail "Invalid subtitle file #{path}" unless File.exists?(path)
-
-    params = {:action => "upload", :hash => @hash}
-
-    url = URI.parse(self.class.api_url)
-
-    begin
-      file = File.open(path, "rb")
-
-      io = UploadIO.new(file, "application/octet-stream", File.basename(path))
-
-      req               = Net::HTTP::Post::Multipart.new(url.path + stringify_params(params), {"file" => io, "hash" => @hash})
-      req["User-Agent"] = user_agent
-
-      res = Net::HTTP.start(url.host, url.port) do |http|
-        http.request(req)
-      end
-
-      case res.code.to_s
-      when "201" then true
-      when "403" then false
-      when "400" then fail "Malformed request"
-      when "415" then fail "Invalid subtitle type"
-      end
-    ensure
-      file.close
-    end
-  end
-
-  def pathbase
-    File.basename(path)
-  end
-
-  protected
-
-  def build_hash
-    chunk_size = 64 * 1024
-
-    size = File.size(@path)
-    file = File.open(@path, "rb")
-    data = file.read(chunk_size)
-    file.seek(size - chunk_size)
-    data += file.read(chunk_size)
-
-    file.close
-
-    Digest::MD5.hexdigest(data)
-  end
-
-  def user_agent
-    "SubDB/1.0 (RubySubDB/#{VERSION}; http://github.com/wilkerlucio/subdb)"
-  end
-
-  def request(action, params = {}, body = nil)
-    params = {:action => action, :hash => @hash}.merge(params)
-
-    url = URI.parse(self.class.api_url)
-
-    req = Net::HTTP::Get.new(url.path + stringify_params(params))
-    req["User-Agent"] = user_agent
-    req.set_form_data(body) if body
-
-    Net::HTTP.start(url.host, url.port) do |http|
-      http.request(req)
-    end
-  end
-
-  def check_get(res)
-    case res.code.to_s
-    when "200" then res.body
-    when "400" then fail "Malformed request"
-    when "404" then nil
-    else
-      fail "Unexpected response code - #{res.code}"
-    end
-  end
-
-  def stringify_params(params)
-    params_string = []
-
-    params.each do |key, value|
-      next unless value
-
-      key   = CGI.escape(key.to_s)
-      value = CGI.escape(value.to_s)
-
-      params_string << "#{key}=#{value}"
-    end
-
-    params_string.length.zero? ? "" : "?" + params_string.join("&")
-  end
-end

data/lib/subdb/client_utils.rb

@@ -18,115 +18,117 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-module Subdb::ClientUtils
-  VIDEO_EXTENSIONS = ['.avi', '.mkv', '.mp4', '.mov', '.mpg', '.wmv', '.rm', '.rmvb', '.divx']
-  SUB_EXTESNIONS   = ['.srt', '.sub']
+module Subdb
+  module ClientUtils
+    VIDEO_EXTENSIONS = ['.avi', '.mkv', '.mp4', '.mov', '.mpg', '.wmv', '.rm', '.rmvb', '.divx']
+    SUB_EXTESNIONS   = ['.srt', '.sub']
 
-  class << self
-    def scan_paths(paths)
-      video_ext = VIDEO_EXTENSIONS.join(",")
+    class << self
+      def scan_paths(paths)
+        video_ext = VIDEO_EXTENSIONS.join(",")
 
-      files = []
+        files = []
 
-      for path in paths
-        if File.directory?(path)
-          path = path.chomp(File::SEPARATOR)
-          globpath = "#{path.gsub("\\", "/")}/**/*{#{video_ext}}"
+        for path in paths
+          if File.directory?(path)
+            path = path.chomp(File::SEPARATOR)
+            globpath = "#{path.gsub("\\", "/")}/**/*{#{video_ext}}"
 
-          yield globpath if block_given?
+            yield globpath if block_given?
 
-          files = files.concat(Dir.glob(globpath))
-        else
-          files << path if VIDEO_EXTENSIONS.include?(File.extname(path))
+            files = files.concat(Dir.glob(globpath))
+          else
+            files << path if VIDEO_EXTENSIONS.include?(File.extname(path))
+          end
         end
-      end
 
-      files.sort
-    end
+        files.sort
+      end
 
-    def sync(paths, languages = ["en"])
-      yield :loading_cache
-      cache = Subdb::UploadCache.new(cache_file_path)
+      def sync(paths, languages = ["en"])
+        yield :loading_cache
+        cache = Subdb::UploadCache.new(cache_file_path)
 
-      results = {:download => [], :upload => []}
-      i = 0
+        results = {:download => [], :upload => []}
+        i = 0
 
-      for path in paths
-        base = File.dirname(path) + File::SEPARATOR + File.basename(path, File.extname(path))
-        sub  = find_subtitle(path)
+        for path in paths
+          base = File.dirname(path) + File::SEPARATOR + File.basename(path, File.extname(path))
+          sub  = find_subtitle(path)
 
-        yield :scan, [path, i]
+          yield :scan, [path, i]
 
-        begin
-          subdb = Subdb.new(path)
+          begin
+            subdb = Video.new(path)
 
-          yield :scanned, subdb
+            yield :scanned, subdb
 
-          if sub and !cache.uploaded?(subdb.hash, sub)
-            yield :uploading, subdb
+            if sub and !cache.uploaded?(subdb.hash, sub)
+              yield :uploading, subdb
 
-            begin
-              subdb.upload(sub)
-              cache.push(subdb.hash, sub)
-              results[:upload].push(sub)
-              yield :upload_ok, subdb
-            rescue
-              yield :upload_failed, [subdb, $!]
+              begin
+                subdb.upload(sub)
+                cache.push(subdb.hash, sub)
+                results[:upload].push(sub)
+                yield :upload_ok, subdb
+              rescue
+                yield :upload_failed, [subdb, $!]
+              end
             end
-          end
 
-          if !sub
-            yield :downloading, subdb
+            if !sub
+              yield :downloading, subdb
 
-            begin
-              downloaded = subdb.download(languages)
+              begin
+                downloaded = subdb.download(languages)
 
-              if downloaded
-                sub = base + ".srt"
+                if downloaded
+                  sub = base + ".srt"
 
-                File.open(sub, "wb") do |f|
-                  f << downloaded
-                end
+                  File.open(sub, "wb") do |f|
+                    f << downloaded
+                  end
 
-                cache.push(subdb.hash, sub)
-                results[:download].push(sub)
-                yield :download_ok, subdb
-              else
-                yield :download_not_found, subdb
+                  cache.push(subdb.hash, sub)
+                  results[:download].push(sub)
+                  yield :download_ok, [subdb, sub]
+                else
+                  yield :download_not_found, subdb
+                end
+              rescue
+                yield :download_failed, [subdb, $!]
               end
-            rescue
-              yield :download_failed, [subdb, $!]
             end
+          rescue
+            yield :scan_failed, path, $!
           end
-        rescue
-          yield :scan_failed, path, $!
+
+          i += 1
+
+          yield :file_done, [subdb, i]
         end
 
-        i += 1
+        yield :storing_cache
+        cache.store!
 
-        yield :file_done, [subdb, i]
+        results
       end
 
-      yield :storing_cache
-      cache.store!
-
-      results
-    end
+      def find_subtitle(path)
+        base = File.dirname(path) + File::SEPARATOR + File.basename(path, File.extname(path))
 
-    def find_subtitle(path)
-      base = File.dirname(path) + File::SEPARATOR + File.basename(path, File.extname(path))
+        for subext in SUB_EXTESNIONS
+          subpath = base + subext
 
-      for subext in SUB_EXTESNIONS
-        subpath = base + subext
+          return subpath if File.exists?(subpath)
+        end
 
-        return subpath if File.exists?(subpath)
+        nil
       end
 
-      nil
-    end
-
-    def cache_file_path
-      File.join((ENV["HOME"] || ENV["USERPROFILE"]), ".subdb_cache")
+      def cache_file_path
+        File.join((ENV["HOME"] || ENV["USERPROFILE"]), ".subdb_cache")
+      end
     end
   end
 end

data/lib/subdb/ui/swing.rb

@@ -37,135 +37,186 @@ import javax.swing.JTextArea
 import javax.swing.SwingConstants
 import javax.swing.UIManager
 
-include_class java.lang.System
-include_class Java::FileDrop
+begin
+  import com.apple.eawt.Application
+  import com.apple.eawt.AppEventListener
+  import com.apple.eawt.OpenFilesHandler
+rescue
+  # just fake classes
+  class Application
+    def self.application
+      self.new
+    end
 
-class SubdbGUI < JFrame
-  include FileDrop::Listener
+    def add_app_event_listener(listener)
+    end
 
-  def initialize
-    super "SubDB Sync"
+    def open_file_handler=(handle)
+    end
+  end
 
-    @uploading = false
+  module AppEventListener
 
-    self.init_ui
   end
 
-  def init_ui
-    begin
-      icon = ImageIO.read(getClass.getResource("images/subdb128.png"))
-      set_icon_image icon
-    rescue
-    end
+  module OpenFilesHandler
 
-    border_size = 1
+  end
+end
 
-    @dropper = JPanel.new
-    @dropper.set_border BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(border_size, border_size, border_size, border_size), BorderFactory.createLineBorder(Color.black))
+include_class java.lang.System
+include_class Java::FileDrop
 
-    @progress = JProgressBar.new(0, 100)
+module Subdb
+  module UI
+    class Swing < JFrame
+      include FileDrop::Listener
+      include AppEventListener
+      include OpenFilesHandler
 
-    hint = JLabel.new("Arraste suas pastas ou arquivos com videos aqui.", SwingConstants::CENTER)
-    hint.set_preferred_size Dimension.new(500, 60)
+      def initialize
+        super "SubDB Sync"
 
-    @dropper.add(hint, BorderLayout::CENTER)
+        @uploading = false
 
-    @log = JTextArea.new
-    @log.set_editable false
+        app = Application.application
+        app.add_app_event_listener(self)
+        app.open_file_handler = self
 
-    @scroller = JScrollPane.new(@log)
+        self.init_ui
+      end
 
-    content_pane.add(@dropper, BorderLayout::NORTH)
-    content_pane.add(@scroller, BorderLayout::CENTER)
-    content_pane.add(@progress, BorderLayout::SOUTH)
+      def init_ui
+        begin
+          icon = ImageIO.read(get_class.get_resource("/images/subdb128.png"))
+          self.icon_image = icon
+        rescue
+          puts "Can't set window icon: #{$!}"
+        end
 
-    FileDrop.new(nil, @dropper, self)
+        border_size = 1
 
-    set_size 800, 300
-    set_resizable true
-    set_default_close_operation JFrame::EXIT_ON_CLOSE
-    set_location_relative_to nil
-    set_visible true
+        @dropper = JPanel.new
+        @dropper.border = BorderFactory.create_compound_border(BorderFactory.create_empty_border(border_size, border_size, border_size, border_size), BorderFactory.create_line_border(Color.black))
 
-    @progress.set_string_painted true
-  end
+        @progress = JProgressBar.new(0, 100)
+        @progress.string_painted = true
 
-  def filesDropped(files)
-    return if @uploading
+        hint = JLabel.new("Arraste suas pastas ou arquivos com videos aqui.", SwingConstants::CENTER)
+        hint.preferred_size = Dimension.new(500, 60)
 
-    files = files.map { |f| f.to_s }
+        @dropper.add(hint, BorderLayout::CENTER)
 
-    @uploading = true
+        @log = JTextArea.new
+        @log.editable = false
 
-    Thread.new do
-      @progress.set_indeterminate true
+        @scroller = JScrollPane.new(@log)
 
-      log "Generating file list..."
+        content_pane.add(@dropper, BorderLayout::NORTH)
+        content_pane.add(@scroller, BorderLayout::CENTER)
+        content_pane.add(@progress, BorderLayout::SOUTH)
 
-      files = Subdb::ClientUtils.scan_paths(files) do |path|
-        log "Scanning #{path}..."
+        FileDrop.new(nil, @dropper, self)
+
+        set_size 800, 300
+        set_resizable true
+        set_default_close_operation JFrame::EXIT_ON_CLOSE
+        set_location_relative_to nil
+        set_visible true
       end
 
-      log "Generation done, #{files.length} files to scan"
-      log_separator
-
-      @progress.set_indeterminate false
-      @progress.set_maximum files.length
-
-      results = Subdb::ClientUtils.sync files, ["pt", "en"] do |action, arg|
-        case action
-        when :loading_cache      then log "Carregando cache de legendas enviadas..."
-        when :scan               then log "Abrindo #{arg[0]}..."
-        when :scanned            then log "Verificando #{arg.pathbase} [#{arg.hash}]..."
-        when :uploading          then log "Enviando legenda local para o servidor..."
-        when :upload_failed      then error "Erro ao enviar legenda #{arg[0]}: #{arg[1]}"
-        when :downloading        then log "Procurando legenda no servidor..."
-        when :download_not_found then log "Nenhuma legenda encontrada no seu indioma"
-        when :download_failed    then error "Erro ao tentar baixar #{arg[0].path}: #{arg[1]}"
-        when :scan_failed        then error "Erro ao abrir arquivo #{arg[0]}: #{arg[1]}"
-        when :storing_cache      then log "Salvando cache de legendas enviadas..."
-        when :file_done
-          log "Concluido #{arg[0].path}"
-          log_separator
-          @progress.set_value arg[1]
-        end
+      def openFiles(e)
+        sleep(0.5) until visible?
+        filesDropped(e.files)
       end
 
-      log "Concluido"
-      log "#{results[:download].length} legendas baixadas"
-      log "#{results[:upload].length} legendas enviadas"
-      log_separator
+      def filesDropped(files)
+        return if @uploading
 
-      @uploading = false
-    end
-  end
+        files = files.map { |f| f.to_s }
 
-  def log(msg)
-    @log.append msg + "\n"
+        @uploading = true
 
-    sleep 0.1
+        Thread.new do
+          @progress.indeterminate = true
 
-    scroll = @scroller.vertical_scroll_bar
-    scroll.value = scroll.maximum if scroll.value > scroll.maximum - (@scroller.height + 30)
+          log "Gerando lista de arquivos..."
 
-    puts msg
-  end
+          files = Subdb::ClientUtils.scan_paths(files) do |path|
+            log "Escaneando #{path}..."
+          end
 
-  def log_separator
-    log "------------------------------"
-  end
+          log "Finalizado, #{files.length} arquivos para escanear."
+          log_separator
+
+          @progress.indeterminate = false
+          @progress.maximum = files.length
+
+          results = Subdb::ClientUtils.sync files, ["pt", "en"] do |action, arg|
+            case action
+            when :loading_cache      then log "Carregando cache de legendas enviadas..."
+            when :scan               then log "Abrindo #{arg[0]}..."
+            when :scanned            then log "Verificando #{arg.pathbase} [#{arg.hash}]..."
+            when :uploading          then log "Enviando legenda local para o servidor..."
+            when :upload_failed      then error "Erro ao enviar legenda #{arg[0]}: #{arg[1]}"
+            when :downloading        then log "Procurando legenda no servidor..."
+            when :download_ok        then log "Legenda baixada com sucesso: #{arg[1]}"
+            when :download_not_found then log "Nenhuma legenda encontrada no seu idioma"
+            when :download_failed    then error "Erro ao tentar baixar #{arg[0].path}: #{arg[1]}"
+            when :scan_failed        then error "Erro ao abrir arquivo #{arg[0]}: #{arg[1]}"
+            when :storing_cache      then log "Salvando cache de legendas enviadas..."
+            when :file_done
+              log "Concluido #{arg[0].path}"
+              log_separator
+              @progress.value = arg[1]
+            end
+          end
+
+          log "Concluido"
+          log_separator
+
+          if results[:download].length > 0
+            log "Legendas baixadas:"
+            results[:download].each { |s| log s }
+            log_separator
+          end
+
+          log "#{results[:download].length} legendas baixadas"
+          log "#{results[:upload].length} legendas enviadas"
+          log_separator
+
+          @uploading = false
+        end
+      end
+
+      def log(msg)
+        @log.append msg + "\n"
+
+        sleep 0.1
+
+        scroll = @scroller.vertical_scroll_bar
+        scroll.value = scroll.maximum if scroll.value > scroll.maximum - (@scroller.height + 30)
+
+        puts msg
+      end
+
+      def log_separator
+        log "------------------------------"
+      end
 
-  def error(msg)
-    log msg
+      def error(msg)
+        log msg
+      end
+    end
   end
 end
 
 # try use system look and feel
 begin
-  UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+  UIManager.look_and_feel = UIManager.system_look_and_feel_class_name
 rescue
   # no lucky...
 end
 
 # start application
-SubdbGUI.new
+Subdb::UI::Swing.new

data/lib/subdb/upload_cache.rb

@@ -56,6 +56,10 @@ class Subdb::UploadCache
     @hash[hash].push(self.class.subtitle_hash(path))
   end
 
+  def versions(hash)
+    (@hash[hash] || []).length
+  end
+
   def store!
     File.open(path, "wb") do |file|
       file << Marshal.dump(@hash)

data/lib/subdb/version.rb

@@ -19,6 +19,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class Subdb
-  VERSION = "0.1.5"
+module Subdb
+  VERSION = "0.1.6"
 end

data/lib/subdb/video.rb

@@ -0,0 +1,162 @@
+# Copyright (c) 2011 Wilker Lucio da Silva
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'net/http'
+require 'uri'
+require 'cgi'
+require 'digest/md5'
+require 'net/http/post/multipart'
+
+require 'subdb/version'
+require 'subdb/client_utils'
+require 'subdb/upload_cache'
+
+module Subdb
+  class Video
+    API     = "http://api.thesubdb.com/"
+    SANDBOX = "http://sandbox.thesubdb.com/"
+
+    class << self
+      attr_accessor :test_mode
+
+      def api_url
+        test_mode ? SANDBOX : API
+      end
+    end
+
+    self.test_mode = false
+
+    attr_reader :hash, :path
+
+    def initialize(path)
+      fail "#{path} is not a file" unless File.exists?(path)
+
+      @path = path
+      @hash = build_hash
+    end
+
+    def search
+      res = request("search")
+      check_get(res)
+    end
+
+    def download(languages = ["en"])
+      res = request("download", :language => languages.join(","))
+      check_get(res)
+    end
+
+    def upload(path)
+      fail "Invalid subtitle file #{path}" unless File.exists?(path)
+
+      params = {:action => "upload", :hash => @hash}
+
+      url = URI.parse(self.class.api_url)
+
+      begin
+        file = File.open(path, "rb")
+
+        io = UploadIO.new(file, "application/octet-stream", File.basename(path))
+
+        req               = Net::HTTP::Post::Multipart.new(url.path + stringify_params(params), {"file" => io, "hash" => @hash})
+        req["User-Agent"] = user_agent
+
+        res = Net::HTTP.start(url.host, url.port) do |http|
+          http.request(req)
+        end
+
+        case res.code.to_s
+        when "201" then true
+        when "403" then false
+        when "400" then fail "Malformed request"
+        when "415" then fail "Invalid subtitle type"
+        end
+      ensure
+        file.close
+      end
+    end
+
+    def pathbase
+      File.basename(path)
+    end
+
+    protected
+
+    def build_hash
+      chunk_size = 64 * 1024
+
+      size = File.size(@path)
+
+      raise ArgumentError.new("The video file need to have at least 128kb") if size < chunk_size * 2
+
+      file = File.open(@path, "rb")
+      data = file.read(chunk_size)
+      file.seek(size - chunk_size)
+      data += file.read(chunk_size)
+
+      file.close
+
+      Digest::MD5.hexdigest(data)
+    end
+
+    def user_agent
+      "SubDB/1.0 (RubySubDB/#{VERSION}; http://github.com/wilkerlucio/subdb)"
+    end
+
+    def request(action, params = {}, body = nil)
+      params = {:action => action, :hash => @hash}.merge(params)
+
+      url = URI.parse(self.class.api_url)
+
+      req = Net::HTTP::Get.new(url.path + stringify_params(params))
+      req["User-Agent"] = user_agent
+      req.set_form_data(body) if body
+
+      Net::HTTP.start(url.host, url.port) do |http|
+        http.request(req)
+      end
+    end
+
+    def check_get(res)
+      case res.code.to_s
+      when "200" then res.body
+      when "400" then fail "Malformed request"
+      when "404" then nil
+      else
+        fail "Unexpected response code - #{res.code}"
+      end
+    end
+
+    def stringify_params(params)
+      params_string = []
+
+      params.each do |key, value|
+        next unless value
+
+        key   = CGI.escape(key.to_s)
+        value = CGI.escape(value.to_s)
+
+        params_string << "#{key}=#{value}"
+      end
+
+      params_string.length.zero? ? "" : "?" + params_string.join("&")
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: subdb
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Wilker Lucio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 -03:00
+date: 2011-04-28 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - lib/subdb/ui/swing.rb
 - lib/subdb/upload_cache.rb
 - lib/subdb/version.rb
+- lib/subdb/video.rb
 - lib/subdb.rb
 - LICENSE
 - README.textile