quartz_torrent 0.0.3 → 0.1.0

data/lib/quartz_torrent/formatter.rb

@@ -90,6 +90,20 @@ module QuartzTorrent
         raise "Malformed size '#{size}'"
       end
     end
-  end
 
+    # Parse a duration of time into seconds.
+    def self.parseTime(time)
+      return nil if ! time
+
+      if time =~ /(?:(\d+)\s*h)?\s*(?:(\d+)\s*m)?\s*(?:(\d+)\s*s)?/
+        h = $1.to_i
+        m = $2.to_i
+        s = $3.to_i
+
+        h*3600+m*60+s
+      else
+        raise "Malformed duration '#{time}'"
+      end
+    end
+  end
 end

data/lib/quartz_torrent/peerclient.rb

@@ -55,6 +55,8 @@ module QuartzTorrent
       @downRateLimit = nil
       @upRateLimit = nil
       @ratio = nil
+      @uploadDuration = nil
+      @downloadCompletedTime = nil
     end
     # The torrents Metainfo.Info struct. This is nil if the torrent has no metadata and we need to download it
     # (i.e. a magnet link)
@@ -99,6 +101,11 @@ module QuartzTorrent
     # After we have completed downloading a torrent, we will continue to upload until we have 
     # uploaded ratio * torrent_size bytes. If nil, no limit on upload.
     attr_accessor :ratio
+    # Maximum amount of time in seconds that the torrent can be in the uploading state before it's paused.
+    attr_accessor :uploadDuration
+    # Time at which we completely downloaded all bytes of the torrent.
+    attr_accessor :downloadCompletedTime
+
   end
 
   # Data about torrents for use by the end user. 
@@ -146,6 +153,7 @@ module QuartzTorrent
     # After we have completed downloading a torrent, we will continue to upload until we have 
     # uploaded ratio * torrent_size bytes. If nil, no limit on upload.
     attr_accessor :ratio
+    attr_accessor :uploadDuration
     attr_accessor :bytesUploadedDataOnly
     attr_accessor :bytesDownloadedDataOnly
     attr_accessor :bytesUploaded
@@ -210,6 +218,7 @@ module QuartzTorrent
       @downloadRateLimit = torrentData.downRateLimit.unitsPerSecond if torrentData.downRateLimit
       @uploadRateLimit = torrentData.upRateLimit.unitsPerSecond if torrentData.upRateLimit
       @ratio = torrentData.ratio
+      @uploadDuration = torrentData.uploadDuration
     end
 
     def buildPeersList(torrentData)
@@ -360,6 +369,18 @@ module QuartzTorrent
       torrentData.ratio = ratio
     end
 
+    # Set the maximum amount of time (in seconds) that a torrent can be in the upload-only state before
+    # it is paused. Pass nil to disable.
+    def setUploadDuration(infoHash, seconds)
+      torrentData = @torrentData[infoHash]
+      if ! torrentData
+        @logger.warn "Asked to set upload duration for a non-existent torrent #{QuartzTorrent.bytesToHex(infoHash)}"
+        return
+      end
+
+      torrentData.uploadDuration = seconds
+    end
+
     # Reactor method called when a peer has connected to us.
     def serverInit(metadata, addr, port)
       # A peer connected to us
@@ -825,11 +846,20 @@ module QuartzTorrent
         return
       end
 
-      if torrentData.state == :uploading && (torrentData.state != :paused) && torrentData.ratio
-        if torrentData.bytesUploadedDataOnly >= torrentData.ratio*torrentData.blockState.totalLength
-          @logger.info "Pausing torrent due to upload ratio limit." if torrentData.metainfoPieceState.complete?
-          setPaused(infoHash, true)
-          return
+      if torrentData.state == :uploading && (torrentData.state != :paused)
+        if torrentData.ratio
+          if torrentData.bytesUploadedDataOnly >= torrentData.ratio*torrentData.blockState.totalLength
+            @logger.info "Pausing torrent due to upload ratio limit." if torrentData.metainfoPieceState.complete?
+            setPaused(infoHash, true)
+            return
+          end
+        end
+        if torrentData.uploadDuration && torrentData.downloadCompletedTime
+          if Time.new > torrentData.downloadCompletedTime + torrentData.uploadDuration
+            @logger.info "Pausing torrent due to upload duration being reached." if torrentData.metainfoPieceState.complete?
+            setPaused(infoHash, true)
+            return
+          end
         end
       end
 
@@ -887,9 +917,10 @@ module QuartzTorrent
       end
 
       if blockInfos.size == 0
-        if torrentData.blockState.completePieceBitfield.allSet?
+        if torrentData.state != :uploading && torrentData.blockState.completePieceBitfield.allSet?
           @logger.info "Download of #{QuartzTorrent.bytesToHex(infoHash)} complete."
           torrentData.state = :uploading
+          torrentData.downloadCompletedTime = Time.new
         end
       end
 
@@ -1036,7 +1067,11 @@ module QuartzTorrent
       end
 
       peer.bitfield = msg.bitfield
-      peer.bitfield.length = torrentData.info.pieces.length
+      if torrentData.info
+        peer.bitfield.length = torrentData.info.pieces.length
+      else
+        @logger.warn "A peer connected and sent a bitfield but we don't know the length of the torrent yet. Assuming number of pieces is divisible by 8"
+      end
 
       if ! torrentData.blockState
         @logger.warn "Bitfield: no blockstate yet."
@@ -1612,6 +1647,13 @@ module QuartzTorrent
       @handler.setUploadRatio(infoHash, ratio)
     end
 
+    # Set the maximum amount of time (in seconds) that a torrent can be in the upload-only state before
+    # it is paused. Pass nil to disable.
+    def setUploadDuration(infoHash, seconds)
+      raise "upload ratio must be Numeric, not a #{seconds.class}" if seconds && ! seconds.is_a?(Numeric)
+      @handler.setUploadDuration(infoHash, seconds)
+    end
+
     # Remove a currently running torrent
     def removeTorrent(infoHash, deleteFiles = false)
       @handler.removeTorrent(infoHash, deleteFiles)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quartz_torrent
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors: