CypherpunkSamurai/NewPipeExtractor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #638 from TeamNewPipe/spelling

Browse source 
Improve exception message thrown when not accepting an URL in LinkHandlerFactory#fromUrl(String url, String baseUrl)
This commit is contained in:
XiangRongLin 2021-06-04 18:23:31 +02:00 committed by GitHub
commit 0ad51e76fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/LinkHandlerFactory.java
View file

@ -59,19 +59,19 @@ public abstract class LinkHandlerFactory {
} }
/** /**
* Builds a {@link LinkHandler} from a url and a base url. The url is expected to be already * Builds a {@link LinkHandler} from an URL and a base URL. The URL is expected to be already
* polished from google search redirects (otherwise how could {@code baseUrl} have been * polished from Google search redirects (otherwise how could {@code baseUrl} have been
* extracted?).<br> * extracted?).<br>
* So do not call {@link Utils#followGoogleRedirectIfNeeded(String)} on the url if overriding * So do not call {@link Utils#followGoogleRedirectIfNeeded(String)} on the URL if overriding
* this function, since that should be done in {@link #fromUrl(String)}. * this function, since that should be done in {@link #fromUrl(String)}.
* @param url the url without google search redirects to extract id from * @param url the URL without Google search redirects to extract id from
* @param baseUrl the base url * @param baseUrl the base URL
* @return a {@link LinkHandler} complete with information * @return a {@link LinkHandler} complete with information
*/ */
public LinkHandler fromUrl(String url, String baseUrl) throws ParsingException { public LinkHandler fromUrl(String url, String baseUrl) throws ParsingException {
if (url == null) throw new IllegalArgumentException("url can not be null"); if (url == null) throw new IllegalArgumentException("URL cannot be null");
if (!acceptUrl(url)) { if (!acceptUrl(url)) {
throw new ParsingException("Malformed unacceptable url: " + url); throw new ParsingException("URL not accepted: " + url);
} }
final String id = getId(url); final String id = getId(url);