fix: refactor now-playing component to utilize Song class for track data management and update cover URL handling

This commit is contained in:
snusxd
2026-04-16 01:14:10 +03:00
parent a33c9a8d84
commit d643fe0059
3 changed files with 81 additions and 55 deletions

View File

@@ -1,9 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import axios from 'axios'
import { onMounted, onUnmounted, ref } from 'vue' import { onMounted, onUnmounted, ref } from 'vue'
import { ChangeTitle } from '@/utils/change-title' import { ChangeTitle } from '@/utils/ChangeTitle'
import { Song } from '@/utils/Song'
const backendUrl = import.meta.env.VITE_BACKEND_DOMAIN
// api // api
const lastfmapi = import.meta.env.VITE_LASTFM_API const lastfmapi = import.meta.env.VITE_LASTFM_API
@@ -19,66 +17,42 @@ const border_color = ref('#656565')
const background_color = ref('#353535') const background_color = ref('#353535')
const primary_color = ref('#656565') // #FFFFFF const primary_color = ref('#656565') // #FFFFFF
async function checkNowPlaying(api: string, username: string) { let timer_id: ReturnType<typeof setTimeout>
try {
const response = await axios.get(
`https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=${username}&api_key=${api}&format=json&limit=1`,
)
return response.data.recenttracks.track
} catch (error) {
console.error('Error fetching data:', error)
}
}
function changeCover(artist: string, album: string, mbid: string): string {
const baseUrl = backendUrl.replace(/\/$/, '')
const safeArtist = encodeURIComponent(artist || 'unknown')
const safeAlbum = encodeURIComponent(album || 'unknown')
const safeMbid = mbid || '0'
return `${baseUrl}/cover/${safeArtist}/${safeAlbum}/${safeMbid}`
}
let timerId: ReturnType<typeof setTimeout>
onMounted(() => { onMounted(() => {
const updateSong = async () => { const SONG = new Song(lastfmapi, lastfmusername)
const trackData = await checkNowPlaying(lastfmapi, lastfmusername)
console.log(trackData) const update_song = async () => {
if (trackData) { SONG.update_song_data()
if (trackData.length > 1) {
if (header.value !== 'now playing') { if (SONG.is_now_playing) {
await ChangeTitle(header, header.value, 'now playing') if (header.value !== 'now playing') {
primary_color.value = '#FFFFFF' await ChangeTitle(header, header.value, 'now playing')
} primary_color.value = '#FFFFFF'
if (artist.value != trackData[0].artist['#text'])
ChangeTitle(artist, artist.value, trackData[0].artist['#text'])
if (track.value != trackData[0].name) {
labelurl.value = changeCover(
trackData[0].artist['#text'],
trackData[0].album['#text'],
trackData[0].album.mbid,
)
console.log(labelurl.value)
ChangeTitle(track, track.value, trackData[0].name)
}
} else {
if (header.value !== 'silence...') ChangeTitle(header, header.value, 'silence...')
primary_color.value = '#656565'
labelurl.value = '/default-cover.png'
if (artist.value != 'today...') ChangeTitle(artist, artist.value, 'today...')
if (track.value != "we're silnce...") ChangeTitle(track, track.value, "we're silnce...")
} }
if (artist.value != SONG.artist) ChangeTitle(artist, artist.value, SONG.artist)
if (track.value != SONG.song) {
SONG.update_cover_url()
console.log(SONG.cover_url)
labelurl.value = SONG.cover_url
ChangeTitle(track, track.value, SONG.song)
}
} else {
if (header.value !== 'silence...') ChangeTitle(header, header.value, 'silence...')
primary_color.value = '#656565'
labelurl.value = '/default-cover.png'
if (artist.value != 'today...') ChangeTitle(artist, artist.value, 'today...')
if (track.value != "we're silnce...") ChangeTitle(track, track.value, "we're silnce...")
} }
timerId = setTimeout(updateSong, 10000)
timer_id = setTimeout(update_song, 10000)
} }
updateSong() update_song()
}) })
onUnmounted(() => { onUnmounted(() => {
if (timerId) clearTimeout(timerId) if (timer_id) clearTimeout(timer_id)
}) })
</script> </script>

52
src/utils/Song.ts Normal file
View File

@@ -0,0 +1,52 @@
import axios from 'axios'
const api_domain = import.meta.env.VITE_BACKEND_DOMAIN
export class Song {
LFM_API: string
LFM_USERNAME: string
is_now_playing: boolean = false
song: string = 'track_name'
song_mbid: string = 'track_song_mbid'
artist: string = 'track_artist'
album: string = 'track_album'
album_mbid: string = 'track_album_mbid'
cover_url: string = 'cover_url'
constructor(lfm_api: string, lfm_username: string) {
this.LFM_API = lfm_api
this.LFM_USERNAME = lfm_username
}
update_cover_url() {
const base_url = api_domain.replace(/\/$/, '')
// спасибо любимому копилоту (модель гемини 3.1 про превью) за это великое решение
const safe_artist = encodeURIComponent(this.artist || 'unknown')
const safe_album = encodeURIComponent(this.album || 'unknown')
const safe_mbid = this.album_mbid || '0'
this.cover_url = `${base_url}/cover/${safe_artist}/${safe_album}/${safe_mbid}`
}
async update_song_data() {
try {
const track_data = await (
await axios.get(
`https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=${this.LFM_USERNAME}&api_key=${this.LFM_API}&format=json&limit=1`,
)
).data.recenttracks.track
console.log(track_data)
this.is_now_playing = track_data.length > 1
this.song = track_data[0].name
this.song_mbid = track_data[0].mbid
this.artist = track_data[0].artist['#text']
this.album = track_data[0].album['#text']
this.album_mbid = track_data[0].album.mbid
} catch (error) {
console.error('Error fetching data:', error)
}
}
}