Skip to content

Commit ea68770

Browse files
committed
fix travis CI + some typos
1 parent 4e91921 commit ea68770

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public ListLinkHandler fromQuery(String id,
7373
* however it should not be overridden by the actual implementation.
7474
*
7575
* @param id
76-
* @return the url coresponding to id without any filters applied
76+
* @return the url corresponding to id without any filters applied
7777
*/
7878
public String getUrl(String id) throws ParsingException {
7979
return getUrl(id, new ArrayList<String>(0), "");

extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/SearchQueryHandlerFactory.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public abstract class SearchQueryHandlerFactory extends ListLinkHandlerFactory {
1212
///////////////////////////////////
1313

1414
@Override
15-
public abstract String getUrl(String querry, List<String> contentFilter, String sortFilter) throws ParsingException;
15+
public abstract String getUrl(String query, List<String> contentFilter, String sortFilter) throws ParsingException;
1616

1717
public String getSearchString(String url) {
1818
return "";
@@ -28,21 +28,21 @@ public String getId(String url) {
2828
}
2929

3030
@Override
31-
public SearchQueryHandler fromQuery(String querry,
31+
public SearchQueryHandler fromQuery(String query,
3232
List<String> contentFilter,
3333
String sortFilter) throws ParsingException {
34-
return new SearchQueryHandler(super.fromQuery(querry, contentFilter, sortFilter));
34+
return new SearchQueryHandler(super.fromQuery(query, contentFilter, sortFilter));
3535
}
3636

37-
public SearchQueryHandler fromQuery(String querry) throws ParsingException {
38-
return fromQuery(querry, new ArrayList<String>(0), "");
37+
public SearchQueryHandler fromQuery(String query) throws ParsingException {
38+
return fromQuery(query, new ArrayList<String>(0), "");
3939
}
4040

4141
/**
4242
* It's not mandatory for NewPipe to handle the Url
4343
*
4444
* @param url
45-
* @return
45+
* @return if we should accept the url
4646
*/
4747
@Override
4848
public boolean onAcceptUrl(String url) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public static String removeWhiteSpaces(String s) {
101101
* Does the same as {@link #mixedNumberWordToLong(String)}, but for the 80 languages supported by YouTube.
102102
*
103103
* @param numberWord string to be converted to a long
104-
* @param loc: a {@link Localization}
104+
* @param loc a {@link Localization}
105105
* @return a long
106106
* @throws ParsingException
107107
*/

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -250,15 +250,18 @@ public void testGetDescription() throws ParsingException {
250250

251251
@Test
252252
public void testGetFullLinksInDescription() throws ParsingException {
253-
assertTrue(extractor.getDescription().getContent().contains("https://www.youtube.com/watch?v=X7FLCHVXpsA&amp;list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34"));
254-
assertTrue(extractor.getDescription().getContent().contains("https://www.youtube.com/watch?v=Lqv6G0pDNnw&amp;list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34"));
255-
assertTrue(extractor.getDescription().getContent().contains("https://www.youtube.com/watch?v=XxaRBPyrnBU&amp;list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34"));
256-
assertTrue(extractor.getDescription().getContent().contains("https://www.youtube.com/watch?v=U-9tUEOFKNU&amp;list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34"));
257-
258-
assertFalse(extractor.getDescription().getContent().contains("https://youtu.be/X7FLCHVXpsA?list=PL7..."));
259-
assertFalse(extractor.getDescription().getContent().contains("https://youtu.be/Lqv6G0pDNnw?list=PL7..."));
260-
assertFalse(extractor.getDescription().getContent().contains("https://youtu.be/XxaRBPyrnBU?list=PL7..."));
261-
assertFalse(extractor.getDescription().getContent().contains("https://youtu.be/U-9tUEOFKNU?list=PL7..."));
253+
Description description = extractor.getDescription();
254+
String content = description.getContent();
255+
if (description.getType() == Description.HTML) {
256+
assertTrue(content.contains("https://www.youtube.com/watch?v=X7FLCHVXpsA&list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34"));
257+
assertTrue(content.contains("https://www.youtube.com/watch?v=Lqv6G0pDNnw&amp;list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34"));
258+
assertTrue(content.contains("https://www.youtube.com/watch?v=XxaRBPyrnBU&amp;list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34"));
259+
assertTrue(content.contains("https://www.youtube.com/watch?v=U-9tUEOFKNU&amp;list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34"));
260+
}
261+
assertFalse(content.contains("https://youtu.be/X7FLCHVXpsA?list=PL7..."));
262+
assertFalse(content.contains("https://youtu.be/Lqv6G0pDNnw?list=PL7..."));
263+
assertFalse(content.contains("https://youtu.be/XxaRBPyrnBU?list=PL7..."));
264+
assertFalse(content.contains("https://youtu.be/U-9tUEOFKNU?list=PL7..."));
262265
}
263266
}
264267

0 commit comments

Comments
 (0)