squash: Moves the logic into tracks and tag and fix it by seeking the correct src position when coping the end of the file.

Author: damencho

src/main/java/org/ebml/io/FileDataWriter.java

@@ -158,13 +158,39 @@ public void copyFromPosition(FileDataWriter src) throws IOException
         src.fc.transferTo(src.fc.position(), src.fc.size() - src.fc.position(), fc);
     }
 
-    public void replaceWithFile(FileDataWriter dw)
-            throws IOException
+  /**
+   * Copies the beginning of the file to a temporary file.
+   * @return the FileDataWriter for the temporary file.
+   * @throws IOException
+   */
+  public FileDataWriter copyBeginningOfFile()
+        throws IOException
     {
-      Files.move(Path.of(dw.filename), Path.of(this.filename), StandardCopyOption.REPLACE_EXISTING);
+        Path f = Files.createTempFile("mka", ".tmp");
+
+        FileDataWriter dw = new FileDataWriter(f.toFile().getPath());
+        dw.copyToPosition(this);
+
+        return dw;
+    }
+
+  /**
+   * Copies the end of the current file(from current position) into the supplied FileDataWriter and replaces
+   * the current file with the temp one.
+   * @param dw The FileDataWriter to use as a new file.
+   * @throws IOException
+   */
+  public void copyEndOfFile(FileDataWriter dw)
+        throws IOException
+    {
+        dw.copyFromPosition(this);
+
+        this.close();
+
+        Files.move(Path.of(dw.filename), Path.of(this.filename), StandardCopyOption.REPLACE_EXISTING);
 
-      // recreate after we move the new file
-      file = new RandomAccessFile(filename, "rw");
-      fc = file.getChannel();
+        // recreate after we move the new file
+        file = new RandomAccessFile(filename, "rw");
+        fc = file.getChannel();
     }
 }

src/main/java/org/ebml/matroska/MatroskaFileTags.java

@@ -1,13 +1,18 @@
 package org.ebml.matroska;
 
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
 import java.util.ArrayList;
 
 import org.ebml.MasterElement;
 import org.ebml.io.DataWriter;
+import org.ebml.io.FileDataWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class MatroskaFileTags
+  implements PropertyChangeListener
 {
   private static final int BLOCK_SIZE = 4096;
   private static final Logger LOG = LoggerFactory.getLogger(MatroskaFileTags.class);
@@ -21,8 +26,7 @@ public void addTag(final MatroskaFileTagEntry tag)
     tags.add(tag);
   }
 
-  public long writeTags(final DataWriter ioDW, boolean checkBlockSize)
-    throws VoidOutOfBoundException
+  public long writeTags(final DataWriter ioDW)
   {
     myPosition = ioDW.getFilePointer();
     final MasterElement tagsElem = MatroskaDocTypes.Tags.getInstance();
@@ -32,11 +36,29 @@ public long writeTags(final DataWriter ioDW, boolean checkBlockSize)
       tagsElem.addChildElement(tag.toElement());
     }
 
-    if (checkBlockSize && BLOCK_SIZE < tagsElem.getTotalSize())
+    if (BLOCK_SIZE < tagsElem.getTotalSize() && ioDW.isSeekable())
     {
-      LOG.warn("Tags element size exceeds block size!");
+      long len;
 
-      throw new VoidOutOfBoundException();
+      // we need to write beyond the void space we have reserved
+      // copy beginning of file into a temporary file
+      try (FileDataWriter dw = ((FileDataWriter)ioDW).copyBeginningOfFile())
+      {
+        // write the tags
+        len = tagsElem.writeElement(dw);
+
+        // now let's copy the rest of the original file by first setting the position after the tags
+        ioDW.seek(myPosition + BLOCK_SIZE);
+
+        // copy the rest of the original file
+        ((FileDataWriter)ioDW).copyEndOfFile(dw);
+      }
+      catch (IOException ex)
+      {
+        throw new RuntimeException(ex);
+      }
+
+      return len;
     }
 
     long len = tagsElem.writeElement(ioDW);
@@ -50,14 +72,22 @@ public long writeTags(final DataWriter ioDW, boolean checkBlockSize)
     return len;
   }
 
-  public long update(final DataWriter ioDW, boolean checkBlockSize)
-    throws VoidOutOfBoundException
+  public long update(final DataWriter ioDW)
   {
     LOG.info("Updating tags list!");
     final long start = ioDW.getFilePointer();
     ioDW.seek(myPosition);
-    long len = writeTags(ioDW, checkBlockSize);
+    long len = writeTags(ioDW);
     ioDW.seek(start);
     return len;
   }
+
+  @Override
+  public void propertyChange(PropertyChangeEvent evt)
+  {
+    if (evt.getPropertyName().equals(MatroskaFileTracks.RESIZED))
+    {
+      myPosition = myPosition + ((long) evt.getNewValue() - (long) evt.getOldValue());
+    }
+  }
 }

src/main/java/org/ebml/matroska/MatroskaFileTracks.java

@@ -1,15 +1,23 @@
 package org.ebml.matroska;
 
+import java.beans.PropertyChangeSupport;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
 import java.util.ArrayList;
 
 import org.ebml.MasterElement;
 import org.ebml.io.DataWriter;
+import org.ebml.io.FileDataWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class MatroskaFileTracks
 {
-  private static final int BLOCK_SIZE = 4096;
+  final public static String RESIZED = "resized";
+
+  private final PropertyChangeSupport listeners = new PropertyChangeSupport(this);
+
+  private static final long BLOCK_SIZE = 4096;
   private static final Logger LOG = LoggerFactory.getLogger(MatroskaFileTracks.class);
 
   private final ArrayList<MatroskaFileTrack> tracks = new ArrayList<>();
@@ -21,8 +29,7 @@ public void addTrack(final MatroskaFileTrack track)
     tracks.add(track);
   }
 
-  public long writeTracks(final DataWriter ioDW, boolean checkBlockSize)
-    throws VoidOutOfBoundException
+  public long writeTracks(final DataWriter ioDW)
   {
     myPosition = ioDW.getFilePointer();
     final MasterElement tracksElem = MatroskaDocTypes.Tracks.getInstance();
@@ -32,11 +39,33 @@ public long writeTracks(final DataWriter ioDW, boolean checkBlockSize)
       tracksElem.addChildElement(track.toElement());
     }
 
-    if (checkBlockSize && BLOCK_SIZE < tracksElem.getTotalSize())
+    if (BLOCK_SIZE < tracksElem.getTotalSize() && ioDW.isSeekable())
     {
-      LOG.warn("Tracks element size exceeds block size!");
+      long len;
+
+      // we need to write beyond the void space we have reserved
+      // copy beginning of file into a temporary file
+      try (FileDataWriter dw = ((FileDataWriter)ioDW).copyBeginningOfFile())
+      {
+        // write the tracks
+        len = tracksElem.writeElement(dw);
+
+        // now let's copy the rest of the original file by first setting the position after the tracks
+        ioDW.seek(myPosition + BLOCK_SIZE);
+
+        // copy the rest of the original file
+        ((FileDataWriter)ioDW).copyEndOfFile(dw);
+      }
+      catch (IOException ex)
+      {
+        throw new RuntimeException(ex);
+      }
 
-      throw new VoidOutOfBoundException();
+      // we need to update tags element that its current position changed as we moved the data and inserted
+      // some data before tags
+      this.listeners.firePropertyChange(RESIZED, BLOCK_SIZE, len);
+
+      return len;
     }
 
     long size = tracksElem.writeElement(ioDW);
@@ -50,14 +79,18 @@ public long writeTracks(final DataWriter ioDW, boolean checkBlockSize)
     return size;
   }
 
-  public long update(final DataWriter ioDW, boolean checkBlockSize)
-    throws VoidOutOfBoundException
+  public long update(final DataWriter ioDW)
   {
     LOG.info("Updating tracks list!");
     final long start = ioDW.getFilePointer();
     ioDW.seek(myPosition);
-    long len = writeTracks(ioDW, checkBlockSize);
+    long len = writeTracks(ioDW);
     ioDW.seek(start);
     return len;
   }
+
+  public void addPropertyChangeListener(PropertyChangeListener listener)
+  {
+    this.listeners.addPropertyChangeListener(listener);
+  }
 }

src/main/java/org/ebml/matroska/MatroskaFileWriter.java

@@ -20,17 +20,13 @@
 package org.ebml.matroska;
 
 import java.io.Closeable;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.ebml.MasterElement;
 import org.ebml.StringElement;
 import org.ebml.UnsignedIntegerElement;
 import org.ebml.io.DataWriter;
-import org.ebml.io.FileDataWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -91,26 +87,13 @@ void initialize()
     segmentInfoElem.writeElement(ioDW);
 
     metaSeek.addIndexedElement(MatroskaDocTypes.Tracks.getType(), ioDW.getFilePointer());
-    try
-    {
-      tracks.writeTracks(ioDW, false);
-    }
-    catch (VoidOutOfBoundException e)
-    {
-      // when initializing tracks are empty so this should never happen
-      LOG.error("Tracks element size exceeds block size?", e);
-    }
+    tracks.writeTracks(ioDW);
 
     metaSeek.addIndexedElement(MatroskaDocTypes.Tags.getType(), ioDW.getFilePointer());
-    try
-    {
-        tags.writeTags(ioDW, false);
-    }
-    catch (VoidOutOfBoundException e)
-    {
-      // when initializing tags are empty so this should never happen
-      LOG.error("Tags element size exceeds block size?", e);
-    }
+    tags.writeTags(ioDW);
+
+    // If tracks got expanded beyond the void element, tags needs to adjust its pointer
+    tracks.addPropertyChangeListener(tags);
 
     cluster = new MatroskaCluster();
     metaSeek.addIndexedElement(MatroskaDocTypes.Cluster.getType(), ioDW.getFilePointer());
@@ -302,65 +285,13 @@ public void close()
       segmentInfoElem.setDuration(maxSegmentTimecode - minSegmentTimecode);
       segmentLen += segmentInfoElem.update(ioDW);
 
-      try
-      {
-          segmentLen += tracks.update(ioDW, true);
-      }
-      catch (VoidOutOfBoundException e)
-      {
-        LOG.info("Tracks element size exceeds block size. Will expand file.");
-
-          try (FileDataWriter dw = copyBeginningOfFile())
-          {
-            segmentLen += tracks.update(dw, false);
-            copyEndOfFileAndClose(dw);
-          }
-          catch (VoidOutOfBoundException | IOException ex)
-          {
-            throw new RuntimeException(ex);
-          }
-      }
-      try
-      {
-          segmentLen += tags.update(ioDW, true);
-      }
-      catch (VoidOutOfBoundException e)
-      {
-        LOG.info("Tags element size exceeds block size. Will expand file.");
-        try (FileDataWriter dw = copyBeginningOfFile())
-        {
-          segmentLen += tags.update(dw, false);
-          copyEndOfFileAndClose(dw);
-        }
-        catch (VoidOutOfBoundException | IOException ex)
-        {
-          throw new RuntimeException(ex);
-        }
-      }
+      segmentLen += tracks.update(ioDW);
+      segmentLen += tags.update(ioDW);
       segmentLen += clusterLen;
 
       segmentElem.setUnknownSize(false);
       segmentElem.setSize(segmentLen);
       segmentElem.update(ioDW);
     }
   }
-
-  private FileDataWriter copyBeginningOfFile()
-    throws IOException
-  {
-    FileDataWriter dw = new FileDataWriter(Files.createTempFile("mka", ".tmp").toFile().getPath());
-    dw.copyToPosition((FileDataWriter)ioDW);
-
-    return dw;
-  }
-
-  private void copyEndOfFileAndClose(FileDataWriter dw)
-    throws IOException
-  {
-    dw.copyFromPosition((FileDataWriter)ioDW);
-
-    ((FileDataWriter) ioDW).close();
-    ((FileDataWriter) ioDW).replaceWithFile(dw);
-
-  }
 }