audiobank-client 0.0.2 → 0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4edaf36749c75f1e945aff673c5dc69019f8d083
+  data.tar.gz: 5484f94791aa122859e06b433ec6d7b42d60026d
+SHA512:
+  metadata.gz: 999d9a05db57f01705c58c37e0580285c6a7fad59eff3afdeb89373041923fba636bc5a55a2cb1aa2449823352a0b1a48ddfdcd37676faffedabb0af4c3e4988
+  data.tar.gz: 93bbc11d30b2ded6b545f7dda6efaf93f1b125a021afaf328d99f6506cf0b725ac96be726e4d274199c8ac54fee4f3e379bd87e74034d79cd7e6bad069d110a5

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 *~
 log/*
+/.ruby-version

data/audiobank-client.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "json"
   gem.add_runtime_dependency "virtus"
   gem.add_runtime_dependency "null_logger"
+  gem.add_runtime_dependency "trollop"
+  gem.add_runtime_dependency "progressbar"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "simplecov"

data/bin/audiobank

@@ -2,9 +2,4 @@
 
 require 'audiobank-client'
 
-# Audiobank::Account.base_uri "audiobank.local"
-
-account = Audiobank::Account.new(ARGV.shift)
-while not ARGV.empty?
-  account.documents.import ARGV.shift
-end
+Audiobank::Client::CLI.new(ARGV).run

data/lib/audiobank-client.rb

@@ -2,10 +2,10 @@ require "audiobank/client/version"
 
 require 'logger'
 require 'json'
-
-require "virtus"
-
-require "null_logger"
+require 'virtus'
+require 'null_logger'
+require 'trollop'
+require 'progressbar'
 
 begin
   require "active_support/core_ext/module/attribute_accessors"
@@ -33,3 +33,5 @@ end
 require "audiobank/document"
 require "audiobank/documents"
 require "audiobank/account"
+require "audiobank/client/local_file"
+require "audiobank/client/cli"

data/lib/audiobank/account.rb

@@ -35,7 +35,9 @@ class Audiobank::Account
   def document(id)
     Audiobank::Client.logger.info "Request document information : #{id}"
     get "/documents/#{id}.json" do |response|
-      Audiobank::Document.new(response) if response.code == 200
+      Audiobank::Document.new(response).tap do |document|
+        document.account = self
+      end if response.code == 200
     end
   end
 

data/lib/audiobank/client/cli.rb

@@ -0,0 +1,91 @@
+module Audiobank::Client
+  class CLI
+
+    attr_accessor :arguments
+
+    def initialize(arguments = [])
+      @arguments = arguments
+    end
+
+    attr_accessor :output
+    def output
+      @output ||= $stdout
+    end
+
+    def parser
+      Trollop::Parser.new.tap do |parser|
+        parser.version "AudioBank client v#{Audiobank::Client::VERSION}"
+        parser.banner <<-EOS
+Manage your AudioBank documents
+
+Usage:
+       audiobank [options] <command>
+
+where <command> are:
+
+    import <filenames>+ : to upload or import given files in AudioBank documents
+
+where [options] are:
+EOS
+
+        parser.opt :debug, "Enable log messages"
+        parser.opt :token, "Audiobank API token", :type => String
+        parser.opt :base_uri, "Change default Audiobank url", :type => String
+      end
+    end
+
+    def debug?
+      options[:debug]
+    end
+
+    def init
+      if debug?
+        Audiobank::Client.logger = Logger.new($stderr)
+      end
+
+      account
+    end
+
+    def command
+      arguments.shift
+    end
+
+    def run
+      Trollop::with_standard_exception_handling(parser) do
+        init
+      end
+
+      send command
+    end
+
+    def options
+      @options ||= parser.parse(arguments).inject({}) do |map, pair|
+        key, value = pair
+        unless key == :help or key.to_s.match(/_given$/) or value.blank?
+          map[key] = value
+        end
+        map
+      end
+    end
+
+    def account
+      Audiobank::Account.base_uri options[:base_uri] if options[:base_uri]
+
+      if options[:token]
+        Audiobank::Account.new(options[:token])
+      else
+        raise "No information to connect Audiobank account"
+      end
+    end
+
+    def import
+      arguments.each do |filename|
+        unless filename =~ /.audiobank$/
+          output.puts "Import #{filename}"
+          Audiobank::Client::LocalFile.new(filename).import(account)
+        end
+      end
+    end
+
+  end
+end

data/lib/audiobank/client/local_file.rb

@@ -0,0 +1,95 @@
+require 'tempfile'
+require 'tmpdir'
+
+module Audiobank::Client
+  class LocalFile
+
+    attr_reader :filename, :uploaded_file
+
+    def initialize(filename)
+      @filename = @uploaded_file = filename
+    end
+
+    def filename_without_extension
+      @filename_without_extension ||= filename.gsub(/\.#{extension}$/, "")
+    end
+
+    def basename
+      @basename ||= File.basename(filename)
+    end
+
+    def extension
+      @extension ||= File.extname(filename)[1..-1]
+    end
+
+    def document_id
+      if basename =~ /^([0-9]+)-/
+        $1.to_i
+      end
+    end
+
+    def file_uuid
+      document_id or Digest::SHA256.hexdigest(filename)
+    end
+
+    def default_title
+      File.basename(filename, File.extname(filename))
+    end
+
+    def flac_file
+      # "#{filename_without_extension}.flac"
+      # (@flac_tempfile ||= Tempfile.new(['audiobank', '.flac'])).path
+      "/tmp/#{file_uuid}.flac"
+    end
+
+    def convert
+      if extension == "wav"
+        # unless FileUtils.uptodate? flac_file, filename
+          Audiobank::Client.logger.info "Create flac version"
+          system "flac -f -o #{flac_file} '#{filename}'" or raise "Can't convert file to wav"
+        # end
+        Audiobank::Client.logger.info "Use flac version"
+        @uploaded_file = flac_file
+      end
+    end
+
+    def import_options
+      { :resume => true, :debug => true, :retries => 10, :progress => true }
+    end
+
+    def import(account)
+      unless FileUtils.uptodate? uploaded_file, [report_file]
+        Audiobank::Client.logger.info "File already imported"
+        return
+      end
+
+      convert
+
+      imported = false
+      if document_id
+        Audiobank::Client.logger.debug "Found document id : #{document_id}"
+        document = account.document(document_id)
+        if document
+          imported = document.import uploaded_file, import_options
+        else
+          raise "Document #{document_id} not found"
+        end
+      else
+        imported = account.documents.import uploaded_file, { :title => default_title }, import_options
+      end
+
+      if imported
+        Audiobank::Client.logger.debug "Create report #{report_file}"
+        system "touch '#{report_file}'"
+        # FileUtils.touch report_file
+      else
+        Audiobank::Client.logger.info "Failed to import #{filename}"
+      end
+    end
+
+    def report_file
+      "#{filename}.audiobank"
+    end
+
+  end
+end

data/lib/audiobank/client/version.rb

@@ -1,5 +1,5 @@
 module Audiobank
   module Client
-    VERSION = "0.0.2"
+    VERSION = "0.5"
   end
 end

data/lib/audiobank/document.rb

@@ -24,18 +24,57 @@ class Audiobank::Document
     @upload_uri ||= URI.parse(upload)
   end
 
-  def upload!(file)
-    Net::FTP.open(upload_uri.host) do |ftp|
-      ftp.login
-      ftp.chdir upload_uri.path
-      ftp.putbinaryfile file 
+  class NullProgressBar
+
+    def inc(size); end
+    def set(size); end
+    def finish; end
+
+  end
+
+  def upload!(file, options = {})
+    Audiobank::Client.logger.debug "Upload #{file} in document #{id} (#{upload_uri})"
+
+    retry_count = (options[:retries] or 0)
+
+    progress_bar = (options[:progress] ? ProgressBar.new("Document #{id}", File.size(file)) : NullProgressBar.new)
+
+    begin
+      Net::FTP.open(upload_uri.host) do |ftp|
+        ftp.debug_mode = options[:debug]
+        ftp.login
+        ftp.chdir upload_uri.path
+        ftp.resume = options[:resume]
+        ftp.passive = true
+        ftp.putbinaryfile file, id.to_s do |buf|
+          progress_bar.inc buf.size
+        end
+      end
+
+      progress_bar.finish
+    rescue => e
+      Audiobank::Client.logger.debug "Upload #{file} failed #{e}"
+      if retry_count > 0
+        retry_count -= 1
+        progress_bar.set 0
+        Audiobank::Client.logger.debug "Retry in 30 seconds"
+        sleep 30
+        retry
+      else
+        return nil
+      end
     end
 
     self
   end
 
   def confirm
+    Audiobank::Client.logger.debug "Confirm upload of document #{id}"
     account.post "/documents/#{id}/upload/confirm.json"
   end
 
+  def import(file, options = {})
+    upload!(file, options).try(:confirm)
+  end
+
 end

data/lib/audiobank/documents.rb

@@ -1,5 +1,5 @@
 class Audiobank::Documents
-  
+
   attr_accessor :account
 
   def initialize(account)
@@ -13,17 +13,18 @@ class Audiobank::Documents
     post "/documents.json", :document => attributes do |response|
       Audiobank::Document.new(response).tap do |document|
         document.account = account
+        Audiobank::Client.logger.debug "Created document has id #{document.id}"
       end
     end
   end
 
-  def import(file, attributes = {})
-    attributes = { 
-      :title => File.basename(file, File.extname(file)), 
-      :description => "Uploaded at #{Time.now}" 
+  def import(file, attributes = {}, options = {})
+    attributes = {
+      :title => File.basename(file, File.extname(file)),
+      :description => "Uploaded at #{Time.now}"
     }.merge(attributes)
 
-    create(attributes).upload!(file).confirm
+    create(attributes).import(file)
   end
 
 end

data/spec/audiobank/documents_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Audiobank::Documents do
-  
+
   let(:account) { Audiobank::Account.new "secret" }
 
   subject { Audiobank::Documents.new account }
@@ -9,7 +9,7 @@ describe Audiobank::Documents do
   before(:each) do
     FakeWeb.allow_net_connect = false
   end
-  
+
   describe "#create" do
 
     it "should post to /documents.json the document attributes" do
@@ -36,21 +36,16 @@ describe Audiobank::Documents do
 
     before do
       subject.stub :create => document
-      document.stub :upload! => document, :confirm => true
+      document.stub :import => true
     end
-    
+
     it "should create a Document with specified attributes" do
       subject.should_receive(:create).with(hash_including(:title => "dummy")).and_return(document)
       subject.import file, :title => "dummy"
     end
 
-    it "should upload the specified file" do
-      document.should_receive(:upload!).with(file)
-      subject.import file
-    end
-
-    it "should confirm the upload" do
-      document.should_receive(:confirm)
+    it "should import the document" do
+      document.should_receive(:import)
       subject.import file
     end
 
@@ -65,5 +60,5 @@ describe Audiobank::Documents do
     end
 
   end
-  
+
 end

data/spec/lib/audiobank/client/local_file_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Audiobank::Client::LocalFile do
+
+  def local_file(filename)
+    Audiobank::Client::LocalFile.new(filename)
+  end
+
+  describe "document_id" do
+
+    it "should be the number which starts filename" do
+      local_file("123-dummy.wav").document_id.should == 123
+    end
+
+    it "should be nil when filename doesn't start with a number" do
+      local_file("dummy.wav").document_id.should be_nil
+    end
+
+  end
+
+end

metadata

@@ -1,203 +1,222 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: audiobank-client
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: '0.5'
 platform: ruby
-authors: 
+authors:
 - Alban Peignier
 - Florent Peyraud
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
+date: 2016-07-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 4
-        version: "4"
-  requirement: *id002
-  name: activesupport
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-  name: json
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: virtus
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: null_logger
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-  name: rake
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: simplecov
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: fakeweb
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: guard
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id011
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: guard-rspec
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id012
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage AudioBank documents from command-line or Ruby
-email: 
+email:
 - alban@tryphon.eu
 - florent@tryphon.eu
-executables: 
+executables:
 - audiobank
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - COPYING
 - COPYRIGHT
 - Gemfile
@@ -208,6 +227,8 @@ files:
 - bin/audiobank
 - lib/audiobank-client.rb
 - lib/audiobank/account.rb
+- lib/audiobank/client/cli.rb
+- lib/audiobank/client/local_file.rb
 - lib/audiobank/client/version.rb
 - lib/audiobank/document.rb
 - lib/audiobank/documents.rb
@@ -215,47 +236,39 @@ files:
 - spec/audiobank/account_spec.rb
 - spec/audiobank/document_spec.rb
 - spec/audiobank/documents_spec.rb
+- spec/lib/audiobank/client/local_file_spec.rb
 - spec/spec_helper.rb
 - spec/support/fakeweb.rb
 - spec/support/log.rb
 - tasks/rspec.rake
 homepage: http://projects.tryphon.eu/projects/audiobank-client
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: AudioBank API client
-test_files: 
+test_files:
 - spec/audiobank/account_spec.rb
 - spec/audiobank/document_spec.rb
 - spec/audiobank/documents_spec.rb
+- spec/lib/audiobank/client/local_file_spec.rb
 - spec/spec_helper.rb
 - spec/support/fakeweb.rb
 - spec/support/log.rb