From 655c9997956147d2f16ef577e2c271d5ecb5d522 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Mon, 17 Feb 2020 17:30:22 +0100
Subject: [PATCH] Detect disabled subriber count correctly

Fix parsing of kiosk name
---
 .../extractors/YoutubeChannelExtractor.java   |  7 ++---
 .../extractors/YoutubeTrendingExtractor.java  | 26 ++++++++++++++++---
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java
index 103a59c44..544a9e461 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java
@@ -165,10 +165,11 @@ public class YoutubeChannelExtractor extends ChannelExtractor {
     @Override
     public long getSubscriberCount() throws ParsingException {
 
-        final String simpleText = ytInitialData.getObject("header").getObject("c4TabbedHeaderRenderer").getObject("subscriberCountText").getArray("runs").getObject(0).getString("text");
-        if (simpleText != null) {
+        final JsonObject subscriberInfo = ytInitialData.getObject("header").getObject("c4TabbedHeaderRenderer").getObject("subscriberCountText");
+        if (subscriberInfo != null) {
             try {
-                return Utils.mixedNumberWordToLong(simpleText);
+
+                return Utils.mixedNumberWordToLong(subscriberInfo.getArray("runs").getObject(0).getString("text"));
             } catch (NumberFormatException e) {
                 throw new ParsingException("Could not get subscriber count", e);
             }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeTrendingExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeTrendingExtractor.java
index be5820de7..44f9c7e5a 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeTrendingExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeTrendingExtractor.java
@@ -20,6 +20,9 @@ package org.schabi.newpipe.extractor.services.youtube.extractors;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import com.grack.nanojson.JsonObject;
+import com.grack.nanojson.JsonParser;
+import com.grack.nanojson.JsonParserException;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
@@ -34,6 +37,7 @@ import org.schabi.newpipe.extractor.localization.TimeAgoParser;
 import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeParsingHelper;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
+import org.schabi.newpipe.extractor.utils.Parser;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
@@ -41,6 +45,7 @@ import java.io.IOException;
 public class YoutubeTrendingExtractor extends KioskExtractor<StreamInfoItem> {
 
     private Document doc;
+    private JsonObject initialData;
 
     public YoutubeTrendingExtractor(StreamingService service,
                                     ListLinkHandler linkHandler,
@@ -55,6 +60,16 @@ public class YoutubeTrendingExtractor extends KioskExtractor<StreamInfoItem> {
 
         final Response response = downloader.get(url, getExtractorLocalization());
         doc = YoutubeParsingHelper.parseAndCheckPage(url, response);
+        initialData = getInitialData();
+    }
+
+    private JsonObject getInitialData() throws ParsingException {
+        try {
+            String initialData = Parser.matchGroup1("window\\[\"ytInitialData\"\\]\\s*=\\s*(\\{.*?\\});", doc.toString());
+            return JsonParser.object().from(initialData);
+        } catch (JsonParserException | Parser.RegexException e) {
+            throw new ParsingException("Could not get ytInitialData", e);
+        }
     }
 
     @Override
@@ -70,14 +85,17 @@ public class YoutubeTrendingExtractor extends KioskExtractor<StreamInfoItem> {
     @Nonnull
     @Override
     public String getName() throws ParsingException {
+        String name;
         try {
-            Element a = doc.select("a[href*=\"/feed/trending\"]").first();
-            Element span = a.select("span[class*=\"display-name\"]").first();
-            Element nameSpan = span.select("span").first();
-            return nameSpan.text();
+            name = initialData.getObject("header").getObject("feedTabbedHeaderRenderer").getObject("title")
+                    .getArray("runs").getObject(0).getString("text");
         } catch (Exception e) {
             throw new ParsingException("Could not get Trending name", e);
         }
+        if (name != null && !name.isEmpty()) {
+            return name;
+        }
+        throw new ParsingException("Could not get Trending name");
     }
 
     @Nonnull