Fix Ogg multi-page-metadata-plugin workaround.

Borewit · Feb 4, 2018 · cff5fbc · cff5fbc
1 parent f1a5620
commit cff5fbc
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ npm install music-metadata
 | flac                                   | audio/flac                            | Vorbis                             | 
 | m4a, m4b, m4p, m4v, m4r, 3gp, mp4, aac | audio/aac, audio/aacp                 | QTFF                               | 
 | mp2, mp3, m2a                          | audio/mpeg                            | ID3v1.1, ID3v2                     | 
-| ogv, oga, ogx, ogg                     | audio/ogg, application/ogg            | Vorbis                             |
+| ogv, oga, ogx, ogg, opus               | audio/ogg, application/ogg            | Vorbis                             |
 | wav                                    | audio/wav, audio/wave                 | ID3v2, RIFF/INFO (EXIF 2.3)        |
 | wv, wvp                                | audio/x-wavpack                       | APEv2                              |
 

diff --git a/src/ogg/OggParser.ts b/src/ogg/OggParser.ts
@@ -95,6 +95,10 @@ export class OggParser implements ITokenParser {
           }
         });
       });
+    }).catch (err => {
+      if (err.message !== "End-Of-File") {
+        throw err;
+      }
     });
   }
 

diff --git a/src/opus/Opus.ts b/src/opus/Opus.ts
@@ -47,7 +47,7 @@ export class IdHeader implements Token.IGetToken<IIdHeader> {
 
   constructor(public len: number) {
     if (len < 19) {
-      throw new Error("ID-header-page 0 should be at leader 19 bytes long");
+      throw new Error("ID-header-page 0 should be at least 19 bytes long");
     }
   }
 

diff --git a/test/test-mime.ts b/test/test-mime.ts
@@ -8,7 +8,7 @@ const t = assert;
 
 describe("MIME & extension mapping", () => {
 
-  const buf = new Buffer(16).fill(0);
+  const buf = new Buffer(30).fill(0);
 
   const audioExtension = [".aac", ".mp3", ".ogg", ".wav", ".flac", ".m4a"]; // ToDo: ass ".ac3"
 
@@ -18,10 +18,8 @@ describe("MIME & extension mapping", () => {
       case ".m4a":
       case ".flac":
       case ".wav":
-        t.strictEqual(err.message, "FourCC contains invalid characters",  "Extension=" + extension);
-        break;
       case ".ogg":
-        t.strictEqual(err.message, "End-Of-File",  "Extension=" + extension);
+        t.strictEqual(err.message, "FourCC contains invalid characters",  "Extension=" + extension);
         break;
 
       default:

diff --git a/test/test-ogg-multipagemetadatabug.ts b/test/test-ogg-multipagemetadatabug.ts
@@ -6,9 +6,7 @@ import * as path from 'path';
 
 const t = assert;
 
-it("ogg-multipage-metadata-bug", function() {
-
-  this.skip();
+it("ogg-multipage-metadata-bug", () => {
 
   const filename = 'ogg-multipagemetadata-bug.ogg';
   const filePath = path.join(__dirname, 'samples', filename);

diff --git a/test/test-ogg.ts b/test/test-ogg.ts
@@ -1,8 +1,10 @@
 import {} from "mocha";
-import {assert} from 'chai';
+import {assert, expect} from 'chai';
 import * as mm from '../src';
 import * as path from 'path';
 import * as fs from 'fs-extra';
+import {IdHeader} from "../src/opus/Opus";
+import {OggParser} from "../src/ogg/OggParser";
 
 describe("Parsing Ogg", function() {
 
@@ -81,6 +83,17 @@ describe("Parsing Ogg", function() {
 
   describe("Parsing Ogg/Opus", () => {
 
+    describe("components", () => {
+
+      it("IdHeader should throw error if data is shorter than header", () => {
+        try {
+          const idHeader = new IdHeader(18);
+        } catch (err) {
+          expect(err.message).to.equal('ID-header-page 0 should be at least 19 bytes long');
+        }
+      });
+    });
+
     describe("decode: Nirvana - In Bloom - 2-sec.opus", () => {
 
       const filePath = path.join(__dirname, 'samples', "Nirvana - In Bloom - 2-sec.opus");