Mobilizon/Facebook-Events-iCal-Converter
1
0
Fork 0
mirror of https://github.com/comatory/fb2iCal synced 2025-02-06 20:03:27 +01:00
Code Issues Releases Wiki Activity

fix invalid function signature for event data extraction

Browse Source 
Additionally fix specs
This commit is contained in:
Ondřej Synáček 2020-07-17 23:11:07 +02:00
parent f14a57aa22
commit a661e54524
5 changed files with 97 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/services/ics-retriever.js
View File

@ -3,7 +3,7 @@ const parseUsingDOM = require('./dom-parser')
const generateICS = require('./ics-generator') const generateICS = require('./ics-generator')
const { createParserError, getNormalizedUrl } = require('../utils') const { createParserError, getNormalizedUrl } = require('../utils')
const extractEventDataFromHTML = (html, { logger }) => { const extractEventDataFromHTML = (html, url, { logger }) => {
const LDJSONEventData = parseUsingLDJSONData(html, { logger }) const LDJSONEventData = parseUsingLDJSONData(html, { logger })
const rawEventData = LDJSONEventData || parseUsingDOM(html, { logger }) const rawEventData = LDJSONEventData || parseUsingDOM(html, { logger })
@ -23,7 +23,7 @@ const extractEventDataFromHTML = (html, { logger }) => {
const retrieveICS = async (URLparameter, { logger, crawl }) => { const retrieveICS = async (URLparameter, { logger, crawl }) => {
const url = getNormalizedUrl(URLparameter) const url = getNormalizedUrl(URLparameter)
const html = await crawl(url, { logger }) const html = await crawl(url, { logger })
const eventData = extractEventDataFromHTML(html, { logger }) const eventData = extractEventDataFromHTML(html, url, { logger })
const icsContent = await generateICS(eventData) const icsContent = await generateICS(eventData)
return icsContent return icsContent

6
lib/static/index.js
View File

@ -236,11 +236,11 @@ import generateICS from '../../lib/services/ics-generator'
hydrateList() hydrateList()
const handleHTMLResponse = (html) => { const handleHTMLResponse = (html, url) => {
try { try {
setStatusParsing() setStatusParsing()
const eventData = extractEventDataFromHTML(html, { logger }) const eventData = extractEventDataFromHTML(html, url, { logger })
generateICS(eventData) generateICS(eventData)
.then((text) => { .then((text) => {
const dataUri = encodeURIComponent(text) const dataUri = encodeURIComponent(text)
@ -287,7 +287,7 @@ import generateICS from '../../lib/services/ics-generator'
postURL(formData) postURL(formData)
.then((res) => { .then((res) => {
res.text() res.text()
.then(handleHTMLResponse) .then((response) => handleHTMLResponse(response, input.value))
.catch((err) => { .catch((err) => {
handleError(err) handleError(err)
}) })

25
test/log-utils.spec.js Normal file
View File

@ -0,0 +1,25 @@
const { expect } = require('chai')
const winston = require('winston')
const logUtils = require('../lib/log-utils')
describe('logUtils', () => {
it('should create console transport for logging in dev mode', () => {
expect(logUtils.createTransports(true)[0])
.to.be.instanceOf(winston.transports.Console)
})
it('should NOT create console transport for logging in undefined mode', () => {
const transports = logUtils.createTransports()
expect(transports).to.have.length(1)
expect(transports[0]).to.be.instanceOf(winston.transports.DailyRotateFile)
})
it('should create log rotate transport for logging in dev mode', () => {
expect(logUtils.createTransports(true)[1])
.to.be.instanceOf(winston.transports.DailyRotateFile)
})
})

85
test/services/ics-retriever.spec.js
View File

@ -12,9 +12,7 @@ const {
clearMockCrawlResult, clearMockCrawlResult,
} = require('../../mocks/crawler.mock') } = require('../../mocks/crawler.mock')
const { retrieveICS } = require('../../lib/services/ics-retriever') const { retrieveICS, extractEventDataFromHTML } = require('../../lib/services/ics-retriever')
jest.mock('../../lib/services/crawler', () => mockCrawl)
describe(retrieveICS, () => { describe(retrieveICS, () => {
let logger let logger
@ -35,7 +33,10 @@ describe(retrieveICS, () => {
setMockCrawlResult(html) setMockCrawlResult(html)
const icsContent = await retrieveICS('https://facebook.com/events/123', { logger }) const icsContent = await retrieveICS('https://facebook.com/events/123', {
logger,
crawl: mockCrawl,
})
expect(icsContent).to.be.ok expect(icsContent).to.be.ok
}) })
@ -52,13 +53,35 @@ describe(retrieveICS, () => {
setMockCrawlResult(html) setMockCrawlResult(html)
const icsContent = await retrieveICS('https://facebook.com/events/123', { logger }) const icsContent = await retrieveICS('https://facebook.com/events/123', {
logger,
crawl: mockCrawl,
})
expect(icsContent).to.include('SUMMARY:Test Event') expect(icsContent).to.include('SUMMARY:Test Event')
expect(icsContent).to.include('LOCATION:Location X') expect(icsContent).to.include('LOCATION:Location X')
}) })
it('should extract event data using LDJSON', () => {
const html = `
<html>
<head>
<script type="application/ld+json">{"name":"Test Event","location":{"name":"Location X"}}</script>
</head>
</html>
`
const { location } = extractEventDataFromHTML(
html,
'https://facebook.com/events/123', {
logger,
})
expect(location).to.equal('Location X')
})
it('should use create ICS contents based on DOM', async () => { it('should use create ICS contents based on DOM', async () => {
const html = ` const html = `
<html> <html>
@ -76,13 +99,41 @@ describe(retrieveICS, () => {
setMockCrawlResult(html) setMockCrawlResult(html)
const icsContent = await retrieveICS('https://facebook.com/events/123', { logger }) const icsContent = await retrieveICS('https://facebook.com/events/123', {
logger,
crawl: mockCrawl,
})
expect(icsContent).to.include('LOCATION:123 Main St. AcmeTown, Main area') expect(icsContent).to.include('LOCATION:123 Main St. AcmeTown, Main area')
}) })
it('should throw parser error if no event data is found', async (callback) => { it('should extract event data based on DOM', () => {
const html = `
<html>
<head>
<title>Test</title>
</head>
<body>
<div id="event_summary">
<div class="test_eventNode1"></div>
<div class="test_eventNode2"><div class="test_timeNode"></div><div class="test_locationNode"><table><tr><td><span></span><span>123 Main St.\nAcmeTown</span><span>Main area</span></td></tr></table></div></div>
</div>
</body>
</html>
`
const { location } = extractEventDataFromHTML(
html,
'https://facebook.com/events/123', {
logger,
})
expect(location).to.equal('123 Main St. AcmeTown, Main area')
})
it('should throw parser error if no event data is found', () => {
const html = ` const html = `
<html> <html>
<head> <head>
@ -92,15 +143,13 @@ describe(retrieveICS, () => {
</html> </html>
` `
setMockCrawlResult(html) expect(() => {
extractEventDataFromHTML(
try { html,
const eventData = await retrieveICS('https://facebook.com/events/132', { logger }) 'https://facebook.com/events/132', {
} catch (err) { logger,
expect(err.toString()).to.include('Unable to parse event data.') })
expect(err.statusCode).to.equal(422) }).to.throw('Unable to parse event data.')
callback()
}
}) })
@ -117,8 +166,8 @@ describe(retrieveICS, () => {
setMockCrawlResult(html) setMockCrawlResult(html)
const icsContent = await retrieveICS('123', { logger }) const icsContent = await retrieveICS('123', { logger, crawl: mockCrawl })
expect(icsContent).to.include('URL:https://mobile.facebook.com/events/123') expect(icsContent).to.include('URL:https://mobile.facebook.com/events/123')
}) })
}) })

22
test/utils.spec.js
View File

@ -1,5 +1,4 @@
const { expect } = require('chai') const { expect } = require('chai')
const winston = require('winston')
const utils = require('../lib/utils') const utils = require('../lib/utils')
@ -152,25 +151,4 @@ describe('utils', () => {
.to.equal(422) .to.equal(422)
}) })
}) })
describe('logging', () => {
it('should create console transport for logging in dev mode', () => {
expect(utils.createTransports(true)[0])
.to.be.instanceOf(winston.transports.Console)
})
it('should NOT create console transport for logging in undefined mode', () => {
const transports = utils.createTransports()
expect(transports).to.have.length(1)
expect(transports[0]).to.be.instanceOf(winston.transports.DailyRotateFile)
})
it('should create log rotate transport for logging in dev mode', () => {
expect(utils.createTransports(true)[1])
.to.be.instanceOf(winston.transports.DailyRotateFile)
})
})
}) })