wistia-uploader 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/bin/wistia-uploader

@@ -75,7 +75,7 @@ end.parse!
 # If there's anything left in ARGV after options parsing, assume it's a path
 # to a media file.
 if ARGV[0]
-  options[:media_file] = ARGV[0]
+  options[:media_file] = ARGV
 end
 
 # Load defaults from ~/.wistia.conf, if present. Only valid loadable options
@@ -107,30 +107,72 @@ unless options.keys.to_set.superset?(required)
 end
 
 # Ok, time to upload!
-$stdout.write("Uploading '#{options[:media_file]}' ...") if !options[:quiet]
-$stdout.flush
 begin
-  unless File.exists? options[:media_file]
-    puts "ERROR: The file '#{options[:media_file]}' doesn't seem to exist."
+
+  if options[:media_file].is_a? Array
+    paths = options[:media_file]
+    # NOTE: Ignoring media name for multiple files!
+    if paths.length > 1
+      options[:media_name] = nil
+    end
+  else
+    paths = [options[:media_file]]
   end
 
-  result = WistiaUploader.upload_media(
-    options[:api_password], options[:project_id],
-    options[:media_file], options[:media_name], options[:contact_id])
-  puts " Done!" if !options[:quiet]
+  paths.each do |local_media|
+
+    puts "Uploading '#{local_media}'..." if !options[:quiet]
+    # Find the proper expansion of the path.
+    unless File.exists?(local_media) && !File.directory?(local_media)
+      puts "Detected possible shell glob. Computing paths."
+      paths = Dir.glob local_media
+      exit
+    end
 
-  data = JSON.parse(result)
+    unless File.exists? local_media
+      puts "ERROR: The file '#{local_media}' doesn't seem to exist."
+      exit
+    end
 
-  # Pretty-print the resultant media details.
-  if !options[:quiet]
-    puts "Media (id:#{data['id']}) successfully created."
-    puts "  bytes: #{data['filesize']}"
-    puts "  md5: #{data['md5']}"
-  end
+    thread = WistiaUploader.upload_media(
+      options[:api_password], options[:project_id],
+      local_media, options[:media_name], options[:contact_id])
 
-  # Spit out the JSON data returned from wistia.
-  if options[:json]
-    puts data
+    $stdout.sync
+
+    phases = ["-", "\\", "|", "/"]
+    phase = 0
+    while (!thread[:upload_status])
+      if thread[:progress] == nil
+        comp = 0
+      else
+        comp = (thread[:progress] * 50).round
+      end
+      if thread[:samples] && (thread[:samples].length > 0)
+        bps = (thread[:samples].inject{|sum,x| sum + x[0] }) / thread[:samples].length
+      else
+        bps = 0.0
+      end
+      unless options[:quiet]
+        $stdout.write("\r")
+        $stdout.write(" #{'%3d' % (2*comp)}% [#{'=' * comp}>#{' ' * (50 - comp)}] #{phases[phase]} #{thread[:last_pos]} bytes")
+      end
+      phase = (phase + 1) % 4
+      sleep 0.2
+    end
+    $stdout.write("\n") unless options[:quiet]
+
+    if thread[:upload_status] == :success
+      data = JSON.parse(thread[:body])
+      # Pretty-print the resultant media details.
+      puts " Media (id:#{data['id']}) successfully created." unless options[:quiet]
+      # Spit out the JSON data returned from wistia.
+      puts data if options[:json]
+    else
+      # Error state.
+      puts "An error occurred during upload!" unless options[:quiet]
+      exit 1
+    end
   end
 rescue
   puts "ERROR! Upload failed. Msg: #{$!}"

data/lib/wistia-uploader.rb

@@ -3,6 +3,21 @@ require 'net/http/post/multipart'
 
 UPLOAD_URL = "https://upload.wistia.com/"
 
+# Hacktacular mostly-accurate patch for upload monitoring.
+class WFile < File
+  def set_thread(thread)
+    @thread = thread
+  end
+  def read(*args)
+    if @thread
+      @thread[:progress] = ((1.0 * self.pos()) / self.size()).round(2)
+      @thread[:last_pos] = self.pos()
+    end
+    super(*args)
+  end
+end
+
+
 class WistiaUploader
 
   def self.upload_media(api_pass, project, file, name=nil, contact=nil)
@@ -10,34 +25,48 @@ class WistiaUploader
     params[:contact_id] = contact if contact
     params[:name] = name if name
 
-    code, body = self.post_file_to_wistia('', params, file)
-    return body
+    return self.post_file_to_wistia('', params, file)
   end
   
   def self.post_file_to_wistia(path, data, file, timeout=nil)
-    uri = URI(UPLOAD_URL + path)
+    Thread.new do
+      thread = Thread.current
+      thread[:progress] = 0.0
+      thread[:last_pos] = 0
 
-    # Sanitize the params hash.
-    data.reject! { |k,v| (v == nil) || v.empty? }
+      uri = URI(UPLOAD_URL + path)
 
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true if (uri.scheme == 'https')
+      # Sanitize the params hash.
+      data.reject! { |k,v| (v == nil) || v.empty? }
 
-    # Set the connection timeouts, if specified
-    if timeout
-      http.ssl_timeout = 10
-      http.open_timeout = 10
-      http.read_timeout = 10
-    end
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true if (uri.scheme == 'https')
+
+      # Set the connection timeouts, if specified
+      if timeout
+        http.ssl_timeout = 10
+        http.open_timeout = 10
+        http.read_timeout = 10
+      end
+
+      media = WFile.open(file)
+      media.set_thread(thread)
 
-    media = File.open(file)
-    req = Net::HTTP::Post::Multipart.new uri.request_uri, data.merge({
-      'file' => UploadIO.new(media, 'application/octet-stream', File.basename(file))
-    })
-    res = http.request(req)
-    media.close
+      req = Net::HTTP::Post::Multipart.new uri.request_uri, data.merge({
+        'file' => UploadIO.new(media, 'application/octet-stream', File.basename(file))
+      })
+      res = http.request(req)
+      media.close
 
-    return [res.code, res.body]
+      thread[:code] = res.code
+      thread[:body] = res.body
+
+      if res.code == '200'
+        thread[:upload_status] = :success
+      else
+        thread[:upload_status] = :failed
+      end
+    end
   end
 
 end

data/wistia-uploader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wistia-uploader"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Lawrence"]
-  s.date = "2012-10-10"
+  s.date = "2012-12-06"
   s.description = "A simple CLI uploader for Wistia users."
   s.email = "jason@wistia.com"
   s.executables = ["wistia-uploader"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wistia-uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -704925937519016139
+      hash: 3095705562316825160
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: