ripxplore 0.16.1 → 0.17.0

data/lib/native_file_types/acornbbc/AcornBASIC.rb

@@ -0,0 +1,265 @@
+require 'NativeFileType'
+
+#references:
+#http://www.cix.co.uk/~rrussell/bbcwin/manual/bbcwinb.html
+#http://xania.org/200711/bbc-basic-line-number-format
+#http://xania.org/200711/bbc-basic-v-format
+#http://www.ncus.org.uk/fmay98.htm
+
+class AcornBASIC<NativeFileType
+  
+def self.file_system_file_types
+  {
+    AcornDFS=>:any
+  }
+end
+
+
+
+#load address should be a page boundary
+is_valid_file_if  lambda {
+	aux_code & 0xFF == 0x00
+	}
+
+#file should start with a CR
+is_valid_file_if  lambda {
+	contents[0]==0x0D
+	}
+
+BBC_TELETEXT_TOKENS={
+0x81=>"ALPHA RED",
+0x82=>"ALPHA GREEN",
+0x83=>"ALPHA YELLOW",
+0x84=>"ALPHA BLUE",
+0x85=>"ALPHA MAGENTA",
+0x86=>"ALPHA CYAN",
+0x87=>"ALPHA WHITE",
+0x88=>"FLASH",
+0x89=>"STEADY",
+0x8C=>"NORMAL HEIGHT",
+0x8D=>"DOUBLE HEIGHT",
+0x91=>"GRAPHIC RED",
+0x92=>"GRAPHIC GREEN",
+0x93=>"GRAPHIC YELLOW",
+0x94=>"GRAPHIC BLUE",
+0x95=>"GRAPHIC MAGENTA",
+0x96=>"GRAPHIC CYAN",
+0x97=>"GRAPHIC WHITE",
+0x98=>"CONCEAL DISPLAY",
+0x99=>"CONTIGUOUS GRAPHICS",
+0x9A=>"SEPERATED GRAPHICS",
+0x9C=>"BLACK BACKGROUND",
+0x9D=>"NEW BACKGROUND",
+0x9E=>"HOLD GRAPHICS",
+0x9F=>"RELEASE GRAPHICS",
+
+}
+BBC_BASIC_TOKENS={
+0x80=>"AND",
+0x81=>"DIV",
+0x82=>"EOR",
+0x83=>"MOD",
+0x84=>"OR",
+0x85=>"ERROR",
+0x86=>"LINE",
+0x87=>"OFF",
+0x88=>"STEP",
+0x89=>"SPC",
+0x8A=>"TAB(",
+0x8B=>"ELSE",
+0x8C=>"THEN",
+0x8E=>"OPENIN",
+0x8F=>"PTR",
+0x90=>"PAGE",
+0x91=>"TIME",
+0x92=>"LOMEM",
+0x93=>"HIMEM",
+0x94=>"ABS",
+0x95=>"ACS",
+0x96=>"ADVAL",
+0x97=>"ASC",
+0x98=>"ASN",
+0x99=>"ATN",
+0x9A=>"BGET",
+0x9B=>"COS",
+0x9C=>"COUNT",
+0x9D=>"DEG",
+0x9E=>"ERL",
+0x9F=>"ERR",
+0xA0=>"EVAL",
+0xA1=>"EXP",
+0xA2=>"EXT",
+0xA3=>"FALSE",
+0xA4=>"FN",
+0xA5=>"GET",
+0xA6=>"INKEY",
+0xA7=>"INSTR(",
+0xA8=>"INT",
+0xA9=>"LEN",
+0xAA=>"LN",
+0xAB=>"LOG",
+0xAC=>"NOT",
+0xAD=>"OPENUP",
+0xAE=>"OPENOUT",
+0xAF=>"PI",
+0xB0=>"POINT(",
+0xB1=>"POS",
+0xB2=>"RAD",
+0xB3=>"RND",
+0xB4=>"SGN",
+0xB5=>"SIN",
+0xB6=>"SQR",
+0xB7=>"TAN",
+0xB8=>"TO",
+0xB9=>"TRUE",
+0xBA=>"USR",
+0xBB=>"VAL",
+0xBC=>"VPOS",
+0xBD=>"CHR$",
+0xBE=>"GET$",
+0xBF=>"INKEY$",
+0xC0=>"LEFT$(",
+0xC1=>"MID$(",
+0xC2=>"RIGHT$(",
+0xC3=>"STR$",
+0xC4=>"STRING$(",
+0xC5=>"EOF",
+0xC6=>"SUM",
+0xC7=>"WHILE",
+0xC8=>"CASE",
+0xC9=>"WHEN",
+0xCA=>"OF",
+0xCB=>"ENDCASE",
+0xCC=>"OTHERWISE",
+0xCD=>"ENDIF",
+0xCE=>"ENDWHILE",
+0xCF=>"PTR ",
+0xD0=>"PAGE",
+0xD1=>"TIME",
+0xD2=>"LOMEM",
+0xD3=>"HIMEM",
+0xD4=>"SOUND",
+0xD5=>"BPUT",
+0xD6=>"CALL",
+0xD7=>"CHAIN",
+0xD8=>"CLEAR",
+0xD9=>"CLOSE",
+0xDA=>"CLG",
+0xDB=>"CLS",
+0xDC=>"DATA",
+0xDD=>"DEF",
+0xDE=>"DIM",
+0xDF=>"DRAW",
+0xE0=>"END",
+0xE1=>"ENDPROC",
+0xE2=>"ENVELOPE",
+0xE3=>"FOR",
+0xE4=>"GOSUB",
+0xE5=>"GOTO",
+0xE6=>"GCOL",
+0xE7=>"IF",
+0xE8=>"INPUT",
+0xE9=>"LET",
+0xEA=>"LOCAL",
+0xEB=>"MODE",
+0xEC=>"MOVE",
+0xED=>"NEXT",
+0xEE=>"ON",
+0xEF=>"VDU",
+0xF0=>"PLOT",
+0xF1=>"PRINT",
+0xF2=>"PROC",
+0xF3=>"READ",
+0xF4=>"REM",
+0xF5=>"REPEAT",
+0xF6=>"REPORT",
+0xF7=>"RESTORE",
+0xF8=>"RETURN",
+0xF9=>"RUN",
+0xFA=>"STOP",
+0xFB=>"COLOUR5",
+0xFC=>"TRACE",
+0xFD=>"UNTIL",
+0xFE=>"WIDTH",
+0xFF=>"OSCLI"
+}
+	
+def to_listing
+	i=0
+	s=""
+	begin
+		raise "0x0D expected, 0x#{"%X" % contents[i]} found at offset #{i} in #{filename}" unless contents[i]==0x0D
+		break if contents[i+1]==0xFF	#end of BASIC 
+		line_number=contents[i+2]+contents[i+1]*0x100
+		line_length=contents[i+3]
+		line_tokens=contents[i+4,line_length-4]
+		tokens_length=line_tokens.length
+		j=0
+		detokenised_line=""
+		inquote=false
+		begin
+			token=line_tokens[j]
+			inquote=!inquote if token==0x22
+			if inquote then
+				if token>=0x80 then
+					detokenised_line+= BBC_TELETEXT_TOKENS[token].nil? ? ("{&%02X}" % token)  : ("{&%02X:#{BBC_TELETEXT_TOKENS[token]}}" % token) 
+				else
+					detokenised_line+= token.chr 
+				end
+			else
+				if token==0x8d then
+					high_bits=line_tokens[j+1] ^ 0x54
+					lo=line_tokens[j+2]-0x40 + ((high_bits & 0b00110000)<<2)
+					hi=line_tokens[j+3]-0x40 + ((high_bits & 0b00001100)<<4)
+					destination_line_number=lo+(hi<<8)
+#					puts "%08b %08b %08b %08b %08b #{line_number} #{destination_line_number}" % [ line_tokens[j+1],high_bits,line_tokens[j+2],line_tokens[j+3],destination_line_number]
+					detokenised_line+= "#{destination_line_number}"
+					j+=3
+
+				else
+					detokenised_line+= BBC_BASIC_TOKENS[token].nil? ? token.chr : BBC_BASIC_TOKENS[token]
+				end
+			end
+			
+			j+=1
+		end until j>=tokens_length
+		s+="#{line_number} #{detokenised_line}\n"
+		i+=line_length
+		
+	end	until i>=contents.length
+#	puts s
+	s
+end
+
+def load_address
+    aux_code
+end
+
+
+end
+
+  
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2011 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/acornbbc/AcornBinary.rb

@@ -0,0 +1,51 @@
+require 'NativeFileType'
+class AcornBinary<NativeFileType
+  
+def self.file_system_file_types
+  {
+    AcornDFS=>:any
+  }
+end
+
+def load_address
+    aux_code
+end
+
+def to_listing
+	self.to_disassembly
+end 
+
+def to_disassembly
+    
+  return AcornBBC.disassemble(contents,load_address)     
+
+end
+
+
+end
+
+  
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2011 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/acornbbc/AcornText.rb

@@ -0,0 +1,48 @@
+require 'NativeFileType'
+class AcornText<NativeFileType
+  
+def self.file_system_file_types
+  {
+    AcornDFS=>:any
+  }
+end
+
+is_valid_file_if  lambda {
+	aux_code & 0xFFFF == 0xFFFF
+	}
+def to_text
+	contents
+end
+
+def load_address
+    aux_code
+end
+
+
+end
+
+  
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2011 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/atari800/AtariMicroPainterPic.rb

@@ -1,18 +1,23 @@
-#8 bit Atari bitmap font
+#Atari Micro-Painter format
+# http://www.cyberroach.com/analog/an12/Micropainter.htm
+
 
 generic_path=File.dirname(__FILE__)+'/../generic/'
 $:.unshift(generic_path) unless
 	$:.include?(generic_path) || $:.include?(File.expand_path(generic_path))
 
+require 'PatchedPNG'
+
 require 'NativeFileType'
 
 class AtariMicroPainterPic<NativeFileType
 
+
 def picture_width
-	320*2 #geoPain pics are 2 screens wide
+	160
 end
 def picture_height
-	record_nos.max*8*2
+	192
 end
 def picture_format
   :png
@@ -24,6 +29,30 @@ def self.file_system_file_types
   }
 end
 
+def to_picture
+  canvas = PNG::Canvas.new picture_width, picture_height, PNG::Color::Black
+  colours=[Atari800.palette[contents[0x1E00]],Atari800.palette[contents[0x1E01]],Atari800.palette[contents[0x1E02]],Atari800.palette[contents[0x1E03]]]
+  picture_height.times do |row|
+  	picture_width.times do |col|
+  		byte_ptr=row*40+col/4
+  		byte=contents[byte_ptr]
+  		colour_number=case (col % 4 ) 
+  			when  3 then byte % 4
+  			when  2 then (byte>>2) % 4
+  			when  1 then (byte>>4) % 4
+  			when  0 then (byte>>6) % 4
+  		end
+  		
+  		colour=colours[colour_number]
+  		
+  		canvas[col, row]= colour
+  	end
+  end
+  png = PNG.new canvas
+  result=png.raw_bytes
+  result
+
+end
 
 
 is_valid_file_if  lambda {contents.length==0x1E04}

data/test/tc_atari_800.rb

@@ -8,9 +8,12 @@ class ImageSniffing < Test::Unit::TestCase
   def test_atari_800_images
 
   
-  sniff_url("http://ftp.pigwa.net/stuff/collections/atari_forever/Tools%20-%20atr/Micro%20Painter/Micropainter.ATR",Atr,AtariDos,[
+ f= sniff_url("http://ftp.pigwa.net/stuff/collections/atari_forever/Tools%20-%20atr/Micro%20Painter/Micropainter.ATR",Atr,AtariDos,[
           {:filename=>"GUITAR.",:expected_native_file_type=>AtariMicroPainterPic,:save_output=>[:to_picture,"png"]},
 	])
+		file_cache.purge_native_file_from_cache(f)
+		file_cache.force_native_file_to_cache(f,:to_picture,'png')
+
 	
   f=sniff_url("http://ftp.pigwa.net/stuff/collections/atari_forever/Tools%20-%20atr/HACKING/DiskTool4.ATR",Atr,AtariDos,[
         {:filename=>"LETTER.FNT",:expected_native_file_type=>AtariBitmapFont,:save_output=>[:to_font,'bdf']},

data/test/tc_bbc.rb

@@ -0,0 +1,39 @@
+require 'testhelper'
+
+class ImageSniffing < Test::Unit::TestCase
+
+  
+  def test_bbc_images
+  
+
+
+
+    f=sniff_url("http://www.jamtronix.com/dsks/bbc/AUPIC2_A.SSD",AcornDsk,AcornDFS,
+    [    
+ 	   {:filename=>"$.!BOOT",:can_execute=>:to_text},
+ 	   {:filename=>"$.SHOW1",:can_execute=>:to_listing},
+    ]
+    )
+
+  
+
+    f=sniff_url("http://www.jamtronix.com/dsks/bbc/SPEL1.SSD",AcornDsk,AcornDFS,
+    [    
+    	{:filename=>"$.FORT2",:can_execute=>:to_listing},
+    	{:filename=>"$.Meteor2",:can_execute=>:to_disassembly},
+
+    ]
+    )
+    
+# 	puts f.to_listing
+    
+    sniff_url("http://www.jamtronix.com/dsks/bbc/AUPIC2_A.BBC",AcornDsk,AcornDFS,
+    [    
+ 	   {:filename=>"$.SHOW1",:can_execute=>:to_listing},
+ 	   
+    ]
+    )
+   
+end
+end
+

data/test/tc_c64.rb

@@ -7,6 +7,13 @@ class ImageSniffing < Test::Unit::TestCase
   def test_c64_images
 
 
+		sniff_url("http://www.jamtronix.com/dsks/blazin-forth-screens.d64",D64,C64BlazinForthBlocks,
+	      [
+#	      {:filename=>"TinkerCon2010",:expected_native_file_type=>C64BasicPrg}
+	      ]
+    	)	
+
+
 		sniff_url("http://noname.c64.org/csdb/getinternalfile.php/90341/TinkerCon2010.prg",C64SinglePrgImage,C64PrgSnapshot,
 	      [{:filename=>"TinkerCon2010",:expected_native_file_type=>C64BasicPrg}]
     	)