Get rid of ID3Stream class. (#580)

Borewit · Aug 9, 2020 · f34c8d9 · f34c8d9
1 parent 8db5720
commit f34c8d9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 25 deletions.
diff --git a/lib/aiff/AiffParser.ts b/lib/aiff/AiffParser.ts
@@ -8,7 +8,6 @@ import { BasicParser } from '../common/BasicParser';
 
 import * as AiffToken from './AiffToken';
 import * as iff from '../iff';
-import { ID3Stream } from "../id3v2/ID3Stream";
 
 const debug = initDebug('music-metadata:parser:aiff');
 
@@ -81,8 +80,7 @@ export class AIFFParser extends BasicParser {
 
       case 'ID3 ': // ID3-meta-data
         const id3_data = await this.tokenizer.readToken<Buffer>(new Token.BufferType(header.chunkSize));
-        const id3stream = new ID3Stream(id3_data);
-        const rst = strtok3.fromStream(id3stream);
+        const rst = strtok3.fromBuffer(id3_data);
         await new ID3v2Parser().parse(this.metadata, rst, this.options);
         return header.chunkSize;
 

diff --git a/lib/dsdiff/DsdiffParser.ts b/lib/dsdiff/DsdiffParser.ts
@@ -3,7 +3,6 @@ import * as Token from 'token-types';
 import * as initDebug from 'debug';
 import { FourCcToken } from '../common/FourCC';
 import { BasicParser } from '../common/BasicParser';
-import { ID3Stream } from '../id3v2/ID3Stream';
 
 import {ChunkHeader, IChunkHeader} from "./DsdiffToken";
 import * as strtok3 from "strtok3/lib/core";
@@ -67,8 +66,7 @@ export class DsdiffParser extends BasicParser {
 
       case 'ID3': // Unofficial ID3 tag support
         const id3_data = await this.tokenizer.readToken<Buffer>(new Token.BufferType(header.chunkSize));
-        const id3stream = new ID3Stream(id3_data);
-        const rst = strtok3.fromStream(id3stream);
+        const rst = strtok3.fromBuffer(id3_data);
         await new ID3v2Parser().parse(this.metadata, rst, this.options);
         break;
 

diff --git a/lib/id3v2/ID3Stream.ts b/lib/id3v2/ID3Stream.ts
diff --git a/lib/riff/WaveParser.ts b/lib/riff/WaveParser.ts
@@ -9,7 +9,6 @@ import { ID3v2Parser } from '../id3v2/ID3v2Parser';
 import Common from '../common/Util';
 import { FourCcToken } from '../common/FourCC';
 import { BasicParser } from '../common/BasicParser';
-import { ID3Stream } from "../id3v2/ID3Stream";
 
 const debug = initDebug('music-metadata:parser:RIFF');
 
@@ -93,8 +92,7 @@ export class WaveParser extends BasicParser {
         case 'id3 ': // The way Picard, FooBar currently stores, ID3 meta-data
         case 'ID3 ': // The way Mp3Tags stores ID3 meta-data
           const id3_data = await this.tokenizer.readToken<Buffer>(new Token.BufferType(header.chunkSize));
-          const id3stream = new ID3Stream(id3_data);
-          const rst = strtok3.fromStream(id3stream);
+          const rst = strtok3.fromBuffer(id3_data);
           await new ID3v2Parser().parse(this.metadata, rst, this.options);
           break;