Merge branch 'bugfix-dont-call-fetch-page-in-constructor' of https://github.com/coffeemakr/NewPipeExtractor into f

Author: theScrabi

build.gradle

@@ -24,4 +24,12 @@ task sourcesJar(type: Jar, dependsOn: classes) {
 
 artifacts {
     archives sourcesJar
+}
+
+tasks.withType(Test) {
+    testLogging {
+        events "skipped", "failed"
+        showStandardStreams = true
+        exceptionFormat = 'full'
+    }
 }

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

@@ -33,12 +33,16 @@ public abstract class Extractor {
      */
     @Nullable
     private String cleanUrl;
+    private boolean pageFetched = false;
+    private final Downloader downloader;
 
     public Extractor(StreamingService service, String url) throws ExtractionException {
         if(service == null) throw new NullPointerException("service is null");
         if(url == null) throw new NullPointerException("url is null");
         this.service = service;
         this.originalUrl = url;
+        this.downloader = NewPipe.getDownloader();
+        if(downloader == null) throw new NullPointerException("downloader is null");
     }
 
     /**
@@ -49,8 +53,26 @@ public Extractor(StreamingService service, String url) throws ExtractionExceptio
 
     /**
      * Fetch the current page.
+     * @throws IOException if the page can not be loaded
+     * @throws ExtractionException if the pages content is not understood
      */
-    public abstract void fetchPage() throws IOException, ExtractionException;
+    public void fetchPage() throws IOException, ExtractionException {
+        if(pageFetched) return;
+        onFetchPage(downloader);
+        pageFetched = true;
+    }
+
+    protected void assertPageFetched() {
+        if(!pageFetched) throw new IllegalStateException("Page is not fetched. Make sure you call fetchPage()");
+    }
+
+    /**
+     * Fetch the current page.
+     * @param downloader the download to use
+     * @throws IOException if the page can not be loaded
+     * @throws ExtractionException if the pages content is not understood
+     */
+    public abstract void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException;
 
     @Nonnull
     public abstract String getId() throws ParsingException;

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

@@ -16,7 +16,7 @@ public abstract class Info implements Serializable {
     public final String url;
     public final String name;
 
-    public List<Throwable> errors = new ArrayList<>();
+    public final List<Throwable> errors = new ArrayList<>();
 
     public void addError(Throwable throwable) {
         this.errors.add(throwable);

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

@@ -3,9 +3,10 @@
 import org.schabi.newpipe.extractor.stream.SubtitlesFormat;
 
 public class Subtitles {
-    private SubtitlesFormat format;
-    private String languageCode, URL;
-    private boolean autoGenerated;
+    private final SubtitlesFormat format;
+    private final String languageCode;
+    private final String URL;
+    private final boolean autoGenerated;
 
     public Subtitles(SubtitlesFormat format, String languageCode, String URL, boolean autoGenerated) {
         this.format = format;

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

@@ -27,7 +27,7 @@
 
 public abstract class SuggestionExtractor {
 
-    private int serviceId;
+    private final int serviceId;
 
     public SuggestionExtractor(int serviceId) {
         this.serviceId = serviceId;

src/main/java/org/schabi/newpipe/extractor/kiosk/KioskExtractor.java

@@ -30,7 +30,7 @@
 
 public abstract class KioskExtractor extends ListExtractor {
     private String contentCountry = null;
-    private String id = null;
+    private final String id;
 
     public KioskExtractor(StreamingService streamingService,
                           String url,

src/main/java/org/schabi/newpipe/extractor/kiosk/KioskList.java

@@ -19,17 +19,17 @@ KioskExtractor createNewKiosk(final StreamingService streamingService,
             throws ExtractionException, IOException;
     }
 
-    private int service_id;
-    private HashMap<String, KioskEntry> kioskList = new HashMap<>();
+    private final int service_id;
+    private final HashMap<String, KioskEntry> kioskList = new HashMap<>();
     private String defaultKiosk = null;
 
     private class KioskEntry {
         public KioskEntry(KioskExtractorFactory ef, UrlIdHandler h) {
             extractorFactory = ef;
             handler = h;
         }
-        KioskExtractorFactory extractorFactory;
-        UrlIdHandler handler;
+        final KioskExtractorFactory extractorFactory;
+        final UrlIdHandler handler;
     }
 
     public KioskList(int service_id) {

src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java

@@ -35,7 +35,7 @@ public NothingFoundException(String message) {
         }
     }
 
-    private InfoItemSearchCollector collector;
+    private final InfoItemSearchCollector collector;
 
     public SearchEngine(int serviceId) {
         collector = new InfoItemSearchCollector(serviceId);

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

@@ -24,14 +24,13 @@ public SoundcloudChannelExtractor(StreamingService service, String url, String n
     }
 
     @Override
-    public void fetchPage() throws IOException, ExtractionException {
-        Downloader dl = NewPipe.getDownloader();
+    public void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException {
 
         userId = getUrlIdHandler().getId(getOriginalUrl());
         String apiUrl = "https://api.soundcloud.com/users/" + userId +
                 "?client_id=" + SoundcloudParsingHelper.clientId();
 
-        String response = dl.download(apiUrl);
+        String response = downloader.download(apiUrl);
         try {
             user = JsonParser.object().from(response);
         } catch (JsonParserException e) {

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

@@ -4,7 +4,7 @@
 import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
 
 public class SoundcloudChannelInfoItemExtractor implements ChannelInfoItemExtractor {
-    private JsonObject searchResult;
+    private final JsonObject searchResult;
 
     public SoundcloudChannelInfoItemExtractor(JsonObject searchResult) {
         this.searchResult = searchResult;