diff --git a/src/FimFic2Epub.js b/src/FimFic2Epub.js index c8f1434..ca25c91 100644 --- a/src/FimFic2Epub.js +++ b/src/FimFic2Epub.js @@ -11,6 +11,7 @@ import fileType from 'file-type' import { styleCss, coverstyleCss, titlestyleCss } from './styles' import { cleanMarkup } from './cleanMarkup' +import fetch from './fetch' import fetchRemote from './fetchRemote' import * as template from './templates' @@ -40,8 +41,8 @@ module.exports = class FimFic2Epub { static fetchStoryInfo (storyId, raw = false) { return new Promise((resolve, reject) => { storyId = FimFic2Epub.getStoryId(storyId) - let url = 'https://www.fimfiction.net/api/story.php?story=' + storyId - fetchRemote(url, (content, type) => { + let url = '/api/story.php?story=' + storyId + fetch(url).then((content) => { let data try { data = JSON.parse(content) @@ -76,32 +77,61 @@ module.exports = class FimFic2Epub { }) } + static parseChapterPage (html) { + let trimWhitespace = /^\s*()+|()+\s*$/ig + + let authorNotesPos = html.indexOf('
Author\'s Note:') + authorNotes = html.substring(authorNotesPos + 22) + authorNotes = authorNotes.substring(0, authorNotes.indexOf('\t\n\t
')) + authorNotes = authorNotes.trim() + authorNotes = authorNotes.replace(trimWhitespace, '') + } + + let chapterPos = html.indexOf('
') + let chapter = html.substring(chapterPos + 29) + + let pos = chapter.indexOf('\t
\t\t\n\t') + + chapter = chapter.substring(0, pos).trim() + + // remove leading and trailing
tags and whitespace + chapter = chapter.replace(trimWhitespace, '') + return {content: chapter, notes: authorNotes, notesFirst: authorNotesPos < chapterPos} + } + constructor (storyId) { this.storyId = FimFic2Epub.getStoryId(storyId) this.hasDownloaded = false - this.downloadPromise = null + this.fetchPromise = null this.storyInfo = null - this.titlePage = null + this.chapters = [] this.chapterContent = [] this.remoteResources = new Map() this.cachedFile = null this.hasCoverImage = false this.coverImageDimensions = {width: 0, height: 0} - this.includeTitlePage = true - this.categories = [] - this.tags = [] + // this.includeTitlePage = true + // this.categories = [] + // this.tags = [] this.zip = new JSZip() } - download () { - if (this.downloadPromise) { - return this.downloadPromise + fetch () { + if (this.fetchPromise) { + return this.fetchPromise } + this.storyInfo = null + this.chapters.length = 0 + this.remoteResources.clear() + console.log('Fetching story metadata...') let p = FimFic2Epub.fetchStoryInfo(this.storyId) @@ -112,250 +142,108 @@ module.exports = class FimFic2Epub { this.filename = FimFic2Epub.getFilename(this.storyInfo) }) .then(this.fetchTitlePage.bind(this)) + .then(this.fetchChapters.bind(this)) .then(() => { - this.downloadPromise = null + console.log('Fetch complete') + console.log(this) + this.fetchPromise = null }) - this.downloadPromise = p + this.fetchPromise = p return p } build () { - return this.extractTitlePageInfo(this.titlePage) - .then(this.checkCoverImage.bind(this)) + this.chapterContent.length = 0 + return this.checkCoverImage() + .then(this.processChapters.bind(this)) + .then(this.fetchRemoteFiles.bind(this)) + .then(this.processStory.bind(this)) + .then(() => { + console.log('Build complete') + }) } fetchTitlePage () { - console.log('Fetching index page...') - return new Promise((resolve, reject) => { - fetchRemote(this.storyInfo.url, (raw, type) => { - this.titlePage = raw - resolve(raw) - }) - }) + console.log('Fetching title page...') + let url = this.storyInfo.url.replace('http://www.fimfiction.net', '') + return fetch(url).then(this.extractTitlePageInfo.bind(this)) } extractTitlePageInfo (html) { - return new Promise((resolve, reject) => { - let descPos = html.indexOf('
') + 2 - html = html.substring(descPos) - let ma = html.match(/Source<\/a>/) - this.storyInfo.source_image = null - if (ma) { - this.storyInfo.source_image = ma[1] - } - let endCatsPos = html.indexOf('
') - let startCatsPos = html.substring(0, endCatsPos).lastIndexOf('
') - let catsHtml = html.substring(startCatsPos, endCatsPos) - html = html.substring(endCatsPos + 6) + let descPos = html.indexOf('
') + 2 + html = html.substring(descPos) + let ma = html.match(/Source<\/a>/) + this.storyInfo.source_image = null + if (ma) { + this.storyInfo.source_image = ma[1] + } + let endCatsPos = html.indexOf('
') + let startCatsPos = html.substring(0, endCatsPos).lastIndexOf('
') + let catsHtml = html.substring(startCatsPos, endCatsPos) + html = html.substring(endCatsPos + 6) - let categories = [] - let matchCategory = /(.*?)<\/a>/g - for (let c; (c = matchCategory.exec(catsHtml));) { - categories.push({ - url: 'http://www.fimfiction.net' + c[1], - className: c[2], - name: entities.decode(c[3]) - }) - } - this.categories = categories - - ma = html.match(/This story is a sequel to (.*?)<\/a>/) - if (ma) { - this.storyInfo.prequel = { - url: 'http://www.fimfiction.net' + ma[1], - title: entities.decode(ma[2]) - } - html = html.substring(html.indexOf('
') + 6) - } - let endDescPos = html.indexOf('\n') - let description = html.substring(0, endDescPos).trim() - - html = html.substring(endDescPos + 7) - let extraPos = html.indexOf('
') - html = html.substring(extraPos + 30) - - ma = html.match(/First Published<\/span>
(.*?)<\/span>/) - if (ma) { - let date = ma[1] - date = date.replace(/^(\d+)[a-z]+? ([a-zA-Z]+? \d+)$/, '$1 $2') - this.storyInfo.publishDate = (new Date(date).getTime() / 1000) | 0 - } - - html = html.substring(0, html.indexOf('
<\/a>/g - for (let tag; (tag = matchTag.exec(html));) { - let t = { - url: 'http://www.fimfiction.net/tag/' + tag[1], - name: entities.decode(tag[2]), - image: entities.decode(tag[3]) - } - tags.push(t) - tags.byImage[t.image] = t - if (this.includeTitlePage) { - this.remoteResources.set(t.image, {filename: 'tag-' + tag[1], originalUrl: t.image, where: ['tags']}) - } - } - this.tags = tags - - cleanMarkup(description).then((html) => { - this.storyInfo.description = html - this.findRemoteResources('description', 'description', html) - resolve() + let categories = [] + let matchCategory = /(.*?)<\/a>/g + for (let c; (c = matchCategory.exec(catsHtml));) { + categories.push({ + url: 'http://www.fimfiction.net' + c[1], + className: c[2], + name: entities.decode(c[3]) }) - }) - } + } + this.categories = categories - checkCoverImage () { - return new Promise((resolve, reject) => { - this.hasCoverImage = !!this.storyInfo.full_image - - if (this.hasCoverImage) { - this.remoteResources.set(this.storyInfo.full_image, {filename: 'cover', where: ['cover']}) - - if (!isNode) { - let coverImage = new Image() - coverImage.src = this.storyInfo.full_image - - coverImage.addEventListener('load', () => { - this.coverImageDimensions.width = coverImage.width - this.coverImageDimensions.height = coverImage.height - this.processStory(resolve, reject) - }, false) - coverImage.addEventListener('error', () => { - console.warn('Unable to fetch cover image, skipping...') - this.hasCoverImage = false - this.processStory(resolve, reject) - }) - } else { - this.processStory(resolve, reject) - } - } else { - this.processStory(resolve, reject) + ma = html.match(/This story is a sequel to (.*?)<\/a>/) + if (ma) { + this.storyInfo.prequel = { + url: 'http://www.fimfiction.net' + ma[1], + title: entities.decode(ma[2]) } - }) - } + html = html.substring(html.indexOf('
') + 6) + } + let endDescPos = html.indexOf('
\n') + let description = html.substring(0, endDescPos).trim() - processStory (resolve, reject) { - console.log('Fetching chapters...') + html = html.substring(endDescPos + 7) + let extraPos = html.indexOf('
') + html = html.substring(extraPos + 30) - this.fetchChapters().then(() => { - console.log('Fetching remote files...') - - this.fetchRemoteFiles(() => { - console.log('Finishing build...') - - this.zip.file('mimetype', 'application/epub+zip') - this.zip.file('META-INF/container.xml', containerXml) - - let coverFilename = '' - this.remoteResources.forEach((r, url) => { - let dest = '../' + r.dest - if (r.dest && r.originalUrl && r.where) { - let ourl = new RegExp(escapeStringRegexp(r.originalUrl), 'g') - for (var i = 0; i < r.where.length; i++) { - let w = r.where[i] - if (typeof w === 'number') { - this.chapterContent[w] = this.chapterContent[w].replace(ourl, dest) - } else if (w === 'description') { - this.storyInfo.description = this.storyInfo.description.replace(ourl, dest) - } else if (w === 'tags') { - this.tags.byImage[r.originalUrl].image = dest - } - } - } - if (r.filename === 'cover' && r.dest) { - coverFilename = dest - } - }) - - for (let num = 0; num < this.chapterContent.length; num++) { - let html = this.chapterContent[num] - let filename = 'OEBPS/Text/chapter_' + zeroFill(3, num + 1) + '.xhtml' - this.zip.file(filename, html) - } - - this.chapterContent.length = 0 - - this.zip.file('OEBPS/content.opf', template.createOpf(this)) - - if (this.hasCoverImage) { - this.zip.file('OEBPS/Text/cover.xhtml', template.createCoverPage(coverFilename, this.coverImageDimensions.width, this.coverImageDimensions.height)) - } else { - this.zip.file('OEBPS/Text/cover.xhtml', template.createCoverPage(this)) - } - - if (this.includeTitlePage) { - this.zip.file('OEBPS/Text/title.xhtml', template.createTitlePage(this)) - } - - this.zip.file('OEBPS/Text/nav.xhtml', template.createNav(this)) - this.zip.file('OEBPS/toc.ncx', template.createNcx(this)) - - this.zip.file('OEBPS/Styles/style.css', styleCss) - this.zip.file('OEBPS/Styles/coverstyle.css', coverstyleCss) - if (this.includeTitlePage) { - this.zip.file('OEBPS/Styles/titlestyle.css', titlestyleCss) - } - - this.hasDownloaded = true - resolve() - }) - }) - } - - fetchRemoteFiles (cb) { - let iter = this.remoteResources.entries() - let count = 0 - let completeCount = 0 - - let recursive = () => { - let r = iter.next().value - if (!r) { - if (completeCount === this.remoteResources.size) { - cb() - } - return - } - let url = r[0] - r = r[1] - - console.log('Fetching remote file ' + (count + 1) + ' of ' + this.remoteResources.size + ': ' + r.filename, url) - count++ - - fetchRemote(url, (data, type) => { - r.dest = null - let info = fileType(isNode ? data : new Uint8Array(data)) - if (info) { - type = info.mime - r.type = type - let isImage = type.indexOf('image/') === 0 - let folder = isImage ? 'Images' : 'Misc' - let dest = folder + '/*.' + info.ext - r.dest = dest.replace('*', r.filename) - this.zip.file('OEBPS/' + r.dest, data) - if (isNode && r.filename === 'cover') { - const sizeOf = require('image-size') - this.coverImageDimensions = sizeOf(data) - } - } - completeCount++ - recursive() - }, 'arraybuffer') + ma = html.match(/First Published<\/span>
(.*?)<\/span>/) + if (ma) { + let date = ma[1] + date = date.replace(/^(\d+)[a-z]+? ([a-zA-Z]+? \d+)$/, '$1 $2') + this.storyInfo.publishDate = (new Date(date).getTime() / 1000) | 0 } - // concurrent downloads! - recursive() - recursive() - recursive() - recursive() + html = html.substring(0, html.indexOf('
<\/a>/g + for (let tag; (tag = matchTag.exec(html));) { + let t = { + url: 'http://www.fimfiction.net/tag/' + tag[1], + name: entities.decode(tag[2]), + image: entities.decode(tag[3]) + } + tags.push(t) + tags.byImage[t.image] = t + if (this.includeTitlePage) { + this.remoteResources.set(t.image, {filename: 'tag-' + tag[1], originalUrl: t.image, where: ['tags']}) + } + } + this.tags = tags + + return cleanMarkup(description).then((html) => { + this.storyInfo.description = html + this.findRemoteResources('description', 'description', html) + }) } fetchChapters () { + console.log('Fetching chapters...') return new Promise((resolve, reject) => { let chapters = this.storyInfo.chapters let chapterCount = this.storyInfo.chapters.length @@ -374,18 +262,15 @@ module.exports = class FimFic2Epub { return } console.log('Fetching chapter ' + (index + 1) + ' of ' + chapters.length + ': ' + ch.title) - let url = ch.link.replace('http', 'https') - fetchRemote(url, (html) => { - template.createChapter(ch, html, (html) => { - this.findRemoteResources('ch_' + zeroFill(3, index + 1), index, html) - this.chapterContent[index] = html - completeCount++ - if (completeCount < chapterCount) { - recursive() - } else { - resolve() - } - }) + let url = ch.link.replace('http://www.fimfiction.net', '') + fetch(url).then((html) => { + this.chapters[index] = FimFic2Epub.parseChapterPage(html) + completeCount++ + if (completeCount < chapterCount) { + recursive() + } else { + resolve() + } }) } @@ -397,6 +282,157 @@ module.exports = class FimFic2Epub { }) } + checkCoverImage () { + return new Promise((resolve, reject) => { + this.hasCoverImage = !!this.storyInfo.full_image + + if (this.hasCoverImage) { + this.remoteResources.set(this.storyInfo.full_image, {filename: 'cover', where: ['cover']}) + + if (!isNode) { + let coverImage = new Image() + coverImage.src = this.storyInfo.full_image + + coverImage.addEventListener('load', () => { + this.coverImageDimensions.width = coverImage.width + this.coverImageDimensions.height = coverImage.height + resolve() + }, false) + coverImage.addEventListener('error', () => { + console.warn('Unable to fetch cover image, skipping...') + this.hasCoverImage = false + resolve() + }) + } else { + resolve() + } + } else { + resolve() + } + }) + } + + processChapters () { + let p = [] + for (let i = 0; i < this.storyInfo.chapters.length; i++) { + let ch = this.storyInfo.chapters[i] + p.push(template.createChapter(ch, this.chapters[i]).then((html) => { + this.findRemoteResources('ch_' + zeroFill(3, i + 1), i, html) + this.chapterContent[i] = html + })) + } + return Promise.all(p) + } + + processStory () { + console.log('Finishing build...') + + this.zip.file('mimetype', 'application/epub+zip') + this.zip.file('META-INF/container.xml', containerXml) + + let coverFilename = '' + this.remoteResources.forEach((r, url) => { + let dest = '../' + r.dest + if (r.dest && r.originalUrl && r.where) { + let ourl = new RegExp(escapeStringRegexp(r.originalUrl), 'g') + for (var i = 0; i < r.where.length; i++) { + let w = r.where[i] + if (typeof w === 'number') { + this.chapterContent[w] = this.chapterContent[w].replace(ourl, dest) + } else if (w === 'description') { + this.storyInfo.description = this.storyInfo.description.replace(ourl, dest) + } else if (w === 'tags') { + this.tags.byImage[r.originalUrl].image = dest + } + } + } + if (r.filename === 'cover' && r.dest) { + coverFilename = dest + } + }) + + for (let num = 0; num < this.chapterContent.length; num++) { + let html = this.chapterContent[num] + let filename = 'OEBPS/Text/chapter_' + zeroFill(3, num + 1) + '.xhtml' + this.zip.file(filename, html) + } + + this.chapterContent.length = 0 + + this.zip.file('OEBPS/content.opf', template.createOpf(this)) + + if (this.hasCoverImage) { + this.zip.file('OEBPS/Text/cover.xhtml', template.createCoverPage(coverFilename, this.coverImageDimensions.width, this.coverImageDimensions.height)) + } else { + this.zip.file('OEBPS/Text/cover.xhtml', template.createCoverPage(this)) + } + + if (this.includeTitlePage) { + this.zip.file('OEBPS/Text/title.xhtml', template.createTitlePage(this)) + } + + this.zip.file('OEBPS/Text/nav.xhtml', template.createNav(this)) + this.zip.file('OEBPS/toc.ncx', template.createNcx(this)) + + this.zip.file('OEBPS/Styles/style.css', styleCss) + this.zip.file('OEBPS/Styles/coverstyle.css', coverstyleCss) + if (this.includeTitlePage) { + this.zip.file('OEBPS/Styles/titlestyle.css', titlestyleCss) + } + + this.hasDownloaded = true + } + + fetchRemoteFiles () { + return new Promise((resolve, reject) => { + console.log('Fetching remote files...') + let iter = this.remoteResources.entries() + let count = 0 + let completeCount = 0 + + let recursive = () => { + let r = iter.next().value + if (!r) { + if (completeCount === this.remoteResources.size) { + resolve() + } + return + } + let url = r[0] + r = r[1] + + console.log('Fetching remote file ' + (count + 1) + ' of ' + this.remoteResources.size + ': ' + r.filename, url) + count++ + + fetchRemote(url).then((data) => { + r.dest = null + let info = fileType(isNode ? data : new Uint8Array(data)) + if (info) { + let type = info.mime + r.type = type + let isImage = type.indexOf('image/') === 0 + let folder = isImage ? 'Images' : 'Misc' + let dest = folder + '/*.' + info.ext + r.dest = dest.replace('*', r.filename) + this.zip.file('OEBPS/' + r.dest, data) + if (isNode && r.filename === 'cover') { + const sizeOf = require('image-size') + this.coverImageDimensions = sizeOf(data) + } + } + completeCount++ + recursive() + }, 'arraybuffer') + } + + // concurrent downloads! + recursive() + recursive() + recursive() + recursive() + }) + } + findRemoteResources (prefix, where, html) { let remoteCounter = 1 let matchUrl = /]*\/([^">]*?))".*?>/g diff --git a/src/cleanMarkup.js b/src/cleanMarkup.js index 87c04bc..6d193b3 100644 --- a/src/cleanMarkup.js +++ b/src/cleanMarkup.js @@ -50,7 +50,7 @@ export function cleanMarkup (html) { let completeCount = 0 function getYoutubeInfo (ids) { - fetch('https://www.googleapis.com/youtube/v3/videos?id=' + ids + '&part=snippet&maxResults=50&key=' + youtubeKey, (raw, type) => { + fetch('https://www.googleapis.com/youtube/v3/videos?id=' + ids + '&part=snippet&maxResults=50&key=' + youtubeKey).then((raw) => { let data try { data = JSON.parse(raw).items diff --git a/src/eventPage.js b/src/eventPage.js index 71b7558..2e280b6 100644 --- a/src/eventPage.js +++ b/src/eventPage.js @@ -5,12 +5,11 @@ import fetch from './fetch' if (typeof safari !== 'undefined') { safari.application.addEventListener('message', function (ev) { let url = ev.message - fetch(url, (buffer, type) => { - console.log('Fetched ' + url + ' (' + type + ')') + fetch(url).then((buffer) => { + console.log('Fetched ' + url) ev.target.page.dispatchMessage('remote', { input: url, - output: buffer, - type: type + output: buffer }) }, 'arraybuffer') }, false) @@ -19,9 +18,9 @@ if (typeof safari !== 'undefined') { onMessage.addListener(function (request, sender, sendResponse) { if (typeof request === 'string') { - fetch(request, (blob, type) => { - sendResponse(URL.createObjectURL(blob), type) - }, 'blob') + fetch(request, 'blob').then((blob) => { + sendResponse(URL.createObjectURL(blob)) + }) // required for async return true } else if (request.showPageAction) { diff --git a/src/fetch.js b/src/fetch.js index a7282c5..6dbe47f 100644 --- a/src/fetch.js +++ b/src/fetch.js @@ -1,47 +1,52 @@ import isNode from 'detect-node' -function fetchNode (url, cb, responseType) { +function fetchNode (url, responseType) { const request = require('request') - request({ - url: url, - encoding: responseType ? null : 'utf8', - headers: { - referer: 'http://www.fimfiction.net/', - cookie: 'view_mature=true' - } - }, (error, response, body) => { - if (error) { - console.error(error) - cb() - return - } - let type = response.headers['content-type'] - cb(body, type) + if (url.indexOf('/') === 0) { + url = 'http://www.fimfiction.net' + url + } + return new Promise((resolve, reject) => { + request({ + url: url, + encoding: responseType ? null : 'utf8', + headers: { + referer: 'http://www.fimfiction.net/', + cookie: 'view_mature=true' + } + }, (error, response, body) => { + if (error) { + reject(error) + return + } + let type = response.headers['content-type'] + resolve(body) + }) }) } -export default function fetch (url, cb, responseType) { +export default function fetch (url, responseType) { if (url.indexOf('//') === 0) { url = 'http:' + url } if (isNode) { - fetchNode(url, cb, responseType) - return + return fetchNode(url, responseType) } - - let x = new XMLHttpRequest() - x.open('get', url, true) - if (responseType) { - x.responseType = responseType - } - x.onload = function () { - cb(x.response, x.getResponseHeader('content-type')) - } - x.onerror = function () { - console.error('error') - cb(null) - } - x.send() + return new Promise((resolve, reject) => { + let x = new XMLHttpRequest() + x.open('get', url, true) + if (responseType) { + console.log(responseType) + x.responseType = responseType + } + x.onload = function () { + // x.getResponseHeader('content-type') + resolve(x.response) + } + x.onerror = function () { + reject('Error fetching ' + url) + } + x.send() + }) } diff --git a/src/fetchRemote.js b/src/fetchRemote.js index 8b3e2fa..1411ea5 100644 --- a/src/fetchRemote.js +++ b/src/fetchRemote.js @@ -39,33 +39,34 @@ if (typeof safari !== 'undefined') { safari.self.addEventListener('message', safariHandler, false) } -function fetchBackground (url, cb, responseType) { - if (typeof chrome !== 'undefined' && chrome.runtime.sendMessage) { - chrome.runtime.sendMessage(url, function (objurl) { - fetch(objurl, cb, responseType) - URL.revokeObjectURL(objurl) - }) - } else if (typeof safari !== 'undefined') { - safariQueue[url] = {cb: cb, responseType: responseType} - safari.self.tab.dispatchMessage('remote', url) - } else { - cb(null) - } +function fetchBackground (url, responseType) { + return new Promise((resolve, reject) => { + if (typeof chrome !== 'undefined' && chrome.runtime.sendMessage) { + chrome.runtime.sendMessage(url, function (objurl) { + resolve(fetch(objurl, responseType)) + URL.revokeObjectURL(objurl) + }) + } else if (typeof safari !== 'undefined') { + safariQueue[url] = {cb: resolve, responseType: responseType} + safari.self.tab.dispatchMessage('remote', url) + } else { + resolve(null) + } + }) } -export default function fetchRemote (url, cb, responseType) { +export default function fetchRemote (url, responseType) { if (url.indexOf('//') === 0) { url = 'http:' + url } if (!isNode && document.location.protocol === 'https:' && url.indexOf('http:') === 0) { - fetchBackground(url, cb, responseType) - return + return fetchBackground(url, responseType) } - fetch(url, (data, type) => { + return fetch(url, responseType).then((data) => { if (!data) { - fetchBackground(url, cb, responseType) + return fetchBackground(url, responseType) } else { - cb(data, type) + return Promise.resolve(data) } - }, responseType) + }) } diff --git a/src/main.js b/src/main.js index db7f6b8..a941ed3 100644 --- a/src/main.js +++ b/src/main.js @@ -75,7 +75,7 @@ let dialog = { } this.createEpub = (e) => { e.target.disabled = true - ffc.download() + ffc.fetch() .then(ffc.build.bind(ffc)) .then(ffc.getFile.bind(ffc)).then((file) => { console.log('Saving file...') diff --git a/src/templates.js b/src/templates.js index 0fc609a..2c7bf97 100644 --- a/src/templates.js +++ b/src/templates.js @@ -24,43 +24,21 @@ function prettyDate (d) { return d.getDate() + nth(d) + ' ' + months[d.getMonth()].substring(0, 3) + ' ' + d.getFullYear() } -export function createChapter (ch, html, callback) { - let trimWhitespace = /^\s*()+|()+\s*$/ig - - let authorNotesPos = html.indexOf('
Author\'s Note:') - authorNotes = html.substring(authorNotesPos + 22) - authorNotes = authorNotes.substring(0, authorNotes.indexOf('\t\n\t
')) - authorNotes = authorNotes.trim() - authorNotes = authorNotes.replace(trimWhitespace, '') - } - - let chapterPos = html.indexOf('
') - let chapter = html.substring(chapterPos + 29) - - let pos = chapter.indexOf('\t
\t\t\n\t') - - chapter = chapter.substring(0, pos).trim() - - // remove leading and trailing
tags and whitespace - chapter = chapter.replace(trimWhitespace, '') - - Promise.all([cleanMarkup(chapter), cleanMarkup(authorNotes)]).then((values) => { +export function createChapter (ch, chapter) { + return Promise.all([cleanMarkup(chapter.content), cleanMarkup(chapter.notes)]).then((values) => { let [cleanChapter, cleanAuthorNotes] = values ch.realWordCount = htmlWordCount(cleanChapter) let content = [ m.trust(cleanChapter), - cleanAuthorNotes ? m('div#author_notes', {className: authorNotesPos < chapterPos ? 'top' : 'bottom'}, [ + cleanAuthorNotes ? m('div#author_notes', {className: chapter.notesFirst ? 'top' : 'bottom'}, [ m('p', m('b', 'Author\'s Note:')), m.trust(cleanAuthorNotes)]) : null ] // if author notes are a the beginning of the chapter - if (cleanAuthorNotes && authorNotesPos < chapterPos) { + if (cleanAuthorNotes && chapter.notesFirst) { content.reverse() } @@ -84,7 +62,7 @@ export function createChapter (ch, html, callback) { ]) )) - callback(chapterPage) + return Promise.resolve(chapterPage) }) }