diff --git a/app/Tasks/CurrentSongTask.ts b/app/Tasks/CurrentSongTask.ts index a716ed7..34d350c 100644 --- a/app/Tasks/CurrentSongTask.ts +++ b/app/Tasks/CurrentSongTask.ts @@ -1,13 +1,18 @@ import Logger from '@ioc:Adonis/Core/Logger' -import { getCurrentPlayingFromSpotify } from 'App/Utils/SongUtils' +import { getCurrentPlayingFromSpotify, getSpotifyAccount } from 'App/Utils/SongUtils' const MS = 1000 let taskId +async function SpotifyCurrentListeningWatcher(): Promise { + if (getSpotifyAccount().access === '') return + await getCurrentPlayingFromSpotify() +} + export async function Activate(): Promise { Logger.info(`Starting task runner for watching spotify current playing [${MS} ms]`) - await getCurrentPlayingFromSpotify() - taskId = setInterval(getCurrentPlayingFromSpotify, MS) + await SpotifyCurrentListeningWatcher() + taskId = setInterval(SpotifyCurrentListeningWatcher, MS) } export function ShutDown(): void { diff --git a/app/Utils/SongUtils.ts b/app/Utils/SongUtils.ts index 2085eb6..44d2842 100644 --- a/app/Utils/SongUtils.ts +++ b/app/Utils/SongUtils.ts @@ -5,10 +5,8 @@ import Redis from '@ioc:Adonis/Addons/Redis' import { SpotifyArtist, SpotifyTrack } from 'App/Types/ILocalSpotify' import { Artist, InternalPlayerResponse, PlayerResponse, SpotifyToken } from 'App/Types/ISpotify' import Song from 'App/Models/Song' -import Logger from '@ioc:Adonis/Core/Logger' export function getSpotifyAccount(): { access: string; refresh: string } { - Logger.info(JSON.parse(readFileSync('spotify.json').toString())) return JSON.parse(readFileSync('spotify.json').toString()) } @@ -20,7 +18,6 @@ export function getAuthorizationURI(): string { redirect_uri: `${Env.get('BASE_URL')}/spotify/callback`, }) - Logger.info(`https://accounts.spotify.com/authorize?${query}`) return `https://accounts.spotify.com/authorize?${query}` } @@ -40,8 +37,6 @@ export async function setupSpotify(code: string): Promise { }, ) - Logger.info(String(authorization_tokens)) - if (authorization_tokens.status === 200) { writeFileSync( 'spotify.json', @@ -55,7 +50,6 @@ export async function setupSpotify(code: string): Promise { export async function regenerateTokens(): Promise { const refresh_token = getSpotifyAccount().refresh - Logger.info(refresh_token) const authorization_tokens: AxiosResponse = await axios.post( 'https://accounts.spotify.com/api/token', @@ -71,7 +65,6 @@ export async function regenerateTokens(): Promise { }, ) - Logger.info(String(authorization_tokens)) if (authorization_tokens.status === 200) { writeFileSync( 'spotify.json',