fix try catch add current track

teticio · Aug 15, 2021 · 2217679 · 2217679
1 parent 18a54dd
commit 2217679
Show file tree

Hide file tree

Showing 19 changed files with 193 additions and 193 deletions.
diff --git a/backend/models.py b/backend/models.py
@@ -16,4 +16,4 @@ class Playlist(Base):
     num_ratings = Column(Integer, default=0)
     track_ids = Column(String)
     tracks = Column(String, default="")
-    waypoints = Column(String, default="")
+    waypoints = Column(String, default="")
diff --git a/src/App.js b/src/App.js
@@ -63,14 +63,14 @@ function App() {
                 .then((playlists) => {
                   setPlaylists(playlists);
                   setScreen('latest-playlists');
-                });
+                }).catch(error => console.error('Error:', error));
               break;
             case 'top-playlists':
               GetTopPlaylists(8)
                 .then((playlists) => {
                   setPlaylists(playlists);
                   setScreen('top-playlists');
-                });
+                }).catch(error => console.error('Error:', error));
               break;
             case 'search-playlists':
               setScreen('search-playlists');
@@ -85,6 +85,7 @@ function App() {
             size={size}
             creativity={creativity}
             noise={noise}
+            spotify={spotify}
             onCreate={(playlist, waypoints) => {
               setWaypoints(waypoints);
               setPlaylist(playlist);

diff --git a/src/components/AddTrack.js b/src/components/AddTrack.js
@@ -1,17 +1,18 @@
 import { useState } from "react";
-import TrackSelector from "./TrackSelector";
 import { FaPlus } from "react-icons/fa";
 import Spinner from 'react-bootstrap/Spinner';
+import TrackSelector from "./TrackSelector";
 
 var searches = 0;
 
-export default function AddTrack({ numTracks = 0, onAdd = f => f }) {
+export default function AddTrack({ numTracks = 0, spotify = null, onAdd = f => f }) {
   const [currentId, setCurrentId] = useState(null);
   const [spinner, setSpinner] = useState(0);
 
   return (
     <div className="d-flex flex-row align-items-center">
       <TrackSelector
+        spotify={spotify}
         onSelect={(id) => setCurrentId(id)}
         onSearch={() => { searches++; if (searches !== 0) setSpinner(true); }}
         onSearchEnd={() => { searches--; if (searches === 0) setSpinner(false); }}

diff --git a/src/components/Banner.css b/src/components/Banner.css
@@ -4,4 +4,4 @@
   background-repeat: no-repeat;
   background-attachment: fixed;
   background-position: center center;
-}
+}
diff --git a/src/components/Banner.js b/src/components/Banner.js
@@ -88,4 +88,4 @@ export default function Banner({ loggedIn = false, onSelect = f => f }) {
       </Navbar>
     </>
   );
-}
+}
diff --git a/src/components/CreatePlaylist.js b/src/components/CreatePlaylist.js
@@ -7,7 +7,15 @@ import RemovablePlaylist from './RemovablePlaylist';
 import GeneratePlaylist from './GeneratePlaylist';
 import SavePlaylist from './SavePlaylist';
 
-export default function CreatePlaylist({ waypoints = { track_ids: [] }, size = 10, creativity = 0.5, noise = 0, onCreate = f => f, onSettings = f => f }) {
+export default function CreatePlaylist({
+  waypoints = { track_ids: [] },
+  size = 10,
+  creativity = 0.5,
+  noise = 0,
+  onCreate = f => f,
+  onSettings = f => f,
+  spotify = null
+}) {
   const [_waypoints, setWaypoints] = useState(waypoints);
   const [spinner, setSpinner] = useState(false);
 
@@ -17,9 +25,12 @@ export default function CreatePlaylist({ waypoints = { track_ids: [] }, size = 1
         <Card.Title>
           Choose the waypoints in your musical journey
         </Card.Title>
-        <AddTrack numTracks={ _waypoints.track_ids.length } onAdd={(id) => {
-          setWaypoints({ 'track_ids': _waypoints.track_ids.concat(id) });
-        }} />
+        <AddTrack
+          numTracks={_waypoints.track_ids.length}
+          spotify={spotify}
+          onAdd={(id) => {
+            setWaypoints({ 'track_ids': _waypoints.track_ids.concat(id) });
+          }} />
         <hr />
         <RemovablePlaylist {..._waypoints} onRemove={(id) => {
           setWaypoints({ 'track_ids': _waypoints.track_ids.filter((element, index) => index !== id) });
@@ -42,6 +53,7 @@ export default function CreatePlaylist({ waypoints = { track_ids: [] }, size = 1
                     return playlist;
                   })
                   .then(playlist => onCreate(playlist, _waypoints))
+                  .catch(error => console.error('Error:', error));
               }}
             />
             <FaCog

diff --git a/src/components/Footer.css b/src/components/Footer.css
@@ -5,4 +5,4 @@
   width: 100%;
   text-align: center;
   opacity: 0.7
-}
+}
diff --git a/src/components/Footer.js b/src/components/Footer.js
@@ -58,4 +58,4 @@ export default function Footer() {
       </Row>
     </>
   );
-}
+}
diff --git a/src/components/GeneratePlaylist.js b/src/components/GeneratePlaylist.js
@@ -1,29 +1,25 @@
 export default async function GeneratePlaylist(playlist, size = 10, creativity = 0.5, noise = 0) {
-  try {
-    const waypoints = playlist.track_ids
-    const response = await fetch(process.env.REACT_APP_API_URL + '/playlist', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        'track_ids': waypoints,
-        'size': size,
-        'creativity': creativity,
-        'noise': noise
-      })
-    });
-    const json = await response.json();
-    const new_playlist = {
-      'name': 'Deej-A.I.',
-      'track_ids': json.track_ids,
-      'tracks': json.tracks,
-      'waypoints': waypoints,
-      'av_rating': 0,
-      'num_ratings': 0
-    };
-    return new_playlist;
-  } catch (error) {
-    console.error('Error:', error);
+  const waypoints = playlist.track_ids
+  const response = await fetch(process.env.REACT_APP_API_URL + '/playlist', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify({
+      'track_ids': waypoints,
+      'size': size,
+      'creativity': creativity,
+      'noise': noise
+    })
+  });
+  const json = await response.json();
+  const new_playlist = {
+    'name': 'Deej-A.I.',
+    'track_ids': json.track_ids,
+    'tracks': json.tracks,
+    'waypoints': waypoints,
+    'av_rating': 0,
+    'num_ratings': 0
   };
-}
+  return new_playlist;
+}
diff --git a/src/components/SavePlaylist.js b/src/components/SavePlaylist.js
@@ -1,75 +1,59 @@
 export default async function SavePlaylist(playlist) {
   const now = new Date();
 
-  try {
-    const response = await fetch(process.env.REACT_APP_API_URL + '/create_playlist', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        'created': now.toISOString(),
-        'track_ids': JSON.stringify(playlist.track_ids),
-        'tracks': JSON.stringify(playlist.tracks),
-        'waypoints': JSON.stringify(playlist.waypoints)
-      })
-    });
-    const db_item = await response.json();
-    return db_item.id;
-  } catch (error) {
-    console.error('Error:', error);
-  };
+  const response = await fetch(process.env.REACT_APP_API_URL + '/create_playlist', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify({
+      'created': now.toISOString(),
+      'track_ids': JSON.stringify(playlist.track_ids),
+      'tracks': JSON.stringify(playlist.tracks),
+      'waypoints': JSON.stringify(playlist.waypoints)
+    })
+  });
+  const db_item = await response.json();
+  return db_item.id;
 }
 
 export async function UpdatePlaylistName(id, name) {
-  try {
-    fetch(process.env.REACT_APP_API_URL + '/update_playlist_name', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        'id': id,
-        'name': name
-      })
-    });
-  } catch (error) {
-    console.error('Error:', error);
-  };
+  fetch(process.env.REACT_APP_API_URL + '/update_playlist_name', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify({
+      'id': id,
+      'name': name
+    })
+  });
 }
 
 export async function UpdatePlaylistRating(id, av_rating, num_ratings) {
-  try {
-    fetch(process.env.REACT_APP_API_URL + '/update_playlist_rating', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        'id': id,
-        'av_rating': av_rating,
-        'num_ratings': num_ratings
-      })
-    });
-  } catch (error) {
-    console.error('Error:', error);
-  };
+  fetch(process.env.REACT_APP_API_URL + '/update_playlist_rating', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify({
+      'id': id,
+      'av_rating': av_rating,
+      'num_ratings': num_ratings
+    })
+  });
 }
 
 export async function UpdatePlaylistId(id, user_id, playlist_id) {
-  try {
-    fetch(process.env.REACT_APP_API_URL + '/update_playlist_id', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        'id': id,
-        'user_id': user_id,
-        'playlist_id': playlist_id
-      })
-    });
-  } catch (error) {
-    console.error('Error:', error);
-  };
-}
+  fetch(process.env.REACT_APP_API_URL + '/update_playlist_id', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify({
+      'id': id,
+      'user_id': user_id,
+      'playlist_id': playlist_id
+    })
+  });
+}
diff --git a/src/components/SearchScreen.js b/src/components/SearchScreen.js
@@ -24,15 +24,15 @@ export default function SearchScreen({ spotify }) {
               SearchPlaylists(searchString, 8)
                 .then((playlists) => {
                   setPlaylists(playlists);
-                })
+                }).catch(error => console.error('Error:', error));
             }}
             onKeyUp={event => {
               if (event.keyCode === 13) {
                 setEditing(false);
                 SearchPlaylists(searchString, 8)
                   .then((playlists) => {
                     setPlaylists(playlists);
-                  })
+                  }).catch(error => console.error('Error:', error));
               }
             }}
           /> :
@@ -44,4 +44,4 @@ export default function SearchScreen({ spotify }) {
         spotify={spotify}
       /></>
   );
-}
+}
diff --git a/src/components/Settings.js b/src/components/Settings.js
@@ -72,4 +72,4 @@ export default function Settings({ size, creativity, noise, onChange = f => f, o
       <Footer />
     </>
   );
-}
+}
diff --git a/src/components/ShowPlaylist.js b/src/components/ShowPlaylist.js
@@ -38,9 +38,10 @@ export default function ShowPlaylist({ playlist, onClose = f => f, spotify = nul
                                 setEditing(false);
                                 setPlaylistUrl(spotify_playlist.external_urls.spotify);
                                 if (userPlaylist) {
-                                  UpdatePlaylistId(playlist.id, spotify_playlist.owner.id, spotify_playlist.id);
+                                  UpdatePlaylistId(playlist.id, spotify_playlist.owner.id, spotify_playlist.id)
+                                  .catch(error => console.error('Error:', error));
                                 }
-                              });
+                              }).catch(error => console.error('Error:', error));
                           }}
                         />}
                       <div style={{ width: '10px' }} />
@@ -59,12 +60,14 @@ export default function ShowPlaylist({ playlist, onClose = f => f, spotify = nul
                           onChange={event => setPlaylistName(event.target.value)}
                           onBlur={() => {
                             setEditing(false);
-                            UpdatePlaylistName(playlist.id, playlistName);
+                            UpdatePlaylistName(playlist.id, playlistName)
+                            .catch(error => console.error('Error:', error));
                           }}
                           onKeyUp={event => {
                             if (event.keyCode === 13) {
                               setEditing(false);
-                              UpdatePlaylistName(playlist.id, playlistName);
+                              UpdatePlaylistName(playlist.id, playlistName)
+                              .catch(error => console.error('Error:', error));
                             }
                           }}
                         /> :
@@ -86,7 +89,7 @@ export default function ShowPlaylist({ playlist, onClose = f => f, spotify = nul
                         playlist.id,
                         (rating + playlist.av_rating) / (playlist.num_ratings + 1),
                         playlist.num_ratings + 1
-                      );
+                      ).catch(error => console.error('Error:', error));
                     }} /></span> :
                     <span onClick={() => setRateIt(true)}>
                       <StarRating rating={playlist.av_rating} />
-Original file line number
+Diff line change
@@ Expand Up @@
           </Navbar>
         </>
       );
-    }
+    }