Fixed missing levels for the Zelda Hanayama Huzzle puzzles

Author: revolter

src/recipes/hanayama_huzzles/HanayamaHuzzlesRecipe.ts

@@ -10,19 +10,44 @@ import { RecipeMarker } from '../helpers/RecipeMarker';
 import { HanayamaHuzzle } from './HanayamaHuzzle';
 import { HanayamaHuzzlesRecipeSettings } from './settings/HanayamaHuzzlesRecipeSettings';
 
+interface HanayamaHuzzlesScrapeDataSource {
+	url: string;
+	level?: string;
+}
+
 export class HanayamaHuzzlesRecipe implements Recipe {
 	static readonly NAME = 'Hanayama Huzzles';
 	static readonly WEBPAGE = 'https://hanayama-toys.com/product-category/puzzles/huzzle';
-	static readonly CHESS_PUZZLES_WEBPAGE = 'https://hanayama-toys.com/product-category/puzzles/huzzle/chess-puzzle';
+	static readonly CHESS_PUZZLES_DATA_SOURCE: HanayamaHuzzlesScrapeDataSource = {
+		url: 'https://hanayama-toys.com/product-category/puzzles/huzzle/chess-puzzle'
+	};
 
 	static readonly #HEADERS: readonly string[] = ['Level', 'Index', 'Name', 'Picture', 'Status'];
-	static readonly #SCRAPE_URLS: readonly string[] = [
-		'https://hanayama-toys.com/product-category/puzzles/huzzle/level-1-fun',
-		'https://hanayama-toys.com/product-category/puzzles/huzzle/level-2-easy',
-		'https://hanayama-toys.com/product-category/puzzles/huzzle/level-3-normal',
-		'https://hanayama-toys.com/product-category/puzzles/huzzle/level-4-hard',
-		'https://hanayama-toys.com/product-category/puzzles/huzzle/level-5-expert',
-		'https://hanayama-toys.com/product-category/puzzles/huzzle/level-6-grand-master'
+	static readonly #SCRAPE_DATA_SOURCES: readonly HanayamaHuzzlesScrapeDataSource[] = [
+		{
+			url: 'https://hanayama-toys.com/product-category/puzzles/huzzle/level-1-fun',
+			level: '1',
+		},
+		{
+			url: 'https://hanayama-toys.com/product-category/puzzles/huzzle/level-2-easy',
+			level: '2',
+		},
+		{
+			url: 'https://hanayama-toys.com/product-category/puzzles/huzzle/level-3-normal',
+			level: '3',
+		},
+		{
+			url: 'https://hanayama-toys.com/product-category/puzzles/huzzle/level-4-hard',
+			level: '4',
+		},
+		{
+			url: 'https://hanayama-toys.com/product-category/puzzles/huzzle/level-5-expert',
+			level: '5',
+		},
+		{
+			url: 'https://hanayama-toys.com/product-category/puzzles/huzzle/level-6-grand-master',
+			level: '6',
+		}
 	];
 
 	#marker = new RecipeMarker(HanayamaHuzzlesRecipe.NAME);
@@ -52,24 +77,29 @@ export class HanayamaHuzzlesRecipe implements Recipe {
 	}
 
 	async #scrapeHuzzles(): Promise<HanayamaHuzzle[]> {
-		const metadataRegex = new RegExp(/\w+[ ](?<level>\d+)-(?<index>\d+)[ ](?<name>.+)/); // https://regex101.com/r/1vGzHd/2
+		const metadataRegex = new RegExp(/\w+[ ]\d+-(?<index>\d+)[ ](?<name>.+)/); // https://regex101.com/r/1vGzHd/3
 
-		const urls = [...HanayamaHuzzlesRecipe.#SCRAPE_URLS];
+		const dataSources = [...HanayamaHuzzlesRecipe.#SCRAPE_DATA_SOURCES];
 		if (this.settings.includeChessPuzzles) {
-			urls.push(HanayamaHuzzlesRecipe.CHESS_PUZZLES_WEBPAGE);
+			dataSources.push(HanayamaHuzzlesRecipe.CHESS_PUZZLES_DATA_SOURCE);
 		}
-		const scraper = new WebsiteScraper(urls);
+		const scraper = new WebsiteScraper(
+			dataSources.map(dataSource => ({
+				url: dataSource.url,
+				context: dataSource.level
+			}))
+		);
 
 		return await scraper.scrape(
 			content => {
 				return Array.from(content.querySelectorAll('#main > .products > .product'));
 			},
-			product => {
+			(product, sourceLevel) => {
 				const title = product.querySelector('.product-info > .product-title > a')?.textContent || '';
 				const titleMatch = title.match(metadataRegex);
 				const titleGroups = titleMatch?.groups;
 
-				const level = titleGroups != null ? titleGroups.level : 'N/A';
+				const level = sourceLevel ?? 'N/A';
 				const index = titleGroups != null ? titleGroups.index : 'N/A';
 				const name = titleGroups != null ? titleGroups.name : title;
 

src/recipes/hanayama_huzzles/settings/HanayamaHuzzlesRecipeExtraSettingsAdder.ts

@@ -18,7 +18,7 @@ export class HanayamaHuzzlesRecipeExtraSettingsAdder implements RecipeExtraSetti
 			'Include chess puzzles',
 			this.root.createFragment(
 				this.root.createText('span', 'Whether to include the chess puzzles ('),
-				this.root.createLink(HanayamaHuzzlesRecipe.CHESS_PUZZLES_WEBPAGE),
+				this.root.createLink(HanayamaHuzzlesRecipe.CHESS_PUZZLES_DATA_SOURCE.url),
 				this.root.createText('span', ') or not.')
 			)
 		);

src/recipes/iq_puzzles/IQPuzzlesRecipe.ts

@@ -44,7 +44,9 @@ export class IQPuzzlesRecipe implements Recipe {
 	async #scrapePuzzles(): Promise<IQPuzzle[]> {
 		const nameRegex = new RegExp(/\s*(?<name>[\w\s]+)$/); // https://regex101.com/r/AuK9pb/2
 		const cleanedLinkRegex = new RegExp(/^(?<cleanedLink>.+?\.jpg)/); // https://regex101.com/r/fd3A6U/1
-		const scraper = new WebsiteScraper([IQPuzzlesRecipe.#SCRAPE_URL]);
+		const scraper = new WebsiteScraper([{
+			url: IQPuzzlesRecipe.#SCRAPE_URL
+		}]);
 
 		return await scraper.scrape(
 			content => {

src/scraping/WebsiteScraper.ts

@@ -1,21 +1,26 @@
 import { WebpageDownloader } from './WebpageDownloader';
 
-export class WebsiteScraper {
-	constructor(private urls: string[]) {}
+interface WebsiteScraperSource<Context> {
+	url: string;
+	context?: Context;
+}
+
+export class WebsiteScraper<Context> {
+	constructor(private sources: WebsiteScraperSource<Context>[]) {}
 
 	async scrape<T>(
 		parseWebpage: (webpage: Document) => Element[],
-		parseElement: (elements: Element) => T
+		parseElement: (elements: Element, context?: Context) => T
 	): Promise<T[]> {
 		const elements = await Promise.all(
-			this.urls
-			.map(async url => {
-				const downloader = new WebpageDownloader(url);
+			this.sources
+			.map(async source => {
+				const downloader = new WebpageDownloader(source.url);
 				const webpage = await downloader.download();
 				const elements = parseWebpage(webpage);
 
 				return elements.map(element => {
-					return parseElement(element);
+					return parseElement(element, source.context);
 				});
 			})
 		);