Skip to content

Commit 81c2a3c

Browse files
mauriciocollimauriciocolli
committed
Fix some tests
- Use JSONObject#optString instead of JSONObject#getString to some optional values - Check if url match the pattern before doing anything (for getId and cleanUrl in the url handlers) - Ignore the suggestion tests
1 parent bf845d8 commit 81c2a3c

27 files changed

Lines changed: 124 additions & 104 deletions

‎src/main/java/org/schabi/newpipe/extractor/search/InfoItemSearchCollector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*/
3030

3131
public class InfoItemSearchCollector extends InfoItemCollector {
32-
private String suggestion;
32+
private String suggestion = "";
3333
private StreamInfoItemCollector streamCollector;
3434
private UserInfoItemCollector userCollector;
3535

‎src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public String getPlaylistName() {
5353

5454
@Override
5555
public String getAvatarUrl() {
56-
return playlist.getString("artwork_url");
56+
return playlist.optString("artwork_url");
5757
}
5858

5959
@Override

‎src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistUrlIdHandler.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
import org.schabi.newpipe.extractor.UrlIdHandler;
77
import org.schabi.newpipe.extractor.exceptions.ParsingException;
88
import org.schabi.newpipe.extractor.utils.Parser;
9+
import org.schabi.newpipe.extractor.utils.Utils;
910

1011
public class SoundcloudPlaylistUrlIdHandler implements UrlIdHandler {
1112

1213
private static final SoundcloudPlaylistUrlIdHandler instance = new SoundcloudPlaylistUrlIdHandler();
14+
private final String URL_PATTERN = "^https?://(www\\.)?soundcloud.com/[0-9a-z_-]+" +
15+
"/sets/[0-9a-z_-]+/?([#?].*)?$";
1316

1417
public static SoundcloudPlaylistUrlIdHandler getInstance() {
1518
return instance;
@@ -26,6 +29,8 @@ public String getUrl(String id) throws ParsingException {
2629

2730
@Override
2831
public String getId(String url) throws ParsingException {
32+
Utils.checkUrl(URL_PATTERN, url);
33+
2934
try {
3035
return SoundcloudParsingHelper.resolveIdWithEmbedPlayer(url);
3136
} catch (Exception e) {
@@ -35,6 +40,8 @@ public String getId(String url) throws ParsingException {
3540

3641
@Override
3742
public String cleanUrl(String complexUrl) throws ParsingException {
43+
Utils.checkUrl(URL_PATTERN, complexUrl);
44+
3845
try {
3946
Element ogElement = Jsoup.parse(NewPipe.getDownloader().download(complexUrl))
4047
.select("meta[property=og:url]").first();
@@ -47,7 +54,6 @@ public String cleanUrl(String complexUrl) throws ParsingException {
4754

4855
@Override
4956
public boolean acceptUrl(String url) {
50-
String regex = "^https?://(www\\.)?soundcloud.com/[0-9a-z_-]+/sets/[0-9a-z_-]+/?([#?].*)?$";
51-
return Parser.isMatch(regex, url.toLowerCase());
57+
return Parser.isMatch(URL_PATTERN, url.toLowerCase());
5258
}
5359
}

‎src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@
99
import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
1010
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
1111
import org.schabi.newpipe.extractor.exceptions.ParsingException;
12-
import org.schabi.newpipe.extractor.stream.AudioStream;
13-
import org.schabi.newpipe.extractor.stream.StreamExtractor;
14-
import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
15-
import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
16-
import org.schabi.newpipe.extractor.stream.StreamType;
17-
import org.schabi.newpipe.extractor.stream.VideoStream;
12+
import org.schabi.newpipe.extractor.stream.*;
1813
import org.schabi.newpipe.extractor.utils.Parser;
1914

2015
import java.io.IOException;
@@ -83,7 +78,7 @@ public String getUploadDate() throws ParsingException {
8378

8479
@Override
8580
public String getThumbnailUrl() {
86-
return track.getString("artwork_url");
81+
return track.optString("artwork_url");
8782
}
8883

8984
@Override

‎src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public long getViewCount() {
4545

4646
@Override
4747
public String getThumbnailUrl() {
48-
return searchResult.getString("artwork_url");
48+
return searchResult.optString("artwork_url");
4949
}
5050

5151
@Override

‎src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandler.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
import org.schabi.newpipe.extractor.UrlIdHandler;
77
import org.schabi.newpipe.extractor.exceptions.ParsingException;
88
import org.schabi.newpipe.extractor.utils.Parser;
9+
import org.schabi.newpipe.extractor.utils.Utils;
910

1011
public class SoundcloudStreamUrlIdHandler implements UrlIdHandler {
1112

1213
private static final SoundcloudStreamUrlIdHandler instance = new SoundcloudStreamUrlIdHandler();
14+
private final String URL_PATTERN = "^https?://(www\\.)?soundcloud.com/[0-9a-z_-]+" +
15+
"/(?!(tracks|albums|sets|reposts|followers|following)/?$)[0-9a-z_-]+/?([#?].*)?$";
1316

1417
private SoundcloudStreamUrlIdHandler() {
1518
}
@@ -29,6 +32,8 @@ public String getUrl(String id) throws ParsingException {
2932

3033
@Override
3134
public String getId(String url) throws ParsingException {
35+
Utils.checkUrl(URL_PATTERN, url);
36+
3237
try {
3338
return SoundcloudParsingHelper.resolveIdWithEmbedPlayer(url);
3439
} catch (Exception e) {
@@ -38,6 +43,8 @@ public String getId(String url) throws ParsingException {
3843

3944
@Override
4045
public String cleanUrl(String complexUrl) throws ParsingException {
46+
Utils.checkUrl(URL_PATTERN, complexUrl);
47+
4148
try {
4249
Element ogElement = Jsoup.parse(NewPipe.getDownloader().download(complexUrl))
4350
.select("meta[property=og:url]").first();
@@ -50,7 +57,6 @@ public String cleanUrl(String complexUrl) throws ParsingException {
5057

5158
@Override
5259
public boolean acceptUrl(String url) {
53-
String regex = "^https?://(www\\.)?soundcloud.com/[0-9a-z_-]+/(?!(tracks|albums|sets|reposts|followers|following)/?$)[0-9a-z_-]+/?([#?].*)?$";
54-
return Parser.isMatch(regex, url.toLowerCase());
60+
return Parser.isMatch(URL_PATTERN, url.toLowerCase());
5561
}
5662
}

‎src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserInfoItemExtractor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public SoundcloudUserInfoItemExtractor(JSONObject searchResult) {
1212

1313
@Override
1414
public String getThumbnailUrl() {
15-
return searchResult.getString("avatar_url");
15+
return searchResult.optString("avatar_url");
1616
}
1717

1818
@Override
@@ -37,6 +37,6 @@ public long getStreamCount() {
3737

3838
@Override
3939
public String getDescription() {
40-
return searchResult.getString("description");
40+
return searchResult.optString("description");
4141
}
4242
}

‎src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserUrlIdHandler.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
import org.schabi.newpipe.extractor.UrlIdHandler;
77
import org.schabi.newpipe.extractor.exceptions.ParsingException;
88
import org.schabi.newpipe.extractor.utils.Parser;
9+
import org.schabi.newpipe.extractor.utils.Utils;
910

1011
public class SoundcloudUserUrlIdHandler implements UrlIdHandler {
1112

1213
private static final SoundcloudUserUrlIdHandler instance = new SoundcloudUserUrlIdHandler();
14+
private final String URL_PATTERN = "^https?://(www\\.)?soundcloud.com/[0-9a-z_-]+" +
15+
"(/((tracks|albums|sets|reposts|followers|following)/?)?)?([#?].*)?$";
1316

1417
public static SoundcloudUserUrlIdHandler getInstance() {
1518
return instance;
@@ -26,6 +29,8 @@ public String getUrl(String id) throws ParsingException {
2629

2730
@Override
2831
public String getId(String url) throws ParsingException {
32+
Utils.checkUrl(URL_PATTERN, url);
33+
2934
try {
3035
return SoundcloudParsingHelper.resolveIdWithEmbedPlayer(url);
3136
} catch (Exception e) {
@@ -35,6 +40,8 @@ public String getId(String url) throws ParsingException {
3540

3641
@Override
3742
public String cleanUrl(String complexUrl) throws ParsingException {
43+
Utils.checkUrl(URL_PATTERN, complexUrl);
44+
3845
try {
3946
Element ogElement = Jsoup.parse(NewPipe.getDownloader().download(complexUrl))
4047
.select("meta[property=og:url]").first();
@@ -47,7 +54,6 @@ public String cleanUrl(String complexUrl) throws ParsingException {
4754

4855
@Override
4956
public boolean acceptUrl(String url) {
50-
String regex = "^https?://(www\\.)?soundcloud.com/[0-9a-z_-]+(/((tracks|albums|sets|reposts|followers|following)/?)?)?([#?].*)?$";
51-
return Parser.isMatch(regex, url.toLowerCase());
57+
return Parser.isMatch(URL_PATTERN, url.toLowerCase());
5258
}
5359
}

‎src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeUserUrlIdHandler.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ public String cleanUrl(String complexUrl) throws ParsingException {
5050

5151
@Override
5252
public boolean acceptUrl(String url) {
53-
return (url.contains("youtube") ||
54-
url.contains("youtu.be")) &&
55-
(url.contains("/user/") ||
56-
url.contains("/channel/"));
53+
return (url.contains("youtube") || url.contains("youtu.be"))
54+
&& (url.contains("/user/") || url.contains("/channel/"));
5755
}
5856
}

‎src/main/java/org/schabi/newpipe/extractor/utils/Utils.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.schabi.newpipe.extractor.utils;
22

3+
import org.schabi.newpipe.extractor.exceptions.ParsingException;
4+
35
public class Utils {
46
private Utils() {
57
//no instance
@@ -42,4 +44,20 @@ public static boolean hasCauseThrowable(Throwable throwable, Class<?>... causesT
4244
}
4345
return false;
4446
}
47+
48+
/**
49+
* Check if the url matches the pattern.
50+
*
51+
* @param pattern the pattern that will be used to check the url
52+
* @param url the url to be tested
53+
*/
54+
public static void checkUrl(String pattern, String url) throws ParsingException {
55+
if (url == null || url.isEmpty()) {
56+
throw new IllegalArgumentException("Url can't be null or empty");
57+
}
58+
59+
if (!Parser.isMatch(pattern, url.toLowerCase())) {
60+
throw new ParsingException("Url not suitable for this url handler");
61+
}
62+
}
4563
}

0 commit comments

Comments
 (0)