Fixed exceptions as requested

antoninkriz · antoninkriz · commit 2c7acc74f55f · 2017-11-24T13:57:54.000+01:00
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java
@@ -148,12 +148,12 @@ public List<VideoStream> getVideoOnlyStreams() throws IOException, ExtractionExc
     }
 
     @Override
-    public List<Subtitles> getSubtitlesDefault() throws IOException, ExtractionException, JsonParserException {
+    public List<Subtitles> getSubtitlesDefault() throws IOException, ExtractionException {
         return null;
     }
 
     @Override
-    public List<Subtitles> getSubtitles(SubtitlesFormat format) throws IOException, ExtractionException, JsonParserException {
+    public List<Subtitles> getSubtitles(SubtitlesFormat format) throws IOException, ExtractionException {
         return null;
     }
 
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
@@ -380,19 +380,25 @@ public List<VideoStream> getVideoOnlyStreams() throws IOException, ExtractionExc
     }
 
     @Override
-    public List<Subtitles> getSubtitlesDefault() throws IOException, ExtractionException, JsonParserException {
+    public List<Subtitles> getSubtitlesDefault() throws IOException, ExtractionException {
         return getSubtitles(SubtitlesFormat.TTML);
     }
 
     @Override
-    public List<Subtitles> getSubtitles(SubtitlesFormat format) throws IOException, ExtractionException, JsonParserException {
+    public List<Subtitles> getSubtitles(SubtitlesFormat format) throws IOException, ExtractionException {
         JsonObject playerConfig = getPlayerConfig(getPageHtml());
         String playerResponse = playerConfig.getObject("args").getString("player_response");
 
-        // Captions does not exist, return null
-        if (!JsonParser.object().from(playerResponse).has("captions")) return null;
+        JsonObject captions;
+        try {
+            // Captions does not exist, return null
+            if (!JsonParser.object().from(playerResponse).has("captions")) return null;
 
-        JsonObject captions = JsonParser.object().from(playerResponse).getObject("captions");
+            captions = JsonParser.object().from(playerResponse).getObject("captions");
+        } catch (JsonParserException e) {
+            // Failed to parse subtitles
+            return null;
+        }
         JsonArray captionsArray = captions.getObject("playerCaptionsTracklistRenderer").getArray("captionTracks");
 
         int captionsSize = captionsArray.size();
diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java b/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java
@@ -112,9 +112,8 @@ protected long getTimestampSeconds(String regexPattern) throws ParsingException
     public abstract List<AudioStream> getAudioStreams() throws IOException, ExtractionException;
     public abstract List<VideoStream> getVideoStreams() throws IOException, ExtractionException;
     public abstract List<VideoStream> getVideoOnlyStreams() throws IOException, ExtractionException;
-    public abstract List<Subtitles> getSubtitlesDefault() throws IOException, ExtractionException, JsonParserException;
-
-    public abstract List<Subtitles> getSubtitles(SubtitlesFormat format) throws IOException, ExtractionException, JsonParserException;
+    public abstract List<Subtitles> getSubtitlesDefault() throws IOException, ExtractionException;
+    public abstract List<Subtitles> getSubtitles(SubtitlesFormat format) throws IOException, ExtractionException;
 
     public abstract StreamType getStreamType() throws ParsingException;
     public abstract StreamInfoItem getNextVideo() throws IOException, ExtractionException;
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java
@@ -107,13 +107,13 @@ public void testGetRelatedVideos() throws ExtractionException, IOException {
     }
 
     @Test
-    public void testGetSubtitlesListDefault() throws IOException, ExtractionException, JsonParserException {
+    public void testGetSubtitlesListDefault() throws IOException, ExtractionException {
         // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
         assertTrue(extractor.getSubtitlesDefault() == null);
     }
 
     @Test
-    public void testGetSubtitlesList() throws IOException, ExtractionException, JsonParserException {
+    public void testGetSubtitlesList() throws IOException, ExtractionException {
         // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
         assertTrue(extractor.getSubtitles(SubtitlesFormat.VTT) == null);
     }
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java
@@ -149,13 +149,13 @@ public void testGetRelatedVideos() throws ExtractionException, IOException {
     }
 
     @Test
-    public void testGetSubtitlesListDefault() throws IOException, ExtractionException, JsonParserException {
+    public void testGetSubtitlesListDefault() throws IOException, ExtractionException {
         // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
         assertTrue(extractor.getSubtitlesDefault() == null);
     }
 
     @Test
-    public void testGetSubtitlesList() throws IOException, ExtractionException, JsonParserException {
+    public void testGetSubtitlesList() throws IOException, ExtractionException {
         // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
         assertTrue(extractor.getSubtitles(SubtitlesFormat.VTT) == null);
     }
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorRestrictedTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorRestrictedTest.java
@@ -108,13 +108,13 @@ public void testGetVideoStreams() throws IOException, ExtractionException {
 
 
     @Test
-    public void testGetSubtitlesListDefault() throws IOException, ExtractionException, JsonParserException {
+    public void testGetSubtitlesListDefault() throws IOException, ExtractionException {
         // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
         assertTrue(extractor.getSubtitlesDefault() == null);
     }
 
     @Test
-    public void testGetSubtitlesList() throws IOException, ExtractionException, JsonParserException {
+    public void testGetSubtitlesList() throws IOException, ExtractionException {
         // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
         assertTrue(extractor.getSubtitles(SubtitlesFormat.VTT) == null);
     }

Original file line number	Diff line number	Diff line change
`@@ -148,12 +148,12 @@ public List<VideoStream> getVideoOnlyStreams() throws IOException, ExtractionExc`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`@Override`
`151`		`- public List<Subtitles> getSubtitlesDefault() throws IOException, ExtractionException, JsonParserException {`
	`151`	`+ public List<Subtitles> getSubtitlesDefault() throws IOException, ExtractionException {`
`152`	`152`	`return null;`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`@Override`
`156`		`- public List<Subtitles> getSubtitles(SubtitlesFormat format) throws IOException, ExtractionException, JsonParserException {`
	`156`	`+ public List<Subtitles> getSubtitles(SubtitlesFormat format) throws IOException, ExtractionException {`
`157`	`157`	`return null;`
`158`	`158`	`}`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,13 @@ public void testGetRelatedVideos() throws ExtractionException, IOException {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`@Test`
`110`		`- public void testGetSubtitlesListDefault() throws IOException, ExtractionException, JsonParserException {`
	`110`	`+ public void testGetSubtitlesListDefault() throws IOException, ExtractionException {`
`111`	`111`	`// Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null`
`112`	`112`	`assertTrue(extractor.getSubtitlesDefault() == null);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`@Test`
`116`		`- public void testGetSubtitlesList() throws IOException, ExtractionException, JsonParserException {`
	`116`	`+ public void testGetSubtitlesList() throws IOException, ExtractionException {`
`117`	`117`	`// Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null`
`118`	`118`	`assertTrue(extractor.getSubtitles(SubtitlesFormat.VTT) == null);`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,13 +149,13 @@ public void testGetRelatedVideos() throws ExtractionException, IOException {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`@Test`
`152`		`- public void testGetSubtitlesListDefault() throws IOException, ExtractionException, JsonParserException {`
	`152`	`+ public void testGetSubtitlesListDefault() throws IOException, ExtractionException {`
`153`	`153`	`// Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null`
`154`	`154`	`assertTrue(extractor.getSubtitlesDefault() == null);`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`@Test`
`158`		`- public void testGetSubtitlesList() throws IOException, ExtractionException, JsonParserException {`
	`158`	`+ public void testGetSubtitlesList() throws IOException, ExtractionException {`
`159`	`159`	`// Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null`
`160`	`160`	`assertTrue(extractor.getSubtitles(SubtitlesFormat.VTT) == null);`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,13 +108,13 @@ public void testGetVideoStreams() throws IOException, ExtractionException {`
`108`	`108`
`109`	`109`
`110`	`110`	`@Test`
`111`		`- public void testGetSubtitlesListDefault() throws IOException, ExtractionException, JsonParserException {`
	`111`	`+ public void testGetSubtitlesListDefault() throws IOException, ExtractionException {`
`112`	`112`	`// Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null`
`113`	`113`	`assertTrue(extractor.getSubtitlesDefault() == null);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`@Test`
`117`		`- public void testGetSubtitlesList() throws IOException, ExtractionException, JsonParserException {`
	`117`	`+ public void testGetSubtitlesList() throws IOException, ExtractionException {`
`118`	`118`	`// Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null`
`119`	`119`	`assertTrue(extractor.getSubtitles(SubtitlesFormat.VTT) == null);`
`120`	`120`	`}`