From 36d98ae33727d6d39f36e33588f5d24fb75ef23e Mon Sep 17 00:00:00 2001
From: Benjamin Sigonneau <benjamin@dromaludaire.info>
Date: Wed, 2 Jun 2021 16:09:45 +0200
Subject: [PATCH] Encode youtube url parameter correctly

---
 balises.py               | 13 ++++++++++---
 views/search_results.tpl | 12 ++++++------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/balises.py b/balises.py
index 4f47c13..c83e12b 100755
--- a/balises.py
+++ b/balises.py
@@ -7,6 +7,7 @@ import datetime as dt
 import bs4
 import requests
 import os
+import urllib.parse
 
 from peewee import *
 from bottle import hook, request, route, run, view
@@ -129,9 +130,15 @@ def results_page():
     delta = int(request.forms.timedelta or 0)
     hour = hour + delta
     time = '{:0>2}:00'.format(hour)
-
-    results = search_song(day, hour)
-    return dict(results=[x for x in results],
+    results = [
+        { 'date': x.date,
+          'song': x.song,
+          'youtube_url': 'https://www.youtube.com/results?search_query=' +
+                          urllib.parse.quote_plus(x.song.artist + ' ' + x.song.title)
+        }
+        for x in search_song(day, hour)
+    ]
+    return dict(results=results,
                 date=day,
                 time=time,
                 start_time=time,
diff --git a/views/search_results.tpl b/views/search_results.tpl
index 20910b8..3b23fc1 100644
--- a/views/search_results.tpl
+++ b/views/search_results.tpl
@@ -34,15 +34,15 @@
       <input value="Chercher" type="submit" />
   </form>
   <h1>Chansons du {{date.strftime('%A %d %B %Y')}} entre {{start_time}} et {{end_time}}</h1>
-  <a href="#" id="go_sooner">[Plus tôt]</a>
-  <a href="#" id="go_later">[Plus tard]</a>
+  <a href="#" id="go_sooner">[<i class="fas fa-angle-left"></i> Plus tôt]</a>
+  <a href="#" id="go_later">[Plus tard <i class="fas fa-angle-right"></i>]</a>
   <table id="results">
     % for x in results:
     <tr>
-      <th>{{str(x.date.time())}}</th>
-      <td>{{x.song.artist}}</td>
-      <td>{{x.song.title}}</td>
-      <td><a href="https://www.youtube.com/results?search_query={{x.song.artist + ' ' + x.song.title}}" title="Rechercher sur Youtube"><i class="fab fa-lg fa-youtube"></i></a></td>
+      <th>{{str(x['date'].time())}}</th>
+      <td>{{x['song'].artist}}</td>
+      <td>{{x['song'].title}}</td>
+      <td><a href="{{x['youtube_url']}}" title="Rechercher sur Youtube"><i class="fab fa-lg fa-youtube"></i></a></td>
     </tr>
     % end
   </table>