Added before scene fetch method to prevent e.g. unnecessary session requests, moved scraper assignment to entity lookup. Removed channel URL hostname matching..

src/entities.js

@@ -8,6 +8,7 @@ const argv = require('./argv');
 const knex = require('./knex');
 const { deleteScenes, deleteMovies } = require('./releases');
 const { flushOrphanedMedia } = require('./media');
+const { resolveScraper, resolveLayoutScraper } = require('./scrapers/resolve');
 
 function getRecursiveParent(entity) {
 	if (!entity) {
@@ -71,6 +72,9 @@ function curateEntity(entity, includeParameters = false) {
 		}, includeParameters));
 	}
 
+	const scraper = resolveScraper(curatedEntity);
+	curatedEntity.scraper = resolveLayoutScraper(entity, scraper);
+
 	return curatedEntity;
 }
 
@@ -187,7 +191,6 @@ async function fetchEntitiesBySlug(entitySlugs, sort = 'asc') {
 				array['parent'] as parent_path
 			FROM entities
 			WHERE slug = ANY(:entitySlugs)
-			OR substring(url from 'https%://%#"[a-z0-9-]+#".(com|net)%' for '#') = ANY(:entitySlugs)
 
 			UNION ALL