FileSystemImage.rb in ripxplore-0.14.0

- old
+ new

@@ -85,11 +85,11 @@
 end
 
 
   def files
     @files=file_system.files(self) if @files.nil?
-    @files
+    @files.flatten
   end
 
 #return an array containing a list of numbers of valid tracks on this image
  def track_list
     image_format.track_list
@@ -140,10 +140,11 @@
 #produce a list of all files contained in this file system images
 def catalog
   s="\n%-32s %-16s %04s   %s\n\n" % ["FILENAME","TYPE","LENGTH","LOAD ADDRESS"]
   self.files.sort.each do |file|      
     raise "bogus file '#{file.filename}'" if file.contents.nil?
-    s<<"%-32s %-16s $%04x    $%04x\n" % [file.filename,file.type_description,file.contents.length,file.load_address]
+    contents_length= (file.contents.respond_to?(:length) ? file.contents.length : 0)
+    s<<"%-32s %-16s $%04x    $%04x\n" % [file.filename,file.type_description,contents_length,file.load_address]
   end
   s
 end
 
 #produce a detailed description of everything we know about this disk and the files on it