Fixed getAlbumTitle
This commit is contained in:
parent
2ecffc3497
commit
5a918ba7ae
@ -20,7 +20,6 @@ import java.util.HashMap;
|
|||||||
|
|
||||||
public class AerisdiesRipper extends AbstractHTMLRipper {
|
public class AerisdiesRipper extends AbstractHTMLRipper {
|
||||||
|
|
||||||
private Document albumDoc = null;
|
|
||||||
private Map<String,String> cookies = new HashMap<>();
|
private Map<String,String> cookies = new HashMap<>();
|
||||||
|
|
||||||
|
|
||||||
@ -41,17 +40,21 @@ public class AerisdiesRipper extends AbstractHTMLRipper {
|
|||||||
public String getGID(URL url) throws MalformedURLException {
|
public String getGID(URL url) throws MalformedURLException {
|
||||||
Pattern p = Pattern.compile("^https?://www.aerisdies.com/html/lb/[a-z]*_(\\d+)_\\d\\.html");
|
Pattern p = Pattern.compile("^https?://www.aerisdies.com/html/lb/[a-z]*_(\\d+)_\\d\\.html");
|
||||||
Matcher m = p.matcher(url.toExternalForm());
|
Matcher m = p.matcher(url.toExternalForm());
|
||||||
if (!m.matches()) {
|
if (m.matches()) {
|
||||||
throw new MalformedURLException("Expected URL format: http://www.aerisdies.com/html/lb/albumDIG, got: " + url);
|
return m.group(1);
|
||||||
}
|
}
|
||||||
return m.group(1);
|
throw new MalformedURLException("Expected URL format: http://www.aerisdies.com/html/lb/albumDIG, got: " + url);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getAlbumTitle(URL url) throws MalformedURLException {
|
public String getAlbumTitle(URL url) throws MalformedURLException {
|
||||||
try {
|
try {
|
||||||
// Attempt to use album title as GID
|
Element el = getFirstPage().select(".headtext").first();
|
||||||
String title = getFirstPage().select("div > div > span[id=albumname] > a").first().text();
|
if (el == null) {
|
||||||
|
throw new IOException("Unable to get album title");
|
||||||
|
}
|
||||||
|
String title = el.text();
|
||||||
return getHost() + "_" + getGID(url) + "_" + title.trim();
|
return getHost() + "_" + getGID(url) + "_" + title.trim();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
// Fall back to default album naming convention
|
// Fall back to default album naming convention
|
||||||
@ -62,12 +65,7 @@ public class AerisdiesRipper extends AbstractHTMLRipper {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Document getFirstPage() throws IOException {
|
public Document getFirstPage() throws IOException {
|
||||||
if (albumDoc == null) {
|
return Http.url(url).get();
|
||||||
Response resp = Http.url(url).response();
|
|
||||||
cookies.putAll(resp.cookies());
|
|
||||||
albumDoc = resp.parse();
|
|
||||||
}
|
|
||||||
return albumDoc;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user