From 0602404dcfcc39cdcef01ce5095db2ee3e3b4efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Mon, 21 Feb 2022 11:59:48 +0100
Subject: [PATCH] Fix generate long playlist option
---
public/index.php | 6 +++---
spotify/lib.php | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/public/index.php b/public/index.php
index 6c0ed8f..ec7b370 100644
--- a/public/index.php
+++ b/public/index.php
@@ -111,7 +111,7 @@ if ($generatePlaylistFromPlaylist) {
$recommendedTrackIds = $filteredTrackIds;
}
- $newPlaylist = createPlaylistWithRandomTracks($api, $recommendedTrackIds, ($generateLongPlaylist ? 100 : 50));
+ $newPlaylist = createPlaylistWithRandomTracks($api, $recommendedTrackIds, $generateLongPlaylist ? 100 : 50);
$templateData['infos'][] = getCreatedPlaylistInformationMessage($api, $newPlaylist);
$templateData['playlist'] = createDisplayablePlaylist($newPlaylist);
@@ -150,7 +150,7 @@ if ($generatePlaylistFromPlaylist) {
}
}
- $newPlaylist = createPlaylistWithRandomTracks($api, $recommendedTrackIds, ($generateLongPlaylist ? 100 : 50));
+ $newPlaylist = createPlaylistWithRandomTracks($api, $recommendedTrackIds, $generateLongPlaylist ? 100 : 50);
$templateData['infos'][] = getCreatedPlaylistInformationMessage($api, $newPlaylist);
$templateData['playlist'] = createDisplayablePlaylist($newPlaylist);
@@ -192,7 +192,7 @@ if ($generatePlaylistFromPlaylist) {
}
}
- $newPlaylist = createPlaylistWithRandomTracks($api, $recommendedTrackIds, ($generateLongPlaylist ? 100 : 50));
+ $newPlaylist = createPlaylistWithRandomTracks($api, $recommendedTrackIds, $generateLongPlaylist ? 100 : 50);
$templateData['infos'][] = getCreatedPlaylistInformationMessage($api, $newPlaylist);
$templateData['playlist'] = createDisplayablePlaylist($newPlaylist);
} else {
diff --git a/spotify/lib.php b/spotify/lib.php
index b8b14d5..cbacc15 100644
--- a/spotify/lib.php
+++ b/spotify/lib.php
@@ -19,12 +19,12 @@ function createEmptyPlaylist($api)
return $playlist;
}
-function pickRandomTrackFromArray($recommendedTrackIds, $count = 50)
+function pickRandomTracksFromArray($recommendedTrackIds, $count = 50)
{
$recommendedTrackIds = array_keys($recommendedTrackIds);
error_log('=> Got '.count($recommendedTrackIds).' unique recommendatations.');
shuffle($recommendedTrackIds);
- $pickedTrackIds = array_slice($recommendedTrackIds, 0, 50);
+ $pickedTrackIds = array_slice($recommendedTrackIds, 0, $count);
error_log('Keep '.count($pickedTrackIds).' random tracks.');
return $pickedTrackIds;
@@ -67,7 +67,7 @@ function getRandomArtistsFromTopArtists($api, $countInTopArtists, $countInLessTo
function createPlaylistWithRandomTracks($api, $trackIds, $count = 50)
{
$playlist = createEmptyPlaylist($api);
- $pickedTrackIds = pickRandomTrackFromArray($trackIds);
+ $pickedTrackIds = pickRandomTracksFromArray($trackIds, $count);
$api->replacePlaylistTracks($playlist->id, $pickedTrackIds);
return $api->getPlaylist($playlist->id);
--
GitLab