Basic PeerTube support (without P2P)

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

@@ -1,5 +1,10 @@
 package org.schabi.newpipe.extractor;
 
+import java.io.IOException;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
@@ -8,11 +13,6 @@
 import org.schabi.newpipe.extractor.localization.Localization;
 import org.schabi.newpipe.extractor.localization.TimeAgoParser;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.io.Serializable;
-
 public abstract class Extractor{ 
     /**
      * {@link StreamingService} currently related to this extractor.<br>
@@ -93,6 +93,11 @@ public String getOriginalUrl() throws ParsingException {
     public String getUrl() throws ParsingException {
         return linkHandler.getUrl();
     }
+
+    @Nonnull
+    public String getBaseUrl() throws ParsingException {
+       return linkHandler.getBaseUrl();
+    }
 
     @Nonnull
     public StreamingService getService() {

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

@@ -126,6 +126,13 @@ public static MediaFormat getFormatById(int id) {
         return null;
     }
 
+    public static MediaFormat getFromSuffix(String suffix) {
+        for (MediaFormat vf: values()) {
+            if (vf.suffix.equals(suffix)) return vf;
+        }
+        return null;
+    }
+
     /**
      * Get the name of the format
      * @return the name of the format
@@ -149,4 +156,5 @@ public String getSuffix() {
     public String getMimeType() {
         return mimeType;
     }
+
 }

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

@@ -1,14 +1,14 @@
 package org.schabi.newpipe.extractor;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import org.schabi.newpipe.extractor.services.media_ccc.MediaCCCService;
+import org.schabi.newpipe.extractor.services.peertube.PeertubeService;
 import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudService;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
 
-import java.util.List;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
-
 /*
  * Copyright (C) Christian Schabesberger 2018 <chris.schabesberger@mailbox.org>
  * ServiceList.java is part of NewPipe.
@@ -38,16 +38,18 @@ private ServiceList() {
     public static final YoutubeService YouTube;
     public static final SoundcloudService SoundCloud;
     public static final MediaCCCService MediaCCC;
+    public static final PeertubeService PeerTube;
 
     /**
      * When creating a new service, put this service in the end of this list,
      * and give it the next free id.
      */
-    private static final List<StreamingService> SERVICES = unmodifiableList(
-            asList(
+    private static final List<StreamingService> SERVICES = Collections.unmodifiableList(
+            Arrays.asList(
                     YouTube = new YoutubeService(0),
                     SoundCloud = new SoundcloudService(1),
-                    MediaCCC = new MediaCCCService(2)
+                    MediaCCC = new MediaCCCService(2),
+                    PeerTube = new PeertubeService(3)
             ));
 
     /**

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

@@ -1,11 +1,19 @@
 package org.schabi.newpipe.extractor;
 
+import java.util.Collections;
+import java.util.List;
+
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
 import org.schabi.newpipe.extractor.comments.CommentsExtractor;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.kiosk.KioskList;
-import org.schabi.newpipe.extractor.linkhandler.*;
+import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
+import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
+import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandler;
+import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandlerFactory;
 import org.schabi.newpipe.extractor.localization.ContentCountry;
 import org.schabi.newpipe.extractor.localization.Localization;
 import org.schabi.newpipe.extractor.localization.TimeAgoParser;
@@ -16,9 +24,6 @@
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
 
-import java.util.Collections;
-import java.util.List;
-
 /*
  * Copyright (C) Christian Schabesberger 2018 <chris.schabesberger@mailbox.org>
  * StreamingService.java is part of NewPipe.
@@ -44,6 +49,7 @@ public abstract class StreamingService {
      */
     public static class ServiceInfo {
         private final String name;
+
         private final List<MediaCapability> mediaCapabilities;
 
         /**
@@ -59,7 +65,7 @@ public ServiceInfo(String name, List<MediaCapability> mediaCapabilities) {
         public String getName() {
             return name;
         }
-
+        
         public List<MediaCapability> getMediaCapabilities() {
             return mediaCapabilities;
         }
@@ -110,6 +116,8 @@ public ServiceInfo getServiceInfo() {
     public String toString() {
         return serviceId + ":" + serviceInfo.getName();
     }
+
+    public abstract String getBaseUrl();
 
     /*//////////////////////////////////////////////////////////////////////////
     // Url Id handler
@@ -250,7 +258,7 @@ public CommentsExtractor getCommentsExtractor(String url) throws ExtractionExcep
         }
         return getCommentsExtractor(llhf.fromUrl(url));
     }
-
+    
     /*//////////////////////////////////////////////////////////////////////////
     // Utils
     //////////////////////////////////////////////////////////////////////////*/

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

@@ -118,7 +118,7 @@ public KioskExtractor getExtractorByUrl(String url, String nextPageUrl, Localiza
         for(Map.Entry<String, KioskEntry> e : kioskList.entrySet()) {
             KioskEntry ke = e.getValue();
             if(ke.handlerFactory.acceptUrl(url)) {
-                return getExtractorById(e.getKey(), nextPageUrl, localization);
+                return getExtractorById(ke.handlerFactory.getId(url), nextPageUrl, localization);
             }
         }
         throw new ExtractionException("Could not find a kiosk that fits to the url: " + url);

extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/LinkHandler.java

@@ -2,6 +2,9 @@
 
 import java.io.Serializable;
 
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.utils.Utils;
+
 public class LinkHandler implements Serializable {
     protected final String originalUrl;
     protected final String url;
@@ -28,4 +31,8 @@ public String getUrl() {
     public String getId() {
         return id;
     }
+
+    public String getBaseUrl() throws ParsingException {
+       return Utils.getBaseUrl(url);
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/LinkHandlerFactory.java

@@ -2,6 +2,7 @@
 
 import org.schabi.newpipe.extractor.exceptions.FoundAdException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.utils.Utils;
 
 /*
  * Created by Christian Schabesberger on 26.07.16.
@@ -33,26 +34,41 @@ public abstract class LinkHandlerFactory {
     public abstract String getUrl(String id) throws ParsingException;
     public abstract boolean onAcceptUrl(final String url) throws ParsingException;
 
+    public String getUrl(String id, String baseUrl) throws ParsingException{
+       return getUrl(id);
+    }
+
     ///////////////////////////////////
     // Logic
     ///////////////////////////////////
 
     public LinkHandler fromUrl(String url) throws ParsingException {
+        final String baseUrl = Utils.getBaseUrl(url);
+        return fromUrl(url, baseUrl);
+    }
+
+    public LinkHandler fromUrl(String url, String baseUrl) throws ParsingException {
         if(url == null) throw new IllegalArgumentException("url can not be null");
         if(!acceptUrl(url)) {
             throw new ParsingException("Malformed unacceptable url: " + url);
         }
 
         final String id = getId(url);
-        return new LinkHandler(url, getUrl(id), id);
+        return new LinkHandler(url, getUrl(id,baseUrl), id);
     }
-
+    
     public LinkHandler fromId(String id) throws ParsingException {
         if(id == null) throw new IllegalArgumentException("id can not be null");
         final String url = getUrl(id);
         return new LinkHandler(url, url, id);
     }
 
+    public LinkHandler fromId(String id, String baseUrl) throws ParsingException {
+        if(id == null) throw new IllegalArgumentException("id can not be null");
+        final String url = getUrl(id, baseUrl);
+        return new LinkHandler(url, url, id);
+    }
+
     /**
      * When a VIEW_ACTION is caught this function will test if the url delivered within the calling
      * Intent was meant to be watched with this Service.
@@ -65,4 +81,5 @@ public boolean acceptUrl(final String url) throws ParsingException {
             throw fe;
         }
     }
+
 }

extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java

@@ -1,10 +1,11 @@
 package org.schabi.newpipe.extractor.linkhandler;
 
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.utils.Utils;
+
 public abstract class ListLinkHandlerFactory extends LinkHandlerFactory {
 
     ///////////////////////////////////
@@ -14,32 +15,53 @@ public abstract class ListLinkHandlerFactory extends LinkHandlerFactory {
     public List<String> getContentFilter(String url) throws ParsingException { return new ArrayList<>(0);}
     public String getSortFilter(String url) throws ParsingException {return ""; }
     public abstract String getUrl(String id, List<String> contentFilter, String sortFilter) throws ParsingException;
+
+    public String getUrl(String id, List<String> contentFilter, String sortFilter, String baseUrl) throws ParsingException {
+       return getUrl(id, contentFilter, sortFilter); 
+    }
 
     ///////////////////////////////////
     // Logic
     ///////////////////////////////////
-
-
+
     @Override
     public ListLinkHandler fromUrl(String url) throws ParsingException {
+        String baseUrl = Utils.getBaseUrl(url);
+        return fromUrl(url, baseUrl);
+    }
+
+    @Override
+    public ListLinkHandler fromUrl(String url, String baseUrl) throws ParsingException {
         if(url == null) throw new IllegalArgumentException("url may not be null");
 
-        return new ListLinkHandler(super.fromUrl(url), getContentFilter(url), getSortFilter(url));
+        return new ListLinkHandler(super.fromUrl(url, baseUrl), getContentFilter(url), getSortFilter(url));
     }
 
     @Override
     public ListLinkHandler fromId(String id) throws ParsingException {
         return new ListLinkHandler(super.fromId(id), new ArrayList<String>(0), "");
     }
+
+    @Override
+    public ListLinkHandler fromId(String id, String baseUrl) throws ParsingException {
+        return new ListLinkHandler(super.fromId(id, baseUrl), new ArrayList<String>(0), "");
+    }
 
     public ListLinkHandler fromQuery(String id,
                                      List<String> contentFilters,
                                      String sortFilter) throws ParsingException {
         final String url = getUrl(id, contentFilters, sortFilter);
         return new ListLinkHandler(url, url, id, contentFilters, sortFilter);
     }
+
+    public ListLinkHandler fromQuery(String id,
+                                     List<String> contentFilters,
+                                     String sortFilter, String baseUrl) throws ParsingException {
+        final String url = getUrl(id, contentFilters, sortFilter, baseUrl);
+        return new ListLinkHandler(url, url, id, contentFilters, sortFilter);
+    }
 
-
+    
     /**
      * For makeing ListLinkHandlerFactory compatible with LinkHandlerFactory we need to override this,
      * however it should not be overridden by the actual implementation.
@@ -50,6 +72,11 @@ public String getUrl(String id) throws ParsingException {
         return getUrl(id, new ArrayList<String>(0), "");
     }
 
+    @Override
+    public String getUrl(String id, String baseUrl) throws ParsingException {
+        return getUrl(id, new ArrayList<String>(0), "", baseUrl);
+    }
+
     /**
      * Will returns content filter the corresponding extractor can handle like "channels", "videos", "music", etc.
      *

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCService.java

@@ -116,4 +116,9 @@ public CommentsExtractor getCommentsExtractor(ListLinkHandler linkHandler)
         return null;
     }
 
+    @Override
+    public String getBaseUrl() {
+        return "https://media.ccc.de";
+    }
+
 }