From 4b134a3b23504d4a99facf2365fde86a55eeccae Mon Sep 17 00:00:00 2001
From: Somethingweirdhere <gtp@g.com>
Date: Wed, 16 May 2018 00:15:00 +0200
Subject: [PATCH 1/5] Fixed longer links not working by changing their href to
 the link they should redirect to.

---
 .../extractors/YoutubeStreamExtractor.java    | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
index 87571e8b7..6718951c2 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
@@ -24,6 +24,7 @@ import org.schabi.newpipe.extractor.utils.Utils;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.*;
 
 /*
@@ -151,12 +152,44 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     public String getDescription() throws ParsingException {
         assertPageFetched();
         try {
-            return doc.select("p[id=\"eow-description\"]").first().html();
+            return fixDescriptionLinks(doc.select("p[id=\"eow-description\"]").first().html());
         } catch (Exception e) {//todo: add fallback method <-- there is no ... as long as i know
             throw new ParsingException("Could not get the description", e);
         }
     }
 
+    private String fixDescriptionLinks(String description) throws ParsingException, UnsupportedEncodingException {
+        boolean everythingIsFine = true;
+        String descriptionE = java.net.URLDecoder.decode(description, "UTF-8");
+        Parser.getLinksFromString(descriptionE);
+        int endlessloop = 0;
+        while(everythingIsFine) {
+            try {
+                String[] FirstCut = description.split("<a href=\"",2);
+                if(FirstCut.length==1) {
+                    everythingIsFine = false;
+                }
+
+                String Beginning = FirstCut[0];
+                String[] SecondCut = FirstCut[1].split("\"",2);
+                String End = SecondCut[1];
+                if(SecondCut[0].contains("q=")) {
+                    String LinkToBeFixed = SecondCut[0].split("q=")[1].split("&amp")[0];
+                    String Link = java.net.URLDecoder.decode(LinkToBeFixed, "UTF-8");
+
+                    description = Beginning + "<a  href=\"" + Link + "\"" + End; //I'm inserting a double space between "<a" and "href" here so the next cut doesn't cut here.
+                } else { //Timestamps and other links to youtube videos are processed here
+                    description = Beginning + "<a  href=\"" + SecondCut[0] + "\"" + End;
+                }
+            } catch (ArrayIndexOutOfBoundsException | UnsupportedEncodingException end) {
+                //this means we have run out of Links because there are no more <a href=" to split the text in so the Array has only one Element or that something else went wrong.
+                endlessloop = endlessloop + 1;
+                if (endlessloop > 20) everythingIsFine = false;
+            }
+        }
+        return description;
+    }
+
     @Override
     public int getAgeLimit() throws ParsingException {
         assertPageFetched();

From ee5fcfc4122033ef628119292fe3aa95f51ac087 Mon Sep 17 00:00:00 2001
From: Somethingweirdhere <gtp@g.com>
Date: Tue, 5 Jun 2018 18:12:18 +0200
Subject: [PATCH 2/5] Renames variables

---
 build.gradle                                  | 13 +++++++
 extractor/build.gradle                        |  2 +-
 .../extractors/YoutubeStreamExtractor.java    | 34 ++++++++++---------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9f25fc28e..44491cac5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,6 +29,19 @@ subprojects {
     }
 }
 
+task deleteJar(type: Delete) {
+    delete 'libs/jars/logmanagementlib.jar'
+}
+
+task createJar(type: Copy) {
+    from('build/intermediates/bundles/release/')
+    into('libs/jars/')
+    include('classes.jar')
+    rename('classes.jar', 'logmanagementlib.jar')
+}
+
+createJar.dependsOn(deleteJar, build)
+
 // https://discuss.gradle.org/t/best-approach-gradle-multi-module-project-generate-just-one-global-javadoc/18657/21
 task aggregatedJavadocs(type: Javadoc, group: 'Documentation') {
     destinationDir = file("$buildDir/docs/javadoc")
diff --git a/extractor/build.gradle b/extractor/build.gradle
index 1b7fbf001..f23be24dd 100644
--- a/extractor/build.gradle
+++ b/extractor/build.gradle
@@ -8,4 +8,4 @@ dependencies {
     implementation 'org.nibor.autolink:autolink:0.8.0'
 
     testImplementation 'junit:junit:4.12'
-}
\ No newline at end of file
+}
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
index 6718951c2..f7071a1f4 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
@@ -159,32 +159,34 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     }
 
     private String fixDescriptionLinks(String description) throws ParsingException, UnsupportedEncodingException {
-        boolean everythingIsFine = true;
+        boolean continueToNextLink = true;
         String descriptionE = java.net.URLDecoder.decode(description, "UTF-8");
         Parser.getLinksFromString(descriptionE);
-        int endlessloop = 0;
-        while(everythingIsFine) {
+        int exceptionsThrown = 0;
+
+        while(continueToNextLink) {
             try {
-                String[] FirstCut = description.split("<a href=\"",2);
-                if(FirstCut.length==1) {
-                    everythingIsFine = false;
+                String[] firstCut = description.split("<a href=\"",2);
+                if(firstCut.length==1) {
+                    continueToNextLink = false;
                 }
 
-                String Beginning = FirstCut[0];
-                String[] SecondCut = FirstCut[1].split("\"",2);
-                String End = SecondCut[1];
-                if(SecondCut[0].contains("q=")) {
-                    String LinkToBeFixed = SecondCut[0].split("q=")[1].split("&amp")[0];
-                    String Link = java.net.URLDecoder.decode(LinkToBeFixed, "UTF-8");
+                String beginning = firstCut[0];
+                String[] secondCut = firstCut[1].split("\"",2);
+                String end = secondCut[1];
+                if(secondCut[0].contains("q=")) {
+                    String linkToBeFixed = secondCut[0].split("q=")[1].split("&amp")[0];
+                    String link = java.net.URLDecoder.decode(linkToBeFixed, "UTF-8");
 
-                    description = Beginning + "<a  href=\"" + Link + "\"" + End; //I'm inserting a double space between "<a" and "href" here so the next cut doesn't cut here.
+                    description = beginning + "<a  href=\"" + link + "\"" + end; //I'm inserting a double space between "<a" and "href" here so the next cut doesn't cut here.
                 } else { //Timestamps and other links to youtube videos are processed here
-                    description = Beginning + "<a  href=\"" + SecondCut[0] + "\"" + End;
+                    description = beginning + "<a  href=\"" + secondCut[0] + "\"" + end;
                 }
             } catch (ArrayIndexOutOfBoundsException | UnsupportedEncodingException end) {
                 //this means we have run out of Links because there are no more <a href=" to split the text in so the Array has only one Element or that something else went wrong.
-                endlessloop = endlessloop + 1;
-                if (endlessloop > 20) everythingIsFine = false;
+
+                exceptionsThrown++;
+                if (exceptionsThrown > 20) continueToNextLink = false;
             }
         }
         return description;

From fa05dd77e4e6c7007d899158f181fc17966ec598 Mon Sep 17 00:00:00 2001
From: Somethingweirdhere <gtp@g.com>
Date: Tue, 5 Jun 2018 18:19:04 +0200
Subject: [PATCH 3/5] Fixed longer links not working by changing their href to
 the link they should redirect to.

(cherry picked from commit 4b134a3b23504d4a99facf2365fde86a55eeccae)

# Conflicts:
#	extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
---
 .../extractors/YoutubeStreamExtractor.java    | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
index f7071a1f4..6718951c2 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
@@ -159,34 +159,32 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     }
 
     private String fixDescriptionLinks(String description) throws ParsingException, UnsupportedEncodingException {
-        boolean continueToNextLink = true;
+        boolean everythingIsFine = true;
         String descriptionE = java.net.URLDecoder.decode(description, "UTF-8");
         Parser.getLinksFromString(descriptionE);
-        int exceptionsThrown = 0;
-
-        while(continueToNextLink) {
+        int endlessloop = 0;
+        while(everythingIsFine) {
             try {
-                String[] firstCut = description.split("<a href=\"",2);
-                if(firstCut.length==1) {
-                    continueToNextLink = false;
+                String[] FirstCut = description.split("<a href=\"",2);
+                if(FirstCut.length==1) {
+                    everythingIsFine = false;
                 }
 
-                String beginning = firstCut[0];
-                String[] secondCut = firstCut[1].split("\"",2);
-                String end = secondCut[1];
-                if(secondCut[0].contains("q=")) {
-                    String linkToBeFixed = secondCut[0].split("q=")[1].split("&amp")[0];
-                    String link = java.net.URLDecoder.decode(linkToBeFixed, "UTF-8");
+                String Beginning = FirstCut[0];
+                String[] SecondCut = FirstCut[1].split("\"",2);
+                String End = SecondCut[1];
+                if(SecondCut[0].contains("q=")) {
+                    String LinkToBeFixed = SecondCut[0].split("q=")[1].split("&amp")[0];
+                    String Link = java.net.URLDecoder.decode(LinkToBeFixed, "UTF-8");
 
-                    description = beginning + "<a  href=\"" + link + "\"" + end; //I'm inserting a double space between "<a" and "href" here so the next cut doesn't cut here.
+                    description = Beginning + "<a  href=\"" + Link + "\"" + End; //I'm inserting a double space between "<a" and "href" here so the next cut doesn't cut here.
                 } else { //Timestamps and other links to youtube videos are processed here
-                    description = beginning + "<a  href=\"" + secondCut[0] + "\"" + end;
+                    description = Beginning + "<a  href=\"" + SecondCut[0] + "\"" + End;
                 }
             } catch (ArrayIndexOutOfBoundsException | UnsupportedEncodingException end) {
                 //this means we have run out of Links because there are no more <a href=" to split the text in so the Array has only one Element or that something else went wrong.
-
-                exceptionsThrown++;
-                if (exceptionsThrown > 20) continueToNextLink = false;
+                endlessloop = endlessloop + 1;
+                if (endlessloop > 20) everythingIsFine = false;
             }
         }
         return description;

From 33f66c426878247c0d5a7dd0bc674b80e3457dcc Mon Sep 17 00:00:00 2001
From: Somethingweirdhere <gtp@g.com>
Date: Tue, 5 Jun 2018 18:25:42 +0200
Subject: [PATCH 4/5] Reverted changes I shouldn't have commited

---
 .../extractors/YoutubeStreamExtractor.java    | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
index 6718951c2..f7071a1f4 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
@@ -159,32 +159,34 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     }
 
     private String fixDescriptionLinks(String description) throws ParsingException, UnsupportedEncodingException {
-        boolean everythingIsFine = true;
+        boolean continueToNextLink = true;
         String descriptionE = java.net.URLDecoder.decode(description, "UTF-8");
         Parser.getLinksFromString(descriptionE);
-        int endlessloop = 0;
-        while(everythingIsFine) {
+        int exceptionsThrown = 0;
+
+        while(continueToNextLink) {
             try {
-                String[] FirstCut = description.split("<a href=\"",2);
-                if(FirstCut.length==1) {
-                    everythingIsFine = false;
+                String[] firstCut = description.split("<a href=\"",2);
+                if(firstCut.length==1) {
+                    continueToNextLink = false;
                 }
 
-                String Beginning = FirstCut[0];
-                String[] SecondCut = FirstCut[1].split("\"",2);
-                String End = SecondCut[1];
-                if(SecondCut[0].contains("q=")) {
-                    String LinkToBeFixed = SecondCut[0].split("q=")[1].split("&amp")[0];
-                    String Link = java.net.URLDecoder.decode(LinkToBeFixed, "UTF-8");
+                String beginning = firstCut[0];
+                String[] secondCut = firstCut[1].split("\"",2);
+                String end = secondCut[1];
+                if(secondCut[0].contains("q=")) {
+                    String linkToBeFixed = secondCut[0].split("q=")[1].split("&amp")[0];
+                    String link = java.net.URLDecoder.decode(linkToBeFixed, "UTF-8");
 
-                    description = Beginning + "<a  href=\"" + Link + "\"" + End; //I'm inserting a double space between "<a" and "href" here so the next cut doesn't cut here.
+                    description = beginning + "<a  href=\"" + link + "\"" + end; //I'm inserting a double space between "<a" and "href" here so the next cut doesn't cut here.
                 } else { //Timestamps and other links to youtube videos are processed here
-                    description = Beginning + "<a  href=\"" + SecondCut[0] + "\"" + End;
+                    description = beginning + "<a  href=\"" + secondCut[0] + "\"" + end;
                 }
             } catch (ArrayIndexOutOfBoundsException | UnsupportedEncodingException end) {
                 //this means we have run out of Links because there are no more <a href=" to split the text in so the Array has only one Element or that something else went wrong.
-                endlessloop = endlessloop + 1;
-                if (endlessloop > 20) everythingIsFine = false;
+
+                exceptionsThrown++;
+                if (exceptionsThrown > 20) continueToNextLink = false;
             }
         }
         return description;

From 337ee21569292194133ea031a26fcec0a3cd6dfc Mon Sep 17 00:00:00 2001
From: Somethingweirdhere <gtp@g.com>
Date: Tue, 5 Jun 2018 18:27:39 +0200
Subject: [PATCH 5/5] Reverted changes I shouldn't have commited

---
 build.gradle           | 13 -------------
 extractor/build.gradle |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 44491cac5..9f25fc28e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,19 +29,6 @@ subprojects {
     }
 }
 
-task deleteJar(type: Delete) {
-    delete 'libs/jars/logmanagementlib.jar'
-}
-
-task createJar(type: Copy) {
-    from('build/intermediates/bundles/release/')
-    into('libs/jars/')
-    include('classes.jar')
-    rename('classes.jar', 'logmanagementlib.jar')
-}
-
-createJar.dependsOn(deleteJar, build)
-
 // https://discuss.gradle.org/t/best-approach-gradle-multi-module-project-generate-just-one-global-javadoc/18657/21
 task aggregatedJavadocs(type: Javadoc, group: 'Documentation') {
     destinationDir = file("$buildDir/docs/javadoc")
diff --git a/extractor/build.gradle b/extractor/build.gradle
index f23be24dd..1b7fbf001 100644
--- a/extractor/build.gradle
+++ b/extractor/build.gradle
@@ -8,4 +8,4 @@ dependencies {
     implementation 'org.nibor.autolink:autolink:0.8.0'
 
     testImplementation 'junit:junit:4.12'
-}
+}
\ No newline at end of file