Merge branch 'master' into invidious-support

Author: connectety

extractor/.attach_pid31246

@@ -27,7 +27,7 @@ public abstract class Info implements Serializable {
      *
      * @see Extractor#getOriginalUrl()
      */
-    private final String originalUrl;
+    private String originalUrl;
     private final String name;
 
     private final List<Throwable> errors = new ArrayList<>();
@@ -62,6 +62,12 @@ public String toString() {
         return getClass().getSimpleName() + "[url=\"" + url + "\"" + ifDifferentString + ", name=\"" + name + "\"]";
     }
 
+    // if you use an api and want to handle the website url
+    // overriding original url is essential
+    public void setOriginalUrl(String url) {
+        originalUrl = url;
+    }
+
     public int getServiceId() {
         return serviceId;
     }

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

@@ -30,20 +30,21 @@ public enum MediaFormat {
     //video and audio combined formats
     //           id      name    suffix  mime type
     MPEG_4      (0x0,   "MPEG-4", "mp4", "video/mp4"),
-    v3GPP       (0x1,   "3GPP",   "3gp", "video/3gpp"),
-    WEBM        (0x2,   "WebM",  "webm", "video/webm"),
+    v3GPP       (0x10,   "3GPP",   "3gp", "video/3gpp"),
+    WEBM        (0x20,   "WebM",  "webm", "video/webm"),
     // audio formats
-    M4A         (0x3,   "m4a",   "m4a",  "audio/mp4"),
-    WEBMA       (0x4,   "WebM",  "webm", "audio/webm"),
-    MP3         (0x5,   "MP3",   "mp3",  "audio/mpeg"),
-    OPUS        (0x6,   "opus",  "opus", "audio/opus"),
+    M4A         (0x100,   "m4a",   "m4a",  "audio/mp4"),
+    WEBMA       (0x200,   "WebM",  "webm", "audio/webm"),
+    MP3         (0x300,   "MP3",   "mp3",  "audio/mpeg"),
+    OPUS        (0x400,   "opus",  "opus", "audio/opus"),
+    OGG         (0x500, "ogg", "ogg", "audio/ogg"),
     // subtitles formats
-    VTT         (0x7,   "WebVTT",                      "vtt",   "text/vtt"),
-    TTML        (0x8,   "Timed Text Markup Language",  "ttml",  "application/ttml+xml"),
-    TRANSCRIPT1 (0x9,   "TranScript v1",               "srv1",  "text/xml"),
-    TRANSCRIPT2 (0xA,   "TranScript v2",               "srv2",  "text/xml"),
-    TRANSCRIPT3 (0xB,   "TranScript v3",               "srv3",  "text/xml"),
-    SRT         (0xC,   "SubRip file format",          "srt",   "text/srt");
+    VTT         (0x1000,   "WebVTT",                      "vtt",   "text/vtt"),
+    TTML        (0x2000,   "Timed Text Markup Language",  "ttml",  "application/ttml+xml"),
+    TRANSCRIPT1 (0x3000,   "TranScript v1",               "srv1",  "text/xml"),
+    TRANSCRIPT2 (0x4000,   "TranScript v2",               "srv2",  "text/xml"),
+    TRANSCRIPT3 (0x5000,   "TranScript v3",               "srv3",  "text/xml"),
+    SRT         (0x6000,   "SubRip file format",          "srt",   "text/srt");
 
     public final int id;
     public final String name;

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

@@ -1,5 +1,6 @@
 package org.schabi.newpipe.extractor;
 
+import org.schabi.newpipe.extractor.services.media_ccc.MediaCCCService;
 import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudService;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
 
@@ -36,6 +37,7 @@ private ServiceList() {
 
     public static final YoutubeService YouTube;
     public static final SoundcloudService SoundCloud;
+    public static final MediaCCCService MediaCCC;
 
     /**
      * When creating a new service, put this service in the end of this list,
@@ -44,7 +46,8 @@ private ServiceList() {
     private static final List<StreamingService> SERVICES = unmodifiableList(
             asList(
                     YouTube = new YoutubeService(0),
-                    SoundCloud = new SoundcloudService(1)
+                    SoundCloud = new SoundcloudService(1),
+                    MediaCCC = new MediaCCCService(2)
             ));
 
     /**

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

@@ -38,5 +38,4 @@ public ChannelExtractor(StreamingService service, ListLinkHandler linkHandler, L
     public abstract String getFeedUrl() throws ParsingException;
     public abstract long getSubscriberCount() throws ParsingException;
     public abstract String getDescription() throws ParsingException;
-    public abstract String[] getDonationLinks() throws ParsingException;
 }

extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java

@@ -61,7 +61,11 @@ public static ChannelInfo getInfo(ChannelExtractor extractor) throws IOException
                 extractor.getLinkHandler(),
                 extractor.getName());
 
-
+        try {
+            info.setOriginalUrl(extractor.getOriginalUrl());
+        } catch (Exception e) {
+            info.addError(e);
+        }
         try {
             info.setAvatarUrl(extractor.getAvatarUrl());
         } catch (Exception e) {
@@ -92,11 +96,6 @@ public static ChannelInfo getInfo(ChannelExtractor extractor) throws IOException
         } catch (Exception e) {
             info.addError(e);
         }
-        try {
-            info.setDonationLinks(extractor.getDonationLinks());
-        } catch (Exception e) {
-            info.addError(e);
-        }
 
         return info;
     }

extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java

@@ -20,6 +20,7 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
@@ -29,7 +30,7 @@
 
 import javax.annotation.Nonnull;
 
-public abstract class KioskExtractor extends ListExtractor<StreamInfoItem> {
+public abstract class KioskExtractor<T extends InfoItem> extends ListExtractor<T> {
     private final String id;
 
     public KioskExtractor(StreamingService streamingService,

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

@@ -49,6 +49,11 @@ public void setDefaultKiosk(String kioskType) {
         defaultKiosk = kioskType;
     }
 
+    public KioskExtractor getDefaultKioskExtractor()
+            throws ExtractionException, IOException {
+        return getDefaultKioskExtractor("");
+    }
+
     public KioskExtractor getDefaultKioskExtractor(String nextPageUrl)
             throws ExtractionException, IOException {
         return getDefaultKioskExtractor(nextPageUrl, NewPipe.getPreferredLocalization());

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

@@ -47,6 +47,11 @@ public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws Extractio
                 extractor.getLinkHandler(),
                 extractor.getName());
 
+        try {
+            info.setOriginalUrl(extractor.getOriginalUrl());
+        } catch (Exception e) {
+            info.addError(e);
+        }
         try {
             info.setStreamCount(extractor.getStreamCount());
         } catch (Exception e) {

extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java

@@ -37,6 +37,11 @@ public static SearchInfo getInfo(SearchExtractor extractor) throws ExtractionExc
                 extractor.getLinkHandler(),
                 extractor.getSearchString());
 
+        try {
+            info.setOriginalUrl(extractor.getOriginalUrl());
+        } catch (Exception e) {
+            info.addError(e);
+        }
         try {
             info.searchSuggestion = extractor.getSearchSuggestion();
         } catch (Exception e) {