fix: apply roborev fix for 9d3c59c (job #20)

Author: pythoninthegrass

app/frontend/__tests__/artist-utils.test.js

@@ -9,7 +9,11 @@
  */
 
 import { describe, it, expect } from 'vitest';
-import { groupTracksIntoAlbums } from '../js/utils/artist-utils.js';
+import {
+  groupTracksIntoAlbums,
+  parseDiscNumber,
+  parseTrackNumber,
+} from '../js/utils/artist-utils.js';
 
 function createMockTrack(id, overrides = {}) {
   return {
@@ -28,14 +32,6 @@ function createMockTrack(id, overrides = {}) {
   };
 }
 
-function parseDiscNumber(val) {
-  return parseInt(String(val || '1').split('/')[0], 10) || 1;
-}
-
-function parseTrackNumber(val) {
-  return parseInt(String(val || '').split('/')[0], 10) || 999999;
-}
-
 describe('groupTracksIntoAlbums', () => {
   describe('album sorting by year', () => {
     it('sorts albums by year ascending (oldest first)', () => {

app/frontend/js/components/artists-browser.js

@@ -4,6 +4,8 @@ import {
   buildArtistDisplayNames,
   buildCanonicalArtistMap,
   groupTracksIntoAlbums,
+  parseDiscNumber,
+  parseTrackNumber,
 } from '../utils/artist-utils.js';
 import { handleDoubleClickPlay } from '../utils/queue-builder.js';
 import { singleTrackContextMenuMixin } from '../mixins/single-track-context-menu.js';
@@ -155,14 +157,6 @@ export function createArtistsBrowser(Alpine) {
       return str;
     },
 
-    _parseDiscNumber(val) {
-      return parseInt(String(val || '1').split('/')[0], 10) || 1;
-    },
-
-    _parseTrackNumber(val) {
-      return parseInt(String(val || '').split('/')[0], 10) || 999999;
-    },
-
     get selectedArtistTracks() {
       if (!this.selectedArtist) return [];
       const canonicalMap = this._canonicalArtistMap;
@@ -189,19 +183,19 @@ export function createArtistsBrowser(Alpine) {
         .sort((a, b) => {
           const albumCmp = (a.album || '').localeCompare(b.album || '');
           if (albumCmp !== 0) return albumCmp;
-          const discCmp = this._parseDiscNumber(a.disc_number) -
-            this._parseDiscNumber(b.disc_number);
+          const discCmp = parseDiscNumber(a.disc_number) -
+            parseDiscNumber(b.disc_number);
           if (discCmp !== 0) return discCmp;
-          return this._parseTrackNumber(a.track_number) -
-            this._parseTrackNumber(b.track_number);
+          return parseTrackNumber(a.track_number) -
+            parseTrackNumber(b.track_number);
         });
     },
 
     get selectedArtistAlbums() {
       return groupTracksIntoAlbums(
         this.selectedArtistTracks,
-        this._parseDiscNumber,
-        this._parseTrackNumber,
+        parseDiscNumber,
+        parseTrackNumber,
       );
     },
 

app/frontend/js/utils/artist-utils.js

@@ -90,6 +90,28 @@ export function buildArtistDisplayNames(tracks, canonicalMap) {
   return displayMap;
 }
 
+/**
+ * Parse a disc number value, handling "X/Y" format.
+ * Returns 1 for missing or unparseable values.
+ *
+ * @param {*} val - Raw disc number from track metadata
+ * @returns {number}
+ */
+export function parseDiscNumber(val) {
+  return parseInt(String(val || '1').split('/')[0], 10) || 1;
+}
+
+/**
+ * Parse a track number value, handling "X/Y" format.
+ * Returns 999999 for missing or unparseable values (sorts to end).
+ *
+ * @param {*} val - Raw track number from track metadata
+ * @returns {number}
+ */
+export function parseTrackNumber(val) {
+  return parseInt(String(val || '').split('/')[0], 10) || 999999;
+}
+
 /**
  * Group sorted tracks into album objects with per-album track sorting.
  *
@@ -143,8 +165,8 @@ export function groupTracksIntoAlbums(tracks, parseDiscNumber, parseTrackNumber)
   }
 
   return Object.values(albumMap).sort((a, b) => {
-    const yearA = parseInt(a.year) || 0;
-    const yearB = parseInt(b.year) || 0;
+    const yearA = parseInt(a.year, 10) || 0;
+    const yearB = parseInt(b.year, 10) || 0;
     // Albums without year go to end
     if (yearA === 0 && yearB !== 0) return 1;
     if (yearA !== 0 && yearB === 0) return -1;