openvfs-rb 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a6247ce26a8d5388b5a5b6982958ea408cec169465cf08bb2f1e13145631b7
-  data.tar.gz: db6e541828e75ac889314d49fda159f32a38c752d3dbab554ea9a56a67a9708f
+  metadata.gz: 29c136caf4ca8b682906683f57159f2e248445ebda666a53e149a189c5842b68
+  data.tar.gz: adaea2a9c4acda51827589efe7546f9d52257df4de0752db599329e81c69a993
 SHA512:
-  metadata.gz: a5f1069b92d4e3ed00126fe2da06cebc425cd9ecb3084566940ed177336c4a074d396d4c7ef91591bac55aae6eaf2b6aa2f8d04364ee8ca613ede3d95be96769
-  data.tar.gz: b55c9d9884575814ac17200e3f78ef60d4eb67b3109ead5ba5acdb0e58697f0da62ddc28f97275285778ef93cbaa219bcde8ea950669af8a65879b4be550c5ab
+  metadata.gz: 9630ec6c73b5817e413fd823feb040c7ac418ebe3474c3c5d746075bc5398c9455692c40b3876a3bc582afdc2111e0904cf898b9303964f6474851d7ab31f2be
+  data.tar.gz: 38a35118b91d71e4b4220b3b6518b591c10842c44189e352185eaf60bd36ab35199cb2e76c6a23243755b5f396d65f19e0ab80a69e12a8690fa157ba088cda15

data/ext/openvfs/occ/sync.cpp

@@ -636,6 +636,26 @@ extern "C" void Init_occ()
             .define_attr("estimated_bandwidth", &OCC::ProgressInfo::Estimates::estimatedBandwidth, Rice::AttrAccess::Read)
             .define_attr("estimated_eta", &OCC::ProgressInfo::Estimates::estimatedEta, Rice::AttrAccess::Read);
 
+        // One file's share of the run. The engine keeps a Progress per file in flight and
+        // discards it when the file finishes, so this is what a per-file progress bar reads;
+        // ProgressInfo's own totals are the whole run.
+        Data_Type<OCC::ProgressInfo::Progress> rb_cProgress =
+            define_class_under<OCC::ProgressInfo::Progress>(rb_mOpenVFS, "Progress")
+            .define_method("completed", &OCC::ProgressInfo::Progress::completed)
+            .define_method("remaining", &OCC::ProgressInfo::Progress::remaining)
+            .define_method("estimates", &OCC::ProgressInfo::Progress::estimates);
+
+        Data_Type<OCC::ProgressInfo::ProgressItem> rb_cProgressItem =
+            define_class_under<OCC::ProgressInfo::ProgressItem>(rb_mOpenVFS, "ProgressItem")
+            // Both by value, so Ruby owns a copy and may keep it after the signal returns -
+            // the engine's own entry goes when the file does.
+            .define_method("item", [](const OCC::ProgressInfo::ProgressItem &self) {
+                return OCC::SyncFileItemPtr::create(self._item);
+            })
+            .define_method("progress", [](const OCC::ProgressInfo::ProgressItem &self) {
+                return self._progress;
+            });
+
         Data_Type<OCC::ProgressInfo> rb_cProgressInfo =
             define_class_under<OCC::ProgressInfo>(rb_mOpenVFS, "ProgressInfo")
             .define_method("status", &OCC::ProgressInfo::status)
@@ -652,6 +672,18 @@ extern "C" void Init_occ()
             .define_method("file_progress", [](const OCC::ProgressInfo &self, const OCC::SyncFileItemPtr &item) {
                 return self.fileProgress(*item);
             }, Arg("item"))
+            // The files in flight, keyed by the path the engine names them by. A Hash rather
+            // than the QHash itself: Rice ships no converter for one, and what a caller wants
+            // is to look a path up.
+            .define_method("current_items", [](const OCC::ProgressInfo &self) {
+                Hash items;
+
+                for (auto entry = self._currentItems.constBegin(); entry != self._currentItems.constEnd(); ++entry) {
+                    items[entry.key()] = entry.value();
+                }
+
+                return items;
+            })
             .define_method("current_discovered_remote_folder", [](const OCC::ProgressInfo &self) {
                 return self._currentDiscoveredRemoteFolder;
             })

data/lib/openvfs/rb/version.rb

@@ -5,6 +5,6 @@
 
 module OpenVFS
   module Rb
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openvfs-rb
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Nathan Kidd