Merge branch '39-improve-clean-code' into 'master'

Resolve "Improve/clean code"

Closes #39

See merge request !36

public/index.php

@@ -61,6 +61,9 @@ try {
 $topArtistsCount = 40;
 $playlistsCount = 24;
 
+$tracksCountInShortPlaylist = 50;
+$tracksCountInLongPlaylist = 100;
+
 $templateData = [
   'user' => $user,
   'playlists' => [],
@@ -76,8 +79,20 @@ $generatePlaylistFromSelectedTopArtists = isset($_GET['generate-playlist-top-art
 $generatePlaylistFromRandomTopArtists = isset($_GET['generate-playlist-random-top-artists']);
 $showPlaylistContent = isset($_GET['show-playlist']);
 
-
+$action = '';
 if ($generatePlaylistFromPlaylist) {
+    $action = 'generate-playlist-from-playlist';
+} elseif ($generatePlaylistFromSelectedTopArtists) {
+    $action = 'generate-playlist-from-selected-top-artists';
+} elseif ($generatePlaylistFromRandomTopArtists) {
+    $action = 'generate-playlist-from-random-top-artists';
+} elseif ($showPlaylistContent) {
+    $action = 'show-playlist-content';
+} else {
+}
+
+switch ($action) {
+    case 'generate-playlist-from-playlist':
         $selectedPlaylists = $_GET['selected-playlist'];
         printLog('Will create new playlist with recommendations from playlists: '.join(', ', $selectedPlaylists).'".');
         $recommendedTrackIds = [];
@@ -130,11 +145,14 @@ if ($generatePlaylistFromPlaylist) {
             $recommendedTrackIds = $filteredTrackIds;
         }
 
-    $newPlaylist = createPlaylistWithRandomTracks($api, $recommendedTrackIds, $generateLongPlaylist ? 100 : 50);
+        $newPlaylist = createPlaylistWithRandomTracks(
+            $api,
+            $recommendedTrackIds,
+            $generateLongPlaylist ? $tracksCountInLongPlaylist : $tracksCountInShortPlaylist
+        );
         $templateData['infos'][] = getCreatedPlaylistInformationMessage($api, $newPlaylist);
-
-} elseif ($generatePlaylistFromSelectedTopArtists) {
-
+        break;
+    case 'generate-playlist-from-selected-top-artists':
         $selectedArtists = $_GET['selected-artist'];
         printLog('Will create new playlist with filterted recommendations from artists: '.join(', ', $selectedArtists).'".');
         $recommendedTrackIds = [];
@@ -168,15 +186,23 @@ if ($generatePlaylistFromPlaylist) {
             }
         }
 
-    $newPlaylist = createPlaylistWithRandomTracks($api, $recommendedTrackIds, $generateLongPlaylist ? 100 : 50);
+        $newPlaylist = createPlaylistWithRandomTracks(
+            $api,
+            $recommendedTrackIds,
+            $generateLongPlaylist ? $tracksCountInLongPlaylist : $tracksCountInShortPlaylist
+        );
         $templateData['infos'][] = getCreatedPlaylistInformationMessage($api, $newPlaylist);
-
-} elseif ($generatePlaylistFromRandomTopArtists) {
-
+        break;
+    case 'generate-playlist-from-random-top-artists':
         $countInTopArtists = random_int(4, 6);
         $countInLessTopArtists = random_int(4, 6);
         $limitBetweenTopAndLessTop = $topArtistsCount;
-    $selectedArtists = getRandomArtistsFromTopArtists($api, $countInTopArtists, $countInLessTopArtists, $limitBetweenTopAndLessTop);
+        $selectedArtists = getRandomArtistsFromTopArtists(
+            $api,
+            $countInTopArtists,
+            $countInLessTopArtists,
+            $limitBetweenTopAndLessTop
+        );
         printLog('Will create new playlist with filterted recommendations from random artists: '.join(', ', $selectedArtists).'".');
         $recommendedTrackIds = [];
 
@@ -192,7 +218,7 @@ if ($generatePlaylistFromPlaylist) {
                 'seed_artists' => $selectedArtist,
                 'limit' => 100
             ]);
-        printLog(' -> Got '.count($recommendations->tracks).' recommendatations.');
+            printLog(' -> Got '.count($recommendations->tracks).' recommendations.');
 
             // Filter by artist if requested, remove duplicates
             foreach ($recommendations->tracks as $recommendedTrack) {
@@ -209,20 +235,25 @@ if ($generatePlaylistFromPlaylist) {
             }
         }
 
-    $newPlaylist = createPlaylistWithRandomTracks($api, $recommendedTrackIds, $generateLongPlaylist ? 100 : 50);
+        $newPlaylist = createPlaylistWithRandomTracks(
+            $api,
+            $recommendedTrackIds,
+            $generateLongPlaylist ? $tracksCountInLongPlaylist : $tracksCountInShortPlaylist
+        );
         $templateData['infos'][] = getCreatedPlaylistInformationMessage($api, $newPlaylist);
-
-} elseif ($showPlaylistContent) {
-    printLog('Get content of playlist: '.($generateLongPlaylist ? 'yes' : 'no'));
+        break;
+    case 'show-playlist-content':
+        printLog('Get content of playlist');
 
         $playlistId = $_GET['id'];
         $playlist = $api->getPlaylist($playlistId);
         $templateData['infos'][] = getPlaylistInformationMessage($api, $playlist);
         $templateData['playlist'] = createDisplayablePlaylist($playlist);
-
-} else {
+        break;
+    default:
         $templateData['topArtists'] = $api->getMyTop('artists', ['limit' => $topArtistsCount, 'time_range' => 'short_term'])->items;
         $templateData['playlists'] = $api->getUserPlaylists($user['id'], ['limit' => $playlistsCount])->items;
+        break;
 }
 
 require '../template.php';

spotify/lib.php

@@ -11,17 +11,17 @@ function generateShowPlaylistUrl($playlistId) {
     return '/view-playlist-'.$playlistId;
 }
 
-function generatePlaylistName()
+function generatePlaylistName($prefix)
 {
     $now = new DateTime();
-    $name = 'Fresh playlist ['.$now->format('Y-m-d H:i:s').']';
+    $name = $prefix.' ['.$now->format('Y-m-d H:i:s').']';
 
     return $name;
 }
 
-function createEmptyPlaylist($api)
+function createEmptyPlaylist($api, $playlistName = 'Auto playlist')
 {
-    $name = generatePlaylistName();
+    $name = generatePlaylistName($playlistName);
     printLog('Create new playlist "'.$name.'".');
     $playlist = $api->createPlaylist([
         'name' => $name,
@@ -30,11 +30,16 @@ function createEmptyPlaylist($api)
     return $playlist;
 }
 
-function pickRandomTracksFromArray($recommendedTrackIds, $count = 50)
+function pickRandomTracksFromArray($recommendedTrackIds, $count = 0)
 {
     $recommendedTrackIds = array_keys($recommendedTrackIds);
-    printLog('=> Got '.count($recommendedTrackIds).' unique recommendatations.');
+    printLog('=> Got '.count($recommendedTrackIds).' unique tracks.');
     shuffle($recommendedTrackIds);
+
+    if (!$count) {
+        return $recommendedTrackIds;
+    }
+
     $pickedTrackIds = array_slice($recommendedTrackIds, 0, $count);
     printLog('Keep '.count($pickedTrackIds).' random tracks.');
 
@@ -77,7 +82,7 @@ function getRandomArtistsFromTopArtists($api, $countInTopArtists, $countInLessTo
 
 function createPlaylistWithRandomTracks($api, $trackIds, $count = 50)
 {
-    $playlist = createEmptyPlaylist($api);
+    $playlist = createEmptyPlaylist($api, 'Fresh playlist');
     $pickedTrackIds = pickRandomTracksFromArray($trackIds, $count);
     $api->replacePlaylistTracks($playlist->id, $pickedTrackIds);