Skip to content

[25/33] feat(music): deduplicate albums and automate catalog normalization #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mmattbtw wants to merge 3 commits into from
Draft

[25/33] feat(music): deduplicate albums and automate catalog normalization #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b854ba
fix(aqua): deduplicate album tracks
mmattbtw Jul 16, 2026
c74a000
fix(aqua): merge duplicate artist albums
mmattbtw Jul 16, 2026
ef09bde
feat(music): automate catalog normalization
mmattbtw Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions .sqlx/query-8cb46e2270b1ce1f6b85ac3d35f9fa484c12e0fa5693d5f37a0f169189c3c4e7.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 0 additions & 34 deletions .sqlx/query-abe60b617d4cd5861a4a8f80755adb8946f3df1bf85b8a7dc3b7c6f2b5733e6d.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...c62d8ead70b840deb29957ec60d2988b4ac9.json → ...4a1edce78892e26b82f3b295c3120ca0411d.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

120 changes: 72 additions & 48 deletions apps/amethyst/app/(tabs)/:o/music/[artist]/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,66 @@ export default function ArtistDetail() {
}
};

const renderRelease = (album: ArtistView["albums"][number]) => {
const art = coverArtUrl(album.mbid);
return (
<Link
key={album.mbid}
href={
musicAlbumHref(album.artistName, album.name, album.mbid) as any
}
asChild
>
<Pressable className="flex-row items-center gap-3 border-b border-border/70 py-4">
<View className="h-16 w-16 items-center justify-center overflow-hidden rounded-lg bg-muted">
{art ? (
<Image source={{ uri: art }} className="h-full w-full" />
) : (
<Icon
icon={Disc3}
size={26}
className="text-muted-foreground"
/>
)}
</View>
<View className="min-w-0 flex-1">
<Text className="font-black" numberOfLines={2}>
{album.name}
</Text>
<Text className="font-mono text-xs text-muted-foreground">
{album.playCount} listens
</Text>
</View>
<Icon
icon={ChevronRight}
size={18}
className="text-muted-foreground"
/>
</Pressable>
</Link>
);
};

const discographyGroups: Array<{
title: string;
releases: ArtistView["albums"];
}> = artist
? [
{
title: "Albums",
releases: artist.albums.filter(
(release) => release.releaseType !== "single",
),
},
{
title: "Singles",
releases: artist.albums.filter(
(release) => release.releaseType === "single",
),
},
]
: [];

return (
<TealShell rightRail={<RightRail />}>
<Stack.Screen
Expand Down Expand Up @@ -226,54 +286,18 @@ export default function ArtistDetail() {
title="Discography"
detail={`${artist.albums.length} RELEASES`}
/>
<View className="overflow-hidden rounded-lg border border-border bg-card px-3">
{artist.albums.map((album) => {
const art = coverArtUrl(album.mbid);
return (
<Link
key={album.mbid}
href={
musicAlbumHref(
album.artistName,
album.name,
album.mbid,
) as any
}
asChild
>
<Pressable className="flex-row items-center gap-3 border-b border-border/70 py-4">
<View className="h-16 w-16 items-center justify-center overflow-hidden rounded-lg bg-muted">
{art ? (
<Image
source={{ uri: art }}
className="h-full w-full"
/>
) : (
<Icon
icon={Disc3}
size={26}
className="text-muted-foreground"
/>
)}
</View>
<View className="min-w-0 flex-1">
<Text className="font-black" numberOfLines={2}>
{album.name}
</Text>
<Text className="font-mono text-xs text-muted-foreground">
{album.playCount} listens
</Text>
</View>
<Icon
icon={ChevronRight}
size={18}
className="text-muted-foreground"
/>
</Pressable>
</Link>
);
})}
</View>
{discographyGroups.map(({ title, releases }) =>
releases.length > 0 ? (
<View key={title} className="mb-6">
<Text className="mb-2 font-mono text-xs font-bold uppercase text-muted-foreground">
{title}
</Text>
<View className="overflow-hidden rounded-lg border border-border bg-card px-3">
{releases.map(renderRelease)}
</View>
</View>
) : null,
)}
</>
)}
</TealShell>
Expand Down
Loading
Loading