Merge branch 'refs/heads/npr-changes'

Author: MarkusLewis

README.md

@@ -1,4 +1,4 @@
-# PodEngine 2.3 – Podcast Feed Library
+# PodEngine 2.4 – Podcast Feed Library
 
 ## Java library for parsing your podcast feeds 🚀
 * Written in Java 7 🤖
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.icosillion.podengine:podengine:2.3'
+    compile 'com.icosillion.podengine:podengine:2.4'
 }
 ```
 
@@ -35,7 +35,7 @@ dependencies {
     <dependency>
         <groupId>com.icosillion.podengine</groupId>
         <artifactId>podengine</artifactId>
-        <version>2.3</version>
+        <version>2.4</version>
     </dependency>
 </dependencies>
 ```

build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'java'
 apply plugin: 'maven-publish'
 
 group = 'com.icosillion.podengine'
-version = '2.3'
+version = '2.4'
 
 description = """Simple library to read podcast feeds"""
 

feed.rss

@@ -71,5 +71,30 @@
                 The show notes live in this section, but we have nothing else interesting to say.
             </content:encoded>
         </item>
+        <item>
+            <title>Episode 2: Most podcasts have more than one episode</title>
+            <description>Our hosts realize they need a second episode.</description>
+            <pubDate>Tue, 28 Oct 2019 13:30:00 GMT</pubDate>
+            <enclosure url="https://podcast-feed-library.owl.im/audio/episode-1.mp3" length="1234000" type="audio/mp3" />
+            <link>https://podcast-feed-library.owl.im/episodes/2</link>
+            <guid>https://podcast-feed-library.owl.im/episodes/2</guid>
+            <comments>https://podcast-feed-library.owl.im/episodes/2/comments</comments>
+            <category>Technology</category>
+            <category>Testing</category>
+            <source url="http://podcast-feed-library.owl.im/feed.rss">Master Feed</source>
+            <itunes:author>Icosillion</itunes:author>
+            <itunes:subtitle>Our hosts realize they need a second episode.</itunes:subtitle>
+            <itunes:summary>Our hosts realize they need a second episode.</itunes:summary>
+            <itunes:explicit>no</itunes:explicit>
+            <itunes:duration>12:34</itunes:duration>
+            <itunes:block>no</itunes:block>
+            <itunes:image href="https://podcast-feed-library.owl.im/images/artwork.png" />
+            <itunes:isClosedCaptioned>no</itunes:isClosedCaptioned>
+            <itunes:order>2</itunes:order>
+            <itunes:season>1</itunes:season>
+            <itunes:episode>2</itunes:episode>
+            <content:encoded>Our hosts realize they need a second episode.
+            </content:encoded>
+        </item>
     </channel>
 </rss>

src/main/java/com/icosillion/podengine/models/ITunesInfo.java

@@ -10,7 +10,7 @@
 public abstract class ITunesInfo {
 
     public enum ExplicitLevel {
-        EXPLICIT, CLEAN, UNKNOWN
+        EXPLICIT, CLEAN, NO, UNKNOWN
     }
 
     protected final Element parent;
@@ -92,6 +92,10 @@ public ExplicitLevel getExplicit() {
             return this.explicit = ExplicitLevel.EXPLICIT;
         }
 
+        if ("no".equalsIgnoreCase(explicitText)) {
+            return this.explicit = ExplicitLevel.NO;
+        }
+
         if ("clean".equalsIgnoreCase(explicitText)) {
             return this.explicit = ExplicitLevel.CLEAN;
         }

src/main/java/com/icosillion/podengine/models/ITunesItemInfo.java

@@ -6,7 +6,7 @@
 public class ITunesItemInfo extends ITunesInfo {
 
     public enum EpisodeType {
-        FULL, TRAILER, BONUS
+        FULL, TRAILER, BONUS, UNKNOWN
     }
 
     private String duration;
@@ -124,7 +124,7 @@ public EpisodeType getEpisodeType() {
 
         Element episodeTypeElement = this.parent.element(QName.get("episodeType", this.iTunesNamespace));
         if (episodeTypeElement == null) {
-            return this.episodeType = EpisodeType.FULL;
+            return this.episodeType = EpisodeType.UNKNOWN;
         }
 
         String rawEpisodeType = episodeTypeElement.getTextTrim().toLowerCase();
@@ -139,7 +139,7 @@ public EpisodeType getEpisodeType() {
                 this.episodeType = EpisodeType.FULL;
                 break;
             default:
-                this.episodeType = EpisodeType.FULL;
+                this.episodeType = EpisodeType.UNKNOWN;
                 break;
         }
 

src/main/java/com/icosillion/podengine/models/Podcast.java

@@ -22,6 +22,7 @@ public class Podcast {
     private String xmlData;
     private Document document;
     private URL feedURL;
+    private URL resolvedURL;
 
     private Element rootElement, channelElement;
 
@@ -54,6 +55,7 @@ public Podcast(URL feed) throws InvalidFeedException, MalformedFeedException {
             bomInputStream = new BOMInputStream(is, false);
 
             this.feedURL = feed;
+            this.resolvedURL = ic.getURL();
             this.xmlData = IOUtils.toString(bomInputStream);
             this.document = DocumentHelper.parseText(xmlData);
             this.rootElement = this.document.getRootElement();
@@ -594,4 +596,8 @@ public String getXMLData() {
     public URL getFeedURL() {
         return feedURL;
     }
+
+    public URL getResolvedURL() {
+        return resolvedURL;
+    }
 }

src/test/java/com/icosillion/podengine/models/EpisodeTest.java

@@ -68,5 +68,15 @@ public void testEpisode() throws MalformedFeedException, MalformedURLException,
         assertEquals(1, (int) iTunesInfo.getOrder());
         assertEquals(1, (int) iTunesInfo.getSeasonNumber());
         assertEquals(1, (int) iTunesInfo.getEpisodeNumber());
+
+    }
+
+    @Test
+    public void testEpisodeWithExplicitNo()
+    {
+        List<Episode> episodes = podcast.getEpisodes();
+        Episode episode = episodes.get(1);
+        ITunesItemInfo iTunesInfo = episode.getITunesInfo();
+        assertEquals(ITunesInfo.ExplicitLevel.NO, iTunesInfo.getExplicit());
     }
 }

src/test/java/com/icosillion/podengine/models/PodcastOverviewTest.java

@@ -57,7 +57,7 @@ public void testOverview() throws MalformedFeedException, MalformedURLException,
         assertTrue(skipDays.contains("Wednesday"));
         assertTrue(skipDays.contains("Friday"));
         assertArrayEquals(new String[] { "podcast", "java", "xml", "dom4j", "icosillion", "maven" } , podcast.getKeywords());
-        assertEquals(1, podcast.getEpisodes().size());
+        assertEquals(2, podcast.getEpisodes().size());
     }
 
     @Test