Merge pull request iipc#14 from ukwa/uncompressed-arcs-issue-13

Uncompressed arcs - issue 13

Author: anjackson

src/main/java/org/archive/io/arc/ARCReaderFactory.java

@@ -147,11 +147,11 @@ protected ArchiveReader getArchiveReader(final String arc,
         possiblyWrapped.mark(100);
         boolean compressed = testCompressedARCStream(possiblyWrapped);
         possiblyWrapped.reset();
-
+        
         if (compressed) {
             return new CompressedARCReader(arc, possiblyWrapped, atFirstRecord);
         } else {
-            return new UncompressedARCReader(arc, possiblyWrapped);
+            return new UncompressedARCReader(arc, possiblyWrapped, atFirstRecord);
         }
 	}
 
@@ -330,10 +330,11 @@ public UncompressedARCReader(final File f, final long offset)
          * @param f Uncompressed arc to read.
          * @param is InputStream.
          */
-        public UncompressedARCReader(final String f, final InputStream is) {
+        public UncompressedARCReader(final String f, final InputStream is, boolean atFirstRecord) {
             // Arc file has been tested for existence by time it has come
             // to here.
             setIn(new CountingInputStream(is));
+            setAlignedOnFirstRecord(atFirstRecord);
             initialize(f);
         }
     }

src/test/java/org/archive/io/arc/ARCReaderFactoryTest.java

@@ -0,0 +1,57 @@
+package org.archive.io.arc;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+
+import org.archive.io.ArchiveReader;
+import org.archive.io.ArchiveRecord;
+
+import junit.framework.TestCase;
+
+/**
+ * 
+ * Based on https://github.com/iipc/openwayback/pull/104/files
+ * 
+ * @author csr@statsbiblioteket.dk (Colin Rosenthal)
+ *
+ */
+public class ARCReaderFactoryTest extends TestCase {
+
+    private File testfile1 = new File("src/test/resources/org/archive/format/arc/IAH-20080430204825-00000-blackbook-truncated.arc");
+
+    /**
+     * Test reading uncompressed arcfile for issue
+     * https://github.com/iipc/openwayback/issues/101
+     * @throws Exception
+     */
+    public void testGetResource() throws Exception {
+    	this.offsetResourceTest(testfile1, 1515, "http://www.archive.org/robots.txt" );
+    	this.offsetResourceTest(testfile1, 36420, "http://www.archive.org/services/collection-rss.php" );
+    }
+    
+    private void offsetResourceTest( File testfile, long offset, String uri ) throws Exception {
+    	RandomAccessFile raf = new RandomAccessFile(testfile, "r");
+		raf.seek(offset);
+		InputStream is = new FileInputStream(raf.getFD());
+		String fPath = testfile.getAbsolutePath();
+		ArchiveReader reader = ARCReaderFactory.get(fPath, is, false);    	
+		// This one works:
+		//ArchiveReader reader = ARCReaderFactory.get(testfile, offset);
+		ArchiveRecord record = reader.get();
+
+		final String url = record.getHeader().getUrl();
+		assertEquals("URL of record is not as expected.", uri, url);
+		
+        final long position = record.getPosition();
+        final long recordLength = record.getHeader().getLength();
+        assertTrue("Position " + position + " is after end of record " + recordLength, position <= recordLength);
+
+        // Clean up:
+        if( raf != null )
+        	raf.close();
+    }
+    
+}