blat 0.1.0b → 0.1.0c

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a18d2f9b96d5a2d9b6e7e8ae085e1bfed1855d32
-  data.tar.gz: df5cc403ee46326005387f73432d73edb0fb69bf
+  metadata.gz: edc10068370f1a5d73ed06c92ef162dbecdefaa6
+  data.tar.gz: 69b155992407e5c2bf4facebb077a89d14272229
 SHA512:
-  metadata.gz: f324fa27a4c93dd576a2663b87a047c3f0c74cf2387ad8fdf362eb4cf884b156a09232421101a7ca6cd947c03ad3d7fe5870ff6a1d7a95897a107fd31ca66fa7
-  data.tar.gz: cf89d6d6a43935fbd03dd811a770ff53ba091318cb89ee88037b9017efaed91e178dd1dcd8387624383b0d476b35f9bf9f5dc22d8fe3046876b7e07362d4c51b
+  metadata.gz: 40688b033ed506bde40d2606d678fdcf0522c1b84060a516b0a2805e4816060c8eca618e38434f716eb21b826bcc1b511d699e45611565ae18378c3c9bec3197
+  data.tar.gz: 281605fdb68e87329f7009de13a27af4388c2f6700471a96de2a91ea9f906c3565ef6135fd155dde76cbc4624e58359b1af0206ac1bed81a4b2dba9abcf96d21

data/lib/blat.rb

@@ -6,6 +6,6 @@ require 'blat/queue'
 # aggressively as possible.
 module Blat
 
-  VERSION = '0.1.0b'
+  VERSION = '0.1.0c'
 
 end

data/lib/blat/queue.rb

@@ -27,6 +27,10 @@ module Blat
       @pipeline             = (pipeline == true)
       @multi.max_connects   = @max_connects
       @multi.pipeline       = @pipeline
+
+      # Keep track of activity
+      @active               = false
+      @activity_mx          = Mutex.new
     end
 
     # Add a URL or a Curl::Easy object to the queue.
@@ -50,12 +54,19 @@ module Blat
       return curl
     end
 
+    # Cancel all requests currently queued or downloading
+    def cancel
+      @multi.cancel!
+    end
+
+    alias_method :cancel!, :cancel
+
     # Returns the number of active requests
     def request_count
       requests.length
     end
 
-    # Returns a list of active requests
+    # Returns a list of active requests (Curl::Easy objects)
     def requests
       @multi.requests
     end
@@ -67,16 +78,43 @@ module Blat
       @multi.remove(curl)
     end
 
-    # Wait for all requests to finish (blocking).
+    # Run the queue, waiting for requests to finish (blocking).
     #
-    # If a block is given it is executed repeatedly whilst waiting.
-    def wait(&block)
+    # If a block is given it is executed repeatedly whilst waiting, e.g.
+    #
+    #  q.perform {
+    #    puts "Active downloads: #{q.request_count}"
+    #  }
+    #
+    def perform(&block)
+      raise 'Already actively performing requests' if active?
+
+      @activity_mx.synchronize { @active = true }
       @multi.perform do
         yield if block_given?
       end
+    ensure
+      @activity_mx.synchronize { @active = false }
+    end
+
+    # Perform downloads in a nonblocking manner
+    #
+    # Optionally run the block given, as with regular #perform
+    def perform_nonblock(&block)
+      raise 'Currently active' if @thread
+
+        me = self
+        @thread = Thread.new() do
+          me.perform { yield if block_given? }
+        end
+        @thread.abort_on_exception = true
+
     end
 
-    alias_method :perform, :wait
+    # Is this object currently actively downloading data?
+    def active?
+      @activity_mx.synchronize { @active }
+    end
 
     # Is the queue idle?
     def idle?
@@ -113,7 +151,7 @@ module Blat
     #  end
     #
     def consume(connections = @max_connects, &block)
-      @multi.perform do
+      perform do
         while request_count < connections && new_link = yield
           add(new_link) if new_link
         end
@@ -132,7 +170,7 @@ module Blat
       item = 0            # Start at item 0
       list = list.to_a    # Ensure we can address with []
 
-      @multi.perform do
+      perform do
         while request_count < connections && new_link = list[item]
 
           item += 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blat
 version: !ruby/object:Gem::Version
-  version: 0.1.0b
+  version: 0.1.0c
 platform: ruby
 authors:
 - Stephen Wattam