Merge branch 'dev' into yt-webm-opus

Author: kapodamy

README.md

@@ -13,6 +13,17 @@ If you're using Gradle, you could add NewPipe Extractor as a dependency with the
 1. Add `maven { url 'https://jitpack.io' }` to the `repositories` in your `build.gradle`.
 2. Add `compile 'com.github.TeamNewPipe:NewPipeExtractor:v0.11.0'`the `dependencies` in your `build.gradle`. Replace `v0.11.0` with the latest release.
 
+### Testing changes
+
+To test changes quickly you can build the library locally. Using the local Maven repository is a good approach, here's a gist of how to use it:
+
+1. Add `mavenLocal()` in your project `repositories` list (usually as the first entry to give priority above the others).
+2. It's _recommended_ that you change the `version` of this library (e.g. `LOCAL_SNAPSHOT`).
+3. Run gradle's `ìnstall` task to deploy this library to your local repository (using the wrapper, present in the root of this project: `./gradlew install`)
+4. Change the dependency version used in your project to match the one you chose in step 2 (`implementation 'com.github.TeamNewPipe:NewPipeExtractor:LOCAL_SNAPSHOT'`)
+     
+> Tip for Android Studio users: After you make changes and run the `install` task, use the menu option `File → "Sync with File System"` to refresh the library in your project.
+
 ## Supported sites
 
 The following sites are currently supported:

build.gradle

@@ -1,15 +1,23 @@
 allprojects {
     apply plugin: 'java-library'
+    apply plugin: 'maven'
+
     sourceCompatibility = 1.7
     targetCompatibility = 1.7
 
     version 'v0.13.0'
+    group 'com.github.TeamNewPipe'
 
     repositories {
         jcenter()
     }
 }
 
+dependencies {
+    implementation project(':extractor')
+    implementation project(':timeago-parser')
+}
+
 subprojects {
     task sourcesJar(type: Jar, dependsOn: classes) {
         classifier = 'sources'

extractor/.attach_pid31246

@@ -1,9 +1,12 @@
 package org.schabi.newpipe.extractor;
 
+import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
-import org.schabi.newpipe.extractor.utils.Localization;
+import org.schabi.newpipe.extractor.localization.ContentCountry;
+import org.schabi.newpipe.extractor.localization.Localization;
+import org.schabi.newpipe.extractor.localization.TimeAgoParser;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -16,21 +19,20 @@ public abstract class Extractor{
      * Useful for getting other things from a service (like the url handlers for cleaning/accepting/get id from urls).
      */
     private final StreamingService service;
-
     private final LinkHandler linkHandler;
-    private final Localization localization;
 
-    @Nullable
+    @Nullable private Localization forcedLocalization = null;
+    @Nullable private ContentCountry forcedContentCountry = null;
+
     private boolean pageFetched = false;
     private final Downloader downloader;
 
-    public Extractor(final StreamingService service, final LinkHandler linkHandler, final Localization localization) {
+    public Extractor(final StreamingService service, final LinkHandler linkHandler) {
         if(service == null) throw new NullPointerException("service is null");
         if(linkHandler == null) throw new NullPointerException("LinkHandler is null");
         this.service = service;
         this.linkHandler = linkHandler;
         this.downloader = NewPipe.getDownloader();
-        this.localization = localization;
         if(downloader == null) throw new NullPointerException("downloader is null");
     }
 
@@ -105,8 +107,30 @@ public Downloader getDownloader() {
         return downloader;
     }
 
+    /*//////////////////////////////////////////////////////////////////////////
+    // Localization
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public void forceLocalization(Localization localization) {
+        this.forcedLocalization = localization;
+    }
+
+    public void forceContentCountry(ContentCountry contentCountry) {
+        this.forcedContentCountry = contentCountry;
+    }
+
+    @Nonnull
+    public Localization getExtractorLocalization() {
+        return forcedLocalization == null ? getService().getLocalization() : forcedLocalization;
+    }
+
+    @Nonnull
+    public ContentCountry getExtractorContentCountry() {
+        return forcedContentCountry == null ? getService().getContentCountry() : forcedContentCountry;
+    }
+
     @Nonnull
-    public Localization getLocalization() {
-        return localization;
+    public TimeAgoParser getTimeAgoParser() {
+        return getService().getTimeAgoParser(getExtractorLocalization());
     }
 }

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

@@ -2,7 +2,6 @@
 
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
-import org.schabi.newpipe.extractor.utils.Localization;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
@@ -14,8 +13,8 @@
  */
 public abstract class ListExtractor<R extends InfoItem> extends Extractor {
 
-    public ListExtractor(StreamingService service, ListLinkHandler linkHandler, Localization localization) {
-        super(service, linkHandler, localization);
+    public ListExtractor(StreamingService service, ListLinkHandler linkHandler) {
+        super(service, linkHandler);
     }
 
     /**

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

@@ -20,24 +20,42 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.utils.Localization;
+import org.schabi.newpipe.extractor.localization.ContentCountry;
+import org.schabi.newpipe.extractor.localization.Localization;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.List;
 
 /**
  * Provides access to streaming services supported by NewPipe.
  */
 public class NewPipe {
-    private static Downloader downloader = null;
-    private static Localization localization = null;
+    private static Downloader downloader;
+    private static Localization preferredLocalization;
+    private static ContentCountry preferredContentCountry;
 
     private NewPipe() {
     }
 
+    public static void init(Downloader d) {
+        downloader = d;
+        preferredLocalization = Localization.DEFAULT;
+        preferredContentCountry = ContentCountry.DEFAULT;
+    }
+
     public static void init(Downloader d, Localization l) {
         downloader = d;
-        localization = l;
+        preferredLocalization = l;
+        preferredContentCountry = l.getCountryCode().isEmpty() ? ContentCountry.DEFAULT : new ContentCountry(l.getCountryCode());
+    }
+
+    public static void init(Downloader d, Localization l, ContentCountry c) {
+        downloader = d;
+        preferredLocalization = l;
+        preferredContentCountry = c;
     }
 
     public static Downloader getDownloader() {
@@ -99,11 +117,41 @@ public static String getNameOfService(int id) {
         }
     }
 
-    public static void setLocalization(Localization localization) {
-        NewPipe.localization = localization;
+    /*//////////////////////////////////////////////////////////////////////////
+    // Localization
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static void setupLocalization(Localization preferredLocalization) {
+        setupLocalization(preferredLocalization, null);
     }
 
+    public static void setupLocalization(Localization preferredLocalization, @Nullable ContentCountry preferredContentCountry) {
+        NewPipe.preferredLocalization = preferredLocalization;
+
+        if (preferredContentCountry != null) {
+            NewPipe.preferredContentCountry = preferredContentCountry;
+        } else {
+            NewPipe.preferredContentCountry = preferredLocalization.getCountryCode().isEmpty()
+                    ? ContentCountry.DEFAULT
+                    : new ContentCountry(preferredLocalization.getCountryCode());
+        }
+    }
+
+    @Nonnull
     public static Localization getPreferredLocalization() {
-        return localization;
+        return preferredLocalization == null ? Localization.DEFAULT : preferredLocalization;
+    }
+
+    public static void setPreferredLocalization(Localization preferredLocalization) {
+        NewPipe.preferredLocalization = preferredLocalization;
+    }
+
+    @Nonnull
+    public static ContentCountry getPreferredContentCountry() {
+        return preferredContentCountry == null ? ContentCountry.DEFAULT : preferredContentCountry;
+    }
+
+    public static void setPreferredContentCountry(ContentCountry preferredContentCountry) {
+        NewPipe.preferredContentCountry = preferredContentCountry;
     }
 }