* In TVRenamer.buildURL_(), encode the show name in case it has spaces

* nil is also a valid error from the proxy response

diff --git a/src/server.go b/src/server.go
index 8c2df4b8daf36b4e96d03b45d4d9b702d3795313..07674a00088a55cc597753631cfcbe0b45583f6c 100644 (file)
--- a/src/server.go
+++ b/src/server.go
@@ -120,7 +120,7 @@ func performProxy(url *http.URL, response http.ResponseWriter, origRequest *http
   }
   var proxyResponse *http.Response
   proxyResponse, err = client.Read()
-  if err != http.ErrPersistEOF {
+  if err != nil && err != http.ErrPersistEOF {
     return err
   }
   _, err = io.Copy(response, proxyResponse.Body)

diff --git a/web_frontend/tv_renamer.js b/web_frontend/tv_renamer.js
index 5134b629a7cc9b1fa25d528da5180180a2df672b..823d8bba05fc3062407a8c0b8da19b5d9134f37b 100644 (file)
--- a/web_frontend/tv_renamer.js
+++ b/web_frontend/tv_renamer.js
@@ -99,8 +99,8 @@ armadillo.TVRenamer.prototype.parseName_ = function(name) {
  * @private
  */
 armadillo.TVRenamer.prototype.buildURL_ = function(show, season, episode) {
-  return "http://services.tvrage.com/tools/quickinfo.php?show=" + show +
-      "&ep=" + season + "x" + episode;
+  return "http://services.tvrage.com/tools/quickinfo.php?show=" +
+      encodeURIComponent(show) + "&ep=" + season + "x" + episode;
 };
 
 /**