Merge remote-tracking branch 'origin/dev' into bandcamp

Author: TobiGr

.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - dev
+      - master
+  pull_request:
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1.4.3
+        with:
+          java-version: 1.8
+
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+
+      - name: Build and run Tests
+        run: ./gradlew check --stacktrace -Ddownloader=MOCK

.github/workflows/docs.yml

@@ -0,0 +1,33 @@
+name: Build and deploy JavaDocs
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build-and-deploy-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1.4.3
+        with:
+          java-version: 1.8
+
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+
+      - name: Build JavaDocs
+        run: ./gradlew aggregatedJavadocs
+
+      - name: Deploy JavaDocs
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./build/docs

.travis.yml

@@ -1,6 +1,6 @@
 # NewPipe Extractor
 
-[![Build Status](https://travis-ci.org/TeamNewPipe/NewPipeExtractor.svg?branch=master)](https://travis-ci.org/TeamNewPipe/NewPipeExtractor) [![JIT Pack Badge](https://jitpack.io/v/TeamNewPipe/NewPipeExtractor.svg)](https://jitpack.io/#TeamNewPipe/NewPipeExtractor) [JDoc](https://teamnewpipe.github.io/NewPipeExtractor/javadoc/) • [Documentation](https://teamnewpipe.github.io/documentation/)
+[![Build Status](https://github.com/TeamNewPipe/NewPipeExtractor/workflows/CI/badge.svg?branch=dev&event=push)](https://github.com/TeamNewPipe/NewPipeExtractor/actions) [![JIT Pack Badge](https://jitpack.io/v/TeamNewPipe/NewPipeExtractor.svg)](https://jitpack.io/#TeamNewPipe/NewPipeExtractor) [JDoc](https://teamnewpipe.github.io/NewPipeExtractor/javadoc/) • [Documentation](https://teamnewpipe.github.io/documentation/)
 
 NewPipe Extractor is a library for extracting things from streaming sites. It is a core component of [NewPipe](https://github.com/TeamNewPipe/NewPipe), but could be used independently.
 
@@ -11,7 +11,7 @@ NewPipe Extractor is available at JitPack's Maven repo.
 If you're using Gradle, you could add NewPipe Extractor as a dependency with the following steps:
 
 1. Add `maven { url 'https://jitpack.io' }` to the `repositories` in your `build.gradle`.
-2. Add `implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.20.6'`the `dependencies` in your `build.gradle`. Replace `v0.20.6` with the latest release.
+2. Add `implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.20.8'`the `dependencies` in your `build.gradle`. Replace `v0.20.8` with the latest release.
 
 **Note:** To use NewPipe Extractor in projects with a `minSdkVersion` below 26, [API desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring) is required.
 

README.md

@@ -5,7 +5,7 @@ allprojects {
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
-    version 'v0.20.5'
+    version 'v0.20.8'
     group 'com.github.TeamNewPipe'
 
     repositories {
@@ -43,7 +43,7 @@ task aggregatedJavadocs(type: Javadoc, group: 'Documentation') {
     destinationDir = file("$buildDir/docs/javadoc")
     title = "$project.name $version"
     // options.memberLevel = JavadocMemberLevel.PRIVATE
-    options.links 'https://docs.oracle.com/javase/7/docs/api/'
+    options.links 'https://docs.oracle.com/javase/8/docs/api/'
     options.encoding 'UTF-8'
 
     subprojects.each { project ->

build.gradle

@@ -1,3 +1,10 @@
+test {
+//  Pass on downloader type to tests for different CI jobs. See DownloaderFactory.java and ci.yml
+    if (System.properties.containsKey('downloader')) {
+        systemProperty('downloader', System.getProperty('downloader'))
+    }
+}
+
 dependencies {
     implementation project(':timeago-parser')
 
@@ -7,6 +14,7 @@ dependencies {
     implementation 'com.github.spotbugs:spotbugs-annotations:4.0.2'
     implementation 'org.nibor.autolink:autolink:0.10.0'
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
     testImplementation "com.squareup.okhttp3:okhttp:3.12.11"
+    testImplementation 'com.google.code.gson:gson:2.8.6'
 }

extractor/build.gradle

@@ -3,8 +3,10 @@
 import org.schabi.newpipe.extractor.exceptions.FoundAdException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 /*
@@ -32,17 +34,31 @@ public abstract class InfoItemsCollector<I extends InfoItem, E extends InfoItemE
     private final List<I> itemList = new ArrayList<>();
     private final List<Throwable> errors = new ArrayList<>();
     private final int serviceId;
+    @Nullable
+    private final Comparator<I> comparator;
+
+    /**
+     * Create a new collector with no comparator / sorting function
+     * @param serviceId the service id
+     */
+    public InfoItemsCollector(final int serviceId) {
+        this(serviceId, null);
+    }
 
     /**
      * Create a new collector
      * @param serviceId the service id
      */
-    public InfoItemsCollector(int serviceId) {
+    public InfoItemsCollector(final int serviceId, @Nullable final Comparator<I> comparator) {
         this.serviceId = serviceId;
+        this.comparator = comparator;
     }
 
     @Override
     public List<I> getItems() {
+        if (comparator != null) {
+            itemList.sort(comparator);
+        }
         return Collections.unmodifiableList(itemList);
     }
 

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

@@ -0,0 +1,76 @@
+package org.schabi.newpipe.extractor;
+
+import org.schabi.newpipe.extractor.stream.Description;
+
+import java.io.Serializable;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
+public class MetaInfo implements Serializable {
+
+    private String title = "";
+    private Description content;
+    private List<URL> urls = new ArrayList<>();
+    private List<String> urlTexts = new ArrayList<>();
+
+    public MetaInfo(@Nonnull final String title, @Nonnull final Description content,
+                    @Nonnull final List<URL> urls, @Nonnull final List<String> urlTexts) {
+        this.title = title;
+        this.content = content;
+        this.urls = urls;
+        this.urlTexts = urlTexts;
+    }
+
+    public MetaInfo() {
+    }
+
+    /**
+     * @return Title of the info. Can be empty.
+     */
+    @Nonnull
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(@Nonnull final String title) {
+        this.title = title;
+    }
+
+    @Nonnull
+    public Description getContent() {
+        return content;
+    }
+
+    public void setContent(@Nonnull final Description content) {
+        this.content = content;
+    }
+
+    @Nonnull
+    public List<URL> getUrls() {
+        return urls;
+    }
+
+    public void setUrls(@Nonnull final List<URL> urls) {
+        this.urls = urls;
+    }
+
+    public void addUrl(@Nonnull final URL url) {
+        urls.add(url);
+    }
+
+    @Nonnull
+    public List<String> getUrlTexts() {
+        return urlTexts;
+    }
+
+    public void setUrlTexts(@Nonnull final List<String> urlTexts) {
+        this.urlTexts = urlTexts;
+    }
+
+    public void addUrlText(@Nonnull final String urlText) {
+        urlTexts.add(urlText);
+    }
+}

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

@@ -16,6 +16,7 @@ public class CommentsInfoItem extends InfoItem {
     @Nullable
     private DateWrapper uploadDate;
     private int likeCount;
+    private boolean heartedByUploader;
 
     public CommentsInfoItem(int serviceId, String url, String name) {
         super(InfoType.COMMENT, serviceId, url, name);
@@ -85,4 +86,12 @@ public int getLikeCount() {
     public void setLikeCount(int likeCount) {
         this.likeCount = likeCount;
     }
+
+    public void setHeartedByUploader(boolean isHeartedByUploader) {
+        this.heartedByUploader = isHeartedByUploader;
+    }
+
+    public boolean getHeartedByUploader() {
+        return this.heartedByUploader;
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItem.java

@@ -40,4 +40,9 @@ public interface CommentsInfoItemExtractor extends InfoItemExtractor {
     String getUploaderName() throws ParsingException;
 
     String getUploaderAvatarUrl() throws ParsingException;
+
+    /**
+     * Whether the comment has been hearted by the uploader
+     */
+    boolean getHeartedByUploader() throws ParsingException;
 }