diff options
Diffstat (limited to 'core')
6 files changed, 81 insertions, 3 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java index 6d459075a..b93f41771 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java +++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java @@ -81,7 +81,7 @@ public class NSAtom extends Namespace { String rel = attributes.getValue(LINK_REL); SyndElement parent = state.getTagstack().peek(); if (parent.getName().matches(isFeedItem)) { - if (LINK_REL_ALTERNATE.equals(rel)) { + if (rel == null || LINK_REL_ALTERNATE.equals(rel)) { state.getCurrentItem().setLink(href); } else if (LINK_REL_ENCLOSURE.equals(rel)) { String strSize = attributes.getValue(LINK_LENGTH); @@ -107,7 +107,7 @@ public class NSAtom extends Namespace { state.getCurrentItem().setPaymentLink(href); } } else if (parent.getName().matches(isFeed)) { - if (LINK_REL_ALTERNATE.equals(rel)) { + if (rel == null || LINK_REL_ALTERNATE.equals(rel)) { String type = attributes.getValue(LINK_TYPE); /* * Use as link if a) no type-attribute is given and 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 b8ec3524b..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. @@ -184,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/syndication/handler/AtomParserTest.java b/core/src/test/java/de/danoeh/antennapod/core/syndication/handler/AtomParserTest.java index 2acc73204..36ca7f0d8 100644 --- a/core/src/test/java/de/danoeh/antennapod/core/syndication/handler/AtomParserTest.java +++ b/core/src/test/java/de/danoeh/antennapod/core/syndication/handler/AtomParserTest.java @@ -14,6 +14,7 @@ import de.danoeh.antennapod.model.feed.FeedMedia; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; /** * Tests for Atom feeds in FeedHandler. @@ -55,6 +56,34 @@ public class AtomParserTest { } @Test + public void testEmptyRelLinks() throws Exception { + File feedFile = FeedParserTestHelper.getFeedFile("feed-atom-testEmptyRelLinks.xml"); + Feed feed = FeedParserTestHelper.runFeedParser(feedFile); + assertEquals(Feed.TYPE_ATOM1, feed.getType()); + assertEquals("title", feed.getTitle()); + assertEquals("http://example.com/feed", feed.getFeedIdentifier()); + assertEquals("http://example.com", feed.getLink()); + assertEquals("This is the description", feed.getDescription()); + assertNull(feed.getPaymentLinks()); + assertEquals("http://example.com/picture", feed.getImageUrl()); + assertEquals(1, feed.getItems().size()); + + // feed entry + FeedItem item = feed.getItems().get(0); + assertEquals("http://example.com/item-0", item.getItemIdentifier()); + assertEquals("item-0", item.getTitle()); + assertNull(item.getDescription()); + assertEquals("http://example.com/items/0", item.getLink()); + assertEquals(new Date(0), item.getPubDate()); + assertNull(item.getPaymentLink()); + assertEquals("http://example.com/picture", item.getImageLocation()); + // media + assertFalse(item.hasMedia()); + // chapters + assertNull(item.getChapters()); + } + + @Test public void testLogoWithWhitespace() throws Exception { File feedFile = FeedParserTestHelper.getFeedFile("feed-atom-testLogoWithWhitespace.xml"); Feed feed = FeedParserTestHelper.runFeedParser(feedFile); 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/feed-atom-testEmptyRelLinks.xml b/core/src/test/resources/feed-atom-testEmptyRelLinks.xml new file mode 100644 index 000000000..04c28ef67 --- /dev/null +++ b/core/src/test/resources/feed-atom-testEmptyRelLinks.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom"> + <id>http://example.com/feed</id> + <title>title</title> + <link href="http://example.com" /> + <subtitle>This is the description</subtitle> + <logo>http://example.com/picture</logo> + <entry> + <id>http://example.com/item-0</id> + <title>item-0</title> + <link href="http://example.com/items/0" /> + <published>1970-01-01T00:00:00Z</published> + </entry> +</feed> diff --git a/core/src/test/resources/media-parser/mp3chaps-py.mp3 b/core/src/test/resources/media-parser/mp3chaps-py.mp3 Binary files differnew file mode 100644 index 000000000..05d519fb0 --- /dev/null +++ b/core/src/test/resources/media-parser/mp3chaps-py.mp3 |