Issue 37

.gitignore

@@ -1 +1,12 @@
 target/
+
+# eclipse
+.classpath
+.project
+.settings
+
+# intellij
+.idea
+*.iml
+
+

src/main/java/net/iryndin/jdbf/reader/DbfReader.java

@@ -31,7 +31,7 @@ public DbfReader(InputStream dbfInputStream) throws IOException {
         readMetadata();
     }
 
-    public DbfReader(InputStream dbfInputStream, InputStream memoInputStream) throws IOException {
+    public DbfReader(InputStream dbfInputStream, FileInputStream memoInputStream) throws IOException {
         this.dbfInputStream = new BufferedInputStream(dbfInputStream, BUFFER_SIZE);
         this.memoReader = new MemoReader(memoInputStream);
         readMetadata();

src/main/java/net/iryndin/jdbf/reader/MemoReader.java

@@ -7,67 +7,70 @@
 import net.iryndin.jdbf.util.JdbfUtils;
 
 import java.io.*;
+import java.nio.BufferUnderflowException;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
 
 /**
  * Reader of memo files (tested of *.FPT files - Visual FoxPro)
- * See links: 
- * 
+ * See links:
+ *
  * Visual FoxPro file formats:
  * http://msdn.microsoft.com/en-us/library/aa977077(v=vs.71).aspx
- * 
+ *
  * DBase file formats:
  * http://www.dbase.com/Knowledgebase/INT/db7_file_fmt.htm
- * 
+ *
  */
 public class MemoReader implements Closeable {
-
-    private static final int BUFFER_SIZE = 8192;
-    private InputStream memoInputStream;
     private MemoFileHeader memoHeader;
+    private MappedByteBuffer memoByteBuffer;
 
     public MemoReader(File memoFile) throws IOException {
         this(new FileInputStream(memoFile));
     }
 
-    public MemoReader(InputStream inputStream) throws IOException {
-        this.memoInputStream = new BufferedInputStream(inputStream, BUFFER_SIZE);
+    public MemoReader(FileInputStream inputStream) throws IOException {
+        FileChannel channel = inputStream.getChannel();
+        this.memoByteBuffer = channel.map(MapMode.READ_ONLY, 0, channel.size());
         readMetadata();
     }
 
     private void readMetadata() throws IOException {
         byte[] headerBytes = new byte[JdbfUtils.MEMO_HEADER_LENGTH];
-        memoInputStream.mark(8192);
-
-        if (IOUtils.readFully(memoInputStream, headerBytes) != JdbfUtils.MEMO_HEADER_LENGTH)
-            throw new IOException("The file is corrupted or is not a dbf file");
+        try {
+            this.memoByteBuffer.get(headerBytes);
+        } catch (BufferUnderflowException e) {
+            throw new IOException("The file is corrupted or is not a dbf file", e);
+        }
 
         this.memoHeader = MemoFileHeader.create(headerBytes);
     }
 
     @Override
     public void close() throws IOException {
-        if (memoInputStream != null) {
-            memoInputStream.close();
-        }
+        this.memoByteBuffer = null;
     }
 
     public MemoFileHeader getMemoHeader() {
         return memoHeader;
     }
 
     public MemoRecord read(int offsetInBlocks) throws IOException {
-        memoInputStream.reset();
-        memoInputStream.skip(memoHeader.getBlockSize()*offsetInBlocks);
-        byte[] recordHeader = new byte[JdbfUtils.RECORD_HEADER_LENGTH];
-        if (IOUtils.readFully(memoInputStream, recordHeader) != JdbfUtils.RECORD_HEADER_LENGTH)
-            throw new IOException("The file is corrupted or is not a dbf file");
-
-        int memoRecordLength = BitUtils.makeInt(recordHeader[7], recordHeader[6], recordHeader[5], recordHeader[4]);
-        byte[] recordBody = new byte[memoRecordLength];
+        int start = memoHeader.getBlockSize()*offsetInBlocks;
+        try {
 
-        if (IOUtils.readFully(memoInputStream, recordBody) != memoRecordLength)
-            throw new IOException("The file is corrupted or is not a dbf file");
+            byte[] recordHeader = new byte[JdbfUtils.RECORD_HEADER_LENGTH];
+            this.memoByteBuffer.position(start);
+            this.memoByteBuffer.get(recordHeader);
+            int memoRecordLength = BitUtils.makeInt(recordHeader[7], recordHeader[6], recordHeader[5], recordHeader[4]);
 
-        return new MemoRecord(recordHeader, recordBody, memoHeader.getBlockSize(), offsetInBlocks);
+            byte[] recordBody = new byte[memoRecordLength];
+            this.memoByteBuffer.get(recordBody);
+            return new MemoRecord(recordHeader, recordBody, memoHeader.getBlockSize(), offsetInBlocks);
+        } catch (BufferUnderflowException e) {
+            throw new IOException("The file is corrupted or is not a dbf file", e);
+        }
     }
-}
+}

src/test/java/net/iryndin/jdbf/TestMemo.java

@@ -6,6 +6,8 @@
 import net.iryndin.jdbf.reader.DbfReader;
 import org.junit.Test;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -16,11 +18,11 @@
 public class TestMemo {
 
     @Test
-    public void test1() {
+    public void test1() throws FileNotFoundException {
         Charset stringCharset = Charset.forName("cp1252");
 
         InputStream dbf = getClass().getClassLoader().getResourceAsStream("memo1/texto.dbf");
-        InputStream memo = getClass().getClassLoader().getResourceAsStream("memo1/texto.fpt");
+        FileInputStream memo = new FileInputStream(getClass().getClassLoader().getResource("memo1/texto.fpt").getFile());
 
         try (DbfReader reader = new DbfReader(dbf, memo)) {
             DbfMetadata meta = reader.getMetadata();