bitferry 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17d40f40cac1390daae5cb6500acddf6f47bc83cc99b089530b7babf76adfb67
-  data.tar.gz: 4a5652c86fc09e7b6a23fe1bf53b8ffd891ca544782fe73df9eeb4472cdd4495
+  metadata.gz: 4ef499867b4d23f30f8edeb19f087d80d5c6e10f22a0b969b296c953e5d3b2e6
+  data.tar.gz: 9a4945bbcd8c6ea7c0994f291c8f278cd08cc4aae2fab432811059a169c805b3
 SHA512:
-  metadata.gz: 95f3e41305bd871b1ca3ce8b8d5172c54006e8b3ca4125ac60dd36a1d4f9b816853f2f30454c7269ef084c596c520c491c0f9202169ef9e2cf34f82a06f3d33f
-  data.tar.gz: 0cc18872c913a6583d72d487191c26bac65f35f09fa051005b6fdc39293eb8d428a151e9643486bd9bb241dbd2cf705081345638c274ce49a2f13ebddd26daed
+  metadata.gz: 2737d6337aa29f0046eaa9d9088dd14ac83fc3934c234bd9d659c788aca15fb03c618aa5698327a99985b5049f68f52e320d649e867bac1b18aaff0a876f2d5f
+  data.tar.gz: 362ba450ce7b4322f19d153b1958d6bb615e1ffd379c9b90a3bd191c1f39f706f30e495b5836ce2ab575b96b7f22510dd59de1386bb98461919f46e22d30ff79

data/CHANGES.md

@@ -1,3 +1,14 @@
+## 0.0.6
+
+- Rudimentary GUI employing FXRuby
+
+## 0.0.5
+
+- Disable cache usage in Restic check profiles
+- Show stale tasks in verbose mode only
+- Pick the innermost Bitferry volume in case of volumes nesting
+- Fix an options profile application bug
+
 ## 0.0.4
 
 - Include/exclude path filters

data/README.md

@@ -211,7 +211,7 @@ Parameters:
 Options:
     -e                       Encrypt files in destination using default profile (alias for -E default)
     -d                       Decrypt source files using default profile (alias for -D default)
-    -x                       Use extended encryption profile options (applies to -e, -d)
+    -u                       Use extended encryption profile options (applies to -e, -d)
     --process, -X OPTIONS    Extra task processing profile/options
     --encrypt, -E OPTIONS    Encrypt files in destination using specified profile/options
     --decrypt, -D OPTIONS    Decrypt source files using specified profile/options

data/bin/bitferryfx

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

data/lib/bitferry/cli.rb

@@ -158,7 +158,7 @@ Clamp do
           puts "  #{task.tag}    #{task.show_status}"
         end
       end
-      unless (xs = Bitferry::Task.stale).empty?
+      if !(xs = Bitferry::Task.stale).empty? && Bitferry.verbosity == :verbose
         puts
         puts '# Stale tasks'
         puts

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.4'
+  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
@@ -341,12 +353,10 @@ module Bitferry
 
     def self.endpoint(root)
       path = Pathname.new(root).realdirpath
-      # FIXME select innermost or outermost volume in case of nested volumes?
-      intact.sort { |v1, v2| v2.root.size <=> v1.root.size }.each do |volume|
+      intact.sort { |v1, v2| v2.root.to_s.size <=> v1.root.to_s.size }.each do |volume|
         begin
-          # FIXME chop trailing slashes
-          stem = path.relative_path_from(volume.root)
-          case stem.to_s
+          stem = path.relative_path_from(volume.root).to_s #.chomp('/')
+          case stem
             when '.' then return volume.endpoint
             when /^[^\.].*/ then return volume.endpoint(stem)
           end
@@ -477,7 +487,7 @@ module Bitferry
     when Array then option # Array is passed verbatim
     when '-' then nil # Disable adding any options with -
     when /^-/ then option.split(',') # Split comma-separated string into array --foo,bar --> [--foo, bar]
-    else route.fetch(option) # Obtain array from the database
+    else route.fetch(option.nil? ? nil : option.to_sym) # Obtain options from the profile database
     end
   end
 
@@ -860,7 +870,7 @@ module Bitferry
 
       def include_filters = include.collect { |x| ['--filter', "+ #{x}"]}.flatten
 
-        
+
       def exclude_filters = ([Volume::STORAGE, Volume::STORAGE_] + exclude).collect { |x| ['--filter', "- #{x}"]}.flatten
 
 
@@ -1044,7 +1054,7 @@ module Bitferry
 
       def include_filters = include.collect { |x| ['--include', x]}.flatten
 
-      
+
       def common_options
         [
           case Bitferry.verbosity
@@ -1118,8 +1128,8 @@ module Bitferry
 
 
       CHECK = {
-        default: [],
-        full: ['--read-data']
+        default: ['--no-cache'],
+        full: ['--no-cache', '--read-data']
       }
       CHECK[nil] = nil # Skip integrity checking by default
 
@@ -1138,8 +1148,8 @@ module Bitferry
 
 
       def exclude_filters = ([Volume::STORAGE, Volume::STORAGE_] + exclude).collect { |x| ['--exclude', x]}.flatten
-  
-  
+
+
       def show_status = "#{show_operation} #{directory.show_status} #{show_direction} #{repository.show_status} #{show_filters}"
 
 
@@ -1238,8 +1248,8 @@ module Bitferry
 
 
       def exclude_filters = exclude.collect { |x| ['--exclude', x]}.flatten
-  
-  
+
+
       def show_status = "#{show_operation} #{repository.show_status} #{show_direction} #{directory.show_status} #{show_filters}"
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitferry
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Oleg A. Khlybov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-20 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