ID-Based Return Fuctionality, Spotify Embeds added, File Restructure

absotone · Sep 6, 2021 · 22a12a9 · 22a12a9
1 parent c5e2928
commit 22a12a9
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 53 deletions.
diff --git a/app.py b/app.py
@@ -11,18 +11,16 @@
 
 songDataLoader = SongData(creds.CLIENT_ID,creds.CLIENT_SECRET)
 
+NUM_SONGS_SHOW = 10
+
 
 app = Flask(
     __name__,
     template_folder="templates",
     static_folder="static"
 )
 
-@app.route("/")
-def index():
-    return render_template("index.html")
-
-@app.route("/predict/", methods = ["GET","POST"])
+@app.route("/", methods = ["GET","POST"])
 def predict():
     if request.method == "POST":
 
@@ -31,13 +29,13 @@ def predict():
 
         label = getLabel(model,
                         song_features)
-        songsList = getSongsWithLabel(label,4)
 
-        print(songsList)
-        return render_template("predict.html",label = str(label), displayForm = False, songsList = songsList)
+
+        indexListRet = getSongsWithLabel(label,NUM_SONGS_SHOW)
+        return render_template("index.html",label = str(label), displayForm = False, indexList = indexListRet)
 
     else:
-        return render_template("predict.html", label = "", displayForm = True, songsList = [])
+        return render_template("index.html", label = "", displayForm = True, indexListRet = [])
 
 if __name__ == "__main__":
     app.run(debug=True)
diff --git a/creds.py b/creds.py
@@ -3,4 +3,3 @@
 
 CLIENT_ID = ""
 CLIENT_SECRET = ""
-
diff --git a/displaysongdetails.py b/displaysongdetails.py
@@ -0,0 +1,18 @@
+"""
+    Class to describe how songs are displayed in the webapp
+"""
+
+class DisplaySong():
+
+    def __init__(self, name, id):
+        self.name = name 
+        self.id = id 
+        self.iframe = self.getIFrameLink()
+
+    def setIFrameLink(self):
+        return format('<iframe src="https://open.spotify.com/embed/track/{self.id}}" width="300" height="80" frameborder="0" allowtransparency="true" allow="encrypted-media"></iframe>')
+
+    def getIFrameLink(self):
+        return self.iframe
+
+
diff --git a/helpers.py b/helpers.py
@@ -26,7 +26,8 @@ def getLabel(model, inputValues):
 def getSongsWithLabel(label,numSongs=5):
     label = int(label)
     label_df = df[df["label"] == label]
-    return  (label_df.sample(numSongs)["name"])[:numSongs]
+
+    return  label_df.sample(numSongs)["id"][:numSongs]
 
 
 
diff --git a/templates/index.html b/templates/index.html
@@ -4,10 +4,40 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" href="../static/styles.css">
-    <title>Spotifynd</title>
+    <link rel="stylesheet" href="../static/predict.css">
+    <title>Predictions</title>
 </head>
 <body>
-    <h1>Welcome to spotifynd.</h1>
+
+
+    {% if displayForm %}
+
+        <form action="{{ url_for('predict')}}" method="post">
+
+            <label for="song_id">song_id:</label>
+            <input type="text" id="song_id" name="song_id" placeholder="song_id">
+
+
+            <button type="submit">Get Songs!</button>
+
+        </form>
+
+    {% endif %}
+
+
+
+    {% for i in indexList %}
+
+    <iframe src="https://open.spotify.com/embed/track/{{i}}" width="100%" height="80" frameborder="0" allowtransparency="true" allow="encrypted-media"></iframe>
+
+    <br>
+
+
+    {% endfor %}
+
+    {% if not displayForm %}
+        <a href="{{ url_for('predict')}}"> Try Again!</a>
+    {% endif %}
+
 </body>
 </html>
diff --git a/templates/predict.html b/templates/predict.html