rest-ftp-daemon 0.200 → 0.202

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e1fc48456791d2868a30a17e573aba066face90
-  data.tar.gz: 77471dd20a0e6fb263cff752821f8c0c9b156a27
+  metadata.gz: eb8cd253dc74ddd13d47f208a057dac0fd9d9010
+  data.tar.gz: cad450fab5d69069450e6e2ef569acaa768168e4
 SHA512:
-  metadata.gz: 79472b4ab9a4cea7c3a2437301fb6fd0b03a159b1ed2a1c384448b1a9c6e1ac41b9e192a072c7878cb39012fecb3a6011b89ff6d73076b1f92ebb9332170d1ff
-  data.tar.gz: a3b738c676e30f296b1e68e59298527f9b52e49e4e88268b32bf54fbedb8e551bc48b8e6389bc298b833b63cc85952d44e2d3886540e8bc7abbd0b8d6b904594
+  metadata.gz: 543c89c37961fcc553660758cdca12d464d2c52e8c203d184fc034247a41550103574c94ccd7215e6cbd75392e6709c9bb66cf7d63f2a116e847cc77973c6888
+  data.tar.gz: f501f9e4203a23adcd969ead187d79314caac1b852fb62e7b83593f0d727317b2d151652627464c9a8c01ef8f8034d4a9ebb29aab587fc2367cc1180ba99799f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.200)
+    rest-ftp-daemon (0.201.1)
       double-bag-ftps
       facter
       grape

data/bin/rest-ftp-daemon

@@ -57,7 +57,7 @@ abort "EXITING: cannot read configuration file: #{APP_CONF}" unless File.exists?
 
 # Load config, and merge options from ARGV into settings
 begin
-  require File.expand_path("#{app_root}/lib/rest-ftp-daemon/config")
+  require File.expand_path("#{app_root}/lib/rest-ftp-daemon/settings")
   Settings.merge!(options)
 rescue Psych::SyntaxError => e
   abort "EXITING: config file syntax error: #{e.message}"
@@ -106,7 +106,7 @@ puts "PID file     \t #{Settings.pidfile}"
 puts "Daemonize    \t #{Settings.daemonize ? 'YES' : "no"}"
 puts "Namespace    \t #{Settings.namespace}"
 puts "Network port \t #{Settings.port}"
-puts "User:group   \t #{Settings.user}:#{Settings.group}" if Settings.users || Setting.group
+puts "User:group   \t #{Settings.user}:#{Settings.group}" if (Settings.user || Settings.group)
 puts Settings.dump
 puts
 puts "--- Thin ARGV"

data/lib/rest-ftp-daemon.rb

@@ -4,13 +4,14 @@ require 'json'
 require 'grape'
 require 'grape-entity'
 require 'haml'
-require "facter"
-require "sys/cpu"
+require 'facter'
+require 'sys/cpu'
+require 'syslog'
 
 
 # My libs
 require 'rest-ftp-daemon/constants'
-require 'rest-ftp-daemon/config'
+require 'rest-ftp-daemon/settings'
 require 'rest-ftp-daemon/exceptions'
 require 'rest-ftp-daemon/helpers'
 require 'rest-ftp-daemon/uri'

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

@@ -2,54 +2,27 @@ module RestFtpDaemon
   module API
     class Root < Grape::API
 
+
 ####### DASHBOARD - GET /
 
       # Server global status
       get '/' do
         info "GET /"
 
-        # Initialize UsageWatch
+        # Initialize Facter
         Facter.loadfacts
-        @info_load = Sys::CPU.load_avg.first.to_f
-        @info_procs = (Facter.value :processorcount).to_i
-        @info_ipaddr = Facter.value(:ipaddress)
-        @info_memfree = Facter.value(:memoryfree)
-
-        # Compute normalized load
-        if @info_procs.zero?
-          @info_norm = "N/A"
-        else
-          @info_norm = (100 * @info_load / @info_procs).round(1)
-        end
-
-        # Jobs to display
-        popped_jobs = $queue.ordered_popped.reverse
-        @jobs_queued = $queue.ordered_queue.reverse
-
-        if params["only"].nil? || params["only"].blank?
-          @only = nil
-        else
-          @only = params["only"].to_sym
-        end
 
-        case @only
-        when nil
-          @jobs_current = popped_jobs
-        when JOB_STATUS_QUEUED
-          @jobs_current = @jobs_queued
-        else
-          @jobs_current = $queue.popped_reverse_sorted_by_status @only
-        end
+        # Detect QS filters
+        only = params["only"].to_s
 
-        # Count jobs for each status and total
-        @counts = $queue.counts_by_status
-        @count_all = $queue.all_size
+        # Get jobs to display
+        jobs = $queue.sorted_by_status(only)
 
         # Get workers status
         @worker_vars = $pool.worker_vars
 
         # Compile haml template
-        output = render :dashboard
+        output = render :dashboard, {jobs: jobs, only: only}
 
         # Send response
         env['api.format'] = :html

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

@@ -10,17 +10,22 @@ module RestFtpDaemon
       end
       get '/jobs/*id' do
         info "GET /jobs/#{params[:id]}"
+
         begin
+          # Get job to display
           job = job_find params[:id]
           raise RestFtpDaemon::JobNotFound if job.nil?
 
         rescue RestFtpDaemon::JobNotFound => exception
+          info "EXCEPTION: JobNotFound: #{exception.message}"
           status 404
           api_error exception
         rescue RestFtpDaemonException => exception
+          info "EXCEPTION: RestFtpDaemonException: #{exception.message}"
           status 500
           api_error exception
         rescue Exception => exception
+          info "EXCEPTION: Exception: #{exception.message}"
           status 501
           api_error exception
         else
@@ -37,12 +42,20 @@ module RestFtpDaemon
 
       get '/jobs/' do
         info "GET /jobs"
+
         begin
-          jobs = $queue.all
+          # Detect QS filters
+          only = params["only"].to_s
+
+          # Get jobs to display
+          jobs = $queue.sorted_by_status(only)
+
         rescue RestFtpDaemonException => exception
+          info "EXCEPTION: RestFtpDaemonException: #{exception.message}"
           status 501
           api_error exception
         rescue Exception => exception
+          info "EXCEPTION: Exception: #{exception.message}"
           status 501
           api_error exception
         else
@@ -88,12 +101,15 @@ module RestFtpDaemon
           $queue.counter_inc :jobs_received
 
         rescue JSON::ParserError => exception
+          info "EXCEPTION: JSON::ParserError: #{exception.message}"
           status 406
           api_error exception
         rescue RestFtpDaemonException => exception
+          info "EXCEPTION: RestFtpDaemonException: #{exception.message}"
           status 412
           api_error exception
         rescue Exception => exception
+          info "EXCEPTION: #{exception.message}"
           status 501
           api_error exception
         else

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

@@ -1,6 +1,6 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
-APP_VER = "0.200"
+APP_VER = "0.202"
 
 
 # Logging
@@ -20,6 +20,7 @@ JOB_UPDATE_KB = 2048
 JOB_STATUS_UPLOADING = :uploading
 JOB_STATUS_FINISHED = :finished
 JOB_STATUS_QUEUED = :queued
+JOB_WEIGHTS = {queued: -10, uploading: 10, finished: 50}
 
 # Notifications
 NOTIFY_PREFIX = "rftpd"

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

@@ -74,7 +74,7 @@ module RestFtpDaemon
       # Prepare job
       begin
         info "Job.process prepare"
-        @status = :preparing
+        newstatus :preparing
         prepare
 
       rescue RestFtpDaemon::JobMissingAttribute => exception
@@ -103,7 +103,7 @@ module RestFtpDaemon
 
       else
         # Prepare done !
-        @status = :prepared
+        newstatus :prepared
         info "Job.process notify: started"
         client_notify :started
       end
@@ -111,7 +111,7 @@ module RestFtpDaemon
       # Process job
       begin
         info "Job.process transfer"
-        @status = :starting
+        newstatus :starting
         transfer
 
       rescue SocketError => exception
@@ -170,7 +170,7 @@ module RestFtpDaemon
 
       else
         # All done !
-        @status = JOB_STATUS_FINISHED
+        newstatus JOB_STATUS_FINISHED
         info "Job.process notify: ended"
         client_notify :ended
       end
@@ -186,7 +186,7 @@ module RestFtpDaemon
 
     def set_queued
       # Update job status
-      @status = JOB_STATUS_QUEUED
+      newstatus JOB_STATUS_QUEUED
     end
 
     def oops_after_crash exception
@@ -251,7 +251,7 @@ module RestFtpDaemon
 
     def prepare
       # Update job status
-      @status = :preparing
+      newstatus :preparing
 
       # Init
       @source_method = :file
@@ -286,7 +286,7 @@ module RestFtpDaemon
 
     def transfer
       # Update job status
-      @status = :checking_source
+      newstatus = :checking_source
       @started_at = Time.now
 
       # Method assertions and init
@@ -355,6 +355,23 @@ module RestFtpDaemon
 
   private
 
+    def info message, context = {}
+      return if @logger.nil?
+
+      # Inject context
+      context[:id] = @id
+      context[:origin] = self.class
+
+      # Forward to logger
+      @logger.info_with_id message, context
+    end
+
+    def newstatus name
+      # Update local status
+      @status = name
+      # push_job
+    end
+
     def flag_default name, default
       # build the flag instance var name
       variable = "@#{name.to_s}"
@@ -368,7 +385,7 @@ module RestFtpDaemon
 
     def ftp_init
       # Update job status
-      @status = :ftp_init
+      newstatus :ftp_init
 
       # Method assertions
       raise RestFtpDaemon::JobAssertionFailed, "ftp_init/1" if @target_method.nil?
@@ -418,7 +435,7 @@ module RestFtpDaemon
       end
 
       # Update job status
-      @status = :disconnecting
+      newstatus :disconnecting
       @finished_at = Time.now
 
       # Update counters
@@ -428,7 +445,7 @@ module RestFtpDaemon
 
     def ftp_connect
       # Update job status
-      @status = :ftp_connect
+      newstatus :ftp_connect
 
       # Method assertions
       host = @target_url.host
@@ -441,7 +458,7 @@ module RestFtpDaemon
 
     def ftp_login
       # Update job status
-      @status = :ftp_login
+      newstatus :ftp_login
 
       # Method assertions
       raise RestFtpDaemon::JobAssertionFailed, "ftp_login/1" if @ftp.nil?
@@ -456,7 +473,7 @@ module RestFtpDaemon
     def ftp_chdir_or_buildpath path
       # Method assertions
       info "Job.ftp_chdir [#{path}] mkdir: #{@mkdir}"
-      @status = :ftp_chdir
+      newstatus :ftp_chdir
       raise RestFtpDaemon::JobAssertionFailed, "ftp_chdir_or_buildpath/1" if path.nil?
 
       # Extract directory from path
@@ -506,7 +523,7 @@ module RestFtpDaemon
 
     def ftp_presence target_name
       # Update job status
-      @status = :ftp_presence
+      newstatus :ftp_presence
 # FIXME / TODO: try with nlst
 
       # Method assertions
@@ -534,7 +551,7 @@ module RestFtpDaemon
       set :source_current, target_name
 
       # Check for target file presence
-      @status = :checking_target
+      newstatus :checking_target
       present = ftp_presence target_name
       if present
         if @overwrite
@@ -563,7 +580,8 @@ module RestFtpDaemon
       chunk_size = update_every_kb * 1024
       t0 = tstart = Time.now
       notified_at = Time.now
-      @status = JOB_STATUS_UPLOADING
+      newstatus JOB_STATUS_UPLOADING
+
       @ftp.putbinaryfile(source_filename, target_real, chunk_size) do |block|
         # Update counters
         @transfer_sent += block.bytesize
@@ -575,12 +593,12 @@ module RestFtpDaemon
         set :transfer_bitrate, bitrate0
 
         # Update job info
-        percent1 = (100.0 * @transfer_sent / @transfer_total).round(1)
-        set :progress, percent1
+        percent0 = (100.0 * @transfer_sent / @transfer_total).round(0)
+        set :progress, percent0
 
         # Log progress
         stack = []
-        stack << "#{percent1} %"
+        stack << "#{percent0} %"
         stack << (Helpers.format_bytes @transfer_sent, "B")
         stack << (Helpers.format_bytes @transfer_total, "B")
         stack << (Helpers.format_bytes bitrate0, "bps")
@@ -592,7 +610,7 @@ module RestFtpDaemon
         # Notify if requested
         unless notify_after_sec.nil? || (notified_at + notify_after_sec > Time.now)
           notif_status = {
-            progress: percent1,
+            progress: percent0,
             transfer_sent: @transfer_sent,
             transfer_total: @transfer_total,
             transfer_bitrate: bitrate0
@@ -605,7 +623,7 @@ module RestFtpDaemon
 
       # Rename temp file to target_temp
       if @tempfile
-        @status = :renaming
+        newstatus :renaming
         info "Job.ftp_transfer renaming: #{target_name}"
         @ftp.rename target_real, target_name
       end
@@ -633,19 +651,7 @@ module RestFtpDaemon
     end
 
     def get_bitrate total, last_timestamp
-      total.to_f / (Time.now - last_timestamp)
-    end
-
-
-    def info message, context = {}
-      return if @logger.nil?
-
-      # Inject context
-      context[:id] = @id
-      context[:origin] = self.class
-
-      # Forward to logger
-      @logger.info_with_id message, context
+      8*total.to_f / (Time.now - last_timestamp)
     end
 
     def oops event, exception, error = nil, include_backtrace = false
@@ -663,7 +669,7 @@ module RestFtpDaemon
       @ftp.close unless @ftp.nil? || @ftp.welcome.nil?
 
       # Update job's internal status
-      @status = :failed
+      newstatus :failed
       @error = error
       set :error_exception, exception.class
       set :error_message, exception.message

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

@@ -16,7 +16,7 @@ module RestFtpDaemon
       self.taint
       @mutex = Mutex.new
 
-      # # Logger
+      # Logger
       @logger = RestFtpDaemon::LoggerPool.instance.get :queue
 
       # Identifiers generator
@@ -76,11 +76,20 @@ module RestFtpDaemon
       end
     end
 
-    def popped_reverse_sorted_by_status status
-      return [] if status.nil?
+    def sorted_by_status status
+      # Just use the base if filter is empty
+      if status.empty?
+        elements = all
+      else
+        elements = all.select { |item| item.status == status.to_sym }
+      end
+
+      # Sort these elements
+      elements.sort_by do |item|
+        w = JOB_WEIGHTS[item.status] || 0
+        [ w,  item.wid.to_s, item.updated_at.to_s]
+      end
 
-      # Select jobs from the queue if their status is (status)
-      ordered_popped.reverse.select { |item| item.status == status.to_sym }
     end
 
     def counts_by_status
@@ -166,12 +175,12 @@ module RestFtpDaemon
       end
     end
 
-    def ordered_popped
-      @mutex_counters.synchronize do
-        @popped.sort_by { |item| [ item.wid.to_s, item.updated_at] }
-        # @popped.sort_by { |item| [item.status.to_s, item.wid.to_s, item.updated_at, - item.id.to_i] }
-      end
-    end
+    # def ordered_popped
+    #   @mutex_counters.synchronize do
+    #     @popped.sort_by { |item| [ item.wid.to_s, item.updated_at] }
+    #     # @popped.sort_by { |item| [item.status.to_s, item.wid.to_s, item.updated_at, - item.id.to_i] }
+    #   end
+    # end
 
   protected
 
@@ -182,6 +191,7 @@ module RestFtpDaemon
     def conchita_loop
       info "conchita starting with: #{@conchita.inspect}"
       loop do
+        # Do the cleanup
         conchita_clean JOB_STATUS_FINISHED
         conchita_clean :failed
         sleep @conchita[:timer]

data/lib/rest-ftp-daemon/{config.rb → settings.rb}

@@ -2,7 +2,7 @@
 begin
   require "settingslogic"
 rescue LoadError
-  raise "config.rb warning: Settingslogic is needed to provide configuration values to the Gemspec file"
+  raise "warning: Settingslogic is needed to provide configuration values to the Gemspec file"
 end
 
 # Configuration class
@@ -19,7 +19,6 @@ class Settings < Settingslogic
 
   # Direct access to any depth
   def at *path
-    #put "Settings.nested: wrong path [#{path.inspect}]" unless path.is_a? Hash
     path.reduce(Settings) {|m,key| m && m[key.to_s] }
   end
 

data/lib/rest-ftp-daemon/static/css/main.css

@@ -60,5 +60,6 @@ h2 {
 
 .progress {
   margin-bottom: 0;
+  /*min-width: 60px;*/
   }
 

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

@@ -4,7 +4,7 @@
     %meta{:charset => "utf-8"}/
     %link{ href:"/css/bootstrap.css" , rel: "stylesheet"}
     %link{ href:"/css/main.css" , rel: "stylesheet"}
-    %link{ href:"http://fonts.googleapis.com/css?family=Inconsolata:400,700" , rel: "stylesheet"}
+    -# %link{ href:"http://fonts.googleapis.com/css?family=Inconsolata:400,700" , rel: "stylesheet"}
     %title="#{Settings.host} [#{Settings.namespace}] #{APP_NAME}"
 
   %body
@@ -25,51 +25,17 @@
       = render :dashboard_headers
 
       .row
-        .col-md-12
-
-          %h2
-            Jobs  
-
-            .btn-group.btn-group-md
-              - klass = @only.nil? ? "btn-info" : ""
-              %a.btn.btn-default{href: "?only=", class: klass}
-                ALL (#{@count_all})
-            .btn-group.btn-group-md
-              - @counts.each do |status, count|
-                - klass = (status == @only) ? "btn-info" : ""
-                %a.btn.btn-default{href: "?only=#{status}", class: klass}
-                  #{status} (#{count})
-
-          %table.table.table-striped.table-hover.table-condensed
-            %tr
-              %th ID
-              %th label
-              %th source
-              %th <=>
-              %th target
-              %th date
-              %th status
-              %th error
-              %th.text-right size
-              %th.text-right bitrate
-              %th
-
-            - if @only.nil? && !@jobs_queued.empty?
-              = render :dashboard_jobs, {jobs: @jobs_queued, counts: @counts}
-              %tr
-                %th{colspan: 12}
-
-            = render :dashboard_jobs, {jobs: @jobs_current, counts: @counts}
-
+        #box-jobs.col-md-12
+          = render :dashboard_jobs, {jobs: jobs, only: only}
 
       .row
-        .col-md-6
+        #box-tokens.col-md-6
           = render :dashboard_tokens, {tokens: Settings.endpoints || {}}
 
-        .col-md-3
+        #box-workers.col-md-3
           = render :dashboard_workers
 
-        .col-md-3
+        #box-counters.col-md-3
           = render :dashboard_counters
 
       %br

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

@@ -1,27 +1,32 @@
 - trans = $queue.counter_get :transferred
+- info_procs = Facter.value :processorcount
+- info_load = Sys::CPU.load_avg.first.to_f
+- info_norm = info_procs.zero? ? "N/A" : (100 * info_load / info_procs).round(1)
+
+
 .btn-group.btn-group-sm
-  .btn.btn-default.btn-success Processors
-  .btn.btn-default= @info_procs
+  .btn.btn-default.btn-success CPUs
+  .btn.btn-default= info_procs
 
 .btn-group.btn-group-sm
   .btn.btn-default.btn-success IP
-  .btn.btn-default= @info_ipaddr
+  .btn.btn-default= Facter.value(:ipaddress)
 
 .btn-group.btn-group-sm
   .btn.btn-default.btn-success Host
   .btn.btn-default= Settings.host
 
 .btn-group.btn-group-sm
-  .btn.btn-default.btn-warning Load
-  .btn.btn-default= @info_load.round(1)
+  .btn.btn-default.btn-info Load
+  .btn.btn-default= info_load.round(1)
 
 .btn-group.btn-group-sm
-  .btn.btn-default.btn-warning CPU
-  .btn.btn-default= "#{@info_norm} %"
+  .btn.btn-default.btn-info CPU
+  .btn.btn-default= "#{info_norm} %"
 
 .btn-group.btn-group-sm
-  .btn.btn-default.btn-warning Free
-  .btn.btn-default= @info_memfree
+  .btn.btn-default.btn-info Free
+  .btn.btn-default= Facter.value(:memoryfree)
 
 .btn-group.btn-group-sm
   .btn.btn-default.btn-info Transferred

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

@@ -1,77 +1,35 @@
-- jobs.each do |job|
-  - size = job.get :transfer_total
-  - progress = job.get :progress
-  - source_count = job.get(:source_count) || 0
-  - source_processed = job.get(:source_processed) || 0
-  - source_current = job.get(:source_current)
-  - presented = present job, :with => RestFtpDaemon::API::Entities::JobPresenter, hide_params: true
-  - errmsg = job.get :error_message
-  - method = job.get(:target_method)
-
-  - if !job.error.nil?
-    - trclass = "danger"
-  - elsif job.status == JOB_STATUS_UPLOADING
-    - trclass = "info"
-  - elsif job.status == JOB_STATUS_FINISHED
-    - trclass = "success"
-  - elsif job.status == JOB_STATUS_QUEUED
-    - trclass = "active"
-  - else
-    - trclass = "warning"
-
-  %tr{class: trclass}
-
-    %td{title: presented.to_json}
-      %b= job.id
-
-    %td= job.label
-
-    %td{title: job.get(:source_path)}
-      = Helpers.highlight_tokens job.source
-
-    %td
-      = Helpers.job_method_label method
-
-    %td{title: job.get(:target_url)}
-      = Helpers.highlight_tokens job.target
-
-    %td
-      = Helpers.datetime_short(job.queued_at)
-
-    %td
-      = job.status
-
-      - if (source_processed < source_count)
-        = " (#{source_processed}/#{source_count})"
-
-      - unless progress.nil?
-        = "#{progress}%"
-
-      - if job.status != JOB_STATUS_FINISHED
-        %br
-        %b= source_current unless source_current.nil?
-
-    %td
-      - if !job.error && job.status != JOB_STATUS_FINISHED
-        -# unless progress.nil? ||
-        .progress
-          .progress-bar{style:"width: #{progress}%;"}
-            = "#{progress}%" unless progress.nil?
-
-      - else
-        .error{title: errmsg}
-          = Helpers.text_or_empty(job.error)
-
-    %td.nobr.text-right
-      = Helpers.format_bytes(size, "B")
-
-    %td.nobr.text-right
-      - if (bitrate = job.get :transfer_bitrate)
-        =  Helpers.format_bytes(bitrate, "bps")
-
-    %td
-      - unless job.priority.nil?
-        .label.label-info.flag.worker-label= job.priority
-
-      - unless job.wid.nil?
-        .label.label-warning.flag.worker-label= job.wid
+- count_all = $queue.all_size
+- counts_by_status = $queue.counts_by_status
+
+
+%h2
+  Jobs &nbsp;
+
+  .btn-group.btn-group-md
+    - klass = only.empty? ? "btn-info" : ""
+    %a.btn.btn-default{href: "?only=", class: klass}
+      ALL (#{count_all})
+  .btn-group.btn-group-md
+    - counts_by_status.each do |status, count|
+      - klass = (status.to_s == only) ? "btn-info" : ""
+      %a.btn.btn-default{href: "?only=#{status}", class: klass}
+        #{status} (#{count})
+
+%table.table.table-striped.table-hover.table-condensed#jobs
+  %thead
+    %tr
+      %th ID
+      %th label
+      %th source
+      %th <=>
+      %th target
+      %th date
+      %th{width: 220} status
+      %th{width: 150} error
+      %th.text-right size
+      %th.text-right bitrate
+      %th info
+
+  - if true
+    %tbody.current
+      = render :dashboard_table, {jobs: jobs}

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

@@ -0,0 +1,84 @@
+- jobs.each do |job|
+  - size = job.get :transfer_total
+  - sent = job.get :transfer_sent
+  - progress = job.get :progress
+  - source_count = job.get(:source_count) || 0
+  - source_processed = job.get(:source_processed) || 0
+  - source_current = job.get(:source_current)
+  - presented = present job, :with => RestFtpDaemon::API::Entities::JobPresenter, hide_params: true
+  - errmsg = job.get :error_message
+  - method = job.get(:target_method)
+
+  - if !job.error.nil?
+    - trclass = "danger"
+  - elsif job.status == JOB_STATUS_UPLOADING
+    - trclass = "info"
+  - elsif job.status == JOB_STATUS_FINISHED
+    - trclass = "success"
+  - elsif job.status == JOB_STATUS_QUEUED
+    - trclass = "active"
+  - else
+    - trclass = "warning"
+
+  %tr{class: trclass}
+
+    %td{title: presented.to_json}
+      %b= job.id
+
+    %td= job.label
+
+    %td{title: job.get(:source_path)}
+      = Helpers.highlight_tokens job.source
+
+    %td
+      = Helpers.job_method_label method
+
+    %td{title: job.get(:target_url)}
+      = Helpers.highlight_tokens job.target
+
+    %td
+      = Helpers.datetime_short(job.queued_at)
+
+    %td
+      %span.push-status
+        = job.status
+
+      - if (job.status != JOB_STATUS_FINISHED) && (source_processed < source_count)
+        = " (#{source_processed}/#{source_count})"
+
+      - if job.status == JOB_STATUS_UPLOADING
+
+        - unless progress.nil?
+          %span.push-progress
+            = "#{progress}%"
+
+        %br
+        %b
+          %span.push-filename
+            = source_current unless source_current.nil?
+
+    %td
+      - unless job.error || job.status == JOB_STATUS_FINISHED
+        .progress
+          .progress-bar{style:"width: #{progress}%;"}
+            =# "#{progress}%" unless progress.nil?
+            = Helpers.format_bytes(sent, "B")
+
+      - else
+        .error{title: errmsg}
+          = Helpers.text_or_empty(job.error)
+
+    %td.nobr.text-right
+      = Helpers.format_bytes(size, "B")
+
+    %td.nobr.text-right
+      - if (bitrate = job.get :transfer_bitrate)
+        %span.push-bitrate
+          = Helpers.format_bytes(bitrate, "bps")
+
+    %td
+      - unless job.priority.nil?
+        .label.label-info.flag.worker-label= job.priority
+
+      - unless job.wid.nil?
+        .label.label-warning.flag.worker-label= job.wid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: '0.200'
+  version: '0.202'
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,7 +203,6 @@ files:
 - lib/rest-ftp-daemon/api/root.rb
 - lib/rest-ftp-daemon/api/routes.rb
 - lib/rest-ftp-daemon/api/status.rb
-- lib/rest-ftp-daemon/config.rb
 - lib/rest-ftp-daemon/constants.rb
 - lib/rest-ftp-daemon/exceptions.rb
 - lib/rest-ftp-daemon/helpers.rb
@@ -212,6 +211,7 @@ files:
 - lib/rest-ftp-daemon/logger.rb
 - lib/rest-ftp-daemon/logger_pool.rb
 - lib/rest-ftp-daemon/notification.rb
+- lib/rest-ftp-daemon/settings.rb
 - lib/rest-ftp-daemon/static/css/bootstrap.css
 - lib/rest-ftp-daemon/static/css/main.css
 - lib/rest-ftp-daemon/uri.rb
@@ -219,6 +219,7 @@ files:
 - lib/rest-ftp-daemon/views/dashboard_counters.haml
 - lib/rest-ftp-daemon/views/dashboard_headers.haml
 - lib/rest-ftp-daemon/views/dashboard_jobs.haml
+- lib/rest-ftp-daemon/views/dashboard_table.haml
 - lib/rest-ftp-daemon/views/dashboard_tokens.haml
 - lib/rest-ftp-daemon/views/dashboard_workers.haml
 - lib/rest-ftp-daemon/worker_pool.rb