change on Flac file metadata saved

core/pom.xml

@@ -43,6 +43,14 @@
             </execution>
         </executions>
       </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+                <source>8</source>
+                <target>8</target>
+            </configuration>
+        </plugin>
     </plugins>
   </build>
 </project>

core/src/main/java/org/gagravarr/flac/FlacFile.java

@@ -14,13 +14,17 @@
 package org.gagravarr.flac;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.SequenceInputStream;
+import java.util.Enumeration;
 import java.util.List;
+import java.util.Vector;
 
 import org.gagravarr.ogg.IOUtils;
 import org.gagravarr.ogg.OggFile;
@@ -52,7 +56,7 @@ public static FlacFile open(InputStream inp) throws IOException, FileNotFoundExc
       byte[] header = new byte[4];
       IOUtils.readFully(inp, header);
       inp.reset();
-      
+
       if(header[0] == (byte)'O' && header[1] == (byte)'g' &&
          header[2] == (byte)'g' && header[3] == (byte)'S') {
          return new FlacOggFile(new OggFile(inp));
@@ -89,8 +93,15 @@ public FlacTags getTags() {
    /**
     * In Reading mode, will close the underlying ogg/flac
     *  file and free its resources.
-    * In Writing mode, will write out the Info and 
+    * In Writing mode, will write out the Info and
     *  Comments objects, and then the audio data.
     */
    public abstract void close() throws IOException;
+
+    /**
+     * <p>Return {@link InputStream} of {@link FlacFile}. If tags modified, then return modified.</p>
+     * @return
+     */
+   public abstract InputStream getInputStream();
+
 }

core/src/main/java/org/gagravarr/flac/FlacMetadataBlock.java

@@ -100,7 +100,7 @@ public byte[] getData() {
 
        // Fix the length
        byte[] data = baos.toByteArray();
-       IOUtils.putInt3BE(data, 1, data.length);
+       IOUtils.putInt3BE(data, 1, data.length - 4);
 
        // All done
        return data;

core/src/main/java/org/gagravarr/flac/FlacNativeFile.java

@@ -13,106 +13,167 @@
  */
 package org.gagravarr.flac;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.SequenceInputStream;
+import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Vector;
 
 import org.gagravarr.flac.FlacTags.FlacTagsAsMetadata;
 import org.gagravarr.ogg.IOUtils;
+import org.gagravarr.ogg.OggPacket;
+import org.gagravarr.ogg.OggStreamPacket;
 
 /**
  * This lets you work with FLAC files that
- *  are contained in a native FLAC Stream
+ * are contained in a native FLAC Stream
  */
 public class FlacNativeFile extends FlacFile {
-   private InputStream input;
-
-   /**
-    * Opens the given file for reading
-    */
-   public FlacNativeFile(File f) throws IOException, FileNotFoundException {
-      this(new FileInputStream(f));
-   }
-
-   /**
-    * Opens the given FLAC file
-    */
-   public FlacNativeFile(InputStream inp) throws IOException {
-      // Check the header
-      byte[] header = new byte[4];
-      IOUtils.readFully(inp, header);
-      if(header[0] == (byte)'f' && header[1] == (byte)'L' &&
-         header[2] == (byte)'a' && header[3] == (byte)'C') {
-         // Good
-      } else {
-         throw new IllegalArgumentException("Not a FLAC file");
-      }
-
-      // First must be the FLAC info
-      info = (FlacInfo)FlacMetadataBlock.create(inp); 
-
-      // Read the rest of the Metadata blocks
-      otherMetadata = new ArrayList<FlacMetadataBlock>();
-      while(true) {
-         FlacMetadataBlock m = FlacMetadataBlock.create(inp);
-         if(m instanceof FlacTagsAsMetadata) {
-            tags = ((FlacTagsAsMetadata)m).getTags();
-         } else {
-            otherMetadata.add(m);
-         }
-
-         if(m.isLastMetadataBlock()) {
-            break;
-         }
-      }
-
-      // Rest is audio
-      this.input = inp;
-   }
-
-
-   public FlacAudioFrame getNextAudioPacket() throws IOException {
-       int skipped = 0;
-       int b1 = 0;
-       int b2 = input.read();
-       while (b1 != -1 && b2 != -1) {
-           b1 = b2;
-           b2 = input.read();
-           if (FlacAudioFrame.isFrameHeaderStart(b1, b2)) {
-               if (skipped > 0)
-                   System.err.println("Warning - had to skip " + skipped +
-                           " bytes of junk data before finding the next packet header");
-               return new FlacAudioFrame(b1, b2, input, info);
-           }
-           skipped++;
-       }
-       return null;
-   }
-
-   /**
-    * Skips the audio data to the next packet with a granule
-    *  of at least the given granule position.
-    * Note that skipping backwards is not currently supported!
-    */
-   public void skipToGranule(long granulePosition) throws IOException {
-       throw new RuntimeException("Not supported");
-   }
-
-   /**
-    * In Reading mode, will close the underlying ogg/flac
-    *  file and free its resources.
-    * In Writing mode, will write out the Info and 
-    *  Comments objects, and then the audio data.
-    */
-   public void close() throws IOException {
-       if(input != null) {
-           input.close();
-           input = null;
-       } else {
-           throw new RuntimeException("Not supported");
-       }
-   }
+    private InputStream input;
+    private final LinkedList<FlacFrame> blocksInOrder = new LinkedList<>();
+
+    /**
+     * Opens the given file for reading
+     */
+    public FlacNativeFile(File f) throws IOException, FileNotFoundException {
+        this(new FileInputStream(f));
+    }
+
+    /**
+     * Opens the given FLAC file
+     */
+    public FlacNativeFile(InputStream inp) throws IOException {
+        // Check the header
+        byte[] header = new byte[4];
+        IOUtils.readFully(inp, header);
+        if (header[0] == (byte) 'f' && header[1] == (byte) 'L' &&
+                header[2] == (byte) 'a' && header[3] == (byte) 'C') {
+            // Good
+        } else {
+            throw new IllegalArgumentException("Not a FLAC file");
+        }
+
+        // First must be the FLAC info
+        info = (FlacInfo) FlacMetadataBlock.create(inp);
+        blocksInOrder.addLast(info);
+
+        // Read the rest of the Metadata blocks
+        otherMetadata = new ArrayList<>();
+        while (true) {
+            FlacMetadataBlock m = FlacMetadataBlock.create(inp);
+            if (m instanceof FlacTagsAsMetadata) {
+                tags = ((FlacTagsAsMetadata) m).getTags();
+                blocksInOrder.addLast(new OggStreamPacketDecorator(tags));
+            } else {
+                otherMetadata.add(m);
+                blocksInOrder.addLast(m);
+            }
+
+            if (m.isLastMetadataBlock()) {
+                break;
+            }
+        }
+
+        // Rest is audio
+        this.input = inp;
+    }
+
+    public FlacAudioFrame getNextAudioPacket() throws IOException {
+        int skipped = 0;
+        int b1 = 0;
+        int b2 = input.read();
+        while (b1 != -1 && b2 != -1) {
+            b1 = b2;
+            b2 = input.read();
+            if (FlacAudioFrame.isFrameHeaderStart(b1, b2)) {
+                if (skipped > 0)
+                    System.err.println("Warning - had to skip " + skipped +
+                            " bytes of junk data before finding the next packet header");
+                return new FlacAudioFrame(b1, b2, input, info);
+            }
+            skipped++;
+        }
+        return null;
+    }
+
+    /**
+     * Skips the audio data to the next packet with a granule
+     * of at least the given granule position.
+     * Note that skipping backwards is not currently supported!
+     */
+    public void skipToGranule(long granulePosition) throws IOException {
+        throw new RuntimeException("Not supported");
+    }
+
+    /**
+     * In Reading mode, will close the underlying ogg/flac
+     * file and free its resources.
+     * In Writing mode, will write out the Info and
+     * Comments objects, and then the audio data.
+     */
+    public void close() throws IOException {
+        if (input != null) {
+            input.close();
+            input = null;
+        } else {
+            throw new RuntimeException("Not supported");
+        }
+    }
+
+    @Override
+    public InputStream getInputStream() {
+        Vector<InputStream> streams = new Vector<>();
+        byte[] header = {'f', 'L', 'a', 'C'};
+        streams.add(new ByteArrayInputStream(header));
+        blocksInOrder.stream().forEach(block -> {
+                    this.addStream(streams, block.getData());
+                });
+        streams.add(input);
+
+        return new SequenceInputStream(streams.elements());
+    }
+
+    private void addStream(Vector<InputStream> streams, byte[] data) {
+        if (Objects.nonNull(data) && data.length > 0)
+            streams.add(new ByteArrayInputStream(data));
+    }
+
+    private static final class OggStreamPacketDecorator extends FlacFrame implements OggStreamPacket {
+
+        private OggStreamPacket decorated;
+
+        public OggStreamPacketDecorator(OggStreamPacket decorated) {
+            this.decorated = decorated;
+        }
+
+        public byte[] getData() {
+            decorated.write();
+            return decorated.getData();
+        }
+
+        @Override
+        public void setData(byte[] data) {
+
+        }
+
+        @Override
+        public int getOggOverheadSize() {
+            return 0;
+        }
+
+        @Override
+        public OggPacket write() {
+            return null;
+        }
+
+    }
 }

core/src/main/java/org/gagravarr/flac/FlacOggFile.java

@@ -18,6 +18,7 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -223,6 +224,11 @@ public void close() throws IOException {
         }
     }
 
+    @Override
+    public InputStream getInputStream() {
+        return null;
+    }
+
     /**
      * Return the Ogg-specific version of the Flac Info
      */