britebox 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa1811b0fba08e5510eb6d8ba5f7ec0bbbc50a1
-  data.tar.gz: 683a9e4ab0215704e595707dd2b9e79e1ecdfa1a
+  metadata.gz: c1c00185a346814ccf212ae94af05ab53388b33e
+  data.tar.gz: 0598112a0cebcce6152771cc2838e847301ccd2a
 SHA512:
-  metadata.gz: 4d7344b2279ca9eb703482056aa1cb1f5d462b46a98304213b3c2e4eba2a59e082268e94892324b1d94978b13796fd4299f025c50513ea8d885c61acb55dd56a
-  data.tar.gz: 400ae595131e0cf4ff30c4b5ed40bd56b459ecc76660ce0a8cacb347c7872ece698c184c80852f825496760b27d330aadebeb82f9fec5310710b486ede7241ca
+  metadata.gz: 9002a8e7934f4f497dcd94619ea2d5d125d3becebaf7db0a9daa8457dd055aca596013c2201d4873a20f78a4cac215f12c7838159ea38149ded866c99b756aa0
+  data.tar.gz: 1a4f87174f2b7e9cd07486a8238e7b3cf4c9f5d8d0c8b888ea5d68f6d203407f73e4af61c82fdd1b3629d653a3c4e1ba2914643a59d8d3412c78b57db8f9d18e

data/lib/britebox/cli.rb

@@ -53,6 +53,20 @@ module Britebox
         puts warn
       end
 
+      Thread.new do
+        loop do
+          sleep 20
+          if Config.recheck_enabled
+            Dir.glob(File.join(@out_dir, "*" + FileJob::FIRST_PASS + ".*")).each do |f|
+              if ((Time.now - Config.recheck_interval * 60 - 60) .. (Time.now - Config.recheck_interval * 60)).cover? File.mtime(f)
+                new_name = File.basename(f).sub(FileJob::FIRST_PASS, FileJob::SECOND_PASS)
+                File.rename f, File.join(@dir, new_name)
+              end
+            end
+          end
+        end
+      end
+
       puts "Press Ctrl-C to quit"
       puts
 

data/lib/britebox/file_job.rb

@@ -9,6 +9,9 @@ module Britebox
 
     attr_accessor :size_processed
 
+    FIRST_PASS = ' (1st pass)'
+    SECOND_PASS = ' (2nd pass)'
+
     def initialize(file_name, brite_client, options = {})
       @file_name = file_name
       @brite_client = brite_client

data/lib/britebox/file_job_pool.rb

@@ -52,6 +52,18 @@ module Britebox
           end
         when 'complete'
           File.delete file_name
+
+          if Config.recheck_enabled
+            if file.include?(FileJob::SECOND_PASS + '.')
+              # already processed twice, restore initial name
+              new_out_name = file.sub(FileJob::SECOND_PASS + '.', '.')
+            else
+              # processed once, add label
+              new_out_name = File.basename(file, File.extname(file)) + FileJob::FIRST_PASS + File.extname(file)
+            end
+
+            File.rename File.expand_path(file, out_dir), File.join(out_dir, new_out_name)
+          end
         when 'cancelled'
           cancelled_name = File.basename(file, File.extname(file)) + '_cancelled' + File.extname(file)
           File.rename file_name, File.expand_path(cancelled_name, out_dir)

data/lib/britebox/version.rb

@@ -1,3 +1,3 @@
 module Britebox
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/resources/assets/javascripts/compiled-coffee.js

@@ -125,6 +125,14 @@
         }, {
           key: 'log_file',
           title: 'Log file'
+        }, {
+          key: 'recheck_enabled',
+          title: 'Enable re-checking csv files with unknown records',
+          type: 'checkbox'
+        }, {
+          key: 'recheck_interval',
+          title: 'Delay before re-checking, minutes',
+          help: 'only records with "unknown" status will be proceed second time'
         }
       ];
       $scope.texts = {

data/resources/assets/javascripts/controllers/settings_ctrl.coffee

@@ -10,8 +10,8 @@ app.controller 'SettingsCtrl', ['$scope', '$http', '$injector', ($scope, $http,
     {key: 'port',     title: 'Port', help: 'Launch web server on this port'}
     {key: 'logging_enabled', title: 'Enable logging', type: 'checkbox'}
     {key: 'log_file', title: 'Log file'}
-#    {key: 'recheck_enabled', title: 'Enable re-checking csv files with unknown records', type: 'checkbox'}
-#    {key: 'recheck_interval', title: 'Delay before re-checking, minutes', help: 'only records with "unknown" status will be proceed second time'}
+    {key: 'recheck_enabled', title: 'Enable re-checking csv files with unknown records', type: 'checkbox'}
+    {key: 'recheck_interval', title: 'Delay before re-checking, minutes', help: 'only records with "unknown" status will be proceed second time'}
   ]
 
   $scope.texts = {

data/resources/public/javascripts/application.js

@@ -125,6 +125,14 @@
         }, {
           key: 'log_file',
           title: 'Log file'
+        }, {
+          key: 'recheck_enabled',
+          title: 'Enable re-checking csv files with unknown records',
+          type: 'checkbox'
+        }, {
+          key: 'recheck_interval',
+          title: 'Delay before re-checking, minutes',
+          help: 'only records with "unknown" status will be proceed second time'
         }
       ];
       $scope.texts = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: britebox
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Alexander Shapiotko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brite-api