ripxplore 0.11.0 → 0.12.0

data/lib/LibRipXplore.rb

@@ -4,7 +4,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'open-uri'
 class RipXplore
 
-VERSION="0.11.0"
+VERSION="0.12.0"
 
 private
 def RipXplore.require_files_in_subdir(dirname)

data/lib/NativeFileType.rb

@@ -65,7 +65,9 @@ class NativeFileType
   end
   
   def to_info_dump
+  	
   	s="class: #{self.class}\n"
+  	s+="filename: #{self.filename}\n"
   	@meta_data.keys.sort.each {|k| s<<"#{k}: #{@meta_data[k]}\n"}
   	s
   end

data/lib/file_systems/CVTArchive.rb

@@ -0,0 +1,110 @@
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+$:.unshift(File.dirname(__FILE__+"\\..")) unless
+	$:.include?(File.dirname(__FILE__+"\\..")) || $:.include?(File.expand_path(File.dirname(__FILE__+"\\..")))
+
+
+require 'FileSystem'
+#
+# CVT files - sequential representation of C64 GEOS files 
+#
+# this is a pseudo file system, a single CVT file will only
+# contain 1 GEOS file
+# References: 
+#	http://ist.uwaterloo.ca/~schepers/formats/CVT.TXT
+
+class CVTArchive<FileSystem
+
+def self.host_system
+  C64
+end  
+
+FILE_TYPES=[:del,:seq,:prg,:usr,:rel,:unk,:unk,:unk]
+GEOS_FILE_TYPES=[:not_geos,:basic,:assembler,:data,:system,:desk_accessory,:application,:application_data,:font,:printer_driver,:input_driver,:disk_driver,:system_boot,:temp,:autoexec]
+
+is_valid_file_system_if lambda {file_system_image.image_format.class==CVT}
+is_valid_file_system_if lambda { 
+  (file_system_image.file_bytes[0x22,9]=="formatted")
+}
+
+def self.files(file_system_image)
+	files=FileContainer.new
+	directory_entry=file_system_image.file_bytes[0x00,0x1D]
+#	require 'DumpUtilities'
+#	puts DumpUtilities.hex_dump(directory_entry)
+	file_type=FILE_TYPES[directory_entry[0x00]%8]
+	geos_file_type=GEOS_FILE_TYPES[directory_entry[0x16]]
+	is_geos_file=(geos_file_type!=:not_geos)
+
+	is_vlir=is_geos_file && (directory_entry[0x15]==0x01)
+
+	file_name=(directory_entry[0x03..0x12]).gsub(/\xa0/," ").strip #GEOS filenames will be ASCII not PETSCII
+	info_block="\000\000"+file_system_image.file_bytes[0xFE,0xFE] #put dummy bytes where the t/s would nromally go
+	file_contents=[info_block]
+	
+	if (is_vlir) then    	
+		record_block="\000\377"+file_system_image.file_bytes[0x1FC,0xFE]
+		ptr=0x2FA
+		127.times do |i|
+			record_no=i+1
+			sectors=record_block[2*record_no]
+			last_sector_length=record_block[1+(2*record_no)]
+	
+			break if sectors==0 && last_sector_length==00			
+			if sectors==0 && last_sector_length==0xFF then
+				file_contents<<(nil)
+			else
+				record_length=254*(sectors-1)+last_sector_length-1
+				record_bytes=file_system_image.file_bytes[ptr,record_length]
+#	puts "#{record_no}/#{sectors}/#{last_sector_length}"
+#	require 'DumpUtilities'
+#	puts DumpUtilities.hex_dump(record_bytes[0,0x40])
+				
+				file_contents<<(record_bytes)
+				ptr+=254*(sectors)
+#				puts "record #{record_no} has length #{"%2x" % record_length} - sectors=$#{"%x" % sectors}, last sector =$#{"%02x" % last_sector_length} : ptr now #{ptr} of #{file_system_image.file_bytes.length} for #{file_name}"
+			end
+		end
+	else
+		file_contents=file_system_image.file_bytes[0x1FC,file_system_image.file_bytes.length-0x1FC]
+	end
+	file=NativeFileType.best_fit(file_system_image,file_name,file_contents,file_type,geos_file_type)
+	file.meta_data["c64_file_type"]=file_type
+	if (is_geos_file) then
+		file.meta_data["geos_file_structure_type"]=("$%02x" % directory_entry[0x15])
+		file.meta_data["geos_file_type"]=geos_file_type
+		file.meta_data["geos_file_modified_date"]="%04d-%02d-%02d %02d:%02d" % [1900+directory_entry[0x17],directory_entry[0x18],directory_entry[0x19],directory_entry[0x1a],directory_entry[0x1b]]
+	end
+	files<<file
+#	puts file.to_info_dump
+  files
+end
+
+
+end
+  
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2008,2009,2010 Jonno Downes (jonno@jamtronix.com)
+#
+#Permission is hereby granted, free of charge, to any person obtaining
+#a copy of this software and associated documentation files (the
+#"Software"), to deal in the Software without restriction, including
+#without limitation the rights to use, copy, modify, merge, publish,
+#distribute, sublicense, and/or sell copies of the Software, and to
+#permit persons to whom the Software is furnished to do so, subject to
+#the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/file_systems/CbmDos.rb

@@ -17,8 +17,8 @@ end
 DIRECTORY_ENTRY_SIZE=0x20
 FILE_TYPES=[:del,:seq,:prg,:usr,:rel,:unk,:unk,:unk]
 GEOS_FILE_TYPES=[:not_geos,:basic,:assembler,:data,:system,:desk_accessory,:application,:application_data,:font,:printer_driver,:input_driver,:disk_driver,:system_boot,:temp,:autoexec]
-#for now, assume that anything on a CBM compatable image format is a CBM DOS
-is_valid_file_system_if lambda {true}
+#for now, assume that anything on a CBM compatable disk image format is a CBM DOS
+is_valid_file_system_if lambda {file_system_image.image_format.respond_to?(:dir_track_no)}
 
 def self.files(file_system_image)
   files=FileContainer.new

data/lib/image_formats/CVT.rb

@@ -0,0 +1,52 @@
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+$:.unshift(File.dirname(__FILE__+"\\..")) unless
+	$:.include?(File.dirname(__FILE__+"\\..")) || $:.include?(File.expand_path(File.dirname(__FILE__+"\\..")))
+
+require 'ImageFormat'
+
+class CVT < ImageFormat
+	
+#
+# CVT files - sequential representation of C64 GEOS files 
+#
+# References: 
+#	http://ist.uwaterloo.ca/~schepers/formats/CVT.TXT
+#	http://ftp.martnet.com/commie/geos/programming/documents/Convert%20format.txt
+
+def self.possible_extensions
+    ['.cvt']
+end  
+
+def self.host_system
+    C64
+end  
+
+
+
+end
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2008,2009 Jonno Downes (jonno@jamtronix.com)
+#
+#Permission is hereby granted, free of charge, to any person obtaining
+#a copy of this software and associated documentation files (the
+#"Software"), to deal in the Software without restriction, including
+#without limitation the rights to use, copy, modify, merge, publish,
+#distribute, sublicense, and/or sell copies of the Software, and to
+#permit persons to whom the Software is furnished to do so, subject to
+#the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/native_file_types/c64/C64GeosFile.rb

@@ -8,6 +8,8 @@ require 'CbmFile'
 
 class C64GeosFile<CbmFile
 
+
+
 is_valid_file_if  lambda {(aux_code!=:not_geos)}
 
 def type_description
@@ -24,11 +26,6 @@ def header_filename
 	info_block[0x4d,16].unpack("A*")[0]
 end
 
-def self.file_system_file_types
-  {
-    CbmDos=>:any
-  }
-end
 def info_block
 	@contents[0]
 end

data/lib/native_file_types/c64/C64GeosFont.rb

@@ -38,7 +38,12 @@ def point_ids
 	@point_ids
 end
 def point_sizes
-	(record_nos-[0])
+	r=[]
+	@contents.length.times do |record_no|
+			next if record_no==0
+			r<<record_no-1 unless @contents[record_no].nil? 
+	end
+	r
 end
 def lengths
 	if @lengths.nil? then
@@ -53,31 +58,31 @@ def lengths
 end
 
 def char_width(point_size,char)
-	font_data=@contents[point_size]
+	font_data=@contents[point_size+1]
 	return nil if font_data.nil?
 	bit_stream_index=font_data[0x04]+0x100*font_data[0x05]
 	char_pointer=2*((char[0]%0x80)-0x20)
 	start_of_char=font_data[char_pointer+bit_stream_index]+0x100*font_data[char_pointer+bit_stream_index+1]
 	start_of_next_char=font_data[char_pointer+bit_stream_index+2]+0x100*font_data[char_pointer+bit_stream_index+3]
 	width=(start_of_next_char-start_of_char)
-	raise "invalid char width #{width} for char $#{"%02x" % char} point size #{point_size} - char pointer=#{char_pointer}" if width>(2*point_size)
+	raise "invalid char width #{width} for char $#{"%02x" % char[0]} point size #{point_size} - char pointer=#{char_pointer}" if width>(2*point_size)
 	width
 end
 
 def bytes_in_bitstream(point_size)
-	font_data=@contents[point_size]
+	font_data=@contents[point_size+1]
 	return nil if font_data.nil?
 	font_data[0x01]+font_data[0x02]*100	
 end
 
 def char_height(point_size)
-	font_data=@contents[point_size]
+	font_data=@contents[point_size+1]
 	return nil if font_data.nil?
 	font_data[0x03]
 end
 
 def bitstreams(point_size,char)
-	font_data=@contents[point_size]
+	font_data=@contents[point_size+1]
 	return nil if font_data.nil?
 	bit_stream_index=font_data[0x04]+0x100*font_data[0x05]
 	bit_stream_base=font_data[0x06]+0x100*font_data[0x07]
@@ -104,28 +109,11 @@ def bitstreams(point_size,char)
 end
 
 
+
 def to_picture
   require 'PatchedPNG'
-  
-  point_size=point_sizes[0]
   canvas = PNG::Canvas.new picture_width,picture_height, BACKGROUND_COLOUR
-  draw_string(canvas,point_size,"#{filename} #{point_size}",0,0,TEXT_COLOUR)
-  x=0
-  y=point_size
-  (32..126).each do |b|
-  	c=b.chr
-  	width=char_width(point_size,c)
-#  	puts "char #{c} - char width=#{width},x=#{x},y=#{y},#{canvas.height}"
-	if (x+width)>=picture_width then
-#		puts "skipping at #{x} - w=#{width}"
-  		x=0
-  		y+=point_size
-  		break if (y+point_size)>=picture_height
-  	end
-  	draw_char(canvas,point_size,c,x,y,TEXT_COLOUR)
-  	x+=width
- 
-  end
+  draw_sampler(canvas)
   png = PNG.new canvas
   result=png.raw_bytes
   result
@@ -150,9 +138,11 @@ end
 	  		x=0
 	  		y+=point_size
 	  	end
+	  	break if (y+point_size)>=picture_height
   		draw_char(canvas,point_size,c,x,y,colour)
   		x+=width
   	end
+  	[x,y]
   end
   
 def meta_data
@@ -163,7 +153,7 @@ def meta_data
 	@meta_data["geos_font_lengths"]=(lengths.collect{|x| '$%04x' % x}).join(",")
 #	point_sizes.each do |point_size|
 #		prefix="geos_font_point_size_#{point_size}"
-#		font_data=@contents[point_size]
+#		font_data=@contents[point_size+1]
 #		next if font_data.nil?
 #		@meta_data["#{prefix}_line_of_print"]=font_data[0x00]
 #		@meta_data["#{prefix}_bytes_in_bitstream"]=bytes_in_bitstream(point_size)
@@ -176,6 +166,40 @@ def meta_data
 	super
 end
 
+private
+def draw_sampler(canvas)
+  raise "no valid point sizes" if point_sizes.length==0  
+  point_size=point_sizes[0]
+
+  
+  first_letter=filename[0].chr
+  #some fonts have only upper case, some have only lower case, some have both
+  best_case_filename= (char_width(point_size,first_letter.upcase) > char_width(point_size,first_letter.downcase) ? filename.upcase : filename.downcase)
+  x=0
+  y=0
+  point_sizes.each do |point_size|
+	  (x,y)=draw_string(canvas,point_size,"#{best_case_filename} #{point_size}",x,y,TEXT_COLOUR)
+	  x=0
+	  y+=point_size
+	  (32..126).each do |b|
+		c=b.chr
+		width=char_width(point_size,c)
+#	  	puts "#{filename} char #{c} - char width=#{width},x=#{x},y=#{y},#{picture_height}"
+		if (x+width)>=picture_width then
+#			puts "skipping at #{x} - w=#{width}"
+			x=0
+			y+=point_size
+		end
+		break if (y+point_size)>=picture_height
+		draw_char(canvas,point_size,c,x,y,TEXT_COLOUR)
+		x+=width
+	end
+  	x=0
+	y+=point_size		
+  end
+  
+end
+
 
 end
 

data/lib/native_file_types/c64/CbmFile.rb

@@ -1,12 +1,16 @@
 require 'NativeFileType'
 class CbmFile<NativeFileType
 
+
 def self.file_system_file_types
   {
-    CbmDos=>:any
+    CVTArchive=>:any,
+    CbmDos=>:any,
+
   }
 end
 
+
 def type_description
   file_type.to_s
 end

data/test/tc_c64.rb

@@ -5,8 +5,35 @@ class ImageSniffing < Test::Unit::TestCase
 
   
   def test_c64_images
+   	f=sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/SUPRA-SEXY.CVT",CVT,CVTArchive,
+      [{:filename=>"Supra Sexy",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']}]
+    )
+
+	sniff_url("http://lyonlabs.org/commodore/onrequest/geos/geosfonts1.d64",D64,CbmDos,
+      [
+      {:filename=>"America",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']},
+      {:filename=>"BONANZA",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']},
+      {:filename=>"Cursive",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']},
+      ]
+    )
 
 
+ 	f=sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/STENCIL.CVT",CVT,CVTArchive,
+      [{:filename=>"STENCIL",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']}]
+    )
+
+    f=sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/ZAPF.FONT.CVT",CVT,CVTArchive,
+      [{:filename=>"ZAPF 10 14",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']}]
+    )    
+    f=sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/PRINCETONFNT.CVT",CVT,CVTArchive,
+      [{:filename=>"PRINCETON24 PD",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']}]
+    )
+    
+    
+ #	f=sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/60DPIMEGAS.SFX",D64,CbmDos,
+ #     [{:filename=>"klingon ship",:expected_native_file_type=>C64GeoPaintPic,:save_output=>[:to_picture,'png']}]
+ #   )
+    
  	f=sniff_url("http://lyonlabs.org/commodore/onrequest/geos/geos-klingon.d64",D64,CbmDos,
       [{:filename=>"klingon ship",:expected_native_file_type=>C64GeoPaintPic,:save_output=>[:to_picture,'png']}]
     )
@@ -36,10 +63,7 @@ class ImageSniffing < Test::Unit::TestCase
   f=get_file_from_url("http://lyonlabs.org/commodore/geoLink/geoLink-1.00.d64","TURBOBOOT")
 #  puts f.to_hex_dump
  
- 	sniff_url("http://lyonlabs.org/commodore/onrequest/geos/geosfonts1.d64",D64,CbmDos,
-      [{:filename=>"America",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']}]
-    )
-
+ 	
     
   f=get_file_from_url("http://lyonlabs.org/commodore/onrequest/geos/geosfonts1.d64","America")