boiii/traxxx
1
0
Fork 0
forked from DebaucheryLibrarian/traxxx
Code Issues Pull Requests Projects Releases Wiki Activity

Reordered scraper arguments. Fixed Jules Jordan scraper for Amateur Allure.

Browse Source
This commit is contained in:
DebaucheryLibrarian
2020-07-17 23:27:59 +02:00
parent f59e809713
commit a3d281192d
13 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/scrapers/amateurallure.js
View File

@@ -37,8 +37,9 @@ async function fetchLatestWrap(site, page = 1) {
return latest.map(scene => extractActors(scene));
}
async function fetchSceneWrap(url, site) {
const scene = await fetchScene(url, site);
async function fetchSceneWrap(url, channel, baseRelease, include) {
console.log(include);
const scene = await fetchScene(url, channel, baseRelease, include);
return extractActors(scene);
}

2
src/scrapers/assylum.js
View File

@@ -41,7 +41,7 @@ function scrapeLatest(scenes, site, models) {
});
}
function scrapeScene({ html, qu }, url, site, models) {
function scrapeScene({ html, qu }, url, site, include, models) {
const release = { url };
[release.entryId] = url.split('/').slice(-1);

2
src/scrapers/hush.js
View File

@@ -356,7 +356,7 @@ function scrapeProfileTour({ el, qu }, site) {
return profile;
}
async function fetchLatest(site, page = 1, _beforeFetchLatest, accSiteReleases) {
async function fetchLatest(site, page = 1, include, preflight, accSiteReleases) {
const url = (site.parameters?.latest && util.format(site.parameters.latest, page))
|| (site.parameters?.t1 && `${site.url}/t1/categories/movies_${page}_d.html`)
|| `${site.url}/categories/movies_${page}_d.html`;

13
src/scrapers/julesjordan.js
View File

@@ -139,8 +139,8 @@ function scrapeAll(scenes, site) {
release.entryId = el.dataset.setid || qu.q('.rating_box')?.dataset.id;
release.url = qu.url('.update_title, .dvd_info > a, a ~ a');
release.title = qu.q('.update_title, .dvd_info > a, a ~ a', true);
release.url = qu.url('.update_title a, .dvd_info > a, a ~ a');
release.title = qu.q('.update_title a, .dvd_info > a, a ~ a', true);
release.date = qu.date('.update_date', 'MM/DD/YYYY');
release.actors = qu.all('.update_models a', true);
@@ -247,11 +247,16 @@ async function scrapeScene({ html, qu }, url, site, include) {
if (include.trailer && site.slug !== 'manuelferrara') {
const trailerLines = html.split('\n').filter(line => /movie\["trailer\w*"\]\[/i.test(line));
console.log(trailerLines);
if (trailerLines.length) {
release.trailer = trailerLines.map((trailerLine) => {
const src = trailerLine.match(/path:"([\w:/.&=?%]+)"/)?.[1];
// const src = trailerLine.match(/path:"([\w-:/.&=?%]+)"/)?.[1];
const src = trailerLine.match(/path:"(.+)"/)?.[1];
const quality = trailerLine.match(/movie_height:'(\d+)/)?.[1];
console.log(src, quality);
return src && {
src: /^http/.test(src) ? src : `${site.url}${src}`,
quality: quality && Number(quality.replace('558', '540')),
@@ -368,7 +373,7 @@ async function fetchUpcoming(site) {
return res.statusCode;
}
async function fetchScene(url, site, baseRelease, preflight, include) {
async function fetchScene(url, site, baseRelease, include) {
const res = await get(url);
return res.ok ? scrapeScene(res.item, url, site, include) : res.status;