[SoundCloud] Add logging to SoundcloudParsingHelper, SoundcloudStreamExtractor, StreamInfo

Author: absurdlylongusername

extractor/src/main/java/org/schabi/newpipe/extractor/NewPipe.java

@@ -49,7 +49,7 @@ public static void init(final Downloader d) {
     }
 
     public static void init(final Downloader d, final Localization l) {
-        ExtractorLogger.d(TAG, "Default init called with localization={}");
+        ExtractorLogger.d(TAG, "Default init called with localization");
         init(d, l, l.getCountryCode().isEmpty()
                 ? ContentCountry.DEFAULT : new ContentCountry(l.getCountryCode()));
     }

extractor/src/main/java/org/schabi/newpipe/extractor/StreamingServiceId.java

@@ -0,0 +1,23 @@
+package org.schabi.newpipe.extractor;
+
+import java.util.Objects;
+
+public enum StreamingServiceId {
+    NO_SERVICE_ID,
+    YOUTUBE,
+    SOUNDCLOUD,
+    MEDIACCC,
+    PEERTUBE,
+    BANDCAMP;
+
+
+    private static final StreamingServiceId[] VALUES = values();
+
+    public static String nameFromId(final int serviceId) {
+        try {
+            return VALUES[Objects.checkIndex(serviceId + 1, VALUES.length)].name();
+        } catch (final IndexOutOfBoundsException e) {
+            throw new IllegalArgumentException("Invalid serviceId: " + serviceId, e);
+        }
+    }
+}

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java

@@ -29,6 +29,7 @@
 import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudLikesInfoItemExtractor;
 import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudStreamInfoItemExtractor;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
+import org.schabi.newpipe.extractor.utils.ExtractorLogger;
 import org.schabi.newpipe.extractor.utils.ImageSuffix;
 import org.schabi.newpipe.extractor.utils.JsonUtils;
 import org.schabi.newpipe.extractor.utils.Parser;
@@ -87,6 +88,7 @@ public final class SoundcloudParsingHelper {
     private static final List<ImageSuffix> VISUALS_IMAGE_SUFFIXES =
             List.of(new ImageSuffix("t1240x260", 1240, 260, MEDIUM),
                     new ImageSuffix("t2480x520", 2480, 520, MEDIUM));
+    public static final String TAG = SoundcloudParsingHelper.class.getSimpleName();
 
     private static String clientId;
     public static final String SOUNDCLOUD_API_V2_URL = "https://api-v2.soundcloud.com/";
@@ -100,6 +102,7 @@ private SoundcloudParsingHelper() {
 
     public static synchronized String clientId() throws ExtractionException, IOException {
         if (!isNullOrEmpty(clientId)) {
+            ExtractorLogger.d(TAG, "Returning clientId=" + clientId);
             return clientId;
         }
 
@@ -121,9 +124,11 @@ public static synchronized String clientId() throws ExtractionException, IOExcep
             final String srcUrl = element.attr("src");
             if (!isNullOrEmpty(srcUrl)) {
                 try {
+                    ExtractorLogger.d(TAG, "Searching for clientId in  " + srcUrl);
                     clientId = Parser.matchGroup1(clientIdPattern, dl.get(srcUrl, headers)
                             .validateResponseCode()
                             .responseBody());
+                    ExtractorLogger.d(TAG, "Found clientId=" + clientId);
                     return clientId;
                 } catch (final RegexException ignored) {
                     // Ignore it and proceed to try searching other script
@@ -159,6 +164,7 @@ public static DateWrapper parseDate(final String uploadDate) throws ParsingExcep
      // CHECKSTYLE:ON
     public static JsonObject resolveFor(@Nonnull final Downloader downloader, final String url)
             throws IOException, ExtractionException {
+        ExtractorLogger.d(TAG, "resolveFor(" + url + ")");
         final String apiUrl = SOUNDCLOUD_API_V2_URL + "resolve"
                 + "?url=" + Utils.encodeUrlUtf8(url)
                 + "&client_id=" + clientId();

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamExtractor.java

@@ -35,6 +35,7 @@
 import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.extractor.utils.ExtractorLogger;
 import org.schabi.newpipe.extractor.utils.Utils;
 
 import java.io.IOException;
@@ -46,6 +47,7 @@
 import javax.annotation.Nullable;
 
 public class SoundcloudStreamExtractor extends StreamExtractor {
+    public static final String TAG = SoundcloudStreamExtractor.class.getSimpleName();
     private JsonObject track;
     private boolean isAvailable = true;
 
@@ -57,9 +59,12 @@ public SoundcloudStreamExtractor(final StreamingService service,
     @Override
     public void onFetchPage(@Nonnull final Downloader downloader) throws IOException,
             ExtractionException {
-        track = SoundcloudParsingHelper.resolveFor(downloader, getUrl());
+        final var url = getUrl();
+        ExtractorLogger.d(TAG, "onFetchPage(" + url + ")");
+        track = SoundcloudParsingHelper.resolveFor(downloader, url);
 
         final String policy = track.getString("policy", "");
+        ExtractorLogger.d(TAG, "policy is: " + policy);
         if (!policy.equals("ALLOW") && !policy.equals("MONETIZE")) {
             isAvailable = false;
 
@@ -164,6 +169,7 @@ public List<AudioStream> getAudioStreams() throws ExtractionException {
         // For playing the track, it is only necessary to have a streamable track.
         // If this is not the case, this track might not be published yet.
         if (!track.getBoolean("streamable") || !isAvailable) {
+            ExtractorLogger.d(TAG, "Not streamable track: " + getUrl());
             return audioStreams;
         }
 
@@ -172,6 +178,7 @@ public List<AudioStream> getAudioStreams() throws ExtractionException {
                                                 .getArray("transcodings");
             if (!isNullOrEmpty(transcodings)) {
                 // Get information about what stream formats are available
+                ExtractorLogger.d(TAG, "Extracting audio streams for " + getName());
                 extractAudioStreams(transcodings, audioStreams);
             }
         } catch (final NullPointerException e) {

extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java

@@ -186,6 +186,18 @@ private static void extractStreams(final StreamInfo streamInfo,
         // Either audio or video has to be available, otherwise we didn't get a stream (since
         // videoOnly are optional, they don't count).
         if ((streamInfo.videoStreams.isEmpty()) && (streamInfo.audioStreams.isEmpty())) {
+            final var errors = streamInfo.getErrors();
+            final var url = streamInfo.getOriginalUrl();
+            final var name = streamInfo.getName();
+            if (errors.isEmpty()) {
+                ExtractorLogger.e(TAG, "Error extracting " + name + " " + url
+                                       + "\nCould not get any stream and didn't catch any errors");
+            } else {
+                errors.forEach(m -> ExtractorLogger.e(TAG,
+                                                      "Error for " + streamInfo.getOriginalUrl(),
+                                                      m));
+            }
+
             throw new StreamExtractException(
                     "Could not get any stream. See error variable to get further details.");
         }