ripxplore 0.0.1 → 0.0.2

data/lib/native_file_types/ti99/Ti99BasicFile.rb

@@ -0,0 +1,223 @@
+
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+require 'Ti99File'
+#http://nouspikel.group.shef.ac.uk//ti99/basic.htm
+#http://groups.google.com.au/group/comp.sys.ti/browse_frm/thread/d58a8f0ff2fb9210/e33fc780cba5df90
+class Ti99BasicFile<Ti99File
+
+
+is_valid_file_if  lambda {    
+ file_type<0x80 && (file_type%02==01) #FIXED/VARIABLE flag set to 0 -> fixed, PROGRAM/DATA file 1 -> program
+}
+
+#BYTES 0/1 should be a checksum of bytes 2/3 XOR bytes 4/5
+is_valid_file_if  lambda {    
+  (contents[0]==contents[2] ^ contents[4]) && (contents[1]==contents[3] ^ contents[5])
+}
+
+# a file that is all zeros does pass the above XOR test, so let's exclude those
+is_valid_file_if  lambda {    
+  (contents[2]+contents[3]+contents[4]+contents[5]) !=0
+}
+
+TI_BASIC_TOKENS={
+#0x00 => end of line marker
+0x81=>'ELSE',
+0x82=>'::',
+0x83=>'!',
+0x84=>'IF',
+0x85=>'GO',
+0x86=>'GOTO',
+0x87=>'GOSUB',
+0x88=>'RETURN',
+0x89=>'DEF',
+0x8A=>'DIM',
+0x8B=>'END',
+0x8C=>'FOR',
+0x8D=>'LET',
+0x8E=>'BREAK',
+0x8F=>'UNBREAK',
+0x90=>'TRACE',
+0x91=>'UNTRACE',
+0x92=>'INPUT',
+0x93=>'DATA',
+0x94=>'RESTORE',
+0x95=>'RANDOMIZE',
+0x96=>'NEXT',
+0x97=>'READ',
+0x98=>'STOP',
+0x99=>'DELETE',
+0x9A=>'REM',
+0x9B=>'ON',
+0x9C=>'PRINT',
+0x9D=>'CALL',
+0x9E=>'OPTION',
+0x9F=>'OPEN',
+0xA0=>'CLOSE',
+0xA1=>'SUB',
+0xA2=>'DISPLAY',
+0xA3=>'IMAGE',
+0xA4=>'ACCEPT',
+0xA5=>'ERROR',
+0xA6=>'WARNING',
+0xA7=>'SUBEXIT',
+0xA8=>'SUBEND',
+0xA9=>'RUN',
+0xAA=>'LINPUT',
+0xB0=>'THEN',
+0xB1=>'TO',
+0xB2=>'STEP',
+0xB3=>',',
+0xB4=>';',
+0xB5=>':',
+0xB6=>')',
+0xB7=>'(',
+0xB8=>'&',
+0xBA=>'OR',
+0xBB=>'AND',
+0xBC=>'XOR',
+0xBD=>'NOT',
+0xBE=>'=',
+0xBF=>'<',
+0xC0=>'>',
+0xC1=>'+',
+0xC2=>'-',
+0xC3=>'*',
+0xC4=>'/',
+0xC5=>'^',
+#0xC7=> QUOTED STRING (following byte indicates length of string)
+#0xC8=>UNQUOTED STRING (following byte indicates length of string)
+#0xC9=>LINE NUMBER (16 bit word)
+0xCA=>'EOF',
+0xCB=>'ABS',
+0xCC=>'ATN',
+0xCD=>'COS',
+0xCE=>'EXP',
+0xCF=>'INT',
+0xD0=>'LOG',
+0xD1=>'SGN',
+0xD2=>'SIN',
+0xD3=>'SQR',
+0xD4=>'TAN',
+0xD5=>'LEN',
+0xD6=>'CHR$',
+0xD7=>'RND',
+0xD8=>'SEG$',
+0xD9=>'POS',
+0xDA=>'VAL',
+0xDB=>'STR$',
+0xDC=>'ASC',
+0xDD=>'PI',
+0xDE=>'REC',
+0xDF=>'MAX',
+0xE0=>'MIN',
+0xE1=>'RPT$',
+0xE8=>'NUMERIC',
+0xE9=>'DIGIT',
+0xEA=>'UALPHA',
+0xEB=>'SIZE',
+0xEC=>'ALL',
+0xED=>'USING',
+0xEE=>'BEEP',
+0xEF=>'ERASE',
+0xF0=>'AT',
+0xF1=>'BASE',
+0xF3=>'VARIABLE',
+0xF4=>'RELATIVE',
+0xF5=>'INTERNAL',
+0xF6=>'SEQUENTIAL',
+0xF7=>'OUTPUT',
+0xF8=>'UPDATE',
+0xF9=>'APPEND',
+0xFA=>'FIXED',
+0xFB=>'PERMANENT',
+0xFC=>'TAB',
+0xFD=>'#',
+0xFE=>'VALIDATE',
+#0xFF=>'end of file marker',
+}
+def to_listing
+  buffer=contents
+  end_of_line_number_table=(buffer[2]<<8)+buffer[3]
+  start_of_line_number_table=(buffer[4]<<8)+buffer[5]
+  number_of_lines=(1+end_of_line_number_table-start_of_line_number_table)/4
+  relocation_offset=start_of_line_number_table-7  
+#  puts "START %x END %x LINES %x RELOC OFFSET %x" % [start_of_line_number_table,end_of_line_number_table,number_of_lines,relocation_offset]
+  line_number_table=buffer[8,(number_of_lines*4)]
+  detokenised_lines={}
+  number_of_lines.times do |i|
+    line_number_data=line_number_table[i*4,4]
+    line_number=(line_number_data[0]<<8)+line_number_data[1]
+    location_of_line_in_memory=(line_number_data[2]<<8)+line_number_data[3]
+    location_of_line_in_buffer=location_of_line_in_memory-relocation_offset
+#   puts "#{line_number} MEM %x FILE %x " % [location_of_line_in_memory,location_of_line_in_buffer]
+    line_length=buffer[location_of_line_in_buffer]
+    detokenised_line="#{line_number} "
+    p=location_of_line_in_buffer+1
+    last_byte_was_token=false
+    while (p<location_of_line_in_buffer+line_length) && (!buffer[p].nil?) && (buffer[p]!=0) do
+      token=buffer[p]
+      token_text=TI_BASIC_TOKENS[token]
+      if (token_text.nil?) then
+        detokenised_line<<" " if ((detokenised_line=~/\w$/) && (last_byte_was_token))
+        if token==0xC7 then #quoted string
+          detokenised_line<<"\"#{buffer[p+2,buffer[p+1]]}\""
+          p+=buffer[p+1]+1
+        elsif token==0xC8 then #unquoted string
+          detokenised_line<<"#{buffer[p+2,buffer[p+1]]}"
+          p+=buffer[p+1]+1
+        elsif token==0xC9 then #line number
+          detokenised_line<<"#{(buffer[p+1]<<8)+buffer[p+2]}"
+          p+=2
+        else          
+          detokenised_line<<token.chr  
+        end
+        last_byte_was_token=false
+      else
+        last_byte_was_token=true
+        detokenised_line<<" " if detokenised_line=~/(\w|:|")$/ && token_text=~/^(\w|:|")/
+        detokenised_line<<token_text
+      end
+      p+=1
+    end
+    detokenised_lines[line_number]=detokenised_line
+    
+  end
+  result=""
+  detokenised_lines.keys.sort.each do |line_number|
+    result << "#{detokenised_lines[line_number]}\n"
+  end
+#  puts result
+  
+  result
+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/ti99/Ti99File.rb

@@ -0,0 +1,40 @@
+require 'NativeFileType'
+class Ti99File<NativeFileType
+
+def self.file_system_file_types
+  {
+    Ti99Fms=>:any
+  }
+end
+
+def type_description
+   "#{self.class}:%02x"  % file_type 
+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/ti99/Ti99TextFile.rb

@@ -0,0 +1,62 @@
+
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+require 'Ti99File'
+class Ti99TextFile<Ti99File
+
+
+is_valid_file_if  lambda {    
+ file_type>=0x80  #FIXED/VARIABLE flag set to 1 -> variable
+ 
+}
+
+def to_text
+  s=""
+  i=0
+  while i<contents.length do
+    record_length=contents[i]
+    i+=1
+    if record_length==0xff then
+      while ((i<contents.length) && (i%256!=0)) do
+        i+=1 
+      end
+    else
+      s+=contents[i,record_length]
+      s+="\n"
+      i+=record_length
+    end    
+  end
+  s
+end
+
+def text_for_screendump
+  to_text.gsub("\n",0x0D.chr)
+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/ti99/TiArtistColours.rb

@@ -0,0 +1,40 @@
+
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+require 'Ti99File'
+
+class TiArtistColours<Ti99File
+
+is_valid_file_if  lambda {    
+ file_type%4==0x01  && filename=~/_C$/ && contents.length==0x1800
+}
+
+
+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/ti99/TiArtistPattern.rb

@@ -0,0 +1,109 @@
+
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+require 'Ti99File'
+require 'PatchedPNG'
+class TiArtistPattern<Ti99File
+
+is_valid_file_if  lambda {    
+ file_type%4==0x01  && filename=~/_P$/ && contents.length==0x1800
+}
+
+
+#pallete taken from
+#http://www.msx.org/forumtopic7147.html
+#http://ragozini.googlepages.com/dithering
+
+TMS9918_PALLETE=[
+  PNG::Color.new(0,0,0,0xFF),	#color=$00 Transparent
+  PNG::Color.new(0,0,0,0xFF),	#color=$01 black
+  PNG::Color.new(38,229,0,0xFF),	#color=$02 medium green
+  PNG::Color.new(100,240,49,0xFF),	#color=$03 light green
+  PNG::Color.new(93,57,255,0xFF),	#color=$04 dark blue
+  PNG::Color.new(132,94,255,0xFF),	#color=$05 light blue
+  PNG::Color.new(214,104,20,0xFF),	#color=$06 dark red
+  PNG::Color.new(64,228,255,0xFF),	#color=$07 cyan
+  PNG::Color.new(253,111,15,0xFF),	#color=$08 medium red
+  PNG::Color.new(255,245,49,0xFF),	#color=$09 light red
+  PNG::Color.new(216,230,0,0xFF),	#color=$0A dark yellow
+  PNG::Color.new(232,233,14,0xFF),	#color=$0B light yellow
+  PNG::Color.new(40,202,0,0xFF),	#color=$0C dark green
+  PNG::Color.new(205,86,255,0xFF),	#color=$0D magenta
+  PNG::Color.new(208,208,208,0xFF),	#color=$0E grey
+  PNG::Color.new(255,255,255,0xFF),	#color=$0F white
+]  
+  
+#formula taken from http://www.digitalstratum.com/programming/yinyang_ti_asm
+def to_picture
+  canvas = PNG::Canvas.new picture_width, picture_height, TMS9918_PALLETE[0]
+  colour_attributes_filename=filename.sub(/_P$/,'_C')
+  colour_attributes_file=file_system_image.files[colour_attributes_filename]
+  if colour_attributes_file.nil? || colour_attributes_file.contents.length<6144 then    
+    #colour_attributes=(0x4E.chr)*6144
+    colour_attributes=(0x0F.chr)*6144
+  else
+    colour_attributes=colour_attributes_file.contents
+  end
+
+  picture_width.times do |x|
+    picture_height.times do |y|  
+      byte_offset=y<<5
+      byte_offset|=y
+      byte_offset&=0xFF07
+      bit_offset=x % 0x08
+      byte_offset+=x
+      byte_offset-=bit_offset      
+      bitmask=1<<(7-bit_offset)
+      bitmap_byte=contents[byte_offset]
+      colour_byte=colour_attributes[byte_offset]
+      foreground_colour=TMS9918_PALLETE[colour_byte>>4]
+      background_colour=TMS9918_PALLETE[colour_byte%16]
+      if ((bitmap_byte & bitmask)==bitmask) then
+        canvas[x, y]= foreground_colour
+      else
+        canvas[x, y]= background_colour
+      end
+    end
+  end
+  png = PNG.new canvas
+  result=png.raw_bytes
+  result
+end
+
+def picture_width
+  256
+end
+def picture_height
+  192
+end
+def picture_format
+  :png
+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/ti99/TiRLE.rb

@@ -0,0 +1,91 @@
+
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+require 'Ti99File'
+require 'PatchedPNG'
+class TiRLE<Ti99File
+
+is_valid_file_if  lambda {    
+ (contents[0]==0x1B &&  contents[1]==0x47) && ( contents[2]==0x48 ||  contents[2]==0x4D)
+}
+
+  
+
+
+def picture_width 
+        case contents[2] 
+                when 0x48 then return 256 #H=High Resolution 
+                when 0x4D then return 128 #M=Medium Resolution 
+        end 
+        raise "invalid RLE graphic mode #{buffer[2].chr}" 
+end 
+def picture_height 
+        case contents[2] 
+                when 0x48 then return 192 #H=High Resolution 
+                when 0x4D then return 96  #M=Medium Resolution 
+        end 
+        raise "invalid RLE graphic mode #{buffer[2].chr}" 
+end 
+
+
+RLE_COLOURS=[PNG::Color::Black,PNG::Color::White] 
+def to_picture 
+        buffer=contents
+        cols=picture_width 
+        rows=picture_height 
+        canvas = PNG::Canvas.new cols, rows, PNG::Color::Black  
+        p=3     
+        colour_index=0 
+        done=false 
+        bit_index=0 
+        while !(buffer[p]).nil? 
+                if buffer[p]>=0x20 then #skip over any control characters 
+                        run_length=(buffer[p]-0x20) 
+                        run_length.times do 
+                                x=bit_index % cols 
+                                y=bit_index / cols 
+                                break if y>=rows 
+                                canvas[x, y]= RLE_COLOURS[colour_index] 
+                                bit_index+=1            
+                        end 
+                        colour_index=((colour_index+1)%2) 
+                end 
+                p+=1 
+        end 
+        
+        png = PNG.new canvas 
+        result=png.raw_bytes 
+        result 
+      end 
+
+def picture_format
+  :png
+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/trs80/Trs80BasicListing.rb

@@ -0,0 +1,51 @@
+require 'NativeFileType'
+
+
+class Trs80BasicListing<NativeFileType
+
+def self.file_system_file_types
+  {
+    TrsDos=>"BAS"
+  }
+end
+
+#file should start with a line number
+is_valid_file_if  lambda {!(contents[0,5]=~/^\s*\d/).nil?}
+
+#make sure if we match, we override CMD
+def matching_score
+  Trs80Cmd.matching_score+1
+end
+
+def to_text
+  contents
+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/trs80/Trs80Cmd.rb

@@ -22,7 +22,9 @@ require 'NativeFileType'
 
 class Trs80Cmd<NativeFileType
 
-is_valid_file_if  lambda {contents[0].between?(1,0x15)}
+is_valid_file_if  lambda {(contents[0].between?(1,0x15))}
+
+is_valid_file_if  lambda {!(filename=~/\/(BAS|)$/) }
 @records=nil
 
 def records

data/lib/native_file_types/trs80/Trs80LevelIIBasic.rb

@@ -9,11 +9,23 @@ def self.file_system_file_types
   }
 end
 
-#BASIC files should start with 0xFF
+#BASIC files should start with 0xFF 
 is_valid_file_if  lambda {contents[0]==0xFF}
 
-#filename should either have no extension, or end /BAS
-is_valid_file_if  lambda {filename=~/\/(BAS|)$/}
+#eliminate some false positives
+is_valid_file_if  lambda {
+  !(filename=~/\/SYS$/)
+}
+#filename should either have no extension, or end /BAS, or if it has any other extension, check the file ends with 00 00
+is_valid_file_if  lambda {
+  (filename=~/\/(BAS|)$/) || (contents[-2,2]=="\000\000")
+}
+
+#make sure if we match, we override CMD
+def matching_score
+  Trs80Cmd.matching_score+1
+end
+
 
   SINGLE_BYTE_TOKENS={
 0x80=>'END',