From f67934e6d17df6d711d4af181316b4cdbcd3d3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Tue, 7 Dec 2021 11:28:36 +0100
Subject: [PATCH] Clean/format code
---
.editorconfig | 12 +++++
public/css/styles.css | 26 +++++-----
public/js/scripts.js | 12 ++---
spotify/lib.php | 112 ++++++++++++++++++++++--------------------
spotify/spotify.php | 2 +-
5 files changed, 91 insertions(+), 73 deletions(-)
create mode 100644 .editorconfig
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..779f99a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/public/css/styles.css b/public/css/styles.css
index cd9397d..eefad3e 100644
--- a/public/css/styles.css
+++ b/public/css/styles.css
@@ -1,20 +1,20 @@
@charset "UTF-8";
.spotify-image {
- display: inline-block;
- text-align: center;
- justify-content: center;
- align-items: center;
- height: 1rem;
- width: 1rem;
- max-height: 1rem;
- max-width: 1rem;
+ display: inline-block;
+ text-align: center;
+ justify-content: center;
+ align-items: center;
+ height: 1rem;
+ width: 1rem;
+ max-height: 1rem;
+ max-width: 1rem;
}
.spotify-image>img {
- border: solid 1px #888;
- text-align: center;
- max-height: 1rem;
- max-width: 1rem;
- margin: auto;
+ border: solid 1px #888;
+ text-align: center;
+ max-height: 1rem;
+ max-width: 1rem;
+ margin: auto;
}
diff --git a/public/js/scripts.js b/public/js/scripts.js
index f495485..cdf9add 100644
--- a/public/js/scripts.js
+++ b/public/js/scripts.js
@@ -1,9 +1,9 @@
/* pick some random artists */
function pickRandomArtists() {
- var pickedArtistsCount = 6 + Math.floor(Math.random() * 6);
- var artistElements = document.getElementsByClassName("checkbox-artist");
- for (var i = 0; i < pickedArtistsCount; i++) {
- var random = Math.floor(Math.random() * artistElements.length);
- artistElements[random].click();
- }
+ var pickedArtistsCount = 6 + Math.floor(Math.random() * 6);
+ var artistElements = document.getElementsByClassName("checkbox-artist");
+ for (var i = 0; i < pickedArtistsCount; i++) {
+ var random = Math.floor(Math.random() * artistElements.length);
+ artistElements[random].click();
+ }
}
diff --git a/spotify/lib.php b/spotify/lib.php
index ac781de..60cc9e9 100644
--- a/spotify/lib.php
+++ b/spotify/lib.php
@@ -1,76 +1,82 @@
<?php
-function generatePlaylistName() {
- $now = new DateTime();
- $name = 'Fresh playlist ['.$now->format('Y-m-d H:i:s').']';
+function generatePlaylistName()
+{
+ $now = new DateTime();
+ $name = 'Fresh playlist ['.$now->format('Y-m-d H:i:s').']';
- return $name;
+ return $name;
}
-function createEmptyPlaylist($api) {
- $name = generatePlaylistName();
- error_log('Create new playlist "'.$name.'".');
- $playlist = $api->createPlaylist([
- 'name' => $name,
- ]);
+function createEmptyPlaylist($api)
+{
+ $name = generatePlaylistName();
+ error_log('Create new playlist "'.$name.'".');
+ $playlist = $api->createPlaylist([
+ 'name' => $name,
+ ]);
- return $playlist;
+ return $playlist;
}
-function pickRandomTrackFromArray($recommendedTrackIds, $count = 50) {
- $recommendedTrackIds = array_keys($recommendedTrackIds);
- error_log('=> Got '.count($recommendedTrackIds).' unique recommendatations.');
- shuffle($recommendedTrackIds);
- $pickedTrackIds = array_slice($recommendedTrackIds, 0, 50);
- error_log('Keep '.count($pickedTrackIds).' random tracks.');
+function pickRandomTrackFromArray($recommendedTrackIds, $count = 50)
+{
+ $recommendedTrackIds = array_keys($recommendedTrackIds);
+ error_log('=> Got '.count($recommendedTrackIds).' unique recommendatations.');
+ shuffle($recommendedTrackIds);
+ $pickedTrackIds = array_slice($recommendedTrackIds, 0, 50);
+ error_log('Keep '.count($pickedTrackIds).' random tracks.');
- return $pickedTrackIds;
+ return $pickedTrackIds;
}
-function createPlaylistWithRandomTracks($api, $trackIds, $count = 50) {
- $playlist = createEmptyPlaylist($api);
- $pickedTrackIds = pickRandomTrackFromArray($trackIds);
- $api->replacePlaylistTracks($playlist->id, $pickedTrackIds);
+function createPlaylistWithRandomTracks($api, $trackIds, $count = 50)
+{
+ $playlist = createEmptyPlaylist($api);
+ $pickedTrackIds = pickRandomTrackFromArray($trackIds);
+ $api->replacePlaylistTracks($playlist->id, $pickedTrackIds);
- return $api->getPlaylist($playlist->id);
+ return $api->getPlaylist($playlist->id);
}
-function getCreatedPlaylistInformationMessage($api, $playlist) {
- $link = '<a href="'.$playlist->external_urls->spotify.'">'.$playlist->name.'</a>';
- $message = 'Ok created new playlist with '.count($playlist->tracks->items).' tracks: '.$link;
+function getCreatedPlaylistInformationMessage($api, $playlist)
+{
+ $link = '<a href="'.$playlist->external_urls->spotify.'">'.$playlist->name.'</a>';
+ $message = 'Ok created new playlist with '.count($playlist->tracks->items).' tracks: '.$link;
- return $message;
+ return $message;
}
-function createDisplayablePlaylist($playlist) {
- $output = [
- 'id' => $playlist->id,
- 'name' => $playlist->name,
- 'tracks' => [],
- 'artists' => [],
- ];
-
- $artists = [];
-
- foreach($playlist->tracks->items as $item) {
- $track = [
- 'id' => $item->track->id,
- 'name' => $item->track->name,
- 'artists' => [],
+function createDisplayablePlaylist($playlist)
+{
+ $output = [
+ 'id' => $playlist->id,
+ 'name' => $playlist->name,
+ 'tracks' => [],
+ 'artists' => [],
];
- foreach($item->track->artists as $artist) {
- $track['artists'][] = [
- 'id' => $artist->id,
- 'name' => $artist->name,
- ];
- $artists[$artist->id] = $artist->name;
- }
+ $artists = [];
+
+ foreach ($playlist->tracks->items as $item) {
+ $track = [
+ 'id' => $item->track->id,
+ 'name' => $item->track->name,
+ 'artists' => [],
+ ];
- $output['tracks'][] = $track;
- }
+ foreach ($item->track->artists as $artist) {
+ $track['artists'][] = [
+ 'id' => $artist->id,
+ 'name' => $artist->name,
+ ];
+ $artists[$artist->id] = $artist->name;
+ }
+
+ $output['tracks'][] = $track;
+ }
- $output['artists'] = array_values($artists);
+ $output['artists'] = array_values($artists);
- return $output;
+ return $output;
}
diff --git a/spotify/spotify.php b/spotify/spotify.php
index c5862db..cf03e10 100644
--- a/spotify/spotify.php
+++ b/spotify/spotify.php
@@ -5,7 +5,7 @@ require '../vendor/autoload.php';
$parametersFile = realpath(__DIR__.'/../parameters.php');
if (!is_file($parametersFile)) {
- die('Missing parameters file: '.$parametersFile);
+ die('Missing parameters file: '.$parametersFile);
}
require $parametersFile;
--
GitLab