diff --git a/.gitignore b/.gitignore index 72a49342..8ddc82d7 100755 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ assets/js/config/ !assets/js/config/default.js *.heapprofile *.heapsnapshot +.vscode diff --git a/package-lock.json b/package-lock.json index f590395c..7ff0a741 100755 --- a/package-lock.json +++ b/package-lock.json @@ -74,6 +74,7 @@ "tippy.js": "^6.3.1", "tough-cookie": "^4.0.0", "tunnel": "0.0.6", + "ua-parser-js": "^1.0.32", "undici": "^4.13.0", "unprint": "^0.7.2", "url-pattern": "^1.0.3", @@ -16551,6 +16552,24 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, + "node_modules/ua-parser-js": { + "version": "1.0.32", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.32.tgz", + "integrity": "sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/ua-parser-js" + }, + { + "type": "paypal", + "url": "https://paypal.me/faisalman" + } + ], + "engines": { + "node": "*" + } + }, "node_modules/uid-safe": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", @@ -30887,6 +30906,11 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, + "ua-parser-js": { + "version": "1.0.32", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.32.tgz", + "integrity": "sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA==" + }, "uid-safe": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", diff --git a/package.json b/package.json index 308bc1f2..ec1432af 100755 --- a/package.json +++ b/package.json @@ -133,6 +133,7 @@ "tippy.js": "^6.3.1", "tough-cookie": "^4.0.0", "tunnel": "0.0.6", + "ua-parser-js": "^1.0.32", "undici": "^4.13.0", "unprint": "^0.7.2", "url-pattern": "^1.0.3", diff --git a/src/scrapers/loveherfilms.js b/src/scrapers/loveherfilms.js index 698e3852..8c743d61 100755 --- a/src/scrapers/loveherfilms.js +++ b/src/scrapers/loveherfilms.js @@ -13,7 +13,7 @@ function scrapeAll(scenes, channel) { return scenes.map(({ query }) => { const release = {}; - release.url = query.url('a.item-video-overlay'); + release.url = query.url('a.item-video-overlay, a.item-episode-overlay'); release.title = query.cnt('.item-title'); release.date = query.date('.video-date', 'MMM D, YYYY'); @@ -60,7 +60,7 @@ function scrapeScene({ query }, url, channel) { return release; } -function scrapeProfile({ query, el }, url, entity, include) { +function scrapeProfile({ query, el }, url, entity, _include) { const profile = { url }; const bio = Array.from(Array.from(query.html('.stats script').matchAll(/totalStats\.push\(.*\)/g))).reduce((acc, match) => { @@ -106,10 +106,7 @@ function scrapeProfile({ query, el }, url, entity, include) { } profile.avatar = query.img('.picture img'); - - if (include.releases) { - return scrapeAll(qu.initAll(el, '.scene')); - } + profile.scenes = scrapeAll(qu.initAll(el, '.scene, .latest-scene .item-episode'), entity); console.log(bio); console.log(profile);