rest-ftp-daemon 0.212.0 → 0.213.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53e2cba7fe2218d3f261566678feba235343ca4a
-  data.tar.gz: 75c4001a985741740c66165c6b1d73a893d0e43a
+  metadata.gz: 8cdf3cbfd6993183cfe6410fc11ce2743f0d3ca2
+  data.tar.gz: 07938cd1ed765a2939e8bdc2589069e9379dcd7b
 SHA512:
-  metadata.gz: 695516939d86fe5e962458758dfe2ce3aa34b5c80ca8eec9bd3ccc4f893c303f9fac4489eec4368cc0ab469d53c584654573e938ad6b90a37c42795f3c1d85ce
-  data.tar.gz: 72cdbba9f002f17faa9e6c0d203c089b89e5eb9a57cc32e892287ebe620e4e4c96f1234fc54ca0087e1cfe733ba7da3290c247c93f1f07cf1d1ec269f7ee6361
+  metadata.gz: 22536522c3a2cc04c73876305ce7f9217f9f8a12ec141c0d8ea8113c7908c94aa7569477051d179316afffb2efd2c836fb940418aa2d00acd74485b95e45238a
+  data.tar.gz: 4835fa78f98b4ab22b57be1456e438c65687756ec919435e5dd6cbf5880c7795724ee336fb334ca71df0667b9a8aa681e4a199b12b45bdfc5f696f81378c96f2

data/lib/rest-ftp-daemon.rb

@@ -23,6 +23,7 @@ require 'rest-ftp-daemon/constants'
 require 'rest-ftp-daemon/settings'
 require 'rest-ftp-daemon/exceptions'
 require 'rest-ftp-daemon/helpers'
+require 'rest-ftp-daemon/paginate'
 require 'rest-ftp-daemon/uri'
 require 'rest-ftp-daemon/job_queue'
 # require 'rest-ftp-daemon/worker'

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

@@ -19,20 +19,25 @@ module RestFtpDaemon
         Facter.loadfacts
 
         # Detect QS filters
-        only = params["only"].to_s
+        @only = params["only"].to_s
 
         # Get jobs for this view, order jobs by their weights
-        current = $queue.filter_jobs only
+        result = $queue.filter_jobs @only
 
         # Provide queue only if no filtering set
-        queue = []
-        queue = $queue.queue if only.empty?
+        @queue = []
+        @queue = $queue.queue if @only.empty?
 
         # Get workers status
         @worker_variables = $pool.worker_variables
 
+        # Build paginator
+        @paginate = Paginate.new result.reverse
+        @paginate.only = params["only"]
+        @paginate.page = params["page"]
+
         # Compile haml template
-        output = render :dashboard, {queue: queue, current: current, only: only}
+        output = render :dashboard
 
         # Send response
         env['api.format'] = :html

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

@@ -1,7 +1,7 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
 APP_NICK = "rftpd"
-APP_VER = "0.212.0"
+APP_VER = "0.213.0"
 
 
 # Jobs and workers
@@ -44,7 +44,7 @@ WORKER_STYLES = {
   :done                 => :success,
   :dead                 => :danger
   }
-
+PAGINATE_MAX            = 30
 
 # Configuration defaults
 DEFAULT_WORKER_TIMEOUT  = 3600

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

@@ -0,0 +1,60 @@
+module RestFtpDaemon
+  class Paginate
+
+    def initialize data
+      # Defaults
+      @pages = 0
+      @total = 0
+      @data = []
+      @only = nil
+      @page = 1
+      @pages = 1
+
+      # Ensure data set is countable
+      return unless data.is_a? Enumerable
+      @data = data
+
+      # Count elements
+      @total = @data.count
+
+      # Count pages
+      @pages = (@total.to_f / PAGINATE_MAX).ceil
+      @pages = 1 if @pages < 1
+    end
+
+    def only= raw_only
+      @only = raw_only
+    end
+
+    def page= raw_page
+      @page = [1, raw_page.to_i, @pages].sort[1]
+    end
+
+    def browser
+      out = []
+      1.upto(@pages) do |p|
+        out << link(p)
+      end
+      out.join()
+    end
+
+    def subset
+      size = PAGINATE_MAX.to_i
+      offset = (@page-1) * size
+      @data[offset, size]
+    end
+
+  private
+
+    def link p
+      klass = (p == @page)? ' btn-info' : ''
+      return "<a class='page btn btn-default%s' href='?only=%s&page=%d'>%p</a>" % [
+        klass,
+        @only,
+        p,
+        p,
+      ]
+    end
+
+  end
+end

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

@@ -63,3 +63,16 @@ h2 {
   /*min-width: 60px;*/
   }
 
+a.class {
+  text-decoration: underline;
+  }
+
+
+a.page.btn {
+  /*font-weight: bold;*/
+  /*font-size: 1.5em;*/
+  }
+
+.debug {
+  border: 1px solid orange;
+}

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

@@ -24,9 +24,11 @@
 
       = render :dashboard_headers
 
-      .row
-        #box-jobs.col-md-12
-          = render :dashboard_jobs, {current: current, queue: queue, only: only}
+      %br
+      %br
+      %br
+
+      = render :dashboard_jobs
 
       .row
         #box-tokens.col-md-6

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

@@ -32,8 +32,10 @@
 
 .btn-group.btn-group-sm
   .btn.btn-default.btn-info Processed
-  .btn.btn-default= Helpers.format_bytes(info_processed)
+  .btn.btn-default= info_processed
 
 .btn-group.btn-group-sm
   .btn.btn-default.btn-info Transferred
   .btn.btn-default= Helpers.format_bytes(trans, "B")
+
+

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

@@ -1,47 +1,54 @@
-- count_all = $queue.jobs_count
 - counts_by_status = $queue.counts_by_status
--# jobs_without_queue = jobs
-
-
-%h2
-  Jobs table  
-
-  .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 queued
-      %th{width: 150} status
-      %th{"min-width" => 120} error
-      %th.text-right size
-      %th.text-right bitrate
-      %th info
-
-
-    - unless queue.empty?
-      %tbody.jobs
-        = render :dashboard_table, {jobs: queue.reverse}
-
-        %thead
-          %tr
-            %td{colspan: 13}
-              %br
-
-    - unless current.empty?
-      %tbody.jobs
-        = render :dashboard_table, {jobs: current.reverse}
+- counts_all = $queue.jobs_count
+- jobs = @paginate.subset
+
+
+.row
+
+  .col-md-5
+    .btn-group.btn-group-md
+      - klass = @only.empty? ? "btn-info" : ""
+      %a.btn.btn-default{href: "?only=", class: klass}
+        ALL (#{counts_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})
+
+  .col-md-7
+    = @paginate.browser
+
+
+
+.row
+  #box-jobs.col-md-12
+
+    %table.table.table-striped.table-hover.table-condensed#jobs
+
+      %thead
+        %tr
+          %th ID
+          %th label
+          %th source
+          %th <=>
+          %th target
+          %th queued
+          %th{width: 150} status
+          %th{"min-width" => 120} error
+          %th.text-right size
+          %th.text-right bitrate
+          %th info
+
+        - unless @queue.empty?
+          %tbody.jobs
+            = render :dashboard_table, {jobs: @queue.reverse}
+
+            %thead
+              %tr
+                %td{colspan: 13}
+                  %br
+
+        - unless jobs.empty?
+          %tbody.jobs
+            = render :dashboard_table, {jobs: jobs.reverse}

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

@@ -84,19 +84,19 @@ module RestFtpDaemon
       job = $queue.pop
 
       # Prepare the job for processing
-      worker_status :processing
+      worker_status :working
       worker_jid job.id
-      info "processing"
+      info "working"
       job.wid = Thread.current.thread_variable_get :wid
 
       # Processs this job protected by a timeout
-      status = Timeout::timeout(@timeout, RestFtpDaemon::JobTimeout) do
+      Timeout::timeout(@timeout, RestFtpDaemon::JobTimeout) do
         job.process
       end
 
       # Processing done
-      worker_status :done
-      info "done"
+      worker_status :finished
+      info "finished"
       worker_jid nil
       job.wid = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.212.0
+  version: 0.213.0
 platform: ruby
 authors:
 - Bruno MEDICI
@@ -239,6 +239,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/paginate.rb
 - lib/rest-ftp-daemon/settings.rb
 - lib/rest-ftp-daemon/static/css/bootstrap.css
 - lib/rest-ftp-daemon/static/css/main.css