Merge remote-tracking branch 'upstream/master'

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

@@ -568,9 +568,9 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     private final static String DECYRYPTION_SIGNATURE_FUNCTION_REGEX =
             "(\\w+)\\s*=\\s*function\\((\\w+)\\)\\{\\s*\\2=\\s*\\2\\.split\\(\"\"\\)\\s*;";
     private final static String DECRYPTION_AKAMAIZED_STRING_REGEX =
-            "yt\\.akamaized\\.net/\\)\\s*\\|\\|\\s*.*?\\s*c\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*([a-zA-Z0-9$]+)\\(";
+            "yt\\.akamaized\\.net/\\)\\s*\\|\\|\\s*.*?\\s*c\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*(:encodeURIComponent\\s*\\()([a-zA-Z0-9$]+)\\(";
     private final static String DECRYPTION_AKAMAIZED_SHORT_STRING_REGEX =
-            "\\bc\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*([a-zA-Z0-9$]+)\\(";
+            "\\bc\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*(:encodeURIComponent\\s*\\()([a-zA-Z0-9$]+)\\(";
 
     private volatile String decryptionCode = "";
 

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

@@ -270,8 +270,8 @@ public class StreamInfo extends Info {
     }
 
     private StreamType streamType;
-    private String thumbnailUrl;
+    private String thumbnailUrl = "";
-    private String uploadDate;
+    private String uploadDate = "";
     private long duration = -1;
     private int ageLimit = -1;
     private String description;
@@ -280,26 +280,26 @@ public class StreamInfo extends Info {
     private long likeCount = -1;
     private long dislikeCount = -1;
 
-    private String uploaderName;
+    private String uploaderName = "";
-    private String uploaderUrl;
+    private String uploaderUrl = "";
-    private String uploaderAvatarUrl;
+    private String uploaderAvatarUrl = "";
 
-    private List<VideoStream> videoStreams;
+    private List<VideoStream> videoStreams = new ArrayList<>();
-    private List<AudioStream> audioStreams;
+    private List<AudioStream> audioStreams = new ArrayList<>();
-    private List<VideoStream> videoOnlyStreams;
+    private List<VideoStream> videoOnlyStreams = new ArrayList<>();
 
-    private String dashMpdUrl;
+    private String dashMpdUrl = "";
-    private List<VideoStream> segmentedVideoStreams;
+    private List<VideoStream> segmentedVideoStreams = new ArrayList<>();
-    private List<AudioStream> segmentedAudioStreams;
+    private List<AudioStream> segmentedAudioStreams = new ArrayList<>();
-    private List<VideoStream> segmentedVideoOnlyStreams;
+    private List<VideoStream> segmentedVideoOnlyStreams = new ArrayList<>();
 
 
-    private String hlsUrl;
+    private String hlsUrl = "";
     private StreamInfoItem nextVideo;
-    private List<InfoItem> relatedStreams;
+    private List<InfoItem> relatedStreams = new ArrayList<>();
 
     private long startPosition = 0;
-    private List<SubtitlesStream> subtitles;
+    private List<SubtitlesStream> subtitles = new ArrayList<>();
 
     /**
      * Get the stream type

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDASHTest.java

@@ -1,67 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube;
-
-
-/*
- * Created by Christian Schabesberger on 30.12.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeVideoExtractorDefault.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.stream.StreamExtractor;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.extractor.utils.Localization;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.schabi.newpipe.extractor.ServiceList.YouTube;
-
-/**
- * Test for {@link StreamExtractor}
- */
-public class YoutubeStreamExtractorDASHTest {
-    private static StreamInfo info;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        NewPipe.init(Downloader.getInstance(), new Localization("GB", "en"));
-        info = StreamInfo.getInfo(YouTube, "https://www.youtube.com/watch?v=00Q4SUnVQK4");
-    }
-
-    @Test
-    public void testGetDashMpd() {
-        assertTrue(info.getDashMpdUrl(),
-                info.getDashMpdUrl() != null && !info.getDashMpdUrl().isEmpty());
-    }
-
-    @Test
-    public void testRegularStreams() {
-        assertEquals(0, info.getAudioStreams().size());
-        assertEquals(0, info.getVideoOnlyStreams().size());
-        assertEquals(4, info.getVideoStreams().size());
-    }
-
-    @Test
-    public void testSegmentedStreams() {
-        assertEquals(2, info.getSegmentedAudioStreams().size());
-        assertEquals(3, info.getSegmentedVideoOnlyStreams().size());
-        assertEquals(0, info.getSegmentedVideoStreams().size());
-    }
-}

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java

@@ -43,6 +43,9 @@ import static org.schabi.newpipe.extractor.ServiceList.YouTube;
  */
 public class YoutubeStreamExtractorDefaultTest {
 
+    /**
+     * Test for {@link StreamExtractor}
+     */
     public static class AdeleHello {
         private static YoutubeStreamExtractor extractor;
 

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchCountTest.java

@@ -13,6 +13,9 @@ import static java.util.Collections.singletonList;
 import static junit.framework.TestCase.assertTrue;
 import static org.schabi.newpipe.extractor.ServiceList.YouTube;
 
+/**
+ * Test for {@link YoutubeSearchExtractor}
+ */
 public class YoutubeSearchCountTest {
     public static class YoutubeChannelViewCountTest extends YoutubeSearchExtractorBaseTest {
         @BeforeClass
@@ -28,7 +31,7 @@ public class YoutubeSearchCountTest {
         public void testViewCount() {
             ChannelInfoItem ci = (ChannelInfoItem) itemsPage.getItems().get(0);
             assertTrue("Count does not fit: " + Long.toString(ci.getSubscriberCount()),
-                    69043316 < ci.getSubscriberCount() && ci.getSubscriberCount() < 73043316);
+                    69043316 < ci.getSubscriberCount() && ci.getSubscriberCount() < 103043316);
         }
     }
 }

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorDefaultTest.java

@@ -62,7 +62,9 @@ public class YoutubeSearchExtractorDefaultTest extends YoutubeSearchExtractorBas
 
     @Test
     public void testResultList_FirstElement() {
-        InfoItem firstInfoItem = itemsPage.getItems().get(1);
+        InfoItem firstInfoItem = itemsPage.getItems().get(0);
+        if(! (firstInfoItem instanceof ChannelInfoItem))
+            firstInfoItem = itemsPage.getItems().get(1);
 
         // The channel should be the first item
         assertTrue(firstInfoItem instanceof ChannelInfoItem);

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Fri Jan 18 11:51:40 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip