Merge pull request #5345 from AntennaPod/example-file

Added chapter marks test file with extended header

3 files changed, 40 insertions, 1 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3Reader.java b/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3Reader.java
index 17313ca14..b7baaa8aa 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3Reader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3Reader.java
@@ -11,6 +11,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.nio.charset.MalformedInputException;
 
 /**
  * Reads the ID3 Tag of a given file.
@@ -96,6 +97,10 @@ public class ID3Reader {
         short version = readShort();
         byte flags = readByte();
         int size = unsynchsafe(readInt());
+        if ((flags & 0b01000000) != 0) {
+            int extendedHeaderSize = readInt();
+            skipBytes(extendedHeaderSize - 4);
+        }
         return new TagHeader("ID3", size, version, flags);
     }
 
@@ -180,16 +185,29 @@ public class ID3Reader {
     private String readEncodedString2(Charset charset, int max) throws IOException {
         ByteArrayOutputStream bytes = new ByteArrayOutputStream();
         int bytesRead = 0;
+        boolean foundEnd = false;
         while (bytesRead + 1 < max) {
             byte c1 = readByte();
             byte c2 = readByte();
             if (c1 == 0 && c2 == 0) {
+                foundEnd = true;
                 break;
             }
             bytesRead += 2;
             bytes.write(c1);
             bytes.write(c2);
         }
-        return charset.newDecoder().decode(ByteBuffer.wrap(bytes.toByteArray())).toString();
+        if (!foundEnd && bytesRead < max) {
+            // Last character
+            byte c = readByte();
+            if (c != 0) {
+                bytes.write(c);
+            }
+        }
+        try {
+            return charset.newDecoder().decode(ByteBuffer.wrap(bytes.toByteArray())).toString();
+        } catch (MalformedInputException e) {
+            return "";
+        }
     }
 }
diff --git a/core/src/test/java/de/danoeh/antennapod/core/util/id3reader/ChapterReaderTest.java b/core/src/test/java/de/danoeh/antennapod/core/util/id3reader/ChapterReaderTest.java
index 5e2e46e74..fe3a3c05b 100644
--- a/core/src/test/java/de/danoeh/antennapod/core/util/id3reader/ChapterReaderTest.java
+++ b/core/src/test/java/de/danoeh/antennapod/core/util/id3reader/ChapterReaderTest.java
@@ -185,4 +185,25 @@ public class ChapterReaderTest {
         assertEquals(EmbeddedChapterImage.makeUrl(5330, 4015), chapters.get(0).getImageUrl());
         assertEquals(EmbeddedChapterImage.makeUrl(9498, 4364), chapters.get(1).getImageUrl());
     }
+
+    @Test
+    public void testRealFileMp3chapsPy() throws IOException, ID3ReaderException {
+        CountingInputStream inputStream = new CountingInputStream(getClass().getClassLoader()
+                .getResource("media-parser/mp3chaps-py.mp3").openStream());
+        ChapterReader reader = new ChapterReader(inputStream);
+        reader.readInputStream();
+        List<Chapter> chapters = reader.getChapters();
+
+        assertEquals(4, chapters.size());
+
+        assertEquals(0, chapters.get(0).getStart());
+        assertEquals(7000, chapters.get(1).getStart());
+        assertEquals(9000, chapters.get(2).getStart());
+        assertEquals(11000, chapters.get(3).getStart());
+
+        assertEquals("Start", chapters.get(0).getTitle());
+        assertEquals("Chapter 1", chapters.get(1).getTitle());
+        assertEquals("Chapter 2", chapters.get(2).getTitle());
+        assertEquals("Chapter 3", chapters.get(3).getTitle());
+    }
 }
diff --git a/core/src/test/resources/media-parser/mp3chaps-py.mp3 b/core/src/test/resources/media-parser/mp3chaps-py.mp3
new file mode 100644
index 000000000..05d519fb0
--- /dev/null
+++ b/core/src/test/resources/media-parser/mp3chaps-py.mp3