subdb 0.1.1 → 0.1.2

data/bin/subdb

@@ -1,85 +1,46 @@
 #!/usr/bin/env ruby
+# 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 "rubygems"
 
 $: << File.expand_path("../../lib", __FILE__)
+$: << File.expand_path("../../vendor/multipart-post", __FILE__)
 
 require "subdb"
 
-files = []
-video_ext = Subdb::VIDEO_EXTENSIONS.join(",")
-
-$*.each do |path|
-  if File.directory?(path)
-    path = path.chomp("/")
-    files = files.concat(Dir.glob("#{path}/**/*{#{video_ext}}"))
-  else
-    files << path if Subdb::VIDEO_EXTENSIONS.include?(File.extname(path))
-  end
-end
-
-files = files.sort
-
-languages = ["pt", "en"]
-i = 1
-
-for path in files
-  base = File.dirname(path) + "/" + File.basename(path, File.extname(path))
-  sub = nil
-
-  for subext in Subdb::SUB_EXTESNIONS
-    subpath = base + subext
-
-    if File.exists?(subpath)
-      sub = subpath
-      break
-    end
-  end
-
-  puts "Scanning #{path} [#{i}/#{files.length}]"
-
-  begin
-    subdb  = Subdb.new(path)
-    puts "Hash: #{subdb.hash}"
-
-    remote = subdb.search
-    puts (remote ? "Found with languages: #{remote}" : "No subtitle found")
-
-    if sub and !remote
-      puts "Local subtitle found and none on server, uploading..."
-
-      begin
-        subdb.upload(sub)
-        puts "Upload completed"
-      rescue
-        puts "Error on upload: #{$!}"
-      end
-    end
-
-    if !sub and remote
-      puts "downloading from remote"
-
-      begin
-        downloaded = subdb.download(languages)
-
-        if downloaded
-          File.open(base + ".srt", "w") do |f|
-            f << downloaded
-          end
-
-          puts "Download done ok"
-        else
-          puts "No version for your languages"
-        end
-      rescue
-        puts "Error on download: #{$!}"
-      end
-    end
-  rescue
-    puts "Can't open: #{$!}"
+files = Subdb::ClientUtils.scan_paths($*)
+
+Subdb::ClientUtils.sync files, ["pt", "en"] do |action, arg|
+  case action
+  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 :upload_ok          then puts "Upload completed"
+  when :upload_failed      then puts "Error on upload: #{arg[1]}"
+  when :downloading        then puts "Download from remote..."
+  when :download_ok        then puts "Download done"
+  when :download_not_found then puts "No version found for your language"
+  when :download_failed    then puts "Error on download: #{arg[1]}"
+  when :scan_failed        then puts "Error opening: #{arg}"
+  when :file_done          then puts
   end
-
-  puts
-
-  i += 1
 end

data/bin/subdb-gui

@@ -0,0 +1,82 @@
+#!/usr/bin/env jruby
+
+require 'java'
+require File.expand_path("../../javalib/filedrop.jar", __FILE__)
+
+import java.awt.BorderLayout
+import java.awt.Color
+import javax.swing.BorderFactory
+import javax.swing.JLabel
+import javax.swing.JFrame
+import javax.swing.JPanel
+import javax.swing.JProgressBar
+import javax.swing.JScrollPane
+import javax.swing.JTextArea
+
+include_class java.lang.System
+include_class Java::FileDrop
+
+class Example < JFrame
+  include FileDrop::Listener
+
+  def initialize
+    super "Simple"
+
+    @uploading = false
+
+    self.init_ui
+  end
+
+  def init_ui
+    @dropper = JPanel.new
+    @dropper.set_border BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10), BorderFactory.createLineBorder(Color.black))
+
+    @progress = JProgressBar.new(0, 100)
+
+    hint = JLabel.new("Arraste suas pastas ou arquivos aqui.")
+
+    @dropper.add(hint, BorderLayout::CENTER)
+
+    @log = JTextArea.new
+
+    outer_panel = JPanel.new
+
+    content_pane.add(@dropper, BorderLayout::CENTER)
+    content_pane.add(@progress, BorderLayout::SOUTH)
+
+    # @progress.set_indeterminate true
+
+    FileDrop.new(nil, @dropper, self)
+
+    set_size 500, 300
+    set_resizable false
+    set_default_close_operation JFrame::EXIT_ON_CLOSE
+    set_location_relative_to nil
+    set_visible true
+
+    @progress.set_string_painted true
+    @progress.set_string "enviando"
+
+    Thread.new do
+      i = 0
+
+      while true
+        @progress.set_value i
+        i += 1
+        sleep(5)
+      end
+    end
+  end
+
+  def filesDropped(files)
+    return if @uploading
+
+    @uploading = true
+
+    for file in files
+      puts file.to_s
+    end
+  end
+end
+
+Example.new

data/lib/subdb.rb

@@ -26,11 +26,9 @@ require 'digest/md5'
 require 'net/http/post/multipart'
 
 require 'subdb/version'
+require 'subdb/client_utils'
 
 class Subdb
-  VIDEO_EXTENSIONS = ['.avi', '.mkv', '.mp4', '.mov', '.mpg', '.wmv', '.rm', '.rmvb', '.divx']
-  SUB_EXTESNIONS   = ['.srt', '.sub']
-
   API     = "http://api.thesubdb.com/"
   SANDBOX = "http://sandbox.thesubdb.com/"
 

data/lib/subdb/client_utils.rb

@@ -0,0 +1,111 @@
+# 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.
+
+module Subdb::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(",")
+
+      paths.inject([]) do |files, path|
+        if File.directory?(path)
+          path = path.chomp("/")
+          files = files.concat(Dir.glob("#{path}/**/*{#{video_ext}}"))
+        else
+          files << path if VIDEO_EXTENSIONS.include?(File.extname(path))
+        end
+
+        files
+      end.sort
+    end
+
+    def sync(paths, languages = ["en"])
+      i = 0
+
+      for path in paths
+        base = File.dirname(path) + "/" + File.basename(path, File.extname(path))
+        sub  = find_subtitle(path)
+
+        yield :scan, [path, i]
+
+        begin
+          subdb  = Subdb.new(path)
+
+          yield :scanned, subdb
+
+          remote = subdb.search
+
+          yield :remote, remote
+
+          if sub and !remote
+            yield :uploading, subdb
+
+            begin
+              subdb.upload(sub)
+              yield :upload_ok, subdb
+            rescue
+              yield :upload_failed, [subdb, $!]
+            end
+          end
+
+          if !sub and remote
+            yield :downloading, subdb
+
+            begin
+              downloaded = subdb.download(languages)
+
+              if downloaded
+                File.open(base + ".srt", "w") do |f|
+                  f << downloaded
+                end
+
+                yield :download_ok, subdb
+              else
+                yield :download_not_found, subdb
+              end
+            rescue
+              yield :download_failed, [subdb, $!]
+            end
+          end
+        rescue
+          yield :scan_failed, $!
+        end
+
+        i += 1
+
+        yield :file_done, [subdb, i]
+      end
+    end
+
+    def find_subtitle(path)
+      base = File.dirname(path) + "/" + File.basename(path, File.extname(path))
+
+      for subext in SUB_EXTESNIONS
+        subpath = base + subext
+
+        return subpath if File.exists?(subpath)
+      end
+
+      nil
+    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.1"
+  VERSION = "0.1.2"
 end

data/vendor/multipart-post/composite_io.rb

@@ -0,0 +1,93 @@
+#--
+# (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

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

data/vendor/multipart-post/multipartable.rb

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,27 @@
+#--
+# (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

@@ -0,0 +1,66 @@
+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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: subdb
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Wilker Lucio
@@ -15,25 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -03:00
+date: 2011-04-20 00:00:00 -03:00
 default_executable: 
-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
+dependencies: []
+
 description: API for SubDB
 email: 
 - wilkerlucio@gmail.com
@@ -45,8 +30,15 @@ extra_rdoc_files: []
 
 files: 
 - bin/subdb
+- bin/subdb-gui
+- lib/subdb/client_utils.rb
 - lib/subdb/version.rb
 - lib/subdb.rb
+- 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
@@ -58,6 +50,7 @@ rdoc_options: []
 
 require_paths: 
 - - lib
+  - vendor
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: