alphatheta-connect 0.26.0 → 0.26.1

package/lib/index.js

@@ -1356,7 +1356,9 @@ async function viaLocal(local, opts) {
             if (!orm) {
                 break;
             }
-            yield orm.findTrack(entry.id);
+            // Playlist entries reference the track through trackId; entry.id is the
+            // entry's own row id (or its index, for OneLibrary), not a track.
+            yield orm.findTrack(entry.trackId);
         }
     };
     const tracks = { [Symbol.asyncIterator]: iterateTracks };
@@ -3255,7 +3257,9 @@ var RekordboxAnlz = (function() {
       this.time = this._io.readU4be();
       this.loopTime = this._io.readU4be();
       this.colorId = this._io.readU1();
-      this._unnamed9 = this._io.readBytes(11);
+      this._unnamed9 = this._io.readBytes(7);
+      this.loopNumerator = this._io.readU2be();
+      this.loopDenominator = this._io.readU2be();
       if (this.lenEntry > 43) {
         this.lenComment = this._io.readU4be();
       }
@@ -3275,7 +3279,7 @@ var RekordboxAnlz = (function() {
         this.colorBlue = this._io.readU1();
       }
       if ((this.lenEntry - this.lenComment) > 48) {
-        this._unnamed16 = this._io.readBytes(((this.lenEntry - 48) - this.lenComment));
+        this._unnamed18 = this._io.readBytes(((this.lenEntry - 48) - this.lenComment));
       }
     }
 
@@ -3307,6 +3311,16 @@ var RekordboxAnlz = (function() {
      * and has been assigned a color.
      */
 
+    /**
+     * The numerator of the loop size fraction for a quantized loop,
+     * e.g. 4 for a 4-beat loop. Zero when the loop is not quantized.
+     */
+
+    /**
+     * The denominator of the loop size fraction for a quantized loop,
+     * e.g. 1 for a 4-beat loop.
+     */
+
     /**
      * The comment assigned to this cue by the DJ, if any, with a trailing NUL.
      */
@@ -5760,16 +5774,20 @@ function makeBeatGrid(data) {
  * Fill cue and loop data from the ANLZ section
  */
 function makeCueAndLoop(data) {
-    return data.body.cues.map((entry) => {
+    return data.body.cues
+        .map((entry) => {
         // Cues with the status 0 are likely leftovers that were removed
-        const button = entry.hotCue === 0 ? false : entry.type;
+        // `hotCue` is the button number (1-8, A-H); zero marks a memory cue.
+        // `type` only says whether the entry is a cue point (1) or a loop (2).
+        const button = entry.hotCue === 0 ? false : entry.hotCue;
         const isCue = entry.type === 0x01;
         const isLoop = entry.type === 0x02;
         // NOTE: Unlike the remotedb, these entries are already in milliseconds.
         const offset = entry.time;
         const length = entry.loopTime - offset;
         return (0, utils_1.makeCueLoopEntry)(isCue, isLoop, offset, length, button);
-    });
+    })
+        .filter((c) => c !== null);
 }
 /**
  * Fill waveform HD data from the ANLZ section
@@ -5805,9 +5823,13 @@ function makeExtendedCues(data) {
                 b: (_c = entry.colorBlue) !== null && _c !== void 0 ? _c : 0,
             };
         }
-        // Add comment if present
+        // Add comment if present. The tag stores it with a trailing NUL, which
+        // is not part of what the DJ typed.
         if (entry.lenComment > 0 && entry.comment) {
-            cue.comment = entry.comment;
+            const comment = entry.comment.replace(/\0+$/, '');
+            if (comment.length > 0) {
+                cue.comment = comment;
+            }
         }
         // Add quantized loop information if present
         if (entry.loopNumerator !== undefined && entry.loopNumerator > 0) {
@@ -5873,19 +5895,24 @@ function makeSongStructure(data) {
         },
     };
     const mood = (_a = moodMap[data.body.mood]) !== null && _a !== void 0 ? _a : 'high';
-    const bank = (_b = bankMap[data.body.rawBank]) !== null && _b !== void 0 ? _b : 'default';
+    const bank = (_b = bankMap[data.body.bank]) !== null && _b !== void 0 ? _b : 'default';
+    // Field names follow the Kaitai-generated object (rekordbox_anlz.ksy
+    // `song_structure_entry`): `phraseNumber`, `beatNumber`, `fillIn`,
+    // `fillInBeatNumber`, and `kind` is a `phrase_high` / `phrase_mid` /
+    // `phrase_low` object whose `id` carries the raw kind value.
     const phrases = data.body.entries.map((entry) => {
         var _a;
+        const kind = typeof entry.kind === 'object' ? entry.kind.id : entry.kind;
         const phrase = {
-            index: entry.index,
-            beat: entry.beat,
-            kind: entry.kind,
-            phraseType: (_a = phraseTypeMap[mood][entry.kind]) !== null && _a !== void 0 ? _a : 'Unknown',
+            index: entry.phraseNumber,
+            beat: entry.beatNumber,
+            kind,
+            phraseType: (_a = phraseTypeMap[mood][kind]) !== null && _a !== void 0 ? _a : 'Unknown',
         };
         // Add fill-in information if present
-        if (entry.fill > 0) {
-            phrase.fill = entry.fill;
-            phrase.fillBeat = entry.beatFill;
+        if (entry.fillIn > 0) {
+            phrase.fill = entry.fillIn;
+            phrase.fillBeat = entry.fillInBeatNumber;
         }
         return phrase;
     });