rest-ftp-daemon 0.410.2 → 0.410.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b3b36ee449cbd6c6b17470b250c70d074a79f75
-  data.tar.gz: c42b57eb1a6177c4599692b7cf24c205c37020e7
+  metadata.gz: be7b4ae68db6b95a7bc9752ad7ebbbd08dbaf826
+  data.tar.gz: 45f205479d718def98f02d90bb2d6f42021106c5
 SHA512:
-  metadata.gz: dae3f45a50aa835cad03301af5900680080fa210eb95a6a0f104a1025e42f7c1c5a4e153c29b0141b328e20b743f01af3957624c41446ad8a39ca3a02533c3f9
-  data.tar.gz: d32f13ed0b4021f56fdf29c17cf8ead52abfad781dbef5a14c39bbd29018322763508e4f8f4a7b7687432bbed3afe062c2e0eeb91ba0a7ecd324e48fe5a52103
+  metadata.gz: 2edcf302d49057d7fd0b443d340b273264d785232ab4df259e51fb3877a70f8fde480abe5aaf3e7282b79e59c3dd0edf77f679a3268e3f6e2467259270acafb7
+  data.tar.gz: 43decf57d56dba500de038195f609877cb67eb920427d48adf57a870d9bf15d42ce984f3e1814a1dceb66254fe0eb88837f446e404ffdffe813bd73475c8cb36

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.410.2)
+    rest-ftp-daemon (0.410.4)
       activesupport (~> 4.2)
       api-auth
       bmc-daemon-lib (~> 0.3.4)

data/lib/rest-ftp-daemon/api/jobs.rb

@@ -76,11 +76,11 @@ module RestFtpDaemon
         optional :video_vc,
           type: String,
           desc: "video: video codec",
-          default: ""
+          default: nil
         optional :video_ac,
           type: String,
           desc: "video: audio codec",
-          default: ""
+          default: nil
         optional :video_custom,
           type: Hash,
           desc: "video: custom options passed to FFMPEG encoder",

data/lib/rest-ftp-daemon/exceptions.rb

@@ -17,6 +17,7 @@ module RestFtpDaemon
   class UnresolvedTokens          < RestFtpDaemonException; end
   class LocationParseError        < RestFtpDaemonException; end
   class UnsupportedScheme         < RestFtpDaemonException; end
+  class MissingFfmpegLibraries    < RestFtpDaemonException; end
 
   class SourceNotSupported        < RestFtpDaemonException; end
   class SourceNotFound            < RestFtpDaemonException; end

data/lib/rest-ftp-daemon/helpers/common.rb

@@ -30,14 +30,8 @@ module RestFtpDaemon
     end
 
     def exception_to_error exception
-      underscore exception.class.name.split('::').last
+      underscore 'err_' + exception.class.name.split('::').last
     end
 
-    # Dates and times: date with time generator
-    # def datetime_full datetime
-    #   return "-"  if datetime.nil?
-    #   datetime.to_datetime.strftime("%d.%m.%Y %H:%M:%S")
-    # end
-
   end
 end

data/lib/rest-ftp-daemon/helpers/views.rb

@@ -33,12 +33,10 @@ module RestFtpDaemon
     def location_style uri
       case uri
       when URI::FILE
-        "primary"
+        "info"
       when URI::FTP
         "warning"
-      when URI::FTPS
-        "success"
-      when URI::SFTP
+      when URI::FTPES, URI::FTPS, URI::SFTP
         "success"
       else
         "default"

data/lib/rest-ftp-daemon/job.rb

@@ -1,5 +1,6 @@
 # FIXME: prepare files list ar prepare_common
 # FIXME: scope classes in submodules like Worker::Transfer, Job::Video
+# FIXME: restore HostKeyMismatch and other NEt::SFTP exceptions
 
 # Represents work to be done along with parameters to process it
 require "securerandom"
@@ -16,7 +17,7 @@ module RestFtpDaemon
     # Class constants
     FIELDS = [:type, :source, :target, :label, :priority, :pool, :notify,
       :overwrite, :mkdir, :tempfile,
-      :video_vc, :video_ac, :video_custom
+      :video_vc, :video_ac, :video_custom,
       ]
 
     # Class options
@@ -119,54 +120,31 @@ module RestFtpDaemon
 
       # Notify we start working
       log_info "Job.process notify [started]"
+      current_signal = :started
+      set_status JOB_STATUS_WORKING
       client_notify :started
 
       # Before work
-      begin
-        log_debug "Job.process before"
-        before
-      rescue RestFtpDaemon::SourceNotSupported => exception
-        return oops :started, exception
-      rescue Net::FTPConnectionError => exception
-        return oops :started, exception, "ftp_connection_error"
-      rescue StandardError => exception
-        return oops :started, exception, "unexpected_before_error"
-      end
+      log_debug "Job.process do_before"
+      current_signal = :started
+      do_before
 
       # Do the hard work
-      begin
-        log_debug "Job.process work"
-        set_status JOB_STATUS_WORKING
-        work
-
-      rescue RestFtpDaemon::SourceNotFound => exception
-        return oops :ended, exception
-
-      rescue RestFtpDaemon::TargetFileExists => exception
-        return oops :ended, exception
-
-      rescue RestFtpDaemon::TargetDirectoryError => exception
-        return oops :ended, exception
-
-      rescue RestFtpDaemon::TargetPermissionError => exception
-        return oops :ended, exception
-
-      rescue RestFtpDaemon::AssertionFailed => exception
-        return oops :ended, exception
-
-      rescue StandardError => exception
-        return oops :started, exception, "unexpected_work_error"
-      end
+      log_debug "Job.process do_work"
+      current_signal = :ended
+      do_work
 
       # Finalize all this
-      begin
-        log_debug "Job.process after"
-        after
-      rescue StandardError => exception
-        return oops :started, exception, "unexpected_after_error"
-      end
+      log_debug "Job.process do_after"
+      current_signal = :ended
+      do_after
+
+    rescue StandardError => exception
+      log_debug "Job.process caught #{exception.class} #{exception.message}"
+      return oops current_signal, exception
 
-        # All done !
+    else
+      # All done !
       set_status JOB_STATUS_FINISHED
       log_info "JobVideo.process notify [ended]"
       client_notify :ended
@@ -268,14 +246,6 @@ module RestFtpDaemon
      [@wid, @id, nil]
     end
 
-    def scan_local_paths path
-      Dir.glob(path).collect do |file|
-        next unless File.readable? file
-        next unless File.file? file
-        Path.new file
-      end
-    end
-
     def touch_job
       now = Time.now
       @updated_at = now
@@ -317,38 +287,46 @@ module RestFtpDaemon
       value.to_s.encode("UTF-8")
     end
 
-    def flag_prepare name, default
+    def flag_prepare name
       # build the flag instance var name
       variable = "@#{name}"
 
-      [config[name], default].each do |alt_value|
-        # If it's already true or false, that's ok
-        return if [true, false].include? instance_variable_get(variable)
+      # If it's already true or false, that's ok
+      return if [true, false].include? instance_variable_get(variable)
 
-        # Otherwise, set it to the new alt_value
-        instance_variable_set variable, alt_value
-      end
+      # Otherwise, set it to the new alt_value
+      instance_variable_set variable, config[name]
     end
 
-    def client_notify event, payload = {}
+    def client_notify signal, payload = {}
       # Skip if no URL given
       return unless @notify
 
       # Ok, create a notification!
       payload[:id] = @id
-      payload[:event] = event
+      payload[:signal] = signal
       RestFtpDaemon::Notification.new @notify, payload
 
     rescue StandardError => ex
       log_error "Job.client_notify EXCEPTION: #{ex.inspect}"
     end
 
-    def oops event, exception, error = nil, include_backtrace = false
-      # Default error code derived from  exception name
-      error = exception_to_error(exception) if error.nil?
-      message = "Job.oops event[#{event}] error[#{error}] ex[#{exception.class}] #{exception.message}"
+    def oops signal, exception, error = nil#, include_backtrace = false
+      # Find error code in ERRORS table
+      if error.nil?
+        error = ERRORS.key(exception.class)
+        # log_debug "Job.oops ERRORS: #{exception.class} > #{error}"
+      end
+
+      # Default error code derived from exception name
+      if error.nil?
+        error = exception_to_error(exception)
+        # log_debug "Job.oops derivated: #{exception.class} > #{error}"
+        include_backtrace = true
+      end
 
-      # Backtrace?
+      # Log backtrace ?
+      message = "Job.oops signal[#{signal}] exception[#{exception.class}] error[#{error}] #{exception.message}"
       if include_backtrace
         log_error message, exception.backtrace
       else
@@ -378,8 +356,8 @@ module RestFtpDaemon
       RestFtpDaemon::Counters.instance.increment :jobs, :failed
 
       # Prepare notification if signal given
-      return unless event
-      client_notify event, error: error, status: notif_status, message: "#{exception.class} | #{exception.message}"
+      return unless signal
+      client_notify signal, error: error, status: notif_status, message: "#{exception.class} | #{exception.message}"
     end
 
     # NewRelic instrumentation

data/lib/rest-ftp-daemon/jobs/dummy.rb

@@ -1,19 +1,19 @@
 module RestFtpDaemon
   class JobDummy < Job
 
-    # def initialize job_id, params = {}
-    #   super
-    # end
+  protected
 
-    def before
+    def do_before
+      log_info "JobDummy.do_before"
     end
 
-    def work
-      log_info "JobDummy.work YEAH WE'RE PROCESSING, man !"
+    def do_work
+      log_info "JobDummy.do_work"
       sleep 5
     end
 
-    def after
+    def do_after
+      log_info "JobDummy.do_after"
     end
 
   end

data/lib/rest-ftp-daemon/jobs/errors.rb

@@ -0,0 +1,52 @@
+require "securerandom"
+require "double_bag_ftps"
+require "net/ssh"
+require "net/ftp"
+require "net/sftp"
+require 'streamio-ffmpeg'
+
+module RestFtpDaemon
+  class Job
+
+    # Common errors
+    ERRORS = {
+      invalid_argument:         Errno::EINVAL,
+
+      source_not_supported:     RestFtpDaemon::SourceNotSupported,
+      source_not_found:         RestFtpDaemon::SourceNotFound,
+      target_file_exists:       RestFtpDaemon::TargetFileExists,
+      target_directory_error:   RestFtpDaemon::TargetDirectoryError,
+      target_permission_error:  RestFtpDaemon::TargetPermissionError,
+      assertion_failed:         RestFtpDaemon::AssertionFailed,
+
+      conn_socket_error:        SocketError,
+      conn_eof:                 EOFError,
+      conn_failed:              Errno::ENOTCONN,
+      conn_host_is_down:        Errno::EHOSTDOWN,
+      conn_broken_pipe:         Errno::EPIPE,
+      conn_unreachable:         Errno::ENETUNREACH,
+      conn_reset_by_peer:       Errno::ECONNRESET,
+      conn_refused:             Errno::ECONNREFUSED,
+      conn_timed_out_1:         Timeout::Error,
+      conn_timed_out_2:         Net::ReadTimeout,
+      conn_timed_out_3:         Errno::ETIMEDOUT,
+
+      ftp_connection_error:     Net::FTPConnectionError,
+      ftp_perm_error:           Net::FTPPermError,
+      ftp_reply_error:          Net::FTPReplyError,
+      ftp_temp_error:           Net::FTPTempError,
+      ftp_proto_error:          Net::FTPProtoError,
+      ftp_error:                Net::FTPError,
+
+      ffmpeg_error:             FFMPEG::Error,
+
+      # sftp_exception:       Net::SFTP::StatusException,
+      # sftp_key_mismatch:    Net::SFTP::HostKeyMismatch,
+      # sftp_auth_failed:     Net::SFTP::AuthenticationFailed,
+      sftp_openssl_error:   OpenSSL::SSL::SSLError,
+      # rescue Encoding::UndefinedConversionError => exception
+      #   return oops :ended, exception, "encoding_error", true
+      }
+
+  end
+end

data/lib/rest-ftp-daemon/jobs/transfer.rb

@@ -5,11 +5,11 @@ module RestFtpDaemon
 
   protected
 
-    def before
+    def do_before
       # Prepare flags
-      flag_prepare :mkdir, false
-      flag_prepare :overwrite, false
-      flag_prepare :tempfile, true
+      flag_prepare :mkdir
+      flag_prepare :overwrite
+      flag_prepare :tempfile
 
       # Some init
       @transfer_sent = 0
@@ -35,20 +35,18 @@ module RestFtpDaemon
         raise RestFtpDaemon::TargetNotSupported, @target_loc.scheme
       end
 
-    rescue RestFtpDaemon::AssertionFailed => exception
-      return oops :started, exception
-
     # rescue URI::InvalidURIError => exception
     #   return oops :started, exception, "target_invalid"
     end
 
-    def work
+    def do_work
       # Scan local source files from disk
       set_status JOB_STATUS_CHECKING_SRC
-      sources = scan_local_paths @source_loc.path
-      set_info :source, :count, sources.count
-      set_info :source, :files, sources.collect(&:full)
-      log_info "JobTransfer.work sources #{sources.collect(&:name)}"
+      sources = @source_loc.scan_files
+      log_debug "JobTransfer.work sources result #{sources.inspect}"
+      set_info :source, :count, sources.size
+      set_info :source, :files, sources.collect(&:name)
+      log_info "JobTransfer.work sources names #{sources.collect(&:name)}"
       raise RestFtpDaemon::SourceNotFound if sources.empty?
 
       # Guess target file name, and fail if present while we matched multiple sources
@@ -78,7 +76,7 @@ module RestFtpDaemon
         target_final = @target_loc.clone
 
         # Add the source file name if none found in the target path
-        unless full_target.name
+        unless target_final.name
           target_final.name = source.name
         end
 
@@ -92,71 +90,9 @@ module RestFtpDaemon
         # Update counters
         set_info :source, :processed, source_processed += 1
       end
-
-    rescue SocketError => exception
-      return oops :ended, exception, "conn_socket_error"
-
-    rescue EOFError => exception
-      return oops :ended, exception, "conn_eof"
-
-    rescue Errno::EHOSTDOWN => exception
-      return oops :ended, exception, "conn_host_is_down"
-
-    rescue Errno::EPIPE=> exception
-      return oops :ended, exception, "conn_broken_pipe"
-
-    rescue Errno::ENETUNREACH => exception
-      return oops :ended, exception, "conn_unreachable"
-
-    rescue Errno::ECONNRESET => exception
-      return oops :ended, exception, "conn_reset_by_peer"
-
-    rescue Errno::ENOTCONN => exception
-      return oops :ended, exception, "conn_failed"
-
-    rescue Errno::ECONNREFUSED => exception
-      return oops :ended, exception, "conn_refused"
-
-    rescue Timeout::Error, Errno::ETIMEDOUT, Net::ReadTimeout => exception
-      return oops :ended, exception, "conn_timed_out"
-
-    rescue OpenSSL::SSL::SSLError => exception
-      return oops :ended, exception, "conn_openssl_error"
-
-    rescue Net::FTPReplyError => exception
-      return oops :ended, exception, "ftp_reply_error"
-
-    rescue Net::FTPTempError => exception
-      return oops :ended, exception, "ftp_temp_error"
-
-    rescue Net::FTPPermError => exception
-      return oops :ended, exception, "ftp_perm_error"
-
-    rescue Net::FTPProtoError => exception
-      return oops :ended, exception, "ftp_proto_error"
-
-    rescue Net::FTPError => exception
-      return oops :ended, exception, "ftp_error"
-
-    rescue Net::SFTP::StatusException => exception
-      return oops :ended, exception, "sftp_exception"
-
-    rescue Net::SSH::HostKeyMismatch => exception
-      return oops :ended, exception, "sftp_key_mismatch"
-
-    rescue Net::SSH::AuthenticationFailed => exception
-      return oops :ended, exception, "sftp_auth_failed"
-
-    rescue Errno::EMFILE => exception
-      return oops :ended, exception, "too_many_open_files"
-
-    rescue Errno::EINVAL => exception
-      return oops :ended, exception, "invalid_argument", true
-    # rescue Encoding::UndefinedConversionError => exception
-    #   return oops :ended, exception, "encoding_error", true
     end
 
-    def after
+    def do_after
       # Close FTP connexion and free up memory
       log_info "JobTransfer.after"
       @remote.close
@@ -180,7 +116,7 @@ module RestFtpDaemon
       raise RestFtpDaemon::AssertionFailed, "remote_push/target" if target.nil?
 
       # Use source filename if target path provided none (typically with multiple sources)
-      log_info "JobTransfer.remote_push [#{source.name}]: [#{source.full}] > [#{target.full}]"
+      log_info "JobTransfer.remote_push [#{source.name}]: [#{source.path}] > [#{target.path}]"
       set_info :source, :current, source.name
 
       # Compute temp target name
@@ -222,8 +158,6 @@ module RestFtpDaemon
     end
 
     def progress transferred, name = ""
-
-
       # What's current time ?
       now = Time.now
       notify_after = @config[:notify_after]

data/lib/rest-ftp-daemon/jobs/video.rb

@@ -8,20 +8,28 @@ require 'streamio-ffmpeg'
 module RestFtpDaemon
   class JobVideo < Job
 
+  protected
+
     # Process job
-    def before
+    def do_before
       log_info "JobVideo.before source_loc.path: #{@source_loc.path}"
       log_info "JobVideo.before target_loc.path: #{@target_loc.path}"
 
+      # Ensure FFMPEG lib is available
+      ffmpeg_binary_path = FFMPEG.ffmpeg_binary
+      unless ffmpeg_binary_path && File.exists?(ffmpeg_binary_path)
+        raise RestFtpDaemon::MissingFfmpegLibraries, ffmpeg_binary_path
+      end
+
       # Ensure source and target are FILE
       raise RestFtpDaemon::SourceNotSupported, @source_loc.scheme   unless source_uri.is_a? URI::FILE
       raise RestFtpDaemon::TargetNotSupported, @target.scheme       unless target_uri.is_a? URI::FILE
     end
 
-    def work
+    def do_work
       # Guess source files from disk
       set_status JOB_STATUS_TRANSFORMING
-      sources = scan_local_paths @source_loc.path
+      sources = @source_loc.scan_files
       raise RestFtpDaemon::SourceNotFound if sources.empty?
 
       # Add the source file name if none found in the target path
@@ -35,39 +43,35 @@ module RestFtpDaemon
 
       # Do the work, for each file
       set_info :source, :current, @source_loc.name
-      video_command @source_loc, target_final
+      ffmpeg_command @source_loc, target_final
 
       # Done
       set_info :source, :current, nil
-
-    rescue FFMPEG::Error => exception
-      return oops :ended, exception, "ffmpeg_error"
     end
 
-    def after
+    def do_after
       # Done
       set_info :source, :current, nil
     end
 
-  protected
-
-    def video_command source, target
-      log_info "JobVideo.video_command [#{source.name}]: [#{source.path}] > [#{target.path}]"
+    def ffmpeg_command source, target
       set_info :source, :current, source.name
 
       # Read info about source file
       movie = FFMPEG::Movie.new(source.path)
 
       # Build options
-      ffmpeg_custom_options = {
-        audio_codec: @video_ac,
-        video_codec: @video_vc,
-        custom: ffmpeg_custom_option_array,
-        }
-      set_info :work, :ffmpeg_custom_options, ffmpeg_custom_options
+      options = {}
+      options[:audio_codec] = @video_ac unless @video_ac.to_s.empty?
+      options[:video_codec] = @video_vc unless @video_vc.to_s.empty?
+      options[:custom] = @ffmpeg_custom_option_array if @ffmpeg_custom_option_array
+      set_info :work, :ffmpeg_options, options
+
+      # Announce contexte
+      log_info "JobVideo.ffmpeg_command [#{FFMPEG.ffmpeg_binary}] [#{source.name}] > [#{target.name}]", options
 
       # Build command
-      movie.transcode(target.path, ffmpeg_custom_options) do |ffmpeg_progress|
+      movie.transcode(target.path, options) do |ffmpeg_progress|
         set_info :work, :ffmpeg_progress, ffmpeg_progress
 
         percent0 = (100.0 * ffmpeg_progress).round(0)

data/lib/rest-ftp-daemon/location.rb

@@ -19,7 +19,8 @@ module RestFtpDaemon
     def initialize path
       #@logger = BmcDaemonLib::LoggerPool.instance.get :transfer
       #log_debug "Location.initialize path[#{path}]"
-      location_uri = path.dup
+      # Strip spaces before/after, copying original "path" at the same time
+      location_uri = path.strip
 
       # Replace tokens, fix scheme for local paths
       resolve_tokens! location_uri
@@ -50,7 +51,23 @@ module RestFtpDaemon
     end
 
     def path
-      File.join @dir.to_s, @name.to_s
+      File.join(@dir.to_s, @name.to_s)
+    end
+
+    def scan_files
+      Dir.glob(path).collect do |file|
+        next unless File.readable? file
+        next unless File.file? file
+        # Create a new location object
+        self.class.new(file)
+      end
+    end
+
+    def size
+      return unless uri.is_a? URI::FILE
+      local_fil_path = path
+      return unless File.exist? local_fil_path
+      return File.size local_fil_path
     end
 
   private

data/lib/rest-ftp-daemon/notification.rb

@@ -41,15 +41,15 @@ module RestFtpDaemon
       if @url.nil?
         log_error "skipping (missing url)", params
         return
-      elsif @params[:event].nil?
-        log_error "skipping (missing event)", params
+      elsif @params[:signal].nil?
+        log_error "skipping (missing signal)", params
         return
       end
 
       # Build body and extract job ID if provided
       flags = {
         id:       @params[:id].to_s,
-        signal:   "#{NOTIFY_PREFIX}.#{@params[:event]}",
+        signal:   "#{NOTIFY_PREFIX}.#{@params[:signal]}",
         error:    @params[:error],
         host:     Conf.host.to_s,
         }

data/lib/rest-ftp-daemon/remote_ftp.rb

@@ -36,7 +36,7 @@ module RestFtpDaemon
     end
 
     def present? target
-      size = @ftp.size target.full
+      size = @ftp.size target.path
       log_debug "RemoteFTP.present? [#{target.name}]"
 
     rescue Net::FTPPermError
@@ -47,7 +47,7 @@ module RestFtpDaemon
 
     def remove! target
       log_debug "RemoteFTP.remove! [#{target.name}]"
-      @ftp.delete target.full
+      @ftp.delete target.path
     rescue Net::FTPPermError
       log_debug "#{LOG_INDENT}[#{target.name}] file not found"
     else
@@ -97,7 +97,7 @@ module RestFtpDaemon
       # Do the transfer
       log_debug "RemoteFTP.push to [#{destination.name}]"
 
-      @ftp.putbinaryfile source.full, target.name, @chunk_size do |data|
+      @ftp.putbinaryfile source.path, target.name, @chunk_size do |data|
         # Update job status after this block transfer
         yield data.bytesize, destination.name
       end

data/lib/rest-ftp-daemon/remote_sftp.rb

@@ -35,7 +35,7 @@ module RestFtpDaemon
 
     def present? target
       log_debug "RemoteSFTP.present? [#{target.name}]"
-      stat = @sftp.stat! target.full
+      stat = @sftp.stat! target.path
 
     rescue Net::SFTP::StatusException
       return false
@@ -45,7 +45,7 @@ module RestFtpDaemon
 
     def remove! target
       log_debug "RemoteSFTP.remove! [#{target.name}]"
-      @sftp.remove target.full
+      @sftp.remove target.path
 
     rescue Net::SFTP::StatusException
       log_debug "#{LOG_INDENT}[#{target.name}] file not found"
@@ -100,8 +100,8 @@ module RestFtpDaemon
       destination.name = tempname if tempname
 
       # Do the transfer
-      log_debug "RemoteSFTP.push [#{destination.full}]"
-      @sftp.upload! source.full, destination.full do |event, _uploader, *args|
+      log_debug "RemoteSFTP.push [#{destination.path}]"
+      @sftp.upload! source.path, destination.path do |event, _uploader, *args|
         case event
         when :open then
           # args[0] : file metadata
@@ -129,7 +129,7 @@ module RestFtpDaemon
       # Rename if needed
       if tempname
         log_debug "RemoteSFTP.push rename to\t[#{target.name}]"
-        @sftp.rename! destination.full, target.full, flags
+        @sftp.rename! destination.path, target.path, flags
       end
 
       # progress:

data/lib/rest-ftp-daemon/views/dashboard_jobs.haml

@@ -37,8 +37,8 @@
           %th target
           %th queued
           %th.error status
-          %th{"min-width" => 120} error / progress
-          %th.text-right filesize
+          %th{"min-width" => 120} detail
+          %th.text-right size
           %th.text-right bitrate
           %th{title: "Worker ID"} W
           %th{title: "Priority"} P

data/lib/rest-ftp-daemon.rb

@@ -9,12 +9,10 @@ require "syslog"
 require "thread"
 require "newrelic_rpm"
 
-
 # Shared libs / monkey-patching
 require_relative "shared/patch_array"
 require_relative "shared/patch_haml"
 
-
 # Project's libs
 require_relative "rest-ftp-daemon/constants"
 require_relative "rest-ftp-daemon/exceptions"
@@ -27,28 +25,32 @@ require_relative "rest-ftp-daemon/uri"
 require_relative "rest-ftp-daemon/job_queue"
 require_relative "rest-ftp-daemon/counters"
 require_relative "rest-ftp-daemon/notification"
-
-require_relative "rest-ftp-daemon/path"
 require_relative "rest-ftp-daemon/location"
 
+# Remotes
 require_relative "rest-ftp-daemon/remote"
 require_relative "rest-ftp-daemon/remote_ftp"
 require_relative "rest-ftp-daemon/remote_sftp"
 
+# Jobs
 require_relative "rest-ftp-daemon/job"
+require_relative "rest-ftp-daemon/jobs/errors"
 require_relative "rest-ftp-daemon/jobs/dummy"
 require_relative "rest-ftp-daemon/jobs/transfer"
 require_relative "rest-ftp-daemon/jobs/video"
 
 require_relative "rest-ftp-daemon/worker_pool"
+
+# Workers
+# require_from :workers
 require_relative "rest-ftp-daemon/workers/worker"
 require_relative "rest-ftp-daemon/workers/conchita"
 require_relative "rest-ftp-daemon/workers/reporter"
 require_relative "rest-ftp-daemon/workers/transfer"
 
+# API
 require_relative "rest-ftp-daemon/api/entities/options"
 require_relative "rest-ftp-daemon/api/entities/job"
-
 require_relative "rest-ftp-daemon/api/jobs"
 require_relative "rest-ftp-daemon/api/dashboard"
 require_relative "rest-ftp-daemon/api/status"
@@ -56,3 +58,14 @@ require_relative "rest-ftp-daemon/api/config"
 require_relative "rest-ftp-daemon/api/debug"
 require_relative "rest-ftp-daemon/api/root"
 
+# def require_from subdir
+#   path = sprintf(
+#     '%s/rest-ftp-daemon/%s/*.rb',
+#     File.dirname(__FILE__),
+#     subdir.to_s
+#     )
+#   Dir.glob(path).each do |file|
+#     puts "loading: #{file}"
+#     require_relative file
+#   end
+# end

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.410.2"
+  spec.version                    = "0.410.4"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.410.2
+  version: 0.410.4
 platform: ruby
 authors:
 - Bruno MEDICI
@@ -414,6 +414,7 @@ files:
 - lib/rest-ftp-daemon/job.rb
 - lib/rest-ftp-daemon/job_queue.rb
 - lib/rest-ftp-daemon/jobs/dummy.rb
+- lib/rest-ftp-daemon/jobs/errors.rb
 - lib/rest-ftp-daemon/jobs/transfer.rb
 - lib/rest-ftp-daemon/jobs/video.rb
 - lib/rest-ftp-daemon/launcher.rb
@@ -421,7 +422,6 @@ files:
 - lib/rest-ftp-daemon/metrics.rb
 - lib/rest-ftp-daemon/notification.rb
 - lib/rest-ftp-daemon/paginate.rb
-- lib/rest-ftp-daemon/path.rb
 - lib/rest-ftp-daemon/remote.rb
 - lib/rest-ftp-daemon/remote_ftp.rb
 - lib/rest-ftp-daemon/remote_sftp.rb

data/lib/rest-ftp-daemon/path.rb

@@ -1,51 +0,0 @@
-module RestFtpDaemon
-  class Path
-
-    # Class options
-    attr_accessor :name
-    attr_accessor :dir
-
-    def initialize full, strip_leading_slash = false
-      # Extract path parts
-      @name = extract_filename full.to_s
-
-      @dir = extract_dirname full.to_s
-      # puts "Path full.to_s: #{full.to_s}"
-      # puts "Path extract_dirname: #{@dir}"
-
-      # Remove leading slash if needed
-      strip_leading_slash_from_dir! if strip_leading_slash
-    end
-
-    def full
-      if @dir.nil? || @dir.empty?
-        return @name
-      else
-        return File.join @dir, @name
-      end
-    end
-
-    def size
-      File.size full if File.exist? full
-    end
-
-  private
-
-    def extract_filename path
-      # match everything that's after a slash at the end of the string
-      m = path.match(/\/?([^\/]+)$/)
-      return m[1].to_s unless m.nil?
-    end
-
-    def extract_dirname path
-      # match all the beginning of the string up to the last slash
-      m = path.match(/^(.*)\/[^\/]*$/)
-      return m[1].to_s unless m.nil?
-    end
-
-    def strip_leading_slash_from_dir!
-      @dir.to_s.gsub!(/^\//, '')
-    end
-
-  end
-end