From ef789f6636fc78a24df03a90848a6027789ef25a Mon Sep 17 00:00:00 2001 From: proshunsuke Date: Sun, 18 Apr 2021 05:19:52 +0900 Subject: [PATCH 1/2] =?UTF-8?q?local=E3=81=A7=E6=A4=9C=E8=A8=BC=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81=E3=81=AE=E3=82=B3=E3=83=9E=E3=83=B3?= =?UTF-8?q?=E3=83=89=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 54c1cd0..9c69979 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,9 @@ push: build run: yarn clasp run execute +run/local: + node -e 'require("./dist/index.js");global.setSchedule();' + open: yarn clasp open From 5624bea6fcbe617b988022283893b004d66bdf09 Mon Sep 17 00:00:00 2001 From: proshunsuke Date: Sun, 18 Apr 2021 05:20:15 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=B9=E3=82=B1=E3=82=B8=E3=83=A5?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=8C=E9=81=A9=E5=88=87=E3=81=AB=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=82=92=E8=A7=A3=E6=B1=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gcpFunctions/getSakuraSchedule.js | 71 +++++++++++++++++-------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/gcpFunctions/getSakuraSchedule.js b/gcpFunctions/getSakuraSchedule.js index 5e217ac..a5c4641 100644 --- a/gcpFunctions/getSakuraSchedule.js +++ b/gcpFunctions/getSakuraSchedule.js @@ -13,42 +13,49 @@ exports.getSakuraSchedule = async (req, res) => { page = await getBrowserPage(); } - await page.goto('https://sakurazaka46.com/s/s46/media/list?dy=' + req.query['date']); - - const scheduleEvents = await page.evaluate("scheduleEvents"); - - const scheduleDateList = Array.from(new Set(scheduleEvents.map((scheduleEvent) => scheduleEvent.start.replace(/-/g, '')))); - - const result = []; - - for await (const scheduleDate of scheduleDateList) { - await page.goto('https://sakurazaka46.com/s/s46/media/list?dy=' + scheduleDate); - const scheduleContexts = await page.$$('.com-arclist-part li.box'); - for (const scheduleContext of scheduleContexts) { - const type = await (await scheduleContext.$('.type')).evaluate((el) => el.textContent) || 'その他'; - const times = await (await scheduleContext.$('.times')).evaluate((el) => el.textContent); - const modalCount = (await (await scheduleContext.$('.js-schedule-detail-modal')).evaluate((el) => el.href)).replace(/^.*#/g, ''); - const date = await (await page.$(`.${modalCount} .date.wf-a`)).evaluate((el) => el.textContent); - const title = await (await page.$(`.${modalCount} .title`)).evaluate((el) => el.textContent); - const members = await Promise.all( - (await page.$$(`.${modalCount} .members.fx > li`)).map(async (liElement) => await liElement.evaluate((el) => el.textContent)) - ); - const scheduleObject = {title: title, date: date, type: type}; - if (times) { - const startTime = formattedDate(date, times.replace(/～.*/, '')); - const endTimeHourMin = times.replace(/.*～/, ''); - const endTime = endTimeHourMin ? formattedDate(date, endTimeHourMin) : startTime; - scheduleObject.startTime = startTime; - scheduleObject.endTime = endTime; - } - if (members.length !== 0) scheduleObject.description = `メンバー: ${members.join(', ')}`; - result.push(scheduleObject); - } - } + await page.setUserAgent('Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1'); + + const date = req.query['date']; + const url = 'https://sakurazaka46.com/s/s46/media/list?ima=5250&dy=' + date.substring(0, date.length - 2); + await page.goto(url); + + const modalScheduleDetails = await page.$$('.module-modal.js-schedule-detail'); + let result = await modalScheduleDetails.reduce(async (list, modalScheduleDetail) => { + const l = (await list); + const date = await (await modalScheduleDetail.$('.date.wf-a')).evaluate((el) => el.textContent); + const title = await (await modalScheduleDetail.$('.title')).evaluate((el) => el.textContent); + const members = await Promise.all( + (await modalScheduleDetail.$$('.members.fx > li')).map(async (li) => await li.evaluate((el) => el.textContent)) + ); + const scheduleObject = {title, date}; + if (members.length !== 0) scheduleObject.description = `メンバー: ${members.join(', ')}`; + l.push(scheduleObject); + return l; + }, []); + + const scheduleDetailModals = await page.$$('.js-schedule-detail-modal'); + result = await scheduleDetailModals.reduce(async (list, scheduleDetailModal, index) => { + const l = await list; + const type = await (await scheduleDetailModal.$('.type')).evaluate((el) => el.textContent) || 'その他'; + const times = await (await scheduleDetailModal.$('.times')).evaluate((el) => el.textContent); + + let scheduleObject = {type}; + if (times) scheduleObject = {...scheduleObject, ...startEndTimeObject(l[index].date, times)}; + + l[index] = {...l[index], ...scheduleObject}; + return l; + }, result); res.send(result); }; +function startEndTimeObject(date, times) { + const startTime = formattedDate(date, times.replace(/～.*/, '')); + const endTimeHourMin = times.replace(/.*～/, ''); + const endTime = endTimeHourMin ? formattedDate(date, endTimeHourMin) : startTime; + return {startTime, endTime}; +} + function formattedDate(date, hourMin) { if ((new Date(`${date} ${hourMin}`)).toString() !== 'Invalid Date') return `${date} ${hourMin}`; const hour = parseInt(hourMin.replace(/:.*/, ''));