This commit is contained in:
djazz 2017-10-18 14:59:30 +02:00
parent 731300070b
commit 8d8b634f8f
2 changed files with 9 additions and 9 deletions

View file

@ -54,11 +54,11 @@ class FimFic2Epub extends Emitter {
data = JSON.parse(content) data = JSON.parse(content)
} catch (e) {} } catch (e) {}
if (!data) { if (!data) {
reject('Unable to fetch story info') reject(new Error('Unable to fetch story info'))
return return
} }
if (data.error) { if (data.error) {
reject(data.error) reject(new Error(data.error))
return return
} }
let story = data.story let story = data.story
@ -407,7 +407,7 @@ class FimFic2Epub extends Emitter {
// for node, resolve a Buffer, in browser resolve a Blob // for node, resolve a Buffer, in browser resolve a Blob
getFile () { getFile () {
if (!this.zip) { if (!this.zip) {
return Promise.reject('Not downloaded.') return Promise.reject(new Error('Not downloaded.'))
} }
if (this.cachedFile) { if (this.cachedFile) {
return Promise.resolve(this.cachedFile) return Promise.resolve(this.cachedFile)
@ -459,7 +459,7 @@ class FimFic2Epub extends Emitter {
this.coverImage = buffer this.coverImage = buffer
this.coverFilename = 'Images/cover.' + info.ext this.coverFilename = 'Images/cover.' + info.ext
this.coverType = info.mime this.coverType = info.mime
this.coverImageDimensions = sizeOf(new Buffer(buffer)) this.coverImageDimensions = sizeOf(Buffer.from(buffer))
} }
// Internal/private methods // Internal/private methods
@ -529,7 +529,7 @@ class FimFic2Epub extends Emitter {
this.coverFilename = filename this.coverFilename = filename
this.coverType = type this.coverType = type
this.coverImageDimensions = sizeOf(new Buffer(data)) this.coverImageDimensions = sizeOf(Buffer.from(data))
this.coverImage = data this.coverImage = data
this.coverFilename = filename this.coverFilename = filename
return this.coverImage return this.coverImage

View file

@ -12,7 +12,7 @@ function fetchNode (url, responseType) {
encoding: responseType ? null : 'utf8', encoding: responseType ? null : 'utf8',
headers: { headers: {
referer: 'http://www.fimfiction.net/', referer: 'http://www.fimfiction.net/',
Cookie: 'view_mature=true', cookie: 'view_mature=true'
} }
}, (error, response, body) => { }, (error, response, body) => {
if (error) { if (error) {
@ -39,7 +39,7 @@ export default function fetch (url, responseType) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (typeof window.fetch === 'function') { if (typeof window.fetch === 'function') {
const headers = new Headers() const headers = new Headers()
headers.append("Cookie", "view_mature=true"); headers.append('cookie', 'view_mature=true')
window.fetch(url, { window.fetch(url, {
method: 'GET', method: 'GET',
mode: 'cors', mode: 'cors',
@ -56,7 +56,7 @@ export default function fetch (url, responseType) {
response.text().then(resolve, reject) response.text().then(resolve, reject)
} }
}).catch((err) => { }).catch((err) => {
reject('Error fetching ' + url + ' (' + err + ')') reject(new Error('Error fetching ' + url + ' (' + err + ')'))
}) })
} else { } else {
let x = new XMLHttpRequest() let x = new XMLHttpRequest()
@ -68,7 +68,7 @@ export default function fetch (url, responseType) {
resolve(x.response) resolve(x.response)
} }
x.onerror = function () { x.onerror = function () {
reject('Error fetching ' + url) reject(new Error('Error fetching ' + url))
} }
x.send() x.send()
} }