dsktool 0.1.6 → 0.2.1

data/bin/dskexplorer.rb

@@ -8,7 +8,7 @@
 # dskexplorer.rb [switches] 
 #
 #  -h | --help               display this message
-#  -p | --port PORT_NUMBER   port number to listen on (default is 6052)
+#  -p | --port PORT_NUMBER   port number to listen on (default is 6502)
 #  -r | --root ROOT_DIR      root directory to explore from (default is current directory)
 #  -v | --version            show version number
 #
@@ -41,22 +41,22 @@ filename=opts.parse(ARGV)[0] rescue RDoc::usage_from_file(__FILE__,'Usage')
 require 'webrick'
 require 'DSK'
 include WEBrick
-
-@@uri_cache={}
-@@dsk_cache={}
-def get_uri_from_cache(uri)
-	if @@uri_cache[uri].nil? then
-		@@uri_cache[uri]=open(uri).read
-	end
-	@@uri_cache[uri]
-end
-
-def get_dsk_from_cache(uri)
-	if @@dsk_cache[uri].nil? then
-		@@dsk_cache[uri]=DSK.read(uri)
-	end
-	@@dsk_cache[uri]
-end
+
+@@uri_cache={}
+@@dsk_cache={}
+def get_uri_from_cache(uri)
+	if @@uri_cache[uri].nil? then
+		@@uri_cache[uri]=open(uri).read
+	end
+	@@uri_cache[uri]
+end
+
+def get_dsk_from_cache(uri)
+	if @@dsk_cache[uri].nil? then
+		@@dsk_cache[uri]=DSK.read(uri)
+	end
+	@@dsk_cache[uri]
+end
 
 def common_header
 "
@@ -70,53 +70,56 @@ def common_footer
 <p><i>this is alpha software - please send feedback using the <a href=http://rubyforge.org/tracker/?group_id=3844> dsktool.rb forum</a><p>
 "
 end
+
+def root_dir_is_website?
+	require 'hpricot'
+	require 'open-uri'
+	@@root_directory=~/^http[s]?:/?true : false
+end
+def make_absolute_path(relative_path)
+	if root_dir_is_website? then
+		@@root_directory+uri_encode(relative_path)
+	else
+		@@root_directory+relative_path
+	end	
+end
 
-def root_dir_is_website?
-	require 'hpricot'
-	require 'open-uri'
-	@@root_directory=~/^http[s]?:/?true : false
-end
-def make_absolute_path(relative_path)
-	if root_dir_is_website? then
-		@@root_directory+uri_encode(relative_path)
-	else
-		@@root_directory+relative_path
-	end	
-end
-
-def uri_encode(s)
-	#standard URI.escape appears to miss some important characters
-	require 'uri'
-	URI.escape(s).sub("[","%5b").sub("]","%5d")
-end
-def get_directories_and_files(relative_path)
-	directories=[]
-	dsk_files=[]
-	absolute_path=make_absolute_path(relative_path)
-	if root_dir_is_website? then
-		html=get_uri_from_cache(absolute_path)
-		doc=Hpricot(html)
-		doc.search("a[@href]").each do |a|
-			href=URI.unescape(a.attributes["href"])
-			if (href=~/\w\/$/) 
-				if !(href=~/^\//) then 	#directories end with a /, but skip absolute paths
-					directories<<(href)
-				end
-			elsif DSK.is_dsk_file?(href) then
-				dsk_files<<(href)
-			end
-		end
-	else 
-		if File.exist?(absolute_path) && (File.stat(absolute_path).directory?) then
-			dir=Dir.new(absolute_path)
-			dir.each do |f| 
-				directories<<f if (f[0].chr!=".") && (File.stat(absolute_path+"/"+f).directory?)
-				dsk_files<<f if (DSK.is_dsk_file?(f))
-			end
-		end
-	end
-	[directories,dsk_files]
-end
+def html_escape(s)
+	s.gsub("&","&amp;").gsub("<","&lt;")
+end
+def uri_encode(s)
+	#standard URI.escape appears to miss some important characters
+	require 'uri'
+	URI.escape(s).gsub("[","%5b").gsub("]","%5d")
+end
+def get_directories_and_files(relative_path)
+	directories=[]
+	dsk_files=[]
+	absolute_path=make_absolute_path(relative_path)
+	if root_dir_is_website? then
+		html=get_uri_from_cache(absolute_path)
+		doc=Hpricot(html)
+		doc.search("a[@href]").each do |a|
+			href=URI.unescape(a.attributes["href"])
+			if (href=~/\w\/$/) 
+				if !(href=~/^\//) then 	#directories end with a /, but skip absolute paths
+					directories<<(href)
+				end
+			elsif DSK.is_dsk_file?(href) then
+				dsk_files<<(href)
+			end
+		end
+	else 
+		if File.exist?(absolute_path) && (File.stat(absolute_path).directory?) then
+			dir=Dir.new(absolute_path)
+			dir.each do |f| 
+				directories<<f if (f[0].chr!=".") && (File.stat(absolute_path+"/"+f).directory?)
+				dsk_files<<f if (DSK.is_dsk_file?(f))
+			end
+		end
+	end
+	[directories,dsk_files]
+end
 
 def make_navigation_path(relative_path,filename=nil)
 	path_parts=relative_path.split("/")
@@ -125,86 +128,139 @@ def make_navigation_path(relative_path,filename=nil)
 	s="<a href=/dir/>#{@@root_directory}</a>"
 	path_parts.each do |p|
 		if p.length>0 then
-			partial_path+="/#{p}"			
-			if DSK.is_dsk_file?(partial_path) then				
-				s+="/<a href=/catalog#{uri_encode(partial_path)}>#{p}</a>"
-			else
-				s+="/<a href=/dir#{uri_encode(partial_path)}>#{p}</a>"
-			end
+			partial_path+="/#{p}"			
+			if DSK.is_dsk_file?(partial_path) then				
+				s<<"/<a href=/catalog#{uri_encode(partial_path)}>#{p}</a>"
+			else
+				s<<"/<a href=/dir#{uri_encode(partial_path)}>#{p}</a>"
+			end
 		end
-	end
-	
-	if !filename.nil? then
-		s+="/<a href=/showfile/#{uri_encode(relative_path)+'?filename='+uri_encode(filename)}>#{filename}</a>"
-	end
+	end
+	
+	if !filename.nil? then
+		s<<"/<a href=/showfile/#{uri_encode(relative_path)+'?filename='+uri_encode(filename)}>#{filename}</a>"
+	end
 
 	
-	#show the contents of the current directory
-	directories,dsk_files=get_directories_and_files(relative_path)
-
-	#list out the directories
+	#show the contents of the current directory
+	directories,dsk_files=get_directories_and_files(relative_path)
+
+	#list out the directories
 	
-	s+="<ul>"
-	#s+="<li>[dir] <a href=/#{uri_encode('/dir/'+File.dirname(relative_path))}>..</a>\n"
+	s<<"<ul>"
+	#s<<"<li>[dir] <a href=/#{uri_encode('/dir/'+File.dirname(relative_path))}>..</a>\n"
 	directories.sort.each do |d|
-		s+="<li>[dir] <a href=/dir/#{uri_encode(relative_path)}/#{uri_encode(d)}>#{d}</a>\n"
+		s<<"<li>[dir] <a href=/dir/#{uri_encode(relative_path)}/#{uri_encode(d)}>#{d}</a>\n"
 	end
 	
 	#list out the DSK files		
-	dsk_files.sort.each do |f|		 
-		s+="<li>[dsk] <a href=/catalog/#{uri_encode(relative_path)}/#{uri_encode(f)}>#{f}</a> [ <a href=#{uri_encode(@@root_directory+relative_path+'/'+f)}>download</a> ]\n"
+	dsk_files.sort.each do |f|		 
+		s<<"<li>[dsk] <a href=/catalog/#{uri_encode(relative_path)}/#{uri_encode(f)}>#{f}</a> [ <a href=#{uri_encode(@@root_directory+relative_path+'/'+f)}>download</a> ]\n"
 	end
-	s+="</ul>"
+	s<<"</ul>"
 
 	s
-end
-def make_catalog(relative_path)
-	s="<p>"
-	begin
+end
+def make_catalog(relative_path)
+	s="<p>"
+	begin
+		absolute_path=make_absolute_path(relative_path)
+		dsk=get_dsk_from_cache(absolute_path)
+		if (dsk.respond_to?(:files)) then
+			s<<"<table>\n<th>TYPE</th><th>SIZE (BYTES)</th><th>NAME</th></tr>\n"
+			dsk.files.each_value do |f|
+				display_url="/showfile/#{uri_encode(relative_path)+'?filename='+uri_encode(f.filename)}"
+				if f.respond_to?(:file_type) then 
+					s<<"<td>#{f.file_type}</td>"
+				else 
+					s<<"<td></td>"
+				end
+				s<<"<td>#{sprintf('%03d',f.contents.length)}</td>"				
+				s<<"<td>#{f.filename}</td>"
+				s<<"<td><a href=#{display_url}&mode=hex>hex dump</a></td>"
+				if f.respond_to?(:disassembly)
+					s<<"<td><a href=#{display_url}&mode=list>disassembly</a></td>"
+				else 
+					s<<"<td><a href=#{display_url}&mode=text>text</a></td>"
+				end				
+				s<<"</tr>\n"
+			end
+			s<<"</table>"
+		else
+			s<<"<i>not a recognised format</i>"
+		end
+		s<<"<p><a href=/showsector/#{uri_encode(relative_path)}>View Sectors</a>"
+	rescue Exception => exception
+		s<<"<i>ERROR:#{exception}</i>"
+	end
+	s
+end
+def show_sector(relative_path,track,sector)		
+		track="0" if track.nil?
+		sector="0" if sector.nil?
+		track=("0"+track).to_i
+		sector=("0"+sector).to_i
 		absolute_path=make_absolute_path(relative_path)
 		dsk=get_dsk_from_cache(absolute_path)
-		if (dsk.is_dos33?) then
-			s+="<table>\n<th>TYPE</th><th>SECTORS</th><th>NAME</th></tr>\n"
-			dsk.files.each_value do |f|
-				display_url="/showfile/#{uri_encode(relative_path)+'?filename='+uri_encode(f.filename)}"
-				s+="<td>#{f.file_type}</td><td>#{sprintf('%03d',f.sector_count)}</td><td>#{f.filename}</td>"
-				s+="<td><a href=#{display_url}&mode=hex>hex dump</a></td>"
-				if f.file_type=="T" then
-					s+="<td><a href=#{display_url}&mode=text>text</a></td>"
-				else
-					s+="<td><a href=#{display_url}&mode=list>listing</a></td>"
-				end
-				
-				s+="</tr>\n"
+		uri="/showsector/#{uri_encode(relative_path)}"
+		s=""
+		s<<"<table><tr><th colspan=16>TRACK</th></tr>"
+		s<<"<tr>"
+		0.upto(0x22) do |track_no| 
+			if track_no==track then
+				s<<"<td><b>$#{sprintf('%02X',track)}</b></td>"
+			else
+				s<<"<td><a href=#{uri}?track=#{track_no}&sector=0>$#{sprintf('%02X',track_no)}</a></td>"
+			end
+			if track_no==0x0f ||track_no==0x1f then
+				s<<"</tr></tr>"
 			end
-			s+="</table>"
-		else
-			s+="<i>not DOS 3.3 format</i>"
 		end
-	rescue Exception => exception
-		s+="<i>ERROR:#{exception}</i>"
-	end
-	s
-end
-def show_file(relative_path,filename,display_mode)
-	absolute_path=make_absolute_path(relative_path)
-	dsk=get_dsk_from_cache(absolute_path)
-	file=dsk.files[filename]
-	if file.nil? then
-		s="<i>#{filename} not found</i>"
-	else 
-		s="<hl><pre>"
-		if display_mode=="hex" then
-			s+=file.hex_dump
-		elsif display_mode=="list" && file.file_type=='B'
-			then s+=file.disassembly 
-		else 
-			s+= file.to_s
+		s<<"</tr>"
+		s<<"</table>"
+
+	s<<"<table><tr><th colspan=16>SECTOR</th></tr>"
+		s<<"<tr>"
+		0.upto(0x0F) do |sector_no| 
+			if sector_no==sector then
+				s<<"<td><b>$#{sprintf('%02X',sector)}</b></td>"
+			else
+				s<<"<td><a href=#{uri}?track=#{track}&sector=#{sector_no}>$#{sprintf('%02X',sector_no)}</a></td>"
+			end
 		end
-		s+="\n</pre><hl>"
-	end
-	s
-end
+		s<<"</tr>"
+		s<<"</table>"
+
+		
+		s<<"<pre>\n"
+		s<<html_escape(dsk.dump_sector(track,sector))
+		s<<"</pre>\n"
+		s<<"<p>"
+		s<<"<pre>\n"
+		s<<html_escape(dsk.disassemble_sector(track,sector))
+		s<<"</pre>\n"
+		
+end
+
+def show_file(relative_path,filename,display_mode)
+	absolute_path=make_absolute_path(relative_path)
+	dsk=get_dsk_from_cache(absolute_path)
+	file=dsk.files[filename]
+	if file.nil? then
+		s="<i>#{filename} not found</i>"
+	else 
+		s="<hl><pre>"
+		if display_mode=="hex" then
+			s<<html_escape(file.hex_dump)
+		elsif display_mode=="list" && file.respond_to?(:disassembly)
+			then s<<html_escape(file.disassembly)
+		else 
+			s<< (file.to_s)
+		end
+		s<<"\n</pre><hl>"
+	end
+	s
+end
 
 class DirectoryServlet < HTTPServlet::AbstractServlet
 	def do_GET(req,res)
@@ -212,26 +268,35 @@ class DirectoryServlet < HTTPServlet::AbstractServlet
 		res['Content-Type']="text/html"
 		res.body=common_header+make_navigation_path(relative_path)+common_footer
 	end
-end
+end
 
-class CatalogServlet < HTTPServlet::AbstractServlet
-	def do_GET(req,res)
-		relative_path=URI.unescape(req.path).sub(/^\/catalog/,"")
-		res['Content-Type']="text/html"
-		res.body=common_header+make_navigation_path(relative_path)+make_catalog(relative_path)+common_footer
-	end
-end
-
-class ShowFileServlet < HTTPServlet::AbstractServlet
-	def do_GET(req,res)
-		relative_path=URI.unescape(req.path).sub(/^\/showfile/,"")
-		filename=URI.unescape(req.query['filename'])
-		display_mode=req.query['mode']
-		res['Content-Type']="text/html"
-		res.body=common_header+make_navigation_path(relative_path,filename)+show_file(relative_path,filename,display_mode)+common_footer
-	end
-end
+class CatalogServlet < HTTPServlet::AbstractServlet
+	def do_GET(req,res)
+		relative_path=URI.unescape(req.path).sub(/^\/catalog/,"")
+		res['Content-Type']="text/html"
+		res.body=common_header+make_navigation_path(relative_path)+make_catalog(relative_path)+common_footer
+	end
+end
 
+class ShowFileServlet < HTTPServlet::AbstractServlet
+	def do_GET(req,res)
+		relative_path=URI.unescape(req.path).sub(/^\/showfile/,"")
+		filename=URI.unescape(req.query['filename'])
+		display_mode=req.query['mode']
+		res['Content-Type']="text/html"
+		res.body=common_header+make_navigation_path(relative_path,filename)+show_file(relative_path,filename,display_mode)+common_footer
+	end
+end
+
+class ShowSectorServlet < HTTPServlet::AbstractServlet
+	def do_GET(req,res)
+		relative_path=URI.unescape(req.path).sub(/^\/showsector/,"")
+		track=req.query['track']
+		sector=req.query['sector']
+		res['Content-Type']="text/html"
+		res.body=common_header+make_navigation_path(relative_path)+show_sector(relative_path,track,sector)+common_footer
+	end
+end
 
 
 s=HTTPServer.new(
@@ -240,8 +305,9 @@ s=HTTPServer.new(
 trap("INT") {s.shutdown}
 
 s.mount("/dir",DirectoryServlet)
-s.mount("/catalog",CatalogServlet)
-s.mount("/showfile",ShowFileServlet)
+s.mount("/catalog",CatalogServlet)
+s.mount("/showfile",ShowFileServlet)
+s.mount("/showsector",ShowSectorServlet)
 
 #default page - for now, just redirect to the default dir page
 s.mount("/",DirectoryServlet)

data/bin/dsktool.rb

@@ -19,7 +19,7 @@
 #  -x | --explode               extract all files 
 #  -v | --version               show version number
 #
-#	Currently only works with DOS 3.3 format DSK images 
+#	Currently only works with DOS 3.3 and NADOL format DSK images 
 #	Will uncompress gzipped files (with extension .gz)
 #	input files can be URLs
 #
@@ -33,7 +33,7 @@
 #	dsktool.rb -x DOS3MASTR.dsk.gz -o /tmp/DOS3MASTR/
 #	dsktool.rb -c http://jamtronix.com/dsks/apshai.dsk.gz
 
-DSKTOOL_VERSION="0.1.6"
+DSKTOOL_VERSION="0.2.1"
 
 #make sure the relevant folder with our libraries is in the require path
 lib_path=File.expand_path(File.dirname(__FILE__)+"//..//lib")
@@ -54,7 +54,7 @@ opts.on("-v","--version") do
 		puts File.basename($0)+" "+DSKTOOL_VERSION
 	exit
 end
-opts.on("-r","--raw") {extract_mode=:raw}
+opts.on("-r","--") {extract_mode=:raw}
 opts.on("-c","--catalog") {catalog=true}
 opts.on("-x","--explode") {explode=true}
 opts.on("-l","--list FILENAME",String) do |val| 
@@ -79,10 +79,10 @@ output_file= case
 end
 	
 if(catalog) then	
-	if (dsk.is_dos33?) then
+	if (dsk.respond_to?(:dump_catalog)) then
 		dsk.dump_catalog
 	else
-		puts "#{filename} is not in DOS 3.3 format"
+		puts "#{filename} does not have a recognised file system"
 	end
 end
 
@@ -93,7 +93,7 @@ if(explode) then
 	end
 			
 	dsk.files.each_value do |f|
-		if (raw_mode) then
+		if (extract_mode==:raw) then
 			output_filename=output_dir+"/"+f.filename+".raw"
 			File.open(output_filename,"wb") <<f.contents
 		else
@@ -113,7 +113,7 @@ if (!extract_filename.nil?) then
 			when :raw then file.contents
 			when :hex then file.hex_dump
 			when :list then 	
-				if file.instance_of?(BinaryFile)
+				if file.respond_to?(:disassembly)
 					file.disassembly
 				else
 					puts "'#{extract_filename}' is not a binary file"