From 3757541a9c8223d4ffce261faddee95112f125b5 Mon Sep 17 00:00:00 2001 From: bopol Date: Tue, 5 May 2020 10:02:56 +0200 Subject: [PATCH] adapt new nanojson version --- .../media_ccc/extractors/MediaCCCSearchExtractor.java | 2 +- .../extractors/YoutubeMusicSearchExtractor.java | 10 +++++----- .../youtube/extractors/YoutubeSearchExtractor.java | 4 ++-- .../youtube/search/YoutubeSearchExtractorTest.java | 1 - 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCSearchExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCSearchExtractor.java index c4b368923..914c77497 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCSearchExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCSearchExtractor.java @@ -45,7 +45,7 @@ public class MediaCCCSearchExtractor extends SearchExtractor { @Nonnull @Override - public String getSearchSuggestion() throws ParsingException { + public String getSearchSuggestion() { return ""; } diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMusicSearchExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMusicSearchExtractor.java index 95b8c9f85..0731f3041 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMusicSearchExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMusicSearchExtractor.java @@ -130,7 +130,7 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor { public String getSearchSuggestion() throws ParsingException { final JsonObject itemSectionRenderer = initialData.getObject("contents").getObject("sectionListRenderer") .getArray("contents").getObject(0).getObject("itemSectionRenderer"); - if (itemSectionRenderer == null) { + if (itemSectionRenderer.equals(JsonUtils.EMPTY_OBJECT)) { return ""; } @@ -139,9 +139,9 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor { final JsonObject showingResultsForRenderer = itemSectionRenderer.getArray("contents").getObject(0) .getObject("showingResultsForRenderer"); - if (didYouMeanRenderer != null) { + if (!didYouMeanRenderer.equals(JsonUtils.EMPTY_OBJECT)) { return getTextFromObject(didYouMeanRenderer.getObject("correctedQuery")); - } else if (showingResultsForRenderer != null) { + } else if (!showingResultsForRenderer.equals(JsonUtils.EMPTY_OBJECT)) { return JsonUtils.getString(showingResultsForRenderer, "correctedQueryEndpoint.searchEndpoint.query"); } else { return ""; @@ -152,13 +152,13 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor { public boolean isCorrectedSearch() { final JsonObject itemSectionRenderer = initialData.getObject("contents").getObject("sectionListRenderer") .getArray("contents").getObject(0).getObject("itemSectionRenderer"); - if (itemSectionRenderer == null) { + if (itemSectionRenderer.equals(JsonUtils.EMPTY_OBJECT)) { return false; } final JsonObject showingResultsForRenderer = itemSectionRenderer.getArray("contents").getObject(0) .getObject("showingResultsForRenderer"); - return showingResultsForRenderer != null; + return !showingResultsForRenderer.equals(JsonUtils.EMPTY_OBJECT); } @Nonnull diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java index 8c18c6024..f35bc6c06 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java @@ -73,7 +73,7 @@ public class YoutubeSearchExtractor extends SearchExtractor { final JsonObject showingResultsForRenderer = itemSectionRenderer.getArray("contents").getObject(0) .getObject("showingResultsForRenderer"); - if (didYouMeanRenderer != null) { + if (!didYouMeanRenderer.equals(JsonUtils.EMPTY_OBJECT)) { return JsonUtils.getString(didYouMeanRenderer, "correctedQueryEndpoint.searchEndpoint.query"); } else if (showingResultsForRenderer != null) { return getTextFromObject(showingResultsForRenderer.getObject("correctedQuery")); @@ -89,7 +89,7 @@ public class YoutubeSearchExtractor extends SearchExtractor { .getObject("sectionListRenderer").getArray("contents").getObject(0) .getObject("itemSectionRenderer").getArray("contents").getObject(0) .getObject("showingResultsForRenderer"); - return showingResultsForRenderer != null; + return !showingResultsForRenderer.equals(JsonUtils.EMPTY_OBJECT); } @Nonnull diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorTest.java index 4f7d46d52..84e1501b8 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorTest.java @@ -7,7 +7,6 @@ import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.ListExtractor; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.StreamingService; -import org.schabi.newpipe.extractor.exceptions.ParsingException; import org.schabi.newpipe.extractor.search.SearchExtractor; import org.schabi.newpipe.extractor.services.DefaultSearchExtractorTest;