Merge branch '33-fix-generate-long-playlist-option' into 'master'

Fix generate long playlist option

Closes #33

See merge request !30

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 {

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);