music-metadata 7.13.5 → 7.14.0

package/lib/mp4/MP4Parser.js

@@ -344,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'));
@@ -381,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.5",
+  "version": "7.14.0",
   "author": {
     "name": "Borewit",
     "url": "https://github.com/Borewit"
@@ -103,13 +103,13 @@
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "del-cli": "5.1.0",
-    "eslint": "^8.52.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.1",
+    "eslint-plugin-unicorn": "^49.0.0",
     "mime": "^3.0.0",
     "mocha": "^9.2.2",
     "npm-run-all": "^4.1.5",