ripxplore 0.15.1 → 0.16.1

data/lib/FileSystemImage.rb

@@ -11,7 +11,7 @@ attr_accessor :volume_name
 def FileSystemImage.is_file_system_image_filename?(filename)
   
   extension=File.extname(File.basename(filename,".gz")).downcase
-  RipXploreLog.debug("checking if is file system image filename - #{filename} (extension #{extension})")
+  RipXploreLog.debug("checking if #{filename} is a FileSystemImage (extension #{extension}) - #{ImageFormat.all_possible_extensions.include?(extension)}")
   RipXploreLog.debug(ImageFormat.all_possible_extensions.join(";"))
   ImageFormat.all_possible_extensions.include?(extension)
 end

data/lib/LibRipXplore.rb

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

data/lib/file_systems/C64PrgSnapshot.rb

@@ -0,0 +1,48 @@
+$:.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'
+
+class C64PrgSnapshot < 	FileSystem
+
+def self.host_system
+  C64
+end  
+  
+def self.files(file_system_image)
+  files=FileContainer.new
+  file_name=File. basename(file_system_image.filename,".prg")
+  file_type=:prg
+  files<<NativeFileType.best_fit(file_system_image,file_name,file_system_image.file_bytes,file_type)
+  files
+end
+
+end
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2008 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/image_formats/C64SinglePrgImage.rb

@@ -0,0 +1,45 @@
+$:.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 C64SinglePrgImage< ImageFormat
+
+
+def self.possible_extensions
+    ['.prg']
+end  
+
+def self.host_system
+    C64
+end  
+  
+end
+
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2008 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/apple2/ApplePrintShopFont.rb

@@ -11,138 +11,162 @@ require 'Font'
 require 'NativeFileType'
 require 'AppleBinary'
 require 'Apple2'
+require 'ProDosFile'
 
-class ApplePrintShopFont<AppleBinary
 
 
-TABLE_SIZE=59
-WIDTH_TABLE_START=0x010
-HEIGHT_TABLE_START=WIDTH_TABLE_START+TABLE_SIZE
-BITMAP_POINTER_LO_TABLE=HEIGHT_TABLE_START+TABLE_SIZE
-BITMAP_POINTER_HI_TABLE=BITMAP_POINTER_LO_TABLE+TABLE_SIZE
+module PrintShopFont
 
-include Font
 
- is_valid_file_if  lambda {  
-     (AppleBinary.load_address(contents)==0x5FF4)
-  }  
-  
-  is_valid_file_if lambda {filename=~/^FONT\./}
-  
-def fontname
-	filename.gsub(/^FONT./,'')
-end
-
-def get_charlist
-	if @charlist.nil? then
-		@charlist=[]
-		(32..90).each do |b|
-			c=b.chr
-			char_data={}
-			char_data[:native_encoding]=b
-			char_data[:unicode_encoding]=b
-			char_data[:width]=char_width(c) #width in pixels
-	  		char_data[:bitstreams]=get_bitmap(c)
-			@charlist<<char_data
+	include Font
+	
+	def get_charlist
+		if @charlist.nil? then
+			@charlist=[]
+			(32..90).each do |b|
+				c=b.chr
+				char_data={}
+				char_data[:native_encoding]=b
+				char_data[:unicode_encoding]=b
+				char_data[:width]=char_width(c) #width in pixels
+				char_data[:bitstreams]=get_bitmap(c)
+				@charlist<<char_data
+			end
+	
 		end
-
+		@charlist
+	end
+	def char_width(char)
+		inter_character_gap+unpadded_char_width(char)
 	end
-	@charlist
-end
-def char_width(char)
-	inter_character_gap+unpadded_char_width(char)
-end
-
-def unpadded_char_width(char)
-	b=ascii_to_shape_number(char)
-	return nil if b.nil?
-	return contents[b+WIDTH_TABLE_START]
-end
-
-def inter_character_gap
-	#contents[0x0D]
-	#unpadded_char_width(" ")
-	2
-end
-
-def char_height(char="A")
-	2*inter_character_gap+unpadded_char_height(char)
-end
 
-def line_of_print
- unpadded_char_height("A")
-end
-def unpadded_char_height(char)
-	b=ascii_to_shape_number(char)
-	return nil if b.nil?
-	return contents[b+HEIGHT_TABLE_START]
-end
+	def unpadded_char_width(char)
+		b=ascii_to_shape_number(char)
+		return nil if b.nil?
+		return contents[b+width_table_start]
+	end
+	
+	def inter_character_gap
+		2
+	end
+	
+	def char_height(char="A")
+		2*inter_character_gap+unpadded_char_height(char)
+	end
 
-def	point_size
-	if @point_size.nil? then
-		@point_size=char_height('A')
+	def line_of_print
+	 unpadded_char_height("A")
+	end
+	def unpadded_char_height(char)
+		b=ascii_to_shape_number(char)
+		return nil if b.nil?
+		return contents[b+height_table_start]
+	end
+	
+	def	point_size
+		if @point_size.nil? then
+			@point_size=char_height('A')
+		end
+		@point_size
 	end
-	@point_size
-end
 
-def get_bitmap(char)
-	b=ascii_to_shape_number(char)
-	return nil if b.nil?
-	lo= contents[b+BITMAP_POINTER_LO_TABLE]
-	hi= contents[b+BITMAP_POINTER_HI_TABLE]
-	ptr=(hi<<8)+lo
-	width_in_pixels=unpadded_char_width(char)
-	padded_width_in_pixels=char_width(char)
-	width_in_bytes=(width_in_pixels+7)/8
-	height=unpadded_char_height(char)
-#	puts "#{char}/%02x = %04x - width-%02x/%01x, height=%02x" % [b,ptr,width_in_pixels,width_in_bytes,height]
-	bitmap=[]
-	inter_character_gap.times {bitmap<<Array.new(Array.new(padded_width_in_pixels,0))}
-	offset=inter_character_gap
-	height.times do |i|
-		line=i+offset
-		bitmap[line]=Array.new(padded_width_in_pixels,0)
-		col=0
-		width_in_bytes.times do 
-			font_byte=data_without_header[ptr-load_address+i*width_in_bytes+col/8]
-			8.times do |x_offset|
-			  	bit_mask=1<<(8-(x_offset+1))
-    	  		if ((font_byte & bit_mask)==bit_mask) then
-        			bitmap[line][col]=1
-    			end
-				col+=1
-				break if col>=width_in_pixels
+	def get_bitmap(char)
+		b=ascii_to_shape_number(char)
+		return nil if b.nil?
+		lo= contents[b+bitmap_pointer_lo_table]
+		hi= contents[b+bitmap_pointer_hi_table]
+		ptr=(hi<<8)+lo
+		width_in_pixels=unpadded_char_width(char)
+		padded_width_in_pixels=char_width(char)
+		width_in_bytes=(width_in_pixels+7)/8
+		height=unpadded_char_height(char)
+	#	puts "#{char}/%02x = %04x - width-%02x/%01x, height=%02x" % [b,ptr,width_in_pixels,width_in_bytes,height]
+		bitmap=[]
+		inter_character_gap.times {bitmap<<Array.new(Array.new(padded_width_in_pixels,0))}
+		offset=inter_character_gap
+		height.times do |i|
+			line=i+offset
+			bitmap[line]=Array.new(padded_width_in_pixels,0)
+			col=0
+			width_in_bytes.times do 
+				font_byte=data_without_header[ptr-load_address+i*width_in_bytes+col/8]
+				8.times do |x_offset|
+					bit_mask=1<<(8-(x_offset+1))
+					if ((font_byte & bit_mask)==bit_mask) then
+						bitmap[line][col]=1
+					end
+					col+=1
+					break if col>=width_in_pixels
+				end
 			end
 		end
+		inter_character_gap.times {bitmap<<Array.new(Array.new(padded_width_in_pixels,0))}
+		
+		raise "bitmap length error" unless bitmap.length==char_height(char)
+		bitmap
 	end
-	inter_character_gap.times {bitmap<<Array.new(Array.new(padded_width_in_pixels,0))}
-	
-	raise "bitmap length error" unless bitmap.length==char_height(char)
-	bitmap
-end
 
-def ascii_to_shape_number(char)
-	b=char.upcase[0]
-	case b
-		when 32..90 then return b-32
+	def ascii_to_shape_number(char)
+		b=char.upcase[0]
+		case b
+			when 32..90 then return b-32
+		end
+		nil
 	end
-	nil
-end
-def draw_char(canvas,char,x,y,colour)
-	bitmap=get_bitmap(char)
-	return [x,y] if bitmap.nil?
-	bitmap.length.times do |line|
-		bitmap[line].length.times do |col|
-			if bitmap[line][col]==1 then
-				canvas[x+col, y+line]=colour
+	def draw_char(canvas,char,x,y,colour)
+		bitmap=get_bitmap(char)
+		return [x,y] if bitmap.nil?
+		bitmap.length.times do |line|
+			bitmap[line].length.times do |col|
+				if bitmap[line][col]==1 then
+					canvas[x+col, y+line]=colour
+				end
 			end
 		end
+		[x+char_width(char),y]
+	end
+
+end
+class AppleDosPrintShopFont<AppleBinary
+
+	def width_table_start
+		0x010
+	end
+	def table_size
+		59
+	end
+	
+	
+	def height_table_start
+		width_table_start+table_size
+	end
+	
+	def bitmap_pointer_lo_table
+		height_table_start+table_size
 	end
-	[x+char_width(char),y]
+	
+	def bitmap_pointer_hi_table
+	
+		bitmap_pointer_lo_table+table_size
+	end
+
+
+
+ is_valid_file_if  lambda {  
+     (AppleBinary.load_address(contents)==0x5FF4)
+  }  
+  
+  is_valid_file_if lambda {filename=~/^FONT\./}
+  
+def fontname
+	filename.gsub(/^FONT./,'')
 end
 
+include PrintShopFont
 end
 
+
+
   
 # == Author
 # Jonno Downes (jonno@jamtronix.com)

data/lib/native_file_types/c64/C64BasicPrg.rb

@@ -10,7 +10,8 @@ class C64BasicPrg<C64Prg
 
 def self.file_system_file_types
   {
-    CbmDos=>:prg
+    CbmDos=>:prg,
+    C64PrgSnapshot=>:prg
   }
 end
 
@@ -233,7 +234,7 @@ CBM_BASIC_EXTENDED_TOKENS={
   141=>"<SHIFT RETURN>",
   142=>"<UPPER CASE>",
   144=>"<BLK>",
-  145=>"<DOWN>",
+  145=>"<UP>",
   146=>"<RVS OFF>",
   147=>"<CLR/HOME>",
   148=>"<INST/DEL>",
@@ -303,7 +304,7 @@ CBM_BASIC_EXTENDED_TOKENS={
       end_of_file=(buffer[p]==0 && buffer[p+1]==0) #is the address of the next line $0000?
     end
     rest_of_file=buffer[p+2,0xFFFF]
-    #s+=C64.disassemble(rest_of_file,load_address+p-2) unless rest_of_file.nil?
+    s+=C64.disassemble(rest_of_file,0x801+p-2) unless rest_of_file.nil?
     s
   end
 

data/lib/native_file_types/c64/C64Prg.rb

@@ -10,7 +10,9 @@ class C64Prg<CbmFile
 
 def self.file_system_file_types
   {
-    CbmDos=>:prg
+    CbmDos=>:prg,
+    C64PrgSnapshot=>:prg
+    
   }
 end
 
@@ -24,6 +26,9 @@ def load_address
   contents[0]+contents[1]*256
 end
 
+def to_listing
+	self.to_disassembly
+end 
 def to_disassembly
     
   return C64.disassemble(data_without_header,load_address)     

data/test/tc_apple_2.rb

@@ -8,10 +8,13 @@ class ImageSniffing < Test::Unit::TestCase
   def test_sniff_apple_2_images
 
 
+
+
+
   f=sniff_url("http://mirrors.apple2.org.za/ftp.apple.asimov.net/images/graphics/printshop/printshop.companion.dsk.gz",A2Dsk,AppleDos,
     [
-        {:filename=>"FONT.GATSBY",:save_output=>[:to_picture,"png"],:expected_native_file_type=>ApplePrintShopFont},
-        {:filename=>"FONT.GATSBY",:save_output=>[:to_font,"bdf"],:expected_native_file_type=>ApplePrintShopFont},
+        {:filename=>"FONT.GATSBY",:save_output=>[:to_picture,"png"],:expected_native_file_type=>AppleDosPrintShopFont},
+        {:filename=>"FONT.GATSBY",:save_output=>[:to_font,"bdf"],:expected_native_file_type=>AppleDosPrintShopFont},
 
         ]
     )