Merge pull request #256 from B0pol/mediaccc

Support for non-api mediaccc links, invidious shortened links, refactor mediaccc tests

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java

@@ -16,6 +16,7 @@ import org.schabi.newpipe.extractor.stream.*;
 import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
@@ -104,13 +105,13 @@ public class MediaCCCStreamExtractor extends StreamExtractor {
     @Nonnull
     @Override
     public String getDashMpdUrl() throws ParsingException {
-        return null;
+        return "";
     }
 
     @Nonnull
     @Override
     public String getHlsUrl() throws ParsingException {
-        return null;
+        return "";
     }
 
     @Override
@@ -173,13 +174,13 @@ public class MediaCCCStreamExtractor extends StreamExtractor {
     @Nonnull
     @Override
     public List<SubtitlesStream> getSubtitlesDefault() throws IOException, ExtractionException {
-        return null;
+        return Collections.emptyList();
     }
 
     @Nonnull
     @Override
-    public List<SubtitlesStream> getSubtitles(MediaFormat format) throws IOException, ExtractionException {
+    public List<SubtitlesStream> getSubtitles(final MediaFormat format) throws IOException, ExtractionException {
-        return null;
+        return Collections.emptyList();
     }
 
     @Override
@@ -212,7 +213,6 @@ public class MediaCCCStreamExtractor extends StreamExtractor {
         } catch (JsonParserException jpe) {
             throw new ExtractionException("Could not parse json returned by url: " + getLinkHandler().getUrl(), jpe);
         }
-
     }
 
     @Nonnull

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCConferenceLinkHandlerFactory.java

@@ -19,14 +19,19 @@ public class MediaCCCConferenceLinkHandlerFactory extends ListLinkHandlerFactory
             return url.replace("https://api.media.ccc.de/public/conferences/", "");
         } else if (url.startsWith("https://media.ccc.de/c/")) {
             return Parser.matchGroup1("https://media.ccc.de/c/([^?#]*)", url);
-        } else {
+        } else if (url.startsWith("https://media.ccc.de/b/")) {
-            throw new ParsingException("Could not get id from url: " + url);
+            return Parser.matchGroup1("https://media.ccc.de/b/([^?#]*)", url);
         }
+        throw new ParsingException("Could not get id from url: " + url);
     }
 
     @Override
     public boolean onAcceptUrl(String url) throws ParsingException {
-        return url.startsWith("https://api.media.ccc.de/public/conferences/")
+        try {
-                || url.startsWith("https://media.ccc.de/c/");
+            getId(url);
+            return true;
+        } catch (ParsingException e) {
+            return false;
+        }
     }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCStreamLinkHandlerFactory.java

@@ -1,16 +1,39 @@
 package org.schabi.newpipe.extractor.services.media_ccc.linkHandler;
 
+import org.schabi.newpipe.extractor.exceptions.FoundAdException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;
+import org.schabi.newpipe.extractor.utils.Utils;
+
+import java.net.MalformedURLException;
+import java.net.URL;
 
 public class MediaCCCStreamLinkHandlerFactory extends LinkHandlerFactory {
 
     @Override
-    public String getId(String url) throws ParsingException {
+    public String getId(String urlString) throws ParsingException {
-        if (url.startsWith("https://api.media.ccc.de/public/events/") &&
+        if (urlString.startsWith("https://api.media.ccc.de/public/events/") &&
-                !url.contains("?q=")) {
+                !urlString.contains("?q=")) {
-            return url.replace("https://api.media.ccc.de/public/events/", "");
+            return urlString.substring(39); //remove api…/public/events part
         }
+
+        URL url;
+        try {
+            url = Utils.stringToURL(urlString);
+        } catch (MalformedURLException e) {
+            throw new IllegalArgumentException("The given URL is not valid");
+        }
+
+        String path = url.getPath();
+        // remove leading "/" of URL-path if URL-path is given
+        if (!path.isEmpty()) {
+            path = path.substring(1);
+        }
+
+        if (path.startsWith("v/")) {
+            return path.substring(2);
+        }
+
         throw new ParsingException("Could not get id from url: " + url);
     }
 
@@ -21,7 +44,11 @@ public class MediaCCCStreamLinkHandlerFactory extends LinkHandlerFactory {
 
     @Override
     public boolean onAcceptUrl(String url) throws ParsingException {
-        return url.startsWith("https://api.media.ccc.de/public/events/") &&
+        try {
-                !url.contains("?q=");
+            getId(url);
+            return true;
+        } catch (ParsingException e) {
+            return false;
+        }
     }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeStreamLinkHandlerFactory.java

@@ -202,7 +202,12 @@ public class YoutubeStreamLinkHandlerFactory extends LinkHandlerFactory {
                     return assertIsID(id);
                 }
 
-                break;
+                String viewQueryValue = Utils.getQueryValue(url, "v");
+                if (viewQueryValue != null) {
+                    return assertIsID(viewQueryValue);
+                }
+
+                return assertIsID(path);
             }
         }
 

extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCConferenceExtractorTest.java

@@ -4,22 +4,24 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.schabi.newpipe.DownloaderTestImpl;
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.channel.ChannelExtractor;
 import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCConferenceExtractor;
 
 import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.schabi.newpipe.extractor.ServiceList.MediaCCC;
 
 /**
  * Test {@link MediaCCCConferenceExtractor}
  */
 public class MediaCCCConferenceExtractorTest {
-    private static ChannelExtractor extractor;
+
+    public static class FrOSCon2017 {
+        private static MediaCCCConferenceExtractor extractor;
 
         @BeforeClass
         public static void setUpClass() throws Exception {
             NewPipe.init(DownloaderTestImpl.getInstance());
-        extractor = MediaCCC.getChannelExtractor("https://api.media.ccc.de/public/conferences/froscon2017");
+            extractor = (MediaCCCConferenceExtractor) MediaCCC.getChannelExtractor("https://media.ccc.de/c/froscon2017");
             extractor.fetchPage();
         }
 
@@ -47,4 +49,41 @@ public class MediaCCCConferenceExtractorTest {
         public void testGetInitalPage() throws Exception {
             assertEquals(97, extractor.getInitialPage().getItems().size());
         }
+    }
+
+    public static class Oscal2019 {
+        private static MediaCCCConferenceExtractor extractor;
+
+        @BeforeClass
+        public static void setUpClass() throws Exception {
+            NewPipe.init(DownloaderTestImpl.getInstance());
+            extractor = (MediaCCCConferenceExtractor) MediaCCC.getChannelExtractor("https://media.ccc.de/c/oscal19");
+            extractor.fetchPage();
+        }
+
+        @Test
+        public void testName() throws Exception {
+            assertEquals("Open Source Conference Albania 2019", extractor.getName());
+        }
+
+        @Test
+        public void testGetUrl() throws Exception {
+            assertEquals("https://api.media.ccc.de/public/conferences/oscal19", extractor.getUrl());
+        }
+
+        @Test
+        public void testGetOriginalUrl() throws Exception {
+            assertEquals("https://media.ccc.de/c/oscal19", extractor.getOriginalUrl());
+        }
+
+        @Test
+        public void testGetThumbnailUrl() throws Exception {
+            assertEquals("https://static.media.ccc.de/media/events/oscal/2019/oscal-19.png", extractor.getAvatarUrl());
+        }
+
+        @Test
+        public void testGetInitalPage() throws Exception {
+            assertTrue(extractor.getInitialPage().getItems().size() >= 21);
+        }
+    }
 }

extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCStreamExtractorTest.java

@@ -6,59 +6,67 @@ import org.junit.Test;
 import org.schabi.newpipe.DownloaderTestImpl;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.services.BaseExtractorTest;
 import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCStreamExtractor;
-import org.schabi.newpipe.extractor.stream.StreamExtractor;
+import org.schabi.newpipe.extractor.stream.AudioStream;
+import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.extractor.utils.UtilsTest;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.List;
 
 import static java.util.Objects.requireNonNull;
 import static junit.framework.TestCase.assertEquals;
+import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl;
 import static org.schabi.newpipe.extractor.ServiceList.MediaCCC;
 
 /**
  * Test {@link MediaCCCStreamExtractor}
  */
-public class MediaCCCStreamExtractorTest implements BaseExtractorTest {
+public class MediaCCCStreamExtractorTest {
-    private static StreamExtractor extractor;
+
+    public static class Gpn18Tmux {
+        private static MediaCCCStreamExtractor extractor;
 
         @BeforeClass
         public static void setUpClass() throws Exception {
             NewPipe.init(DownloaderTestImpl.getInstance());
 
-        extractor = MediaCCC.getStreamExtractor("https://api.media.ccc.de/public/events/8afc16c2-d76a-53f6-85e4-90494665835d");
+            extractor = (MediaCCCStreamExtractor) MediaCCC.getStreamExtractor("https://media.ccc.de/v/gpn18-105-tmux-warum-ein-schwarzes-fenster-am-bildschirm-reicht");
             extractor.fetchPage();
         }
 
-    @Override
+        @Test
         public void testServiceId() throws Exception {
             assertEquals(2, extractor.getServiceId());
         }
 
-    @Override
+        @Test
         public void testName() throws Exception {
             assertEquals("tmux - Warum ein schwarzes Fenster am Bildschirm reicht", extractor.getName());
         }
 
-    @Override
+        @Test
         public void testId() throws Exception {
-        assertEquals("", extractor.getId());
+            assertEquals("gpn18-105-tmux-warum-ein-schwarzes-fenster-am-bildschirm-reicht", extractor.getId());
         }
 
-    @Override
+        @Test
         public void testUrl() throws Exception {
-        assertEquals("", extractor.getUrl());
+            assertIsSecureUrl(extractor.getUrl());
+            assertEquals("https://api.media.ccc.de/public/events/gpn18-105-tmux-warum-ein-schwarzes-fenster-am-bildschirm-reicht", extractor.getUrl());
         }
 
-    @Override
+        @Test
         public void testOriginalUrl() throws Exception {
-        assertEquals("", extractor.getOriginalUrl());
+            assertIsSecureUrl(extractor.getOriginalUrl());
+            assertEquals("https://media.ccc.de/v/gpn18-105-tmux-warum-ein-schwarzes-fenster-am-bildschirm-reicht", extractor.getOriginalUrl());
         }
 
         @Test
         public void testThumbnail() throws Exception {
+            assertIsSecureUrl(extractor.getThumbnailUrl());
             assertEquals("https://static.media.ccc.de/media/events/gpn/gpn18/105-hd.jpg", extractor.getThumbnailUrl());
         }
 
@@ -69,22 +77,32 @@ public class MediaCCCStreamExtractorTest implements BaseExtractorTest {
 
         @Test
         public void testUploaderUrl() throws Exception {
+            assertIsSecureUrl(extractor.getUploaderUrl());
             assertEquals("https://api.media.ccc.de/public/conferences/gpn18", extractor.getUploaderUrl());
         }
 
         @Test
         public void testUploaderAvatarUrl() throws Exception {
+            assertIsSecureUrl(extractor.getUploaderAvatarUrl());
             assertEquals("https://static.media.ccc.de/media/events/gpn/gpn18/logo.png", extractor.getUploaderAvatarUrl());
         }
 
         @Test
         public void testVideoStreams() throws Exception {
-        assertEquals(4, extractor.getVideoStreams().size());
+            List<VideoStream> videoStreamList = extractor.getVideoStreams();
+            assertEquals(4, videoStreamList.size());
+            for (VideoStream stream : videoStreamList) {
+                assertIsSecureUrl(stream.getUrl());
+            }
         }
 
         @Test
         public void testAudioStreams() throws Exception {
-        assertEquals(2, extractor.getAudioStreams().size());
+            List<AudioStream> audioStreamList = extractor.getAudioStreams();
+            assertEquals(2, audioStreamList.size());
+            for (AudioStream stream : audioStreamList) {
+                assertIsSecureUrl(stream.getUrl());
+            }
         }
 
         @Test
@@ -98,4 +116,91 @@ public class MediaCCCStreamExtractorTest implements BaseExtractorTest {
             instance.setTime(new SimpleDateFormat("yyyy-MM-dd").parse("2018-05-11"));
             assertEquals(instance, requireNonNull(extractor.getUploadDate()).date());
         }
+    }
+
+    public static class _36c3PrivacyMessaging {
+        private static MediaCCCStreamExtractor extractor;
+
+        @BeforeClass
+        public static void setUpClass() throws Exception {
+            NewPipe.init(DownloaderTestImpl.getInstance());
+            extractor = (MediaCCCStreamExtractor) MediaCCC.getStreamExtractor("https://media.ccc.de/v/36c3-10565-what_s_left_for_private_messaging");
+            extractor.fetchPage();
+        }
+
+        @Test
+        public void testName() throws Exception {
+            assertEquals("What's left for private messaging?", extractor.getName());
+        }
+
+        @Test
+        public void testId() throws Exception {
+            assertEquals("36c3-10565-what_s_left_for_private_messaging", extractor.getId());
+        }
+
+        @Test
+        public void testUrl() throws Exception {
+            assertIsSecureUrl(extractor.getUrl());
+            assertEquals("https://api.media.ccc.de/public/events/36c3-10565-what_s_left_for_private_messaging", extractor.getUrl());
+        }
+
+        @Test
+        public void testOriginalUrl() throws Exception {
+            assertIsSecureUrl(extractor.getOriginalUrl());
+            assertEquals("https://media.ccc.de/v/36c3-10565-what_s_left_for_private_messaging", extractor.getOriginalUrl());
+        }
+
+        @Test
+        public void testThumbnail() throws Exception {
+            assertIsSecureUrl(extractor.getThumbnailUrl());
+            assertEquals("https://static.media.ccc.de/media/congress/2019/10565-hd.jpg", extractor.getThumbnailUrl());
+        }
+
+        @Test
+        public void testUploaderName() throws Exception {
+            assertEquals("36c3", extractor.getUploaderName());
+        }
+
+        @Test
+        public void testUploaderUrl() throws Exception {
+            assertIsSecureUrl(extractor.getUploaderUrl());
+            assertEquals("https://api.media.ccc.de/public/conferences/36c3", extractor.getUploaderUrl());
+        }
+
+        @Test
+        public void testUploaderAvatarUrl() throws Exception {
+            assertIsSecureUrl(extractor.getUploaderAvatarUrl());
+            assertEquals("https://static.media.ccc.de/media/congress/2019/logo.png", extractor.getUploaderAvatarUrl());
+        }
+
+        @Test
+        public void testVideoStreams() throws Exception {
+            List<VideoStream> videoStreamList = extractor.getVideoStreams();
+            assertEquals(8, videoStreamList.size());
+            for (VideoStream stream : videoStreamList) {
+                assertIsSecureUrl(stream.getUrl());
+            }
+        }
+
+        @Test
+        public void testAudioStreams() throws Exception {
+            List<AudioStream> audioStreamList = extractor.getAudioStreams();
+            assertEquals(2, audioStreamList.size());
+            for (AudioStream stream : audioStreamList) {
+                assertIsSecureUrl(stream.getUrl());
+            }
+        }
+
+        @Test
+        public void testGetTextualUploadDate() throws ParsingException {
+            Assert.assertEquals("2020-01-11T01:00:00.000+01:00", extractor.getTextualUploadDate());
+        }
+
+        @Test
+        public void testGetUploadDate() throws ParsingException, ParseException {
+            final Calendar instance = Calendar.getInstance();
+            instance.setTime(new SimpleDateFormat("yyyy-MM-dd").parse("2020-01-11"));
+            assertEquals(instance, requireNonNull(extractor.getUploadDate()).date());
+        }
+    }
 }