Merge pull request #112, add missing onError calls to callback

sealedtx · Apr 8, 2023 · e8a9726 · e8a9726
1 parent e5e91a6
commit e8a9726
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/main/java/com/github/kiulian/downloader/parser/ParserImpl.java b/src/main/java/com/github/kiulian/downloader/parser/ParserImpl.java
@@ -142,7 +142,11 @@ private VideoInfo parseVideoWeb(String videoId, YoutubeCallback<VideoInfo> callb
         JSONObject playerResponse = args.getJSONObject("player_response");
 
         if (!playerResponse.containsKey("streamingData") && !playerResponse.containsKey("videoDetails")) {
-            throw new YoutubeException.BadPageException("streamingData and videoDetails not found");
+            YoutubeException e = new YoutubeException.BadPageException("streamingData and videoDetails not found");
+            if (callback != null) {
+                callback.onError(e);
+            }
+            throw e;
         }
 
         VideoDetails videoDetails = parseVideoDetails(videoId, playerResponse);
@@ -158,8 +162,15 @@ private VideoInfo parseVideoWeb(String videoId, YoutubeCallback<VideoInfo> callb
             }
             JSONObject context = playerConfig.getJSONObject("args").getJSONObject("player_response").getJSONObject("responseContext");
             String clientVersion = extractor.extractClientVersionFromContext(context);
-            List<Format> formats = parseFormats(playerResponse, jsUrl, clientVersion);
-
+            List<Format> formats;
+            try {
+                formats = parseFormats(playerResponse, jsUrl, clientVersion);
+            } catch (YoutubeException e) {
+                if (callback != null) {
+                    callback.onError(e);
+                }
+                throw e;
+            }
             List<SubtitlesInfo> subtitlesInfo = parseCaptions(playerResponse);
             return new VideoInfo(videoDetails, formats, subtitlesInfo);
         } else {