music-metadata 7.13.4 → 7.14.0

package/lib/mp4/MP4Parser.js

@@ -178,7 +178,7 @@ class MP4Parser extends BasicParser_1.BasicParser {
                 this.getTrackDescription().sampleToChunkTable = stsc.entries;
             },
             /**
-             * time to sample
+             * time-to-sample table
              */
             stts: async (len) => {
                 const stts = await this.tokenizer.readToken(new AtomToken.SttsAtom(len));
@@ -275,13 +275,22 @@ class MP4Parser extends BasicParser_1.BasicParser {
         });
         if (audioTracks.length >= 1) {
             const audioTrack = audioTracks[0];
-            const duration = audioTrack.duration / audioTrack.timeScale;
-            this.metadata.setFormat('duration', duration); // calculate duration in seconds
+            if (audioTrack.timeScale > 0) {
+                const duration = audioTrack.duration / audioTrack.timeScale; // calculate duration in seconds
+                this.metadata.setFormat('duration', duration);
+            }
             const ssd = audioTrack.soundSampleDescription[0];
             if (ssd.description) {
                 this.metadata.setFormat('sampleRate', ssd.description.sampleRate);
                 this.metadata.setFormat('bitsPerSample', ssd.description.sampleSize);
                 this.metadata.setFormat('numberOfChannels', ssd.description.numAudioChannels);
+                if (audioTrack.timeScale === 0 && audioTrack.timeToSampleTable.length > 0) {
+                    const totalSampleSize = audioTrack.timeToSampleTable
+                        .map(ttstEntry => ttstEntry.count * ttstEntry.duration)
+                        .reduce((total, sampleSize) => total + sampleSize);
+                    const duration = totalSampleSize / ssd.description.sampleRate;
+                    this.metadata.setFormat('duration', duration);
+                }
             }
             const encoderInfo = encoderDict[ssd.dataFormat];
             if (encoderInfo) {
@@ -335,14 +344,11 @@ class MP4Parser extends BasicParser_1.BasicParser {
                 case 'data': // value atom
                     return this.parseValueAtom(tagKey, child);
                 case 'name': // name atom (optional)
+                case 'mean':
+                case 'rate':
                     const name = await this.tokenizer.readToken(new AtomToken.NameAtom(payLoadLength));
                     tagKey += ':' + name.name;
                     break;
-                case 'mean': // name atom (optional)
-                    const mean = await this.tokenizer.readToken(new AtomToken.NameAtom(payLoadLength));
-                    // console.log("  %s[%s] = %s", tagKey, header.name, mean.name);
-                    tagKey += ':' + mean.name;
-                    break;
                 default:
                     const dataAtom = await this.tokenizer.readToken(new Token.BufferType(payLoadLength));
                     this.addWarning('Unsupported meta-item: ' + tagKey + '[' + child.header.name + '] => value=' + dataAtom.toString('hex') + ' ascii=' + dataAtom.toString('ascii'));
@@ -372,9 +378,12 @@ class MP4Parser extends BasicParser_1.BasicParser {
                         // console.log("  %s[data] = %s", tagKey, genreStr);
                         this.addTag(tagKey, genreStr);
                         break;
+                    case 'rate':
+                        const rate = dataAtom.value.toString('ascii');
+                        this.addTag(tagKey, rate);
+                        break;
                     default:
-                    // console.log("  reserved-data: name=%s, len=%s, set=%s, type=%s, locale=%s, value{ hex=%s, ascii=%s }",
-                    // header.name, header.length, dataAtom.type.set, dataAtom.type.type, dataAtom.locale, dataAtom.value.toString('hex'), dataAtom.value.toString('ascii'));
+                        debug('unknown proprietary value type for: ' + metaAtom.atomPath);
                 }
                 break;
             case 1: // UTF-8: Without any count or NULL terminator

package/lib/mp4/MP4TagMapper.d.ts

@@ -1,5 +1,8 @@
 import { CaseInsensitiveTagMap } from '../common/CaseInsensitiveTagMap';
+import { ITag } from "../type";
+import { INativeMetadataCollector } from "../common/MetadataCollector";
 export declare const tagType = "iTunes";
 export declare class MP4TagMapper extends CaseInsensitiveTagMap {
     constructor();
+    protected postMap(tag: ITag, warnings: INativeMetadataCollector): void;
 }

package/lib/mp4/MP4TagMapper.js

@@ -104,13 +104,24 @@ const mp4TagMap = {
     hdvd: 'hdVideo',
     keyw: 'keywords',
     shwm: 'showMovement',
-    stik: 'stik'
+    stik: 'stik',
+    rate: 'rating'
 };
 exports.tagType = 'iTunes';
 class MP4TagMapper extends CaseInsensitiveTagMap_1.CaseInsensitiveTagMap {
     constructor() {
         super([exports.tagType], mp4TagMap);
     }
+    postMap(tag, warnings) {
+        switch (tag.id) {
+            case 'rate':
+                tag.value = {
+                    source: undefined,
+                    rating: parseFloat(tag.value) / 100
+                };
+                break;
+        }
+    }
 }
 exports.MP4TagMapper = MP4TagMapper;
 //# sourceMappingURL=MP4TagMapper.js.map

package/lib/ogg/vorbis/VorbisTagMapper.d.ts

@@ -1,7 +1,7 @@
 import { CommonTagMapper } from '../../common/GenericTagMapper';
 import { IRating, ITag } from '../../type';
 export declare class VorbisTagMapper extends CommonTagMapper {
-    static toRating(email: string, rating: string): IRating;
+    static toRating(email: string, rating: string, maxScore: number): IRating;
     constructor();
     protected postMap(tag: ITag): void;
 }

package/lib/ogg/vorbis/VorbisTagMapper.js

@@ -112,19 +112,23 @@ const vorbisTagMap = {
     REPLAYGAIN_UNDO: 'replaygain_undo'
 };
 class VorbisTagMapper extends GenericTagMapper_1.CommonTagMapper {
-    static toRating(email, rating) {
+    static toRating(email, rating, maxScore) {
         return {
             source: email ? email.toLowerCase() : email,
-            rating: parseFloat(rating) * GenericTagMapper_1.CommonTagMapper.maxRatingScore
+            rating: (parseFloat(rating) / maxScore) * GenericTagMapper_1.CommonTagMapper.maxRatingScore
         };
     }
     constructor() {
         super(['vorbis'], vorbisTagMap);
     }
     postMap(tag) {
-        if (tag.id.indexOf('RATING:') === 0) {
+        if (tag.id === 'RATING') {
+            // The way Winamp 5.666 assigns rating
+            tag.value = VorbisTagMapper.toRating(undefined, tag.value, 100);
+        }
+        else if (tag.id.indexOf('RATING:') === 0) {
             const keys = tag.id.split(':');
-            tag.value = VorbisTagMapper.toRating(keys[1], tag.value);
+            tag.value = VorbisTagMapper.toRating(keys[1], tag.value, 1);
             tag.id = keys[0];
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "music-metadata",
   "description": "Music metadata parser for Node.js, supporting virtual any audio and tag format.",
-  "version": "7.13.4",
+  "version": "7.14.0",
   "author": {
     "name": "Borewit",
     "url": "https://github.com/Borewit"
@@ -92,30 +92,30 @@
     "token-types": "^4.2.1"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.4",
-    "@types/chai-as-promised": "^7.1.5",
-    "@types/debug": "^4.1.7",
+    "@types/chai": "^4.3.9",
+    "@types/chai-as-promised": "^7.1.7",
+    "@types/debug": "^4.1.10",
     "@types/file-type": "^10.9.1",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^18.15.11",
-    "@typescript-eslint/eslint-plugin": "^5.57.0",
-    "@typescript-eslint/parser": "^5.57.0",
-    "chai": "^4.3.7",
+    "@types/node": "^20.8.9",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
+    "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
-    "del-cli": "5.0.0",
-    "eslint": "^8.37.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-import-resolver-typescript": "^3.5.4",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^40.1.0",
+    "del-cli": "5.1.0",
+    "eslint": "^8.53.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-jsdoc": "^46.8.2",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-unicorn": "^46.0.0",
+    "eslint-plugin-unicorn": "^49.0.0",
     "mime": "^3.0.0",
     "mocha": "^9.2.2",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
-    "remark-cli": "^11.0.0",
-    "remark-preset-lint-recommended": "^6.1.2",
+    "remark-cli": "^12.0.0",
+    "remark-preset-lint-recommended": "^6.1.3",
     "source-map-support": "^0.5.21",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.2"