rwdtorrent 0.02 → 0.03

data/code/superant.com.rwdtorrent/runtorrentwindow.rb

@@ -1,57 +1,311 @@
-  def runtorrentwindow
-    $torrenttodownload = TorrentRootDir + $rwdtorrentfilesdir + "/" + @a_viewtorrent + ".torrent"
-     rwdtorrentwindowtwo
+
+def runtorrentwindow
+if ! @a_viewtorrent.to_s.empty?
+	$torrenttodownload = TorrentRootDir + $rwdtorrentfilesdir + "/" + @a_viewtorrent + ".torrent"
+	rwdtorrentwindowtwo
   end
+end
+
+def runtorrentwindowhttp
+	$torrenttodownload =  @a_viewtorrenthttp
+	rwdtorrentwindowtwo
+end
+
+$temptorrentnumber  = 0
+
+
+
+
+def rwdtorrentwindowtwo 
+	require 'extras/rubytorrent'
+
+	
+  
+	@rwd_call_after_back << "rwdtorrentwindowtwo"
+	#if @rwd_tab== "rwdtorrentrefresh"
+	@rwd_window	= "torrentdisplaywindowtwo"
+	# end
+	if $temptorrentnumber == 0  
+  display_cols = 0
+	@@dlratelim = nil
+	@ulratelim = nil
+
+		@need_update = true
+     display_fn = ""
+		dest = ""
+		display_status = ""
+		display_completed = 0
+		display_total = 0
+		@@display_dlamt = 0
+		@@display_dlrate = 0
+		@@display_ulamt = 0
+		@@display_ulrate = 0
+		display_rate = 0
+		@@display_conn_peers = 0
+		@@display_fail_peers = 0
+		display_untried_peers = 0
+		display_tracker = "not connected"
+		@@display_errcount = 0
+		@dlblocks = 0
+		@ulblocks = 0
+
+		@got_blocks = 0
+		@sent_blocks = 0
+		@@last_got_block = nil
+		@@last_sent_block = nil
+		@start_time = nil
+
+		@use_rate = false
+		proxy = ENV["http_proxy"]
+		dest= $rwdtorrentdownloads
+		$torrenttimestart = Time.now
+		#Dir.chdir($rwdtorrentdownloads)
+
 
-  def runtorrentwindowhttp
-    $torrenttodownload =  @a_viewtorrenthttp
-     rwdtorrentwindowtwo
+
+		begin
+			mi = RubyTorrent::MetaInfo.from_location("#{$torrenttodownload}", proxy)
+		rescue RubyTorrent::MetaInfoFormatError, RubyTorrent::BEncodingError => e
+			die %{Error: can\'t parse metainfo file "#{$torrenttodownload}"---maybe not a .torrent?}
+		rescue RubyTorrent::TypedStructError => e
+			$stderr.print "
+			error parsing metainfo file, and it's likely something I should know about.
+			please email the torrent file to wmorgan-rubytorrent-bug@masanjin.net,
+			along with this backtrace: (this is RubyTorrent version #{RubyTorrent::VERSION})"
+
+			raise e
+		rescue IOError, SystemCallError => e
+			$stderr.puts %{Error: can't read file "#{$torrenttodownload}": #{e.message}}
+			#exit
+		end
+
+		unless dest.nil?
+			if FileTest.directory?(dest) && mi.info.single?
+				dest = File.join(dest, mi.info.name)
+			elsif FileTest.file?(dest) && mi.info.multiple?
+				die %{Error: .torrent contains multiple files, but "#{dest}" is a single file (must be a directory)}
+			end
+		end
+		begin
+			display_status = "checking file on disk..."
+     # @display_det = File.expand_path(dest || mi.info.name) + (mi.single? ? "" : "/")
+			if mi.single?
+				display_fn = "#{mi.info.name} (#{mi.info.length} in one file)"
+			else
+				display_fn = "#{mi.info.name}/ (#{mi.info.total_length} in #{mi.info.files.length} files)"
+			end
+			display_total = mi.info.num_pieces * mi.info.piece_length
+			display_completed = 0
+			 
+
+			@display_use_rate = true
+			@display_start_timer
+			num_pieces = 0
+			start = Time.now
+			every = 10
+			package = RubyTorrent::Package.new(mi, dest) do |piece|
+				num_pieces += 1
+				if (num_pieces % every) == 0
+					display_completed = (num_pieces * mi.info.piece_length)
+					display_rate = display_completed.to_f / (Time.now - start)
+
+        
+				end
+			end
+
+			display_status = "starting peer..."
+			@display_use_rate = false
+			
+			$bt = RubyTorrent::BitTorrent.new(mi, package, :http_proxy => proxy, :dlratelim => @@dlratelim, :ulratelim => @ulratelim)
+
+			@torrent_connecting = true  
+			#runtorrentthread
+      
+			$temptorrentnumber =1
+		end
+		Dir.chdir($progdir)
+		@torrentdisplayvariable =  $bt.percent_completed.to_s
+		@torrentstarttime = $torrenttimestart 
+		@torrentcurrenttime = Time.now.to_s
+
+		
+
+		
+
+	end # end of initial block - should only run once per download
+
+if display_tracker.nil?
+display_tracker = "not connected"
+end
+ 	
+if @@display_errcount.nil?
+
+@@display_errcount = 0
+end
+  
+			$bt.on_event(self, :received_block) do |s, b, peer|
+				@display_got_block
+				@torrent_connecting = false
+			end
+			$bt.on_event(self, :sent_block) do |s, b, peer|
+				@display_sent_block
+				@torrent_connecting = false
+			end
+			$bt.on_event(self, :discarded_piece) { |s, p| @@display_errcount += 1 }
+			$bt.on_event(self, :tracker_connected) do |s, url|
+				display_tracker = url
+				display_untried_peers = $bt.num_possible_peers
+			end
+      if @@display_fail_peers.nil?
+      @@display_fail_peers = 0
+      end
+        if @@display_conn_peers.nil?
+      @@display_conn_peers = 0
+      end
+			$bt.on_event(self, :tracker_lost) { |s, url| display_tracker = "can't connect to #{url}" }
+			$bt.on_event(self, :forgetting_peer) { |s, p| @@display_fail_peers += 1 }
+			$bt.on_event(self, :removed_peer, :added_peer) do |s, p|
+				if (@@display_conn_peers = $bt.num_active_peers) == 0
+					@torrent_connecting = true
+				end
+			end
+        if display_untried_peers.to_s.empty?
+      display_untried_peers = 0
+      end
+			$bt.on_event(self, :added_peer) { |s, p| @@display_conn_peers += 1 }
+			$bt.on_event(self, :trying_peer) { |s, p| display_untried_peers -= 1 unless display_untried_peers == 0 }
+
+			display_total = $bt.total_bytes
+			@display_start_timer
+
+			if true
+
+
+				display_status = if $bt.complete?
+				"seeding (download complete)"
+			elsif @torrent_connecting
+				"connecting to peers"
+			else
+				"downloading"
+			end
+      if display_cols.nil?
+      display_cols = 0
+      end
+      if display_total.nil?
+      display_total = 0
+      end
+      if display_completed.nil?
+      display_completed =0
+      end
+      if @@last_got_block.nil?
+      
+      @@last_got_block = 0
+      end
+       if @@last_sent_block.nil?
+      
+      @@last_sent_block = 0
+      end
+      	@@display_dlamt = $bt.dlamt
+			@@display_dlrate = $bt.dlrate
+			@@display_ulamt = $bt.ulamt
+			@@display_ulrate = $bt.ulrate
+			 complete_width = [display_cols - 23, 0].max
+		complete_ticks = ((display_completed.to_f / display_total) * complete_width)
+
+		elapsed = (@torrentstarttime ? Time.now - @torrentstarttime : nil)
+		rate = (@display_use_rate ? display_rate : @@display_dlrate)
+		remaining = rate && (rate > 0 ? (display_total - display_completed).to_f / rate : nil)
+
+		dlstall = @@last_got_block.to_i && ((Time.now - @@last_got_block).to_i > STALL_SECS)
+		ulstall = @@last_sent_block.to_i && ((Time.now - @@last_sent_block).to_i > STALL_SECS)
+  display_progress = $bt.percent_completed.to_s
+  display_completed = $bt.bytes_completed.to_s
+  dest= $rwdtorrentdownloads
+		$bt.on_event(self, :complete) { display_status = "Download Complete..." }
+		@display_Dest = "    Destination Directory: #{dest}"
+		 
+		@display_Status = "  Status: #{display_status}"
+		
+    @display_Total = "Total File Size to Downloaded: #{display_total}"
+     @display_Completed = "Total Size Downloaded this session: #{display_completed}"
+   @display_Progress = "Percent Progress this session: #{display_progress}"
+		@display_Time_elapsed = "    Time: elapsed #{numeric_to_time(elapsed)}, remaining #{numeric_to_time(remaining)}"
+		@display_Download = "Download: #{numeric_to_sz(@@display_dlamt)} at  #{numeric_to_sz(@@display_dlrate)}"
+		@display_Upload = "  Upload: #{numeric_to_sz(@@display_ulamt)} at  #{numeric_to_sz(@@display_ulrate)}"
+		@display_Peers = "   Peers: connected to #{@@display_conn_peers} (#{@@display_fail_peers} failed, #{display_untried_peers} untried)"
+		#@display_Tracker = " Tracker: #{display_tracker}"
+		@display_Errors = "  Errors: #{@@display_errcount}"
+
+			
+      end
+      
+    #  	rescue SystemCallError, StandardError, Exception
+		#	$stderr.print "system call error: " + $!
+		#end # exception rescue
+  
+end
+
+	def torrent_die(x); $stderr << "#{x}\n" && exit(-1); end
+
+
+
+
+
+	STALL_SECS = 15
+
+	
+
+	def got_block
+		@got_blocks += 1
+		@@last_got_block = Time.now
+	end
+
+	def sent_block
+		@sent_blocks += 1
+		@@last_sent_block = Time.now
+	end
+
+	def sigwinch_handler(sig = nil)
+		@need_update = true
+	end
+
+	def start_timer
+		@start_time = Time.now
+	end
+  
+  def numeric_to_sz(size_in)
+   if size_in.nil?
+  size_in = 0
+  end
+    if size_in < 1024
+      "#{size_in.round}b"
+    elsif size_in < 1024 ** 2
+      "#{(size_in / 1024 ).round}k"
+    elsif size_in < 1024 ** 3
+      sprintf("%.1fm", size_in.to_f / (1024 ** 2))
+    else
+      sprintf("%.2fg", size_in.to_f / (1024 ** 3))
+    end
   end
 
-  $temptorrentnumber  = 0
-
-def runtorrentthread
- $torrenttimestart = Time.now
-   Dir.chdir($rwdtorrentdownloads)
-   
-   $bt = RubyTorrent::BitTorrent.new("#{$torrenttodownload}")
-   $torrentpid = fork do
-     puts "\nIn child, pid = #$$ \n"
-     thread = Thread.new do
-      #while true
-       puts $bt.percent_completed
-     
-       
-      #end
-     end
-     $bt.on_event(self, :complete) { thread.kill }
-     thread.join
+  MIN = 60
+  HOUR = 60 * MIN
+  DAY = 24 * HOUR
+
+  def numeric_to_time(time_in)
+  if time_in.nil?
+  time_in = 0
+  end
+    if time_in < MIN
+      sprintf("0:%02d", time_in)
+    elsif time_in < HOUR
+      sprintf("%d:%02d", time_in / MIN, time_in % MIN)
+    elsif time_in < DAY
+      sprintf("%d:%02d:%02d", time_in / HOUR, (time_in % HOUR) / MIN, (time_in % HOUR) % MIN)
+    else
+      sprintf("%dd %d:%02d:%02d", time_in / DAY, (time_in % DAY) / HOUR, ((time_in % DAY) % HOUR) / MIN, ((time_in % DAY) % HOUR) % MIN)
     end
- end
-
-  def rwdtorrentwindowtwo
-  require 'extras/rubytorrent'
-    
-  @rwd_call_after_back << "rwdtorrentwindowtwo"
-  #if @rwd_tab== "rwdtorrentrefresh"
-    @rwd_window	= "torrentdisplaywindowtwo"
-   # end
- if $temptorrentnumber == 0   
-  runtorrentthread
-    $temptorrentnumber =1
- end
- Dir.chdir($progdir)
-   @torrentdisplayvariable =  $bt.percent_completed.to_s
-   @torrentstarttime = $torrenttimestart 
-   @torrentcurrenttime = Time.now.to_s
-   
-   commandtext = TorrentListCmd + $rwdtorrentdownloads + "/" + @a_viewtorrent.to_s + "*"
-
-        begin # exception trapped block
-          @torrentcurrentsize =`#{commandtext}`
-
-   rescue SystemCallError, StandardError
-            $stderr.print "system call error: " + $!
-   end # exception rescue
+  end
+
+
 
-end

data/code/superant.com.rwdtorrent/test_cases.rb

@@ -0,0 +1,46 @@
+# test harness
+
+	
+require 'test/unit/testcase'
+require 'test/unit/assertions'
+include Test::Unit::Assertions
+include Test::Unit  
+def rwdtorrent_all_tests 
+	print "in rwdtorrent all tests\n"
+  $testrwdtorrenttestcase = TestSuite.new
+	test_runrwdtorrent
+end
+
+def test_runrwdtorrent
+
+
+	begin
+  testasserts = 0
+  print "Starting rwdtorrent tests!\n"
+     runselectiontab
+     assert_equal("selectiontab",@rwd_tab) ; testasserts += 1
+    runedittorrentconfiguration   
+    assert_equal("viewrwdtorrentconfiguration",@rwd_tab) ; testasserts += 1    
+        loadrwdtorrentconfiguration
+    assert_equal("rwdtorrent.cnf",@a_torrentconfigurationfilename) ; testasserts += 1    
+     
+ $stderr.print "tests completed succesfully!\n"
+ $stderr.print testasserts, " asserts performed\n"
+
+	rescue  NotImplementedError, Exception
+		$stderr.print $!
+
+	end
+  
+end
+
+
+
+def teststobedown
+ runtinkerhelpabout
+          assert_equal("rwdtinkerhelpwindow",@rwd_tab)  ; testasserts += 1
+end
+
+
+
+

data/configuration/language.dist

@@ -1,4 +1,4 @@
-##VERSION:1.57
+##VERSION:1.62
 #language selection file
 ##NAME:$lang:0
 #$lang = "jp"

data/configuration/rwdapplicationidentity.dist

@@ -1,3 +1,3 @@
-##VERSION:1.57
-$rwdapplicationidentity = "rwdtorrent bittorrent gui"
+##VERSION:1.63
+$rwdapplicationidentity = "rwdtorrent download client"
 

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION:1.61
+##VERSION:1.64
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -11,5 +11,5 @@ LangDir = "lang"
   $prevouswindow ="main" 
    $rwdcontrolports =["13713","13714","13715","13716","13717","13718"]
  $port = 7705
-
-RwdTinkerVersion = "1.61"
+$rwdjumplink = ["helpscreen","tinkerbackwindow","returntomain","opendocuments","editconfiguration"]
+RwdTinkerVersion = "1.64"

data/configuration/rwdtorrent.dist

@@ -1,4 +1,4 @@
-##VERSION:0.02
+##VERSION:0.03
 ##NAME:$rwdtorrentfilesdir:0
 $rwdtorrentfilesdir="torrentfiles"
 ##NAME:$rwdtorrentdownloads:0
@@ -9,6 +9,7 @@ $extrasdir="extras"
 TorrentListCmd="ls -s -1 -h -R "
 ##NAME:TorrentRootDir:0
 TorrentRootDir=$progdir + "/"
-
-RwdTorrentVersion = "0.02"
+##NAME:$testharnessarray:0
+$testharnessarray += ["rwdtorrent_all_tests"]
+RwdTorrentVersion = "0.03"
 

data/configuration/tinkerwin2variables.dist

@@ -1,4 +1,4 @@
-##VERSION:1.57
+##VERSION:1.63
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
 ##NAME:$zipslocation:0
 $zipslocation = "zips" # location of applets to add

data/gui/00coreguibegin/applicationguitop.rwd

@@ -1,4 +1,4 @@
 $rwdguivar=
 "<application>
-  <window name=\"main\" title=\"Tinker - RubyWebDialogs\">
+  <window name=\"main\" title=\"RwdTorrent - RubyWebDialogs\">
 <tabs>"

data/gui/frontwindow0/superant.com.rwdtorrent/40rwdtorrentrefresh.rwd

@@ -15,6 +15,7 @@ $rwdguivar=
 </table>
     <horizontal>
     <button caption=\'Start local Download\' action=\'runtorrentwindow\'/>
+ <button caption=\'Return to Download Window\' action=\'runtorrentdownloadwindow\'/>
 
      <button caption=\"Help\" action=\"runhelpwindowrwdtorrent\"/>
      <p></p>

data/gui/frontwindowselectionbegin/selectiontabbegin/selectiontabbegin.rwd

@@ -3,14 +3,9 @@ $rwdguivar=
       <tab name=\"selectiontab\" caption=#{Message[:selection_panel]}>
 
       <table>
-      <row> <p align=\"right\">Open a new window with callable applets you have loaded</row>
+      <row> <p align=\"right\">Open a new location </row>
 
      </table>
-      <horizontal>
-      
-      <button caption=#{Message[:rwdtinker_help_window]} action=\"runhelpwindow\"/>
-      
-      
-     </horizontal>"
+"
 
 

data/gui/frontwindowselections/superant.com.rwdtinkerwin2selectiontab/jumplinkcommands.rwd

@@ -0,0 +1,15 @@
+$rwdguivar=
+"
+<horizontal>
+<button caption=\"Show Jump Links\" action=\"showjumplinkoptions\"/>
+
+</horizontal>
+ <table>
+      <select name=\"a_jumplinkinput\">  %%jumplinkoptions%% </select>
+
+   </table>
+
+      <horizontal>
+      <button caption=\"Jump to Application Location\" action=\"runjumplinkcommand\"/>
+    </horizontal>
+"

data/gui/helpaboutinstalled/superant.com.tinkerhelpabout/1appname.rwd

@@ -1,4 +1,4 @@
 $rwdguivar=
 "
 <panel>
- <row> <p align=\"center\">\"rwdtorrent\"</p></row>"
+ <row> <p align=\"center\">#{Message[:rwdtinker]}</p></row>"

data/gui/helpaboutinstalled/superant.com.tinkerhelpabout/5version.rwd

@@ -1,7 +1,7 @@
 $rwdguivar=
 "
       <horizontal>
-       <button caption=#{Message[:clickfor_version]} action=\"runrwdtorrentversion\"/>
+       <button caption=#{Message[:clickfor_version]} action=\"runrwdtinkerversion\"/>
     </horizontal>
 </panel>"
 

data/gui/helpaboutinstalled/superant.com.torrenthelpabout/1appname.rwd

@@ -1,4 +1,4 @@
 $rwdguivar=
 "
 <panel>
- <row> <p align=\"center\">rwdshell for rwdtinker</p></row>"
+ <row> <p align=\"center\">rwdtorrent for rwdtinker</p></row>"

data/gui/helpaboutinstalled/superant.com.torrenthelpabout/3copyright.rwd

@@ -1,3 +1,3 @@
 $rwdguivar=
 "
- <row> <p align=\"center\">copyright s. gibson 2004</p></row>"
+ <row> <p align=\"center\">copyright s. gibson 2005</p></row>"

data/gui/helpaboutinstalled/superant.com.torrenthelpabout/5version.rwd

@@ -1,7 +1,7 @@
 $rwdguivar=
 "
       <horizontal>
-       <button caption=\"Click for Version\" action=\"runrwdshellversion\"/>
+       <button caption=\"Click for Version\" action=\"runrwdtorrentversion\"/>
     </horizontal>
           
 </panel>"

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/81jumplinkcommands.rwd

@@ -0,0 +1,17 @@
+$rwdguivar=
+"
+<tab name=selectiontab caption=\"Selection Tab\">
+<horizontal>
+<button caption=\"Show Jump Links\" action=\"showjumplinkoptions\"/>
+
+</horizontal>
+ <table>
+      <select name=\"a_jumplinkinput\">  %%jumplinkoptions%% </select>
+
+   </table>
+
+      <horizontal>
+      <button caption=\"Jump to Application Location\" action=\"runjumplinkcommand\"/>
+    </horizontal>
+    </tab>
+"

data/gui/tinkerbackwindows/superant.com.torrentdisplay/torrentdisplaywindow.rwd

@@ -2,29 +2,52 @@ $rwdguivar=
 "
   <window name=\"torrentdisplaywindowtwo\" title=\"Torrent Download Progress\" refresh=\'5\'>
     <horizontal>
-    <p>File progress: </p>
-    <p>%torrentdisplayvariable%</p>
-    </horizontal>
-    <p></p>
+       <p>Download Start time: </p>
+        <p>%torrentstarttime%</p>
+        </horizontal>
+ <horizontal>
+<p>Downloading File:</p>
+<p>%a_viewtorrent%</p>
+</horizontal>
     <horizontal>
-    <p>Download Start time: </p>
+    %display_Dest%
+		</horizontal>
+    <horizontal>	
+		%display_Status%
+    	</horizontal>
     
-    <p>%torrentstarttime%</p>
-    </horizontal>
+       	</horizontal>
     <horizontal>
-    <p>current filesize: </p>
-    
-    <p>%torrentcurrentsize%</p>
+		%display_Total%
+    	</horizontal>
+       <horizontal>
+		%display_Completed%
+    	</horizontal>
+       <horizontal>
+		%display_Progress%
+    	</horizontal>
+    <horizontal>
+    		%display_Time_elapsed%
+	</horizontal>
+    <horizontal>
+		%display_Download%
+    	</horizontal>
+    <horizontal>
+		%display_Upload%
+    	</horizontal>
+    <horizontal>
+		%display_Peers%
+    	</horizontal>
+  
+    <horizontal>
+		%display_Errors%
     </horizontal>
-    
     <p><p>
- <horizontal>
-<p>Downloading File:</p>
-<p>%a_viewtorrent%</p>
-</horizontal>
+
 <horizontal>
  <button caption=\'Stop Download\' action=\'stoptorrentwindow\'/>
-   <cancel/>
+   <button caption=\'Return\' action=\'returntomaintorrent\'/>
+ 
    </horizontal>
    <p>%a_torrentdata%</p>
   </window>"