2.1.2

Author: woidzero

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [2.1.2] - 2026-03-29
+
+### Fixed
+
+- Improved track and disc indexing algorithm
+
 ## [2.1.1] - 2026-03-06
 
 ### Added

bun.lock

@@ -1,7 +1,7 @@
 {
   "name": "aotyfy",
   "description": "🔹 Album of the Year user & critic ratings for Spotify.",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "author": "woidzero",
   "private": true,
   "license": "MIT",
@@ -13,19 +13,18 @@
     "release": "bun run build:extras && spicetify-creator --out=dist --minify"
   },
   "dependencies": {
-    "axios": "^1.13.2",
-    "cheerio": "^1.1.2",
+    "axios": "^1.14.0",
+    "cheerio": "^1.2.0",
     "jquery": "^4.0.0"
   },
   "devDependencies": {
     "@types/jquery": "^4.0.0",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "knip": "^5.78.0",
-    "marked": "^17.0.1",
-    "prettier": "^3.7.4",
+    "marked": "^17.0.5",
+    "prettier": "^3.8.1",
     "spicetify-creator": "^1.0.17",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
   },
   "type": "module"
 }

dist/aotyfy.js

@@ -19,17 +19,17 @@ let ui: UI;
 /**
  * extension states
  */
-const State: Record<string, any> = {
+const State: AOTYFY._State = {
   lock: false,
   cache: {
     uri: null,
     album: null,
   },
   prev: {
     track: null,
-    request: 0
-  }
-}
+    request: 0,
+  },
+};
 
 /**
  * button cooldown
@@ -49,10 +49,9 @@ async function refresh() {
   State.prev.request = Date.now();
   State.prev.track = null;
 
-  await update(true)
-    .then(() => {
-      Spicetify.showNotification("[aotyfy] Scores refreshed", false);
-    });
+  await update(true).then(() => {
+    Spicetify.showNotification("[aotyfy] Scores refreshed", false);
+  });
 
   console.info("[aotyfy] scores refreshed");
 }
@@ -80,26 +79,31 @@ async function update(force: boolean = true) {
 
     // fetch
     const Meta: AOTYFY._Meta = getMeta(data);
-    console.debug("[aotyfy] fetched meta", Meta)
+    console.debug("[aotyfy] fetched meta", Meta);
 
     // globals
     let Album: AOTYFY._Album;
 
-    if (State.cache.uri === Meta.album.uri && !force) {
+    const isLocal = Meta.track.uri.startsWith("spotify:local");
+
+    // use track uri if song from local files
+    const cacheKey = isLocal ? Meta.track.uri : Meta.album.uri;
+
+    if (State.cache.uri === cacheKey && !force && State.cache.album) {
       Album = State.cache.album;
-      console.debug("[aotyfy] cache", Album)
+      console.debug("[aotyfy] cache", Album);
     } else {
       try {
         Album = await getAPI(Meta, true, force);
 
         if (!Album.valid && Settings.strict.value) {
-          console.debug("[aotyfy] unable to find, trying again ...")
-          Album = await getAPI(Meta, false)
+          console.debug("[aotyfy] unable to find, trying again ...");
+          Album = await getAPI(Meta, false);
         }
 
         // set album in cache
         State.cache.album = Album;
-        State.cache.uri = Meta.album.uri;
+        State.cache.uri = cacheKey;
       } catch (e: any) {
         ui.hide();
         State.cache.uri = null;
@@ -123,17 +127,17 @@ async function update(force: boolean = true) {
     }
 
     if (Settings.showSidebar.value) {
-      console.debug("[aotyfy] showing sidebar")
+      console.debug("[aotyfy] showing sidebar");
       ui.updateSidebar(Album);
     } else {
-      ui.hideSidebar()
+      ui.hideSidebar();
     }
   } catch (e: any) {
     if (e instanceof AOTYFYError) throw e;
     throw new CriticalError(`updating failed: ${e.message}`);
   } finally {
     State.lock = false;
-    console.info("[aotyfy] scores updated")
+    console.info("[aotyfy] scores updated");
   }
 }
 
@@ -145,23 +149,25 @@ export default async function main() {
   new Spicetify.Menu.SubMenu("AOTYfy", [
     new Spicetify.Menu.Item("Enabled", Settings.isEnabled.get(), async (i) => {
       Settings.isEnabled.toggle(i);
-      await update()
+      await update();
       Spicetify.showNotification("[aotyfy] Extension: " + (Settings.isEnabled.get() ? "enabled" : "disabled"));
     }),
     new Spicetify.Menu.Item("Show In Sidebar", Settings.showSidebar.get(), async (i) => {
       Settings.showSidebar.toggle(i);
-      await update()
+      await update();
       Spicetify.showNotification("[aotyfy] Showing in sidebar: " + (Settings.showSidebar.get() ? "enabled" : "disabled"));
     }),
     new Spicetify.Menu.Item("Show In Now Playing Bar", Settings.showNPB.get(), async (i) => {
       Settings.showNPB.toggle(i);
-      await update()
+      await update();
       Spicetify.showNotification("[aotyfy] Showing in now playing bar: " + (Settings.showNPB.get() ? "enabled" : "disabled"));
     }),
     new Spicetify.Menu.Item("Strict Search", Settings.strict.get(), async (i) => {
       Settings.strict.toggle(i);
-      await update()
-      Spicetify.showNotification("[aotyfy] Strict search: " + (Settings.strict.get() ? "enabled" : "disabled. Disabling this setting will allow extension to use only title instead of `title - artist` to search release."));
+      await update();
+      Spicetify.showNotification(
+        "[aotyfy] Strict search: " + (Settings.strict.get() ? "enabled" : "disabled. Disabling this setting will allow extension to use only title instead of `title - artist` to search release."),
+      );
     }),
     new Spicetify.Menu.Item("Show Notifications", Settings.notifications.get(), (i) => {
       Settings.notifications.toggle(i);

package.json

@@ -1,7 +1,7 @@
 const { React } = Spicetify;
 import { setAppearance } from "../core/dom";
 
-export const ScoreItem = ({ label, score, ratings, url }: { label: string, score: number, ratings: number, url: string }) => (
+export const ScoreItem = ({ label, score, ratings, url }: { label: string; score: number; ratings: number; url: string }) => (
   <div
     className="e-91000-box e-91000-baseline e-91000-box--naked e-91000-box--browser-default-focus e-91000-box--padding-custom e-91000-box--min-size e-91000-Box-sc-8t9c76-0 Box-group-naked-listRow-minBlockSize_32px Box-sc-8t9c76-0 Box-group-naked-listRow-minBlockSize_32px"
     data-encore-id="listRow"

src/app.tsx

@@ -128,7 +128,7 @@ async function parse(url: string) {
             artist: artists,
             score: isNaN(score) ? -1 : score,
             ratings: isNaN(ratings) ? -1 : ratings,
-            discNumber: discIndex,
+            discNumber: discIndex + 1,
             url: trackURL,
           };
 
@@ -190,14 +190,14 @@ async function parse(url: string) {
         score: criticScore,
         ratings: criticRatingsCount,
       },
-    }
-    Album.format = format
-    Album.year = year
-    Album.label = labels
-    Album.url = url
-    Album.verified = verified
-    Album.tracks = Tracks
-    Album.valid = true
+    };
+    Album.format = format;
+    Album.year = year;
+    Album.label = labels;
+    Album.url = url;
+    Album.verified = verified;
+    Album.tracks = Tracks;
+    Album.valid = true;
 
     console.log(`[aotyfy] api response:`, Album);
     return Album;
@@ -214,7 +214,7 @@ export async function getAPI(meta: AOTYFY._Meta, firstIteration: boolean = true,
    * caching albums in local storage
    */
   const SAID = extractStr(/^spotify:album:(.+)$/, meta.album.uri);
-  const Storage = Settings.storage.get()
+  const Storage = Settings.storage.get();
 
   if (SAID && Storage && !force) {
     const cachedAOTYID = Storage[SAID];
@@ -305,9 +305,7 @@ export async function getAPI(meta: AOTYFY._Meta, firstIteration: boolean = true,
       }));
 
       // find the most similar artist
-      const mostSimilarByArtist = releasesWithSimilarity.reduce((best, current) =>
-        current.artistSimilarity > best.artistSimilarity ? current : best,
-      );
+      const mostSimilarByArtist = releasesWithSimilarity.reduce((best, current) => (current.artistSimilarity > best.artistSimilarity ? current : best));
 
       console.debug(`[AOTYfy] most similar artist: ${mostSimilarByArtist.artist} (${mostSimilarByArtist.artistSimilarity})`);
 
@@ -324,9 +322,7 @@ export async function getAPI(meta: AOTYFY._Meta, firstIteration: boolean = true,
 
       // if artist has multiple albums, find the most similar album
       if (artistReleases.length > 1) {
-        const bestAlbumMatch = artistReleases.reduce((best, current) =>
-          current.albumSimilarity! > best.albumSimilarity! ? current : best,
-        );
+        const bestAlbumMatch = artistReleases.reduce((best, current) => (current.albumSimilarity! > best.albumSimilarity! ? current : best));
         console.debug(`[aotyfy] multiple albums from artist, best match: ${bestAlbumMatch.title}`);
         aotyURL = bestAlbumMatch.url;
       }
@@ -372,7 +368,7 @@ export async function getAPI(meta: AOTYFY._Meta, firstIteration: boolean = true,
 
       console.debug("[aotyfy] cached release: ", SAID, "->", aotyId);
     } else {
-      console.warn(`[aotyfy] can't extract 'aotyId': ${aotyId}`)
+      console.warn(`[aotyfy] can't extract 'aotyId': ${aotyId}`);
     }
   }
 
@@ -384,22 +380,35 @@ export async function getAPI(meta: AOTYFY._Meta, firstIteration: boolean = true,
  */
 export function getTrack(meta: AOTYFY._Meta, album: AOTYFY._Album): AOTYFY._Track | null {
   if (!album.tracks || album.tracks.length === 0) {
-    console.warn("[aotyfy] release doesn't contain any tracks")
+    console.warn("[aotyfy] release doesn't contain any tracks");
     return null;
   }
 
-  const discIndex = (meta.track.disc ?? 1) - 1;
+  const normalize = (s: string) =>
+    decodeURIComponent(s)
+      .toLowerCase()
+      .replace(/[^\w\s]/g, "")
+      .trim();
+
+  const isLocal = meta.track.uri.startsWith("spotify:local");
+
+  if (isLocal) {
+    return album.tracks.find((t) => normalize(t.title) === normalize(meta.track.title)) ?? null;
+  }
+
+  const discNumber = meta.track.disc || 1;
   const trackIndex = meta.track.number - 1;
 
-  const discs = album.tracks.reduce<Record<number, typeof album.tracks>>((acc, t: AOTYFY._Track) => {
+  const discs = album.tracks.reduce<Record<number, typeof album.tracks>>((acc, t) => {
     (acc[t.discNumber] ??= []).push(t);
     return acc;
   }, {});
 
-  const discTracks = discs[discIndex];
+  const discTracks = discs[discNumber];
+
   if (!discTracks || !discTracks[trackIndex]) {
-    throw new APIError("unable to find this track")
+    return album.tracks.find((t) => normalize(t.title) === normalize(meta.track.title)) ?? null;
   }
 
-  return discTracks[trackIndex] ?? album.tracks.find((t) => t.title.toLowerCase() === meta.track.title.toLowerCase());
+  return discTracks[trackIndex];
 }

src/components/ScoreItem.tsx

@@ -7,7 +7,8 @@ import $ from "jquery";
 export const Selectors = {
   // spotify selectors
   NOW_PLAYING_WIDGET: ".main-nowPlayingView-nowPlayingWidget",
-  SONG_TITLE_BOX: "#main > div > div.Root__top-container > div.Root__now-playing-bar > aside > div > div.main-nowPlayingBar-left > div > div.main-nowPlayingWidget-trackInfo.main-trackInfo-container > div.main-trackInfo-name > div > span > span > div > span",
+  SONG_TITLE_BOX:
+    "#main > div > div.Root__top-container > div.Root__now-playing-bar > aside > div > div.main-nowPlayingBar-left > div > div.main-nowPlayingWidget-trackInfo.main-trackInfo-container > div.main-trackInfo-name > div > span > span > div > span",
   INFO_CONTAINER: ".main-nowPlayingWidget-trackInfo.main-trackInfo-container",
   PLAYING_BAR: "div.Root__now-playing-bar > aside > div",
 
@@ -39,7 +40,7 @@ export function setAppearance(score: number | string, element?: JQuery): string
 
   if (value === -1 || !Number.isFinite(value)) {
     if (element) {
-      element.css({ "color": color });
+      element.css({ color: color });
       return element;
     }
     return color;
@@ -50,7 +51,7 @@ export function setAppearance(score: number | string, element?: JQuery): string
   else color = "#d76666";
 
   if (element) {
-    element.css({ "color": color });
+    element.css({ color: color });
     return element;
   }
 
@@ -99,4 +100,4 @@ export function waitElement(selector: string | string[], timeout: number = 5000)
       return;
     }, timeout);
   });
-}
+}

src/core/api.ts

@@ -2,12 +2,15 @@ const { showNotification } = Spicetify;
 import { Settings } from "./settings";
 
 export class AOTYFYError extends Error {
-  constructor(message: string, opts: {
-    name?: string,
-    show?: boolean
-  } = {
-      show: false
-    }) {
+  constructor(
+    message: string,
+    opts: {
+      name?: string;
+      show?: boolean;
+    } = {
+      show: false,
+    },
+  ) {
     super(message);
     this.name = opts.name || "AOTYError";
     console.error(`[aotyfy:${this.name}] ` + message);
@@ -39,4 +42,3 @@ export class RateLimitError extends AOTYFYError {
     super(message, { name: "RateLimitError", show: true });
   }
 }
-

src/core/dom.ts

@@ -23,7 +23,7 @@ export function getMeta(data: Record<string, any>): AOTYFY._Meta {
       title: s(md?.title),
     },
     type: null,
-    skipSimcheck: false
+    skipSimcheck: false,
   };
 
   const IGNORE_ARTISTS = ["Weezer", "SOPHIE", "Crystal Castles", "underscores", "Ninajirachi", "slayr"];
@@ -56,6 +56,15 @@ export function getMeta(data: Record<string, any>): AOTYFY._Meta {
     case "spotify:album:3RDAqHBWBHXRwVSJF9T8VW":
       Meta.type = "lp";
       break;
+    // Earl Sweatshirt's 'I Don't Like Shit, I Don't Go Outside'
+    case "spotify:album:3wUv2IjD5hPrqlPakpczQa":
+      Meta.album.title = "I Don't Like Shit, I Don't Go Outside";
+      break;
+    case "spotify:album:0JB2T1lOZ03obXXun0CLzY":
+      Meta.type = "reissue";
+      break;
+    case "spotify:album:7CwtKHbZbn6nYqBOeoKaUp":
+      Meta.album.title = "Experimental Age";
     default:
       break;
   }
@@ -84,12 +93,6 @@ export function getMeta(data: Record<string, any>): AOTYFY._Meta {
           Meta.type = "ep";
           break;
       }
-      switch (Meta.album.uri) {
-        // product spotify reissue
-        case "spotify:album:0JB2T1lOZ03obXXun0CLzY":
-          Meta.type = "reissue";
-          break;
-      }
       break;
     case "David Bowie":
       switch (Meta.album.title) {