Moved package size parsing to a separate class

audiobook/src/main/java/de/ph1b/audiobook/features/chapterReader/ogg/oggReading/PackageSizeParser.kt

@@ -0,0 +1,18 @@
+package de.ph1b.audiobook.features.chapterReader.ogg.oggReading
+
+import de.ph1b.audiobook.features.chapterReader.toUInt
+
+
+object PackageSizeParser {
+
+ fun fromSegmentTable(segmentTable: ByteArray): List<Int> = segmentTable
+ .map { it.toUInt() }
+ .fold(mutableListOf(0), { acc, e ->
+ acc[acc.lastIndex] += e
+ if (e != 255) {
+ acc.add(0)
+ }
+ acc
+ })
+ .filter { it != 0 }
+}

audiobook/src/main/java/de/ph1b/audiobook/features/chapterReader/ogg/oggReading/oggReading.kt

@@ -13,14 +13,6 @@ import java.io.InputStream
 
 private val OGG_PAGE_MAGIC = "OggS".toByteArray()
 
-fun computePacketSizesFromSegmentTable(segmentTable: ByteArray): List<Int>
- = segmentTable.map { it.toUInt() }.fold(mutableListOf(0), { acc, e ->
- acc[acc.lastIndex] += e
- if (e != 255)
- acc.add(0)
- acc
-}).filter { it != 0 }
-
 fun readOggPages(stream: InputStream): Sequence<OggPage> {
  return generateSequence gen@ {
  // https://www.ietf.org/rfc/rfc3533.txt
@@ -41,7 +33,7 @@ fun readOggPages(stream: InputStream): Sequence<OggPage> {
  stream.skipBytes(4) // checksum
  val numberPageSegments = stream.readUInt8()
  val segmentTable = stream.readBytes(numberPageSegments)
- val packets = computePacketSizesFromSegmentTable(segmentTable).map {
+ val packets = PackageSizeParser.fromSegmentTable(segmentTable).map {
  stream.readBytes(it)
  }
 

audiobook/src/test/java/de/ph1b/audiobook/features/chapterReader/ogg/OggReadingTest.kt

@@ -2,7 +2,7 @@ package de.ph1b.audiobook.features.chapterReader.ogg
 
 import de.ph1b.audiobook.features.chapterReader.ogg.oggReading.OggPage
 import de.ph1b.audiobook.features.chapterReader.ogg.oggReading.OggStream
-import de.ph1b.audiobook.features.chapterReader.ogg.oggReading.computePacketSizesFromSegmentTable
+import de.ph1b.audiobook.features.chapterReader.ogg.oggReading.PackageSizeParser
 import de.ph1b.audiobook.features.chapterReader.ogg.oggReading.concat
 import de.ph1b.audiobook.features.chapterReader.ogg.oggReading.demuxOggStreams
 import de.ph1b.audiobook.features.chapterReader.ogg.oggReading.readOggPages
@@ -31,10 +31,10 @@ private fun <T> Iterable<T>.shuffle(): List<T> {
 class OggReadingTest {
  @Test
  fun computePacketSizesFromSegmentTableTest() {
- assertThat(computePacketSizesFromSegmentTable(unsignedByteArrayOf(
+ assertThat(PackageSizeParser.fromSegmentTable(unsignedByteArrayOf(
  255, 255, 14, 255, 0, 255, 255, 17)))
  .isEqualTo(listOf(2*255 + 14, 255, 2*255 + 17))
- assertThat(computePacketSizesFromSegmentTable(unsignedByteArrayOf(
+ assertThat(PackageSizeParser.fromSegmentTable(unsignedByteArrayOf(
  255, 255, 255, 255, 70, 255, 255)))
  .isEqualTo(listOf(4*255 + 70, 2*255))
  }