Skip to content

Commit 67dc9c5

Browse files
committed
Use mime object import
See broofa/mime#295
1 parent eaa6ecf commit 67dc9c5

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

lib/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { render as renderTemplate } from 'ejs';
22
import jszip, { generateAsync, JSZipGeneratorOptions } from 'jszip';
3-
import { getExtension, getType } from 'mime/lite';
3+
import mime from 'mime/lite';
44
import { Chapter, chapterDefaults, Content, Font, Image, isString, NormChapter, NormOptions, Options, optionsDefaults, retryFetch, type, uuid, validateAndNormalizeChapters, validateAndNormalizeOptions, validateIsOptionsOrTitle, validateIsVarargArray } from './util';
55

66

@@ -39,8 +39,8 @@ export class EPub {
3939

4040
if (this.options.cover) {
4141
const fname = isString(this.options.cover) ? this.options.cover : this.options.cover.name;
42-
const mediaType = getType(fname);
43-
const extension = getExtension(mediaType || '');
42+
const mediaType = mime.getType(fname);
43+
const extension = mime.getExtension(mediaType || '');
4444
if (mediaType && extension)
4545
this.cover = { mediaType, extension };
4646
else this.warn('Could not detect cover image type from file', fname);

lib/util/html.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getExtension, getType } from 'mime/lite';
1+
import mime from 'mime/lite';
22
import type { EPub } from '..';
33
import { fixHTML } from './html-parse';
44
import { uuid } from './other';
@@ -15,12 +15,12 @@ export type Image = {
1515
function imgSrc(this: EPub, url: string) {
1616
let image = this.images.find(i => i.url === url);
1717
if (!image) {
18-
const mediaType = getType(url.replace(/\?.*/, "")) || '';
18+
const mediaType = mime.getType(url.replace(/\?.*/, "")) || '';
1919
image = {
2020
url,
2121
mediaType,
2222
id: uuid(),
23-
extension: getExtension(mediaType) || '',
23+
extension: mime.getExtension(mediaType) || '',
2424
};
2525
this.images.push(image);
2626
}

lib/util/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { remove as removeDiacritics } from 'diacritics';
2-
import { getType } from 'mime/lite';
2+
import mime from 'mime/lite';
33
import slugify from 'slugify';
44
import chapterXHTML2 from 'templates/epub2/chapter.xhtml.ejs';
55
import contentOPF2 from 'templates/epub2/content.opf.ejs';
@@ -63,7 +63,7 @@ export const validateAndNormalizeOptions = (options: Options) => {
6363
...options,
6464
} as NormOptions;
6565
opt.author = normName(opt.author);
66-
opt.fonts = opt.fonts.map(font => ({ ...font, filename: font.filename.replace(/\s/g, '_').replace(/[^-._A-Za-z0-9]/g, ''), mediaType: getType(font.filename)! }));
66+
opt.fonts = opt.fonts.map(font => ({ ...font, filename: font.filename.replace(/\s/g, '_').replace(/[^-._A-Za-z0-9]/g, ''), mediaType: mime.getType(font.filename)! }));
6767
opt.date = new Date(opt.date).toISOString();
6868
opt.lang = removeDiacritics(opt.lang);
6969
return opt;

0 commit comments

Comments
 (0)