rwdtorrent 0.03 → 0.04

data/code/01rwdcore/01rwdcore.rb

@@ -14,6 +14,9 @@ class RwdTinker  < RWDialog
 
 			rwdtest_harness
 		end
+            showjumplinkoptions
+            setuptinkerdocuments
+            setuphelpaboutoptionspassive
 	end
 
 	def inspect

data/code/01rwdcore/runopentinkerdocument.rb

@@ -0,0 +1,7 @@
+# open document for rwdtinker application
+def runopentinkerdocument
+
+tinkerdocumenturl = "http://localhost:7705/" + @a_tinkerdocumentinput
+    Thread.new( tinkerdocumenturl){ |t|  `#{Browser_Exe} #{tinkerdocumenturl}`  }
+ end
+   

data/code/01rwdcore/rwdtinkerversion.rb

@@ -3,11 +3,19 @@
 # For  information see http://www.rubyforge.net/projects/rwdapplications
 
 # return the version constant defined in the config file
+def tinkerhelpaboutsetup
+return ["RwdTinker","(c) 2004 Steven Gibson ","Version #{RwdTinkerVersion}"]
+end
+
 def runrwdtinkerversion
 	@rwd_window = "applicationversion"
-	@versionappnamedisplay = "RwdTinker"
-	@versioncopyrightdisplay = "(c) 2004 Steven Gibson "
-	@versionnumberdisplay =  "Version " + RwdTinkerVersion
+  helpaboutinput = @a_helpaboutinput.downcase
+  versionarraysetup = "#{helpaboutinput}helpaboutsetup"
+  versionarray= self.send(versionarraysetup)
+  
+	@versionappnamedisplay = versionarray[0].to_s
+	@versioncopyrightdisplay = versionarray[1].to_s
+	@versionnumberdisplay =  versionarray[2].to_s
 
 end
 

data/code/01rwdcore/setuphelpaboutoptions.rb

@@ -0,0 +1,13 @@
+# help about option setup for rwdtinker application
+def setuphelpaboutoptions 
+
+  @rwd_window = "tinkerhelpabout"
+	@helpaboutoptions = $tinkerhelpaboutarray.rwd_options
+end	
+	
+def setuphelpaboutoptionspassive 
+
+  
+	@helpaboutoptions = $tinkerhelpaboutarray.rwd_options
+end	
+   

data/code/01rwdcore/setuptinkerdocuments.rb

@@ -0,0 +1,6 @@
+# Bind document names  to rwdtinker document tab
+def setuptinkerdocuments 
+
+	@tinkerdocumentsarray = $tinkerdocumentsarray.rwd_options
+end	
+   

data/code/01rwdcore/test_harness.rb

@@ -1,8 +1,8 @@
 # this to start the test harness
 def rwdtest_harness
 
-	print "in test harness, tests to perform:\n"
-       puts $testharnessarray
+	print "in test harness\n"
+  
 	$testharnessarray.each { |x| 
 		print "calling #{x}\n"
 		eval("#{x}")

data/code/superant.com.rwdtinkerbackwindow/loadconfigurationrecord.rb

@@ -20,6 +20,12 @@ def loadconfigurationrecord
 		@a_configline6 = fd.readline.chomp 
 		@a_configline7 =fd.readline.chomp
 		@a_configline8 = fd.readline.chomp
+    @a_configline9 = fd.readline.chomp
+		@a_configline10 = fd.readline.chomp 
+		@a_configline11 =fd.readline.chomp
+		@a_configline12 = fd.readline.chomp
+    @a_configline13 =fd.readline.chomp
+		@a_configline14 = fd.readline.chomp
 
 		while ! fd.eof?
 			@extraconfigdatadisplay = fd.readline

data/code/superant.com.rwdtinkerbackwindow/saveconfigurationrecord.rb

@@ -3,9 +3,12 @@ def saveconfigurationrecord
 	require 'fileutils'
 	if @a_configurationfilename
 		newname = "%s" %   [@a_configurationfilename] # grab the filename to create
-		newdata =@a_configline1.to_s + "\n" + @a_configline2.to_s + "\n" + @a_configline3.to_s + "\n" + @a_configline4.to_s + "\n" + @a_configline5.to_s + "\n" + @a_configline6.to_s + "\n" + @a_configline7.to_s + "\n" + @a_configline8.to_s + "\n"
+		newdata =@a_configline1.to_s + "\n" + @a_configline2.to_s + "\n" + @a_configline3.to_s + "\n" + @a_configline4.to_s + "\n" + @a_configline5.to_s +
+    "\n" + @a_configline6.to_s + "\n" + @a_configline7.to_s + "\n" + @a_configline8.to_s + "\n" +
+ @a_configline9.to_s + "\n" + @a_configline10.to_s + "\n" + @a_configline11.to_s + "\n" +
+ @a_configline12.to_s + "\n" + @a_configline13.to_s + "\n" + @a_configline14.to_s + "\n"
 
-		begin # exception trapped block
+begin # exception trapped block
 			fileName = File.join( ConfigurationDir, newname )
 			fd = File.open(fileName,"w")
 			fd.print(newdata) # save the record info to the file

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

@@ -13,21 +13,9 @@
         
         
 	      fd = File.open(fileName,"r")
-	      @a_torrentconfigline1=        fd.readline.chomp
-	      @a_torrentconfigline2 =  fd.readline.chomp
-        @a_torrentconfigline3 = fd.readline.chomp
-          @a_torrentconfigline4 = fd.readline.chomp
-        @a_torrentconfigline5 = fd.readline.chomp
-         @a_torrentconfigline6 = fd.readline.chomp 
-          @a_torrentconfigline7 =fd.readline.chomp
-          @a_torrentconfigline8 = fd.readline.chomp
-           @a_torrentconfigline9 = fd.readline.chomp
-          @a_torrentconfigline10 = fd.readline.chomp
-           @a_torrentconfigline11 = fd.readline.chomp
+	      @a_torrentconfiglines=        fd.read
 	 
-	      while ! fd.eof?
-	        @extratorrentconfigdatadisplay = fd.readline
-	      end
+	     
         fd.close
         rescue SystemCallError, StandardError
             $stderr.print "system call error: " + $!

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

@@ -79,17 +79,18 @@ def rwdtorrentwindowtwo
 			#exit
 		end
 
-		unless dest.nil?
+		unless dest.nil? or mi.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?
+		
+      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)"
@@ -130,10 +131,14 @@ def rwdtorrentwindowtwo
 
 		
 
-		
+		end # unless
 
 	end # end of initial block - should only run once per download
-
+  begin
+ if  $bt.nil?
+ @rwd_window = "main"
+ @rwd_tab	= "rwdtorrentrefresh"
+ else
 if display_tracker.nil?
 display_tracker = "not connected"
 end
@@ -242,6 +247,11 @@ end
     #  	rescue SystemCallError, StandardError, Exception
 		#	$stderr.print "system call error: " + $!
 		#end # exception rescue
+  end # if bt not nil
+  rescue NoMethodError, Exception
+      $stderr.print "error: " + $!
+      @a_torrentdata = $!
+  end # exception
   
 end
 

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

@@ -4,11 +4,8 @@
 # For more information about RwdTinker see http://www.rubyforge.net/projects/rwdapplications
   
   # return the version constant defined in the config file
-  def runrwdtorrentversion
-  @rwd_window = "applicationversion"
-  @versionappnamedisplay = "RwdTorrent"
-  @versioncopyrightdisplay = "(c) 2005 Steven Gibson "
-  @versionnumberdisplay =  "Version " + RwdTorrentVersion
+  def rwdtorrenthelpaboutsetup
+  return ["RwdTorrent", "(c) 2005 Steven Gibson ", "Version #{RwdTorrentVersion}"]
 
    end
   

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

@@ -3,7 +3,7 @@
    require 'fileutils'
    
    newname = "rwdtorrent.cnf" # grab the filename to create
-   newdata =@a_torrentconfigline1.to_s + "\n" + @a_torrentconfigline2.to_s + "\n" + @a_torrentconfigline3.to_s + "\n" + @a_torrentconfigline4.to_s + "\n" + @a_torrentconfigline5.to_s + "\n" + @a_torrentconfigline6.to_s + "\n" + @a_torrentconfigline7.to_s + "\n" + @a_torrentconfigline8.to_s + "\n" + @a_torrentconfigline9.to_s + "\n"+ @a_torrentconfigline10.to_s + "\n"+ @a_torrentconfigline11.to_s + "\n"+ @a_torrentconfigline9.to_s + "\n"
+   newdata =@a_torrentconfiglines.to_s 
 	 
         begin # exception trapped block
           fileName = File.join( ConfigurationDir, newname )

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

@@ -1,34 +1,64 @@
-
-   
+# show torrent metafile details on screen
+   require 'extras/rubytorrent'
    def viewtorrentfile
-   
-    commandtext = "ruby extras/aversa.rb --decode " + $rwdtorrentfilesdir + "/" + @a_viewtorrent.to_s + ".torrent "
-
+    
+    if !   @a_viewtorrent.to_s.empty?
+    torrentfile = $progdir + "/" + $rwdtorrentfilesdir + "/" + @a_viewtorrent.to_s + ".torrent"
         begin # exception trapped block
-         
-  
-         @a_torrentdata =`#{commandtext}`
-        
-        rescue SystemCallError, StandardError
-            $stderr.print "system call error: " + $!
+         @a_torrentdata = dump_metainfo(RubyTorrent::MetaInfo.from_location(torrentfile))
+       rescue SystemCallError, StandardError, RubyTorrent::MetaInfoFormatError, RubyTorrent::BEncodingError => e
+          $stderr.print "system call error: " + $!
+          @a_torrentdata = $!
+          rescue   Timeout::Error, Exception
+           $stderr.print "error: " + $!
+           @a_torrentdata = $!
         end # exception rescue
-
+   end
   end
-def viewtorrentfilehttp
-   
-    commandtext = "ruby extras/aversa.rb --decode " + @a_viewtorrenthttp.to_s 
 
-        begin # exception trapped block
-         
-
-        print commandtext
-         @a_torrentdata =`#{commandtext}`
-        
-        rescue SystemCallError, StandardError
+def viewtorrentfilehttp
+   require 'extras/rubytorrent'
+      if !   @a_viewtorrenthttp.to_s.empty?
+    torrentfile =  @a_viewtorrenthttp.to_s + ".torrent"
+       begin # exception trapped block
+         @a_torrentdata = dump_metainfo(RubyTorrent::MetaInfo.from_location(torrentfile))
+        rescue SystemCallError, StandardError, RubyTorrent::MetaInfoFormatError, RubyTorrent::BEncodingError,OpenURI::HTTPError => e
             $stderr.print "system call error: " + $!
-        end # exception rescue
-
+             @a_torrentdata = $!
+          rescue   Timeout::Error, Exception
+           $stderr.print "error: " + $!
+            @a_torrentdata = $!
+       end # exception
+   end
   end
 
 
+def dump_metainfoinfo(mii)
+  if mii.single?
+      <<EOS
+       length: #{mii.length / 1024}kb
+     filename: #{mii.name}
+EOS
+  else
+    mii.files.map do |f|
+        <<EOS
+   - filename: #{File.join(mii.name, f.path)}
+       length: #{f.length}
+EOS
+    end.join + "\n"
+  end + <<EOS
+ piece length: #{mii.piece_length / 1024}kb 
+       pieces: #{mii.pieces.length / 20}
+EOS
+end
 
+def dump_metainfo(mi)
+    <<EOS
+#{dump_metainfoinfo(mi.info).chomp}
+     announce: #{mi.announce}
+announce-list: #{(mi.announce_list.nil? ? "<not specified>" : mi.announce_list.map { |x| x.join(', ') }.join('; '))}
+creation date: #{mi.creation_date || "<not specified>"}
+   created by: #{mi.created_by || "<not specified>"}
+      comment: #{mi.comment || "<not specified>"}
+EOS
+end

data/configuration/rwdapplicationidentity.dist

@@ -1,3 +1,3 @@
 ##VERSION:1.63
-$rwdapplicationidentity = "rwdtorrent download client"
+$rwdapplicationidentity = "rwdtinker main application"
 

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION:1.64
+##VERSION:1.65
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -12,4 +12,9 @@ LangDir = "lang"
    $rwdcontrolports =["13713","13714","13715","13716","13717","13718"]
  $port = 7705
 $rwdjumplink = ["helpscreen","tinkerbackwindow","returntomain","opendocuments","editconfiguration"]
-RwdTinkerVersion = "1.64"
+$tinkerhelpaboutarray = ["Tinker"]
+Browser_Exe = 'mozilla '
+$tinkerdocumentsarray =["COPYING","HowTo_Tinker.txt","rwdapplications.html","RubyWebDialogs.html"]
+RwdTinkerVersion = "1.65"
+	
+   

data/configuration/rwdtorrent.dist

@@ -1,4 +1,4 @@
-##VERSION:0.03
+##VERSION:0.04
 ##NAME:$rwdtorrentfilesdir:0
 $rwdtorrentfilesdir="torrentfiles"
 ##NAME:$rwdtorrentdownloads:0
@@ -11,5 +11,8 @@ TorrentListCmd="ls -s -1 -h -R "
 TorrentRootDir=$progdir + "/"
 ##NAME:$testharnessarray:0
 $testharnessarray += ["rwdtorrent_all_tests"]
-RwdTorrentVersion = "0.03"
+$tinkerdocumentsarray += ["HowTo_Torrent.txt"]
+$tinkerhelpaboutarray += ["RwdTorrent"]
+RwdTorrentVersion = "0.04"
 
+      

data/configuration/rwdtorrenthelpabout.rb

@@ -0,0 +1,14 @@
+# Application RwdTinker orginally (c) 2004 Steven Gibson under GPL. 
+# This application is a framework for writing programs from RubyWebDialogs
+# http://www.erikveen.dds.nl/rubywebdialogs/index.html 
+# For more information about RwdTinker see http://www.rubyforge.net/projects/rwdapplications
+  
+  # return the version constant defined in the config file
+  def runrwdtorrentversion
+  @rwd_window = "applicationversion"
+  @versionappnamedisplay = "RwdTorrent"
+  @versioncopyrightdisplay = "(c) 2005 Steven Gibson "
+  @versionnumberdisplay =  "Version " + RwdTorrentVersion
+
+   end
+  

data/gui/00coreguibegin/applicationguitop.rwd

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

data/gui/frontwindow0/superant.com.rwdtorrent/67viewconfiguration.rwd

@@ -17,16 +17,8 @@ $rwdguivar=
    <table>
 
       <row> <p align=\"right\">FileName:</p>  <text name=\"a_torrentconfigurationfilename\"/> </row>
-      <row> <p align=\"right\">1:</p>  <text size=70 name=\"a_torrentconfigline1\"/> </row>
-      <row> <p align=\"right\">2:</p>  <text size=70 name=\"a_torrentconfigline2\"/> </row>
-      <row> <p align=\"right\">3:</p>  <text size=70 name=\"a_torrentconfigline3\"/> </row>
-      <row> <p align=\"right\">4:</p>  <text size=70 name=\"a_torrentconfigline4\"/> </row>
-      <row> <p align=\"right\">5:</p>  <text size=70 name=\"a_torrentconfigline5\"/> </row>
-      <row> <p align=\"right\">6:</p>  <text size=70 name=\"a_torrentconfigline6\"/> </row>
-      <row> <p align=\"right\">7:</p>  <text size=70 name=\"a_torrentconfigline7\"/> </row>
-      <row> <p align=\"right\">8:</p>  <text size=70 name=\"a_torrentconfigline8\"/> </row>
-      <row> <p align=\"right\">9:</p>  <text size=70 name=\"a_torrentconfigline9\"/> </row>
-      
+      </p>  <textarea name=\"a_torrentconfiglines\"/> 
+     
     </table>
     <p>%extratorrentconfigdatadisplay%</p>
     <p>

data/gui/frontwindowtdocuments/superant.com.documents/tinkerdocuments.rwd

@@ -0,0 +1,14 @@
+$rwdguivar=
+"
+<horizontal>
+<button caption=\"Show Documents List\" action=\"setuptinkerdocuments\"/>
+
+</horizontal>
+ <table>
+      <select name=\"a_tinkerdocumentinput\">  %%tinkerdocumentsarray%% </select>
+
+   </table>
+<horizontal>
+      <button caption=\"Open Document\" action=\"runopentinkerdocument\"/>
+  </horizontal>
+"

data/gui/helpaboutbegin/superant.com.helpaboutbegin/zzdocumentend.rwd

@@ -0,0 +1,8 @@
+$rwdguivar=
+"     
+<horizontal>       
+      <button caption=\"Help\" action=\"runhelpwindow\"/>
+      
+    </horizontal>
+	</tab>"
+	

data/gui/helpaboutinstalled/superant.com.tinkerhelpabout/helpabouttab.rwd

@@ -0,0 +1,15 @@
+$rwdguivar=
+"
+<horizontal>
+<button caption=\"Show Help About Links\" action=\"setuphelpaboutoptions\"/>
+
+</horizontal>
+ <table>
+      <select name=\"a_helpaboutinput\">  %%helpaboutoptions%% </select>
+
+   </table>
+
+      <horizontal>
+      <button caption=\"Open Selected Help About\" action=\"runrwdtinkerversion\"/>
+    </horizontal>
+"

data/gui/helpaboutzend/superant.com.helpaboutend/zhelpscreenstart2.rwd

@@ -0,0 +1,3 @@
+$rwdguivar=
+"
+<helpwindow name=\"tinkerbackwindow\" title=\"Help About\">"

data/gui/helpaboutzend/superant.com.helpaboutend/zzzzhelpabout2.rwd

@@ -0,0 +1,15 @@
+$rwdguivar=
+"
+<horizontal>
+<button caption=\"Show Help About Links\" action=\"setuphelpaboutoptions\"/>
+
+</horizontal>
+ <table>
+      <select name=\"a_helpaboutinput\">  %%helpaboutoptions%% </select>
+
+   </table>
+
+      <horizontal>
+      <button caption=\"Open Selected Help About\" action=\"runrwdtinkerversion\"/>
+    </horizontal>
+"

data/gui/helpaboutzend/superant.com.helpaboutend/zzzzhelpscreen2end.rwd

@@ -0,0 +1,3 @@
+$rwdguivar=
+"
+</helpwindow>"

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/60editconfiguration.rwd

@@ -25,7 +25,13 @@ $rwdguivar=
       <row> <p align=\"right\">6:</p>  <text size=70 name=\"a_configline6\"/> </row>
       <row> <p align=\"right\">7:</p>  <text size=70 name=\"a_configline7\"/> </row>
       <row> <p align=\"right\">8:</p>  <text size=70 name=\"a_configline8\"/> </row>
-      
+      <row> <p align=\"right\">9:</p>  <text size=70 name=\"a_configline9\"/> </row>
+      <row> <p align=\"right\">10:</p>  <text size=70 name=\"a_configline10\"/> </row>
+      <row> <p align=\"right\">11:</p>  <text size=70 name=\"a_configline11\"/> </row>
+      <row> <p align=\"right\">12:</p>  <text size=70 name=\"a_configline12\"/> </row>
+     <row> <p align=\"right\">13:</p>  <text size=70 name=\"a_configline13\"/> </row>
+      <row> <p align=\"right\">14:</p>  <text size=70 name=\"a_configline14\"/> </row>
+       
 
     </table>
     <p>%extraconfigdatadisplay%</p>

data/gui/tinkerbackwindows/superant.com.versionwindow/1appname.rwd

@@ -11,7 +11,7 @@ $rwdguivar=
 <p>%versionnumberdisplay%</p>
 
       <horizontal>
-       <cancel/>
+<button caption=Return action=returntomain/>
     </horizontal>
 
 </window>"

data/gui/tinkerbackwindows/superant.com.versionwindow/helpaboutwindow.rwd

@@ -0,0 +1,17 @@
+$rwdguivar=
+"
+<window name=tinkerhelpabout title=\"Help About Window\">
+<horizontal>
+<button caption=\"Show Help About Links\" action=\"setuphelpaboutoptions\"/>
+
+</horizontal>
+ <table>
+      <select name=\"a_helpaboutinput\">  %%helpaboutoptions%% </select>
+
+   </table>
+
+      <horizontal>
+      <button caption=\"Open Selected Help About\" action=\"runrwdtinkerversion\"/>
+    </horizontal>
+    </window>
+"

data/rwd_files/HowTo_Tinker.txt

@@ -227,6 +227,12 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+Version 1.65
+ Changed documents listing screen - now using hash
+ Changed helpabout screen - now using hash
+ added more lines for config edit 
+ added help about to back window
+
 Version 1.64
  fixed jump with no location
 

data/rwd_files/HowTo_Torrent.txt

@@ -132,6 +132,14 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+Version 0.04
+ now only using rubytorrent to read metafile data
+ changed config file screen
+ fixed file not found error on download tab
+ updated for rwdtinker 1.65
+ new helpabout
+ new documents list
+  
 Version 0.03
  added directory name to download window
  resuming download clearer

data/rwdconfig.dist

@@ -1,4 +1,4 @@
-##VERSION:1.63
+##VERSION:1.65
 # rwdtinker core configuration file
 ##NAME: ConfigLocation:0
 ConfigLocation=""
@@ -9,4 +9,9 @@ $testharnessarray = ["rwdtinker_all_tests"]
 ##NAME:TestNow:0
 TestNow=false  # turning this on will run the unit tests
 ##NAME:$testharness:0
-$testharness=true
+$testharness=true
+##NAME:$tinkerdocumentsarray:0
+$tinkerdocumentsarray = ["Readme.txt"]
+
+
+

data/tests/makedist.rb

@@ -7,6 +7,7 @@
 $progdir =""
 require 'fileutils'
 load 'rwdconfig.dist'
+load 'configuration/rwdtinker.dist'
 DistroName = "rwdtorrent"
 load "configuration/#{DistroName}.dist"
 DistroVersion=RwdTorrentVersion

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: rwdtorrent
 version: !ruby/object:Gem::Version 
-  version: "0.03"
-date: 2005-04-09
+  version: "0.04"
+date: 2005-04-16
 summary: rwdtorrent is a GUI front end for BitTorrent with rwdtinker and RubyWebDialogs features.
 require_paths: 
   - "."
@@ -44,6 +44,9 @@ files:
   - code/01rwdcore/rundocuments.rb
   - code/01rwdcore/runhelpabout.rb
   - code/01rwdcore/runeditconfiguration.rb
+  - code/01rwdcore/setuptinkerdocuments.rb
+  - code/01rwdcore/setuphelpaboutoptions.rb
+  - code/01rwdcore/runopentinkerdocument.rb
   - code/superant.com.rwdtinkerbackwindow/controlclient.rb
   - code/superant.com.rwdtinkerbackwindow/diagnostictab.rb
   - code/superant.com.rwdtinkerbackwindow/helptexthashtinkerwin2.rb
@@ -88,8 +91,8 @@ files:
   - configuration/language.dist
   - configuration/rwdapplicationidentity.dist
   - configuration/rwdtorrent.dist
+  - configuration/rwdtorrenthelpabout.rb
   - extras/rconftool.rb
-  - extras/aversa.rb
   - extras/rubytorrent.rb
   - extras/zip/ioextras.rb
   - extras/zip/stdrubyext.rb
@@ -128,33 +131,24 @@ files:
   - gui/frontwindow0/superant.com.rwdtorrent/30viewtorrent.rwd
   - gui/frontwindow0/superant.com.rwdtorrent/40rwdtorrentrefresh.rwd
   - gui/frontwindow0/superant.com.rwdtorrent/67viewconfiguration.rwd
-  - gui/frontwindowselectionbegin/selectiontabbegin/selectiontabbegin.rwd
+  - gui/frontwindowselectionbegin/selectiontabbegin/00selectiontabbegin.rwd
   - gui/frontwindowselections/superant.com.rwdtinkerwin2selectiontab
   - gui/frontwindowselections/superant.com.rwdtinkerwin2selectiontab/jumplinkcommands.rwd
-  - gui/frontwindowselectionzend/viewselectionzend/viewselectionend.rwd
-  - gui/frontwindowtdocumentbegin/superant.com.documentsbegin
-  - gui/frontwindowtdocumentbegin/superant.com.documentsbegin/tt0documentbegin.rwd
+  - gui/frontwindowselectionzend/viewselectionzend/zzdocumentbegin.rwd
+  - gui/frontwindowselectionzend/viewselectionzend/wwselectionend.rwd
   - gui/frontwindowtdocuments/superant.com.documents
-  - gui/frontwindowtdocuments/superant.com.tinkerwin2documents
-  - gui/frontwindowtdocuments/superant.com.torrentdocument
-  - gui/frontwindowtdocuments/superant.com.documents/uu5documents.rwd
-  - gui/frontwindowtdocuments/superant.com.tinkerwin2documents/uu5documents.rwd
-  - gui/frontwindowtdocuments/superant.com.torrentdocument/doctorrent.rwd
-  - gui/frontwindowtdocumentzend/superant.com.documentsend
-  - gui/frontwindowtdocumentzend/superant.com.documentsend/ww0documentend.rwd
-  - gui/frontwindowz1end/frontwindowend/xx0rwdfirsttab.rwd
+  - gui/frontwindowtdocuments/superant.com.documents/tinkerdocuments.rwd
   - gui/helpaboutbegin/superant.com.helpaboutbegin
-  - gui/helpaboutbegin/superant.com.helpaboutbegin/ya0helpscreenstart.rwd
+  - gui/helpaboutbegin/superant.com.helpaboutbegin/zzdocumentend.rwd
+  - gui/helpaboutbegin/superant.com.helpaboutbegin/zzzrwdlasttab.rwd
+  - gui/helpaboutbegin/superant.com.helpaboutbegin/zzzzhelpscreenstart.rwd
   - gui/helpaboutinstalled/superant.com.tinkerhelpabout
-  - gui/helpaboutinstalled/superant.com.torrenthelpabout
-  - gui/helpaboutinstalled/superant.com.tinkerhelpabout/1appname.rwd
-  - gui/helpaboutinstalled/superant.com.tinkerhelpabout/3copyright.rwd
-  - gui/helpaboutinstalled/superant.com.tinkerhelpabout/5version.rwd
-  - gui/helpaboutinstalled/superant.com.torrenthelpabout/1appname.rwd
-  - gui/helpaboutinstalled/superant.com.torrenthelpabout/3copyright.rwd
-  - gui/helpaboutinstalled/superant.com.torrenthelpabout/5version.rwd
+  - gui/helpaboutinstalled/superant.com.tinkerhelpabout/helpabouttab.rwd
   - gui/helpaboutzend/superant.com.helpaboutend
   - gui/helpaboutzend/superant.com.helpaboutend/helpscreenend.rwd
+  - gui/helpaboutzend/superant.com.helpaboutend/zzzzhelpscreen2end.rwd
+  - gui/helpaboutzend/superant.com.helpaboutend/zzzzhelpabout2.rwd
+  - gui/helpaboutzend/superant.com.helpaboutend/zhelpscreenstart2.rwd
   - gui/tinkerbackwindows/superant.com.tinkerbackwindow
   - gui/tinkerbackwindows/superant.com.tinkerhelpwindow
   - gui/tinkerbackwindows/superant.com.versionwindow
@@ -171,6 +165,7 @@ files:
   - gui/tinkerbackwindows/superant.com.tinkerhelpwindow/1appname.rwd
   - gui/tinkerbackwindows/superant.com.tinkerhelpwindow/9end.rwd
   - gui/tinkerbackwindows/superant.com.versionwindow/1appname.rwd
+  - gui/tinkerbackwindows/superant.com.versionwindow/helpaboutwindow.rwd
   - gui/tinkerbackwindows/superant.com.torrentdisplay/torrentdisplaywindow.rwd
   - gui/zzcoreguiend/tinkerapplicationguiend/yy9rwdend.rwd
   - installed/rwdviewlogo-0.4.inf
@@ -180,8 +175,8 @@ files:
   - rwd_files/rdoc-style.css
   - rwd_files/Readme.txt
   - rwd_files/rwdapplications.html
-  - rwd_files/rwdindex.html
   - rwd_files/tinker.png
+  - rwd_files/RubyWebDialogs.html
   - rwd_files/HowTo_Torrent.txt
   - zips/rwdahelloworld-0.5.zip
   - tests/RubyGauge.rb

data/extras/aversa.rb

@@ -1,261 +0,0 @@
-#!/usr/local/bin/ruby
-
-require 'net/http'
-require 'optparse'
-require 'ostruct'
-require 'uri'
-require 'digest/sha1'
-
-AVERSA_VERSION = 0.3
-
-class Encoder
-	def encode_hash(hash, res="")
-		res << "d"
-		sorted = hash.sort # note that BEncoding implies sorted keys
-		sorted.each {|x|
-			encode_str(x[0], res)
-			if x[1].kind_of?(String)
-				encode_str(x[1], res)
-			elsif x[1].kind_of?(Fixnum) || x[1].kind_of?(Bignum)
-				encode_int(x[1], res)
-			elsif x[1].kind_of?(Array)
-				encode_list(x[1], res)
-			elsif x[1].kind_of?(Hash)
-				encode_hash(x[1], res)
-			end
-		}
-		res << "e"
-	end
-	def encode_list(list, res="")
-		res << "l"
-		list.each {|x|
-			if x.kind_of?(String)
-				encode_str(x, res)
-			elsif x.kind_of?(Number) 
-				encode_int(x, res)
-			elsif x.kind_of?(Array)
-				encode_list(x, res)
-			elsif x.kind_of?(Hash)
-				encode_hash(x, res)
-			else
-				raise "Unknown type to encode #{x.class}"
-			end
-		}
-		res << "e"
-	end
-	def encode_str(str, res="")
-		res << "#{str.size}:#{str}"
-	end
-	def encode_int(int, res="")
-		res << "i#{int}e"
-	end
-end
-
-class AbstractDecoder
-	def make(char)
-		if char =~ /^[1-9]/
-			return StringCodec.new
-		elsif char == "i"
-			return IntegerCodec.new
-		elsif char == "l"
-			return ListCodec.new
-		elsif char == "d"
-			return DictionaryCodec.new
-		end
-		raise "Unknown BCoding type: #{char}"
-	end
-end
-class DictionaryCodec < AbstractDecoder
-	def decode(txt)
-		h = {}
-		txt = txt.slice(1, txt.size-1) # remove leading "d"
-		while txt.length > 0
-			if txt[0].chr == "e"
-				txt = txt.slice(1, txt.size-1)
-				break
-			end
-			txt, key = make(txt[0].chr).decode(txt)
-			txt, value = make(txt[0].chr).decode(txt)
-			h[key] = value
-		end
-		[txt, h]
-	end
-end
-class ListCodec < AbstractDecoder
-	def decode(txt)
-		list = []
-		txt = txt.slice(1, txt.size-1) # remove leading "l"
-		while txt.length > 0
-			if txt[0].chr == "e"
-				txt = txt.slice(1, txt.size-1)
-				break
-			end
-			txt, value = make(txt[0].chr).decode(txt)
-			list << value
-		end
-		[txt, list]
-	end
-end
-class IntegerCodec
-	def decode(txt)
-		end_num = txt =~ /e/
-		value = txt.slice(1, end_num - 1).to_i
-		newtxt = txt.slice(end_num + 1, txt.size)
-		[newtxt, value]	
-	end
-end
-class StringCodec
-	def decode(txt)
-		length = txt.split(":")[0].to_i
-		text_start = txt.index(":") + 1
-		text_end = text_start + length
-		newtxt = txt.slice(text_end, txt.size-text_end)
-		value = txt.slice(text_start, length)
-		[newtxt, value]
-	end
-end
-
-class PrettyPrinter
-	def print(obj, depth=0)
-		if obj.kind_of?(Hash)
-			obj.sort.each {|x|
-				if x[1].kind_of?(Array) && x[0] == "path"
-					show(x[0], x[1].join("/"), depth)
-				elsif x[1].kind_of?(Hash) && x[0] == "resume"
-					show(x[0], "[Resume data]", depth)
-				elsif x[1].kind_of?(Hash) && x[0] == "tracker_cache"
-					show(x[0], "[Tracker data]", depth)
-				elsif x[1].kind_of?(Hash) || x[1].kind_of?(Array)
-					show(x[0], "", depth)
-					print(x[1], depth + 1)
-				else
-					show(x[0], x[1], depth)
-				end
-			}
-		elsif obj.kind_of?(Array)
-			obj.each {|x| print(x, depth + 1) }
-		else
-			show("", obj, depth)
-		end
-	end
-	def show(label, txt, depth)
-		if label == "pieces"
-			txt = "[#{txt.size/20} SHA checksums]"
-		elsif label == "creation date"
-			txt = Time.at(txt).to_s
-		end
-		puts "#{"".ljust(depth)}#{label} #{txt} "
-	end
-end
-
-class PiecesCalc
-	def pieces(piece_size, file_size)
-		return file_size / piece_size if file_size % piece_size == 0
-		(file_size.to_f / piece_size.to_f).to_i + 1
-	end
-end
-
-class MetaInfo
-	DEFAULT_PIECE_LENGTH = 262144
-	attr_reader :hash
-	def makemetafile(file,trackerurl)
-		@hash = {}
-		@hash["announce"] = trackerurl
-		@hash["creation date"] = Time.now.to_i
-		@hash["created by"] = "Aversa (http://aversa.rubyforge.org) v#{AVERSA_VERSION}"
-		@hash["info"] = {}
-		@hash["info"]["name"] = file
-		@hash["info"]["piece length"] = DEFAULT_PIECE_LENGTH
-		gather_date_for_actual_file if File.exists?(file)
-		write
-	end
-	def add(key, value)
-		@hash[key] = value
-	end
-	def write
-		File.open("#{@hash['info']['name']}.torrent", "w") {|f|
-			f.write(Encoder.new.encode_hash(@hash))
-		}
-	end
-	def gather_date_for_actual_file
-		# should do this in chunks, not all at once
-		data = File.read(@hash["info"]["name"])
-		@hash["info"]["length"] = data.size
-		pieces = PiecesCalc.new.pieces(@hash["info"]["piece length"], @hash["info"]["length"])
-		pieces_string = ""
-		pieces.times {|piece|
-			d = Digest::SHA1.new			
-			offset = piece * @hash["info"]["piece length"]
-			if (@hash["info"]["length"] - offset) < @hash["info"]["piece length"]
-				d << data.slice(offset, data.size-offset)
-			else
-				d << data.slice(offset, @hash["info"]["piece length"])
-			end
-			pieces_string << d.digest
-		}
-		@hash["info"]["pieces"] = pieces_string
-	end
-	def decode(file)
-		txt, @hash = DictionaryCodec.new.decode(File.read(file))
-	end
-	def decode_txt(txt)
-		txt, @hash = DictionaryCodec.new.decode(txt)
-	end
-	def decode_url(url)
-		data = Net::HTTP.get(URI.parse(url))
-		txt, @hash = DictionaryCodec.new.decode(data)
-	end
-	def announce
-		@hash["announce"]
-	end
-	def creation_date
-		@hash["creation date"]
-	end
-	def encoding
-		@hash["encoding"]
-	end
-	def name
-		@hash["info"]["name"]
-	end
-	def piece_length
-		@hash["info"]["piece length"]
-	end
-	def pieces
-		@hash["info"]["pieces"]
-	end
-	def key(str)
-		@hash[str]
-	end
-	def print
-		PrettyPrinter.new.print(@hash)
-	end
-end
-
-# http://www.tlm-project.org/kernels/2.6.x/linux-2.6.5.tar.bz2.torrent
-# ../../metainfo_samples/specifix.torrent
-if __FILE__ == $0
-	setup = OpenStruct.new
-	ARGV.options {|opt|
-		opt.banner = "Usage: aversa.rb [options]"
-		opt.on("Options:")
-		opt.on("--decode SOURCE", String, "Specify metainfo file or URL to be parsed") {|src| setup.decode = src }
-		opt.on("--makemetafile file,tracker", Array, "Specify a file and a tracker URL for which to create a metainfo file") {|arr| setup.makemetafile = arr}
-		opt.on("--help", "Display a usage message") { puts opt ; exit(0)}
-		opt.parse!
-	}
-
-	if !setup.decode.nil?
-		m = MetaInfo.new
-		if setup.decode =~ /^http/
-			m.decode_url(setup.decode)
-		else
-			m.decode(setup.decode)
-		end
-		m.print
-	elsif setup.makemetafile
-		m = MetaInfo.new
-		m.makemetafile(setup.makemetafile[0], setup.makemetafile[1])
-		m.write
-		m.print
-	end
-end

data/gui/frontwindowtdocuments/superant.com.documents/uu5documents.rwd

@@ -1,15 +0,0 @@
-$rwdguivar=
-"
-      <row> <p align=\"left\"> 
-      <a href=HowTo_Tinker.txt>Howto_Tinker.txt</a></p></row>
-      <row> <p align=\"left\"> 
-      <a href=Readme.txt>Readme.txt</a></p></row>
-      <row> <p align=\"left\"> 
-      <a href=COPYING>GPL License </a></p></row>
-      <row> <p align=\"left\"> 
-      <a href=rwdapplications.html>more information about rwdapplications </a></p></row>
-      <row> <p align=\"left\"> 
-      <a href=rwdindex.html>Link to online information about RubyWebdialogs </a></p></row>"
-      
-     
-	

data/gui/frontwindowtdocuments/superant.com.tinkerwin2documents/uu5documents.rwd

@@ -1,6 +0,0 @@
-$rwdguivar=
-"
-      <row> <p align=\"left\"> 
-      <a href=HowTo_TinkerWin2.txt>Howto_TinkerWin2.txt</a></p></row>"
-     
-	

data/gui/frontwindowtdocuments/superant.com.torrentdocument/doctorrent.rwd

@@ -1,6 +0,0 @@
-
-$rwdguivar=
-"
-      <row> <p align=\"left\"> 
-      <a href=HowTo_Torrent.txt>Howto_Torrent.txt</a></p></row>"
-      

data/gui/frontwindowtdocumentzend/superant.com.documentsend/ww0documentend.rwd

@@ -1,12 +0,0 @@
-$rwdguivar=
-"     
- <row> <p align=\"left\"><a href=.>Spawn a clone Dialog window</a></p></row>
-    </table>
-        </horizontal>
-         <horizontal>
-       
-      <button caption=\"Help\" action=\"runhelpwindow\"/>
-      
-    </horizontal>
-	</tab>"
-	

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

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

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

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

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

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

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

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

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

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

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

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