cvitool 1.0.751 → 1.0.752

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/build/src/cutil.d.ts +2 -2
  2. package/build/src/cutil.js +10 -7
  3. package/package.json +1 -1
  4. package/src/cutil.ts +14 -11
package/build/src/cutil.d.ts CHANGED
@@ -11,8 +11,8 @@ interface CustomObject {
11
11
  [key: string]: any;
12
12
  }
13
13
  interface getMediaFileTypeRes {
14
- type: string;
15
- extname: string;
14
+ type: 'image' | 'video' | 'audio' | 'unknow';
15
+ extname: 'jpg' | 'png' | 'webp' | 'bmp' | 'heic' | 'gif' | 'mp3' | 'wav' | 'pcm' | 'flac' | 'm4a' | 'aac' | 'mp4' | 'mov' | 'flv' | 'mkv' | 'avi' | 'webm' | 'ogg' | 'm4v' | 'wmv' | 'unknow';
16
16
  }
17
17
  /**
18
18
  * 获取一个随机字符串
package/build/src/cutil.js CHANGED
@@ -261,14 +261,17 @@ function getMediaFileType(target) {
261
261
  if (checkString('WAV', 8, 10, buffer)) {
262
262
  return getResult('audio|wav');
263
263
  }
264
- if (checkString('M4A', 8, 10, buffer)) {
265
- return getResult('audio|m4a');
266
- }
267
- if (checkString('heic', 8, 11, buffer) || checkString('mif1', 8, 11, buffer)) {
268
- return getResult('image|heic');
269
- }
270
264
  if (checkString('ftyp', 4, 7, buffer)) {
271
- if (checkString('ftypqt', 4, 9, buffer)) {
265
+ if (checkString('M4A', 8, 10, buffer)) {
266
+ return getResult('audio|m4a');
267
+ }
268
+ if (checkString('M4V', 8, 10, buffer)) {
269
+ return getResult('video|m4v');
270
+ }
271
+ if (checkString('heic', 8, 11, buffer) || checkString('mif1', 8, 11, buffer)) {
272
+ return getResult('image|heic');
273
+ }
274
+ if (checkString('qt', 8, 9, buffer)) {
272
275
  return getResult('video|mov');
273
276
  }
274
277
  return getResult('video|mp4');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cvitool",
3
- "version": "1.0.751",
3
+ "version": "1.0.752",
4
4
  "description": "cvitool",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/cutil.ts CHANGED
@@ -26,8 +26,8 @@ interface CustomObject {
26
26
  }
27
27
 
28
28
  interface getMediaFileTypeRes {
29
- type: string,
30
- extname: string
29
+ type: 'image' | 'video' | 'audio' | 'unknow',
30
+ extname: 'jpg' | 'png' | 'webp' | 'bmp' | 'heic' | 'gif' | 'mp3' | 'wav' | 'pcm' | 'flac' | 'm4a' | 'aac' | 'mp4' | 'mov' | 'flv' | 'mkv' | 'avi' | 'webm' | 'ogg' | 'm4v' | 'wmv' | 'unknow'
31
31
  }
32
32
 
33
33
  /**
@@ -229,12 +229,12 @@ async function getMediaFileType(target: string | Buffer | Readable): Promise<get
229
229
  }
230
230
  return equal;
231
231
  };
232
- const getResult = (typeStr: string) => {
232
+ const getResult = (typeStr: string): getMediaFileTypeRes => {
233
233
  const arr = typeStr.split('|');
234
234
  return {
235
235
  type: arr[0],
236
236
  extname: arr[1]
237
- };
237
+ } as getMediaFileTypeRes;
238
238
  };
239
239
  let buffer: Buffer;
240
240
  const targetType = getValueType(target);
@@ -267,14 +267,17 @@ async function getMediaFileType(target: string | Buffer | Readable): Promise<get
267
267
  if (checkString('WAV', 8, 10, buffer)) {
268
268
  return getResult('audio|wav');
269
269
  }
270
- if (checkString('M4A', 8, 10, buffer)) {
271
- return getResult('audio|m4a');
272
- }
273
- if (checkString('heic', 8, 11, buffer) || checkString('mif1', 8, 11, buffer)) {
274
- return getResult('image|heic');
275
- }
276
270
  if (checkString('ftyp', 4, 7, buffer)) {
277
- if (checkString('ftypqt', 4, 9, buffer)) {
271
+ if (checkString('M4A', 8, 10, buffer)) {
272
+ return getResult('audio|m4a');
273
+ }
274
+ if (checkString('M4V', 8, 10, buffer)) {
275
+ return getResult('video|m4v');
276
+ }
277
+ if (checkString('heic', 8, 11, buffer) || checkString('mif1', 8, 11, buffer)) {
278
+ return getResult('image|heic');
279
+ }
280
+ if (checkString('qt', 8, 9, buffer)) {
278
281
  return getResult('video|mov');
279
282
  }
280
283
  return getResult('video|mp4');