subdb 0.1.4 → 0.1.5

data/README.textile

@@ -2,6 +2,15 @@ h1. Ruby SubDB
 
 This project aims to provide a simple API for accessing "SubBD":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
+
+Just download, open, and drag your files on program window. It will work in same way as Command Line tool.
+
 h2. Installation
 
 bc. gem install subdb

data/bin/subdb

@@ -31,7 +31,7 @@ Subdb::ClientUtils.sync files, ["pt", "en"] do |action, arg|
   when :scan               then puts "Scanning #{arg[0]} [#{arg[1] + 1}/#{files.length}]"
   when :scanned            then puts "Hash: #{arg.hash}"
   when :remote             then puts arg ? "Found with languages: #{arg}" : "No subtitle found"
-  when :uploading          then puts "Local subtitle found and none on server, uploading..."
+  when :uploading          then puts "Local uncached subtitle found, uploading..."
   when :upload_ok          then puts "Upload completed"
   when :upload_failed      then puts "Error on upload: #{arg[1]}"
   when :downloading        then puts "Download from remote..."

data/lib/subdb.rb

@@ -27,6 +27,7 @@ require 'net/http/post/multipart'
 
 require 'subdb/version'
 require 'subdb/client_utils'
+require 'subdb/upload_cache'
 
 class Subdb
   API     = "http://api.thesubdb.com/"

data/lib/subdb/client_utils.rb

@@ -25,7 +25,6 @@ module Subdb::ClientUtils
   class << self
     def scan_paths(paths)
       video_ext = VIDEO_EXTENSIONS.join(",")
-      p paths
 
       files = []
 
@@ -34,7 +33,7 @@ module Subdb::ClientUtils
           path = path.chomp(File::SEPARATOR)
           globpath = "#{path.gsub("\\", "/")}/**/*{#{video_ext}}"
 
-          puts "Scanning #{globpath}"
+          yield globpath if block_given?
 
           files = files.concat(Dir.glob(globpath))
         else
@@ -46,6 +45,10 @@ module Subdb::ClientUtils
     end
 
     def sync(paths, languages = ["en"])
+      yield :loading_cache
+      cache = Subdb::UploadCache.new(cache_file_path)
+
+      results = {:download => [], :upload => []}
       i = 0
 
       for path in paths
@@ -59,32 +62,34 @@ module Subdb::ClientUtils
 
           yield :scanned, subdb
 
-          remote = subdb.search
-
-          yield :remote, remote
-
-          if sub and !remote
+          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, $!]
             end
           end
 
-          if !sub and remote
+          if !sub
             yield :downloading, subdb
 
             begin
               downloaded = subdb.download(languages)
 
               if downloaded
-                File.open(base + ".srt", "wb") do |f|
+                sub = base + ".srt"
+
+                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
@@ -101,6 +106,11 @@ module Subdb::ClientUtils
 
         yield :file_done, [subdb, i]
       end
+
+      yield :storing_cache
+      cache.store!
+
+      results
     end
 
     def find_subtitle(path)
@@ -114,5 +124,9 @@ module Subdb::ClientUtils
 
       nil
     end
+
+    def cache_file_path
+      File.join((ENV["HOME"] || ENV["USERPROFILE"]), ".subdb_cache")
+    end
   end
 end

data/{bin/subdb-gui → lib/subdb/ui/swing.rb}

@@ -18,16 +18,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-$: << File.expand_path("../../lib", __FILE__)
-$: << File.expand_path("../../vendor/multipart-post", __FILE__)
-$: << File.expand_path("../..", __FILE__)
-
 require 'subdb'
 require 'java'
 require 'javalib/filedrop.jar'
 
 import java.awt.BorderLayout
 import java.awt.Color
+import java.awt.Dimension
 import java.awt.image.BufferedImage
 import javax.imageio.ImageIO
 import javax.swing.BorderFactory
@@ -37,6 +34,8 @@ import javax.swing.JPanel
 import javax.swing.JProgressBar
 import javax.swing.JScrollPane
 import javax.swing.JTextArea
+import javax.swing.SwingConstants
+import javax.swing.UIManager
 
 include_class java.lang.System
 include_class Java::FileDrop
@@ -59,26 +58,31 @@ class SubdbGUI < JFrame
     rescue
     end
 
+    border_size = 1
+
     @dropper = JPanel.new
-    @dropper.set_border BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10), BorderFactory.createLineBorder(Color.black))
+    @dropper.set_border BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(border_size, border_size, border_size, border_size), BorderFactory.createLineBorder(Color.black))
 
     @progress = JProgressBar.new(0, 100)
 
-    hint = JLabel.new("Arraste suas pastas ou arquivos com videos aqui.")
+    hint = JLabel.new("Arraste suas pastas ou arquivos com videos aqui.", SwingConstants::CENTER)
+    hint.set_preferred_size Dimension.new(500, 60)
 
     @dropper.add(hint, BorderLayout::CENTER)
 
     @log = JTextArea.new
+    @log.set_editable false
 
-    outer_panel = JPanel.new
+    @scroller = JScrollPane.new(@log)
 
-    content_pane.add(@dropper, BorderLayout::CENTER)
+    content_pane.add(@dropper, BorderLayout::NORTH)
+    content_pane.add(@scroller, BorderLayout::CENTER)
     content_pane.add(@progress, BorderLayout::SOUTH)
 
     FileDrop.new(nil, @dropper, self)
 
     set_size 800, 300
-    set_resizable false
+    set_resizable true
     set_default_close_operation JFrame::EXIT_ON_CLOSE
     set_location_relative_to nil
     set_visible true
@@ -95,40 +99,73 @@ class SubdbGUI < JFrame
 
     Thread.new do
       @progress.set_indeterminate true
-      @progress.set_string "Gerando lista de arquivos..."
 
-      puts "Generating file list..."
+      log "Generating file list..."
 
-      files = Subdb::ClientUtils.scan_paths(files)
+      files = Subdb::ClientUtils.scan_paths(files) do |path|
+        log "Scanning #{path}..."
+      end
 
-      puts "Generation done"
+      log "Generation done, #{files.length} files to scan"
+      log_separator
 
       @progress.set_indeterminate false
       @progress.set_maximum files.length
 
-      Subdb::ClientUtils.sync files, ["pt", "en"] do |action, arg|
+      results = Subdb::ClientUtils.sync files, ["pt", "en"] do |action, arg|
         case action
-        when :scan               then @progress.set_string "Verificando #{arg[0]}"
-        when :scanned            then @progress.set_string "Verificando #{arg.pathbase} [#{arg.hash}]"
-        when :uploading          then @progress.set_string "Encontrada legenda local, subindo para o servidor..."
+        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 @progress.set_string "Baixando a legenda..."
-        when :download_not_found then error "Nenhuma legenda encontrada no seu indioma para #{arg[0].pathbase}"
+        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 :file_done          then @progress.set_value 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
       end
 
-      @progress.set_string "Concluido"
+      log "Concluido"
+      log "#{results[:download].length} legendas baixadas"
+      log "#{results[:upload].length} legendas enviadas"
+      log_separator
 
       @uploading = false
     end
   end
 
-  def error(msg)
+  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
+  end
+end
+
+# try use system look and feel
+begin
+  UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+rescue
+  # no lucky...
 end
 
+# start application
 SubdbGUI.new

data/lib/subdb/upload_cache.rb

@@ -0,0 +1,64 @@
+# Copyright (c) 2011 Wilker Lúcio
+#
+# 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 'digest/sha1'
+
+class Subdb::UploadCache
+  attr_reader :hash, :path
+
+  def self.subtitle_hash(path)
+    data = open(path, "rb") { |io| io.read }
+    Digest::SHA1.hexdigest(data)
+  end
+
+  def initialize(path)
+    if File.exists? path
+      data = open(path, "rb") { |io| io.read }
+
+      begin
+        @hash = Marshal.load(data)
+      rescue TypeError => e
+        @hash = {}
+      end
+    else
+      @hash = {}
+    end
+
+    @path = path
+  end
+
+  def uploaded?(hash, path)
+    list = @hash[hash] || []
+    list.include? self.class.subtitle_hash(path)
+  end
+
+  def push(hash, path)
+    return if uploaded?(hash, path)
+
+    @hash[hash] ||= []
+    @hash[hash].push(self.class.subtitle_hash(path))
+  end
+
+  def store!
+    File.open(path, "wb") do |file|
+      file << Marshal.dump(@hash)
+    end
+  end
+end

data/lib/subdb/version.rb

@@ -20,5 +20,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class Subdb
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: subdb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Wilker Lucio
@@ -15,10 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -03:00
+date: 2011-04-22 00:00:00 -03:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: multipart-post
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id001
 description: API for SubDB
 email: 
 - wilkerlucio@gmail.com
@@ -30,16 +45,11 @@ extra_rdoc_files: []
 
 files: 
 - bin/subdb
-- bin/subdb-gui
 - lib/subdb/client_utils.rb
+- lib/subdb/ui/swing.rb
+- lib/subdb/upload_cache.rb
 - lib/subdb/version.rb
 - lib/subdb.rb
-- javalib/filedrop.jar
-- vendor/multipart-post/composite_io.rb
-- vendor/multipart-post/multipart_post.rb
-- vendor/multipart-post/multipartable.rb
-- vendor/multipart-post/net/http/post/multipart.rb
-- vendor/multipart-post/parts.rb
 - LICENSE
 - README.textile
 has_rdoc: true
@@ -51,7 +61,6 @@ rdoc_options: []
 
 require_paths: 
 - - lib
-  - vendor
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 

data/vendor/multipart-post/composite_io.rb

@@ -1,93 +0,0 @@
-#--
-# (c) Copyright 2007-2011 Nick Sieger.
-# See the file README.txt included with the distribution for
-# software license details.
-#++
-
-# Concatenate together multiple IO objects into a single, composite IO object
-# for purposes of reading as a single stream.
-#
-# Usage:
-#
-#     crio = CompositeReadIO.new(StringIO.new('one'), StringIO.new('two'), StringIO.new('three'))
-#     puts crio.read # => "onetwothree"
-#  
-class CompositeReadIO
-  # Create a new composite-read IO from the arguments, all of which should
-  # respond to #read in a manner consistent with IO.
-  def initialize(*ios)
-    @ios = ios.flatten
-  end
-
-  # Read from the IO object, overlapping across underlying streams as necessary.
-  def read(amount = nil, buf = nil)
-    buffer = buf || ''
-    done = if amount; nil; else ''; end
-    partial_amount = amount
-
-    loop do
-      result = done
-
-      while !@ios.empty? && (result = @ios.first.read(partial_amount)) == done
-        @ios.shift
-      end
-
-      result.force_encoding("BINARY") if result.respond_to?(:force_encoding)
-      buffer << result if result
-      partial_amount -= result.length if partial_amount && result != done
-
-      break if partial_amount && partial_amount <= 0
-      break if result == done
-    end
-
-    if buffer.length > 0
-      buffer
-    else
-      done
-    end
-  end
-end
-
-# Convenience methods for dealing with files and IO that are to be uploaded.
-class UploadIO
-  # Create an upload IO suitable for including in the params hash of a
-  # Net::HTTP::Post::Multipart.
-  #
-  # Can take two forms. The first accepts a filename and content type, and
-  # opens the file for reading (to be closed by finalizer). The second accepts
-  # an already-open IO, but also requires a third argument, the filename from
-  # which it was opened.
-  #
-  #     UploadIO.new("file.txt", "text/plain")
-  #     UploadIO.new(file_io, "text/plain", "file.txt")
-  attr_reader :content_type, :original_filename, :local_path, :io
-
-  def initialize(filename_or_io, content_type, filename = nil)
-    io = filename_or_io
-    local_path = ""
-    if io.respond_to? :read
-      local_path = filename_or_io.path
-    else
-      io = File.open(filename_or_io)
-      local_path = filename_or_io
-    end
-    filename ||= local_path
-
-    @content_type = content_type
-    @original_filename = File.basename(filename)
-    @local_path = local_path
-    @io = io
-  end
-
-  def self.convert!(io, content_type, original_filename, local_path)
-    raise ArgumentError, "convert! has been removed. You must now wrap IOs using:\nUploadIO.new(filename_or_io, content_type, filename=nil)\nPlease update your code."
-  end
-
-  def method_missing(*args)
-    @io.send(*args)
-  end
-
-  def respond_to?(meth)
-    @io.respond_to?(meth) || super(meth)
-  end
-end

data/vendor/multipart-post/multipart_post.rb

@@ -1,3 +0,0 @@
-module MultipartPost
-  VERSION = "1.1.0"
-end

data/vendor/multipart-post/multipartable.rb

@@ -1,13 +0,0 @@
-require 'parts'
-  module Multipartable
-    DEFAULT_BOUNDARY = "-----------RubyMultipartPost"
-    def initialize(path, params, headers={}, boundary = DEFAULT_BOUNDARY)
-      super(path, headers)
-      parts = params.map {|k,v| Parts::Part.new(boundary, k, v)}
-      parts << Parts::EpiloguePart.new(boundary)
-      ios = parts.map{|p| p.to_io }
-      self.set_content_type("multipart/form-data", { "boundary" => boundary })
-      self.content_length = parts.inject(0) {|sum,i| sum + i.length }
-      self.body_stream = CompositeReadIO.new(*ios)
-    end
-  end

data/vendor/multipart-post/net/http/post/multipart.rb

@@ -1,27 +0,0 @@
-#--
-# (c) Copyright 2007-2008 Nick Sieger.
-# See the file README.txt included with the distribution for
-# software license details.
-#++
-
-require 'net/http'
-require 'stringio'
-require 'cgi'
-require 'composite_io'
-require 'multipartable'
-require 'parts'
-
-module Net #:nodoc:
-  class HTTP #:nodoc:
-    class Put
-      class Multipart < Put
-        include Multipartable
-      end
-    end
-    class Post #:nodoc:
-      class Multipart < Post
-        include Multipartable
-      end
-    end
-  end
-end

data/vendor/multipart-post/parts.rb

@@ -1,66 +0,0 @@
-module Parts
-  module Part #:nodoc:
-    def self.new(boundary, name, value)
-      if value.respond_to? :content_type
-        FilePart.new(boundary, name, value)
-      else
-        ParamPart.new(boundary, name, value)
-      end
-    end
-
-    def length
-      @part.length
-    end
-
-    def to_io
-      @io
-    end
-  end
-
-  class ParamPart
-    include Part
-    def initialize(boundary, name, value)
-      @part = build_part(boundary, name, value)
-      @io = StringIO.new(@part)
-    end
-
-    def build_part(boundary, name, value)
-      part = ''
-      part << "--#{boundary}\r\n"
-      part << "Content-Disposition: form-data; name=\"#{name.to_s}\"\r\n"
-      part << "\r\n"
-      part << "#{value}\r\n"
-    end
-  end
-
-  # Represents a part to be filled from file IO.
-  class FilePart
-    include Part
-    attr_reader :length
-    def initialize(boundary, name, io)
-      file_length = io.respond_to?(:length) ?  io.length : File.size(io.local_path)
-      @head = build_head(boundary, name, io.original_filename, io.content_type, file_length)
-      @length = @head.length + file_length
-      @io = CompositeReadIO.new(StringIO.new(@head), io, StringIO.new("\r\n"))
-    end
-
-    def build_head(boundary, name, filename, type, content_len)
-      part = ''
-      part << "--#{boundary}\r\n"
-      part << "Content-Disposition: form-data; name=\"#{name.to_s}\"; filename=\"#{filename}\"\r\n"
-      part << "Content-Length: #{content_len}\r\n"
-      part << "Content-Type: #{type}\r\n"
-      part << "Content-Transfer-Encoding: binary\r\n"
-      part << "\r\n"
-    end
-  end
-
-  # Represents the epilogue or closing boundary.
-  class EpiloguePart
-    include Part
-    def initialize(boundary)
-      @part = "--#{boundary}--\r\n"
-      @io = StringIO.new(@part)
-    end
-  end
-end