Fixed Boobpedia scraper. Catching non-OK responses for Vixen scraper.
This commit is contained in:
parent
77b214f1dc
commit
32a0188b72
|
@ -126,11 +126,7 @@ async function scrapeSites() {
|
||||||
try {
|
try {
|
||||||
return await scrapeSiteReleases(scraper, site);
|
return await scrapeSiteReleases(scraper, site);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (argv.debug) {
|
logger.error(`${site.name}: Failed to scrape releases: ${error.message}`);
|
||||||
logger.error(`${site.name}: Failed to scrape releases`, error);
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.warn(`${site.id}: Failed to scrape releases`);
|
|
||||||
|
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,15 +24,22 @@ function scrapeProfile(html) {
|
||||||
if (bio.Ethnicity) profile.ethnicity = bio.Ethnicity;
|
if (bio.Ethnicity) profile.ethnicity = bio.Ethnicity;
|
||||||
|
|
||||||
if (bio.Measurements) {
|
if (bio.Measurements) {
|
||||||
const [bust, waist, hip] = bio.Measurements
|
const measurements = bio.Measurements
|
||||||
.match(/\d+(\w+)?-\d+-\d+/g)
|
.match(/\d+(\w+)?-\d+-\d+/g)
|
||||||
.slice(-1)[0] // allow for both '34C-25-36' and '86-64-94 cm / 34-25-37 in'
|
?.slice(-1)[0] // allow for both '34C-25-36' and '86-64-94 cm / 34-25-37 in'
|
||||||
.split('-');
|
.split('-');
|
||||||
|
|
||||||
if (/[a-zA-Z]/.test(bust)) profile.bust = bust; // only use bust if cup size is included
|
// account for measuemrents being just e.g. '32EE'
|
||||||
|
if (measurements) {
|
||||||
|
const [bust, waist, hip] = measurements;
|
||||||
|
|
||||||
profile.waist = Number(waist);
|
if (/[a-zA-Z]/.test(bust)) profile.bust = bust; // only use bust if cup size is included
|
||||||
profile.hip = Number(hip);
|
|
||||||
|
profile.waist = Number(waist);
|
||||||
|
profile.hip = Number(hip);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (/^\d+\w+$/.test(bio.Measurements)) profile.bust = bio.Measurements;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bio.Bra_cup_size) {
|
if (bio.Bra_cup_size) {
|
||||||
|
@ -56,9 +63,12 @@ function scrapeProfile(html) {
|
||||||
|
|
||||||
if (avatars.length > 0) {
|
if (avatars.length > 0) {
|
||||||
const [avatarThumbPath] = avatars;
|
const [avatarThumbPath] = avatars;
|
||||||
const avatarPath = avatarThumbPath.slice(0, avatarThumbPath.lastIndexOf('/')).replace('thumb/', '');
|
|
||||||
|
|
||||||
profile.avatar = `http://www.boobpedia.com${avatarPath}`;
|
if (!/NoImageAvailable/.test(avatarThumbPath)) {
|
||||||
|
const avatarPath = avatarThumbPath.slice(0, avatarThumbPath.lastIndexOf('/')).replace('thumb/', '');
|
||||||
|
|
||||||
|
profile.avatar = `http://www.boobpedia.com${avatarPath}`;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
profile.social = qu('.infobox a.external');
|
profile.social = qu('.infobox a.external');
|
||||||
|
|
|
@ -110,15 +110,24 @@ async function scrapeScene(html, url, site) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function fetchLatest(site, page = 1) {
|
async function fetchLatest(site, page = 1) {
|
||||||
const res = await bhttp.get(`${site.url}/videos?page=${page}&size=7`);
|
const url = `${site.url}/videos?page=${page}&size=7`;
|
||||||
|
const res = await bhttp.get(url);
|
||||||
|
|
||||||
return scrapeLatest(res.body.toString(), site);
|
if (res.statusCode === 200) {
|
||||||
|
return scrapeLatest(res.body.toString(), site);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(`Vixen response not OK for latest: ${res.statusCode}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function fetchScene(url, site) {
|
async function fetchScene(url, site) {
|
||||||
const res = await bhttp.get(url);
|
const res = await bhttp.get(url);
|
||||||
|
|
||||||
return scrapeScene(res.body.toString(), url, site);
|
if (res.statusCode === 200) {
|
||||||
|
return scrapeScene(res.body.toString(), url, site);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(`Vixen response not OK for scene (${url}): ${res.statusCode}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
|
Loading…
Reference in New Issue