bitferry 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb10ff66d68e1981c2011621d1d216cfe759e14378844f5101310b78e5938974
-  data.tar.gz: 0341d89784f9acaa607f9267ddcbd494901efa80ca9954d60d84484d177c63ff
+  metadata.gz: 4ef499867b4d23f30f8edeb19f087d80d5c6e10f22a0b969b296c953e5d3b2e6
+  data.tar.gz: 9a4945bbcd8c6ea7c0994f291c8f278cd08cc4aae2fab432811059a169c805b3
 SHA512:
-  metadata.gz: 2ac8f19ed6ef8607082b8943d0cab8ae4fa973694bfac1ddc219fe34e2421c05116d9d4ea20213440b192a7a1eae50cc11a485f489976dd182ff5ea1dc5bf1d2
-  data.tar.gz: cf4dabac47d7b46ed13129b749d82c92cd216f91b3fb41c6a8d2db9114738ae875f38db99d0112d26a7176db639d5cba68ebdeaee8e9e6f61f7f21dc658de568
+  metadata.gz: 2737d6337aa29f0046eaa9d9088dd14ac83fc3934c234bd9d659c788aca15fb03c618aa5698327a99985b5049f68f52e320d649e867bac1b18aaff0a876f2d5f
+  data.tar.gz: 362ba450ce7b4322f19d153b1958d6bb615e1ffd379c9b90a3bd191c1f39f706f30e495b5836ce2ab575b96b7f22510dd59de1386bb98461919f46e22d30ff79

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.0.6
+
+- Rudimentary GUI employing FXRuby
+
 ## 0.0.5
 
 - Disable cache usage in Restic check profiles

data/bin/bitferryfx

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'bitferry/fx'
+#

data/lib/bitferry/fx.rb

@@ -0,0 +1,63 @@
+require 'fox16'
+require 'bitferry'
+
+include Fox
+
+class UI < FXMainWindow
+
+  def initialize(app)
+    super(@app = app, 'BitferryFX', width: 400, padding: 4)
+    FXToolTip.new(app)
+    @progress = FXProgressBar.new(self, padding: 4, height: 16, opts: LAYOUT_FILL_X | JUSTIFY_BOTTOM | LAYOUT_FIX_HEIGHT)
+    @simulate = FXCheckButton.new(self, "&Simulation mode (dry run)\tPrevent operations from making any on-disk changes")
+      @simulate.checkState = Bitferry.simulate?
+    buttons = FXPacker.new(self, opts: LAYOUT_FILL_X | LAYOUT_SIDE_BOTTOM | PACK_UNIFORM_WIDTH | FRAME_SUNKEN)
+      @process = FXButton.new(buttons, "&Process\tProcess all intact tasks", opts: BUTTON_NORMAL | BUTTON_INITIAL | BUTTON_DEFAULT | LAYOUT_SIDE_LEFT)
+        @process.connect(SEL_COMMAND) { process }
+        @process.setFocus
+      @quit = FXButton.new(buttons, "&Quit\tStop any pending operations and exit", opts: BUTTON_NORMAL | LAYOUT_SIDE_RIGHT)
+        @quit.connect(SEL_COMMAND) { exit }
+      @reload = FXButton.new(buttons, "&Reload\tReread volumes and tasks to capture volume changes", opts: BUTTON_NORMAL | LAYOUT_SIDE_RIGHT)
+        @reload.connect(SEL_COMMAND) { reset }
+    @sensible = [@process, @reload] # Controls which must be disabled during processing
+    reset
+  end
+
+  def process
+    Bitferry.simulate = @simulate.checked?
+    @progress.setBarColor(:blue)
+    @progress.progress = 0
+    Thread.new {
+      @app.runOnUiThread { @sensible.each(&:disable) }
+      begin
+        Bitferry.process { |total, processed, failed |
+          @app.runOnUiThread {
+            @progress.setBarColor(:red) if failed > 0
+            @progress.progress = processed
+            @progress.total = total
+          }
+        }
+      ensure
+        @app.runOnUiThread { @sensible.each(&:enable) }
+      end
+    }
+  end
+
+  def reset
+    @progress.progress = 0
+    Bitferry.restore
+  end
+
+  def create
+    super
+    show(PLACEMENT_SCREEN)
+  end
+
+end
+
+FXApp.new do |app|
+  Bitferry.verbosity = :verbose
+  UI.new(app)
+  app.create
+  app.run
+end

data/lib/bitferry.rb

@@ -12,7 +12,7 @@ require 'shellwords'
 module Bitferry
 
 
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 
 
   module Logging
@@ -85,9 +85,11 @@ module Bitferry
   end
 
 
-  def self.process(*tags)
+  def self.intact_tasks = Volume.intact.collect { |volume| volume.intact_tasks }.flatten.uniq
+
+  def self.process(*tags, &block)
     log.info('processing tasks')
-    tasks = Volume.intact.collect { |volume| volume.intact_tasks }.flatten.uniq
+    tasks = intact_tasks
     if tags.empty?
       process = tasks
     else
@@ -102,7 +104,17 @@ module Bitferry
         end
       end
     end
-    result = process.uniq.all? { |task| task.process }
+    tasks = process.uniq
+    total = tasks.size
+    processed = 0
+    failed = 0
+    result = tasks.all? do |task|
+      r = task.process
+      processed += 1
+      failed += 1 unless r
+      yield(total, processed, failed) if block_given?
+      r
+    end
     result ? log.info('tasks processed') : log.warn('task process failure(s) reported')
     result
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitferry
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Oleg A. Khlybov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-26 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: fxruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: neatjson
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +98,17 @@ description:
 email: fougas@mail.ru
 executables:
 - bitferry
+- bitferryfx
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGES.md
 - README.md
 - bin/bitferry
+- bin/bitferryfx
 - lib/bitferry.rb
 - lib/bitferry/cli.rb
+- lib/bitferry/fx.rb
 homepage: https://github.com/okhlybov/bitferry
 licenses:
 - BSD-3-Clause