subdb 0.1.2 → 0.1.3

data/bin/subdb

@@ -19,8 +19,6 @@
 # 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__)
 
@@ -40,7 +38,7 @@ Subdb::ClientUtils.sync files, ["pt", "en"] do |action, arg|
   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 :scan_failed        then puts "Error opening: #{arg[1]}"
   when :file_done          then puts
   end
 end

data/bin/subdb-gui

@@ -1,10 +1,35 @@
-#!/usr/bin/env jruby
-
+# 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.
+
+$: << File.expand_path("../../lib", __FILE__)
+$: << File.expand_path("../../vendor/multipart-post", __FILE__)
+$: << File.expand_path("../..", __FILE__)
+
+require 'subdb'
 require 'java'
-require File.expand_path("../../javalib/filedrop.jar", __FILE__)
+require 'javalib/filedrop.jar'
 
 import java.awt.BorderLayout
 import java.awt.Color
+import java.awt.image.BufferedImage
+import javax.imageio.ImageIO
 import javax.swing.BorderFactory
 import javax.swing.JLabel
 import javax.swing.JFrame
@@ -16,11 +41,11 @@ import javax.swing.JTextArea
 include_class java.lang.System
 include_class Java::FileDrop
 
-class Example < JFrame
+class SubdbGUI < JFrame
   include FileDrop::Listener
 
   def initialize
-    super "Simple"
+    super "SubDB Sync"
 
     @uploading = false
 
@@ -28,12 +53,18 @@ class Example < JFrame
   end
 
   def init_ui
+    begin
+      icon = ImageIO.read(getClass.getResource("images/subdb128.png"))
+      set_icon_image icon
+    rescue
+    end
+
     @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.")
+    hint = JLabel.new("Arraste suas pastas ou arquivos com videos aqui.")
 
     @dropper.add(hint, BorderLayout::CENTER)
 
@@ -44,39 +75,60 @@ class Example < JFrame
     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_size 800, 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
 
+    files = files.map { |f| f.to_s }
+
     @uploading = true
 
-    for file in files
-      puts file.to_s
+    Thread.new do
+      @progress.set_indeterminate true
+      @progress.set_string "Gerando lista de arquivos..."
+
+      puts "Generating file list..."
+
+      files = Subdb::ClientUtils.scan_paths(files)
+
+      puts "Generation done"
+
+      @progress.set_indeterminate false
+      @progress.set_maximum files.length
+
+      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 :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 :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]
+        end
+      end
+
+      @progress.set_string "Concluido"
+
+      @uploading = false
     end
   end
+
+  def error(msg)
+    puts msg
+  end
 end
 
-Example.new
+SubdbGUI.new

data/lib/subdb/client_utils.rb

@@ -25,30 +25,37 @@ module Subdb::ClientUtils
   class << self
     def scan_paths(paths)
       video_ext = VIDEO_EXTENSIONS.join(",")
+      p paths
 
-      paths.inject([]) do |files, path|
+      files = []
+
+      for path in paths
         if File.directory?(path)
-          path = path.chomp("/")
-          files = files.concat(Dir.glob("#{path}/**/*{#{video_ext}}"))
+          path = path.chomp(File::SEPARATOR)
+          globpath = "#{path.gsub("\\", "/")}/**/*{#{video_ext}}"
+
+          puts "Scanning #{globpath}"
+
+          files = files.concat(Dir.glob(globpath))
         else
           files << path if VIDEO_EXTENSIONS.include?(File.extname(path))
         end
+      end
 
-        files
-      end.sort
+      files.sort
     end
 
     def sync(paths, languages = ["en"])
       i = 0
 
       for path in paths
-        base = File.dirname(path) + "/" + File.basename(path, File.extname(path))
+        base = File.dirname(path) + File::SEPARATOR + File.basename(path, File.extname(path))
         sub  = find_subtitle(path)
 
         yield :scan, [path, i]
 
         begin
-          subdb  = Subdb.new(path)
+          subdb = Subdb.new(path)
 
           yield :scanned, subdb
 
@@ -87,7 +94,7 @@ module Subdb::ClientUtils
             end
           end
         rescue
-          yield :scan_failed, $!
+          yield :scan_failed, path, $!
         end
 
         i += 1
@@ -97,7 +104,7 @@ module Subdb::ClientUtils
     end
 
     def find_subtitle(path)
-      base = File.dirname(path) + "/" + File.basename(path, File.extname(path))
+      base = File.dirname(path) + File::SEPARATOR + File.basename(path, File.extname(path))
 
       for subext in SUB_EXTESNIONS
         subpath = base + subext

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.2"
+  VERSION = "0.1.3"
 end

data/lib/subdb.rb

@@ -42,7 +42,7 @@ class Subdb
 
   self.test_mode = false
 
-  attr_reader :hash
+  attr_reader :hash, :path
 
   def initialize(path)
     fail "#{path} is not a file" unless File.exists?(path)
@@ -91,6 +91,10 @@ class Subdb
     end
   end
 
+  def pathbase
+    File.basename(path)
+  end
+
   protected
 
   def build_hash

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: subdb
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Wilker Lucio