From 1a7896716f4bdf6ad891821d595b214cf51e1dc4 Mon Sep 17 00:00:00 2001
From: Jonathan Cremin <jonathan@crem.in>
Date: Thu, 4 Dec 2014 15:45:52 +0000
Subject: [PATCH] Add Beats music support

---
 README.md                    |   3 +-
 lib/beats.js                 |  87 +++++++++++++++++++++++++++++++++++
 lib/rdio.js                  |   6 +--
 package.json                 |   3 +-
 public/images/beats.png      | Bin 0 -> 10800 bytes
 public/stylesheets/style.css |   3 ++
 routes/index.js              |  40 ++++++++++++++--
 views/album.ejs              |  15 ++++--
 views/track.ejs              |  15 ++++--
 9 files changed, 154 insertions(+), 18 deletions(-)
 create mode 100644 lib/beats.js
 create mode 100644 public/images/beats.png

diff --git a/README.md b/README.md
index d884662..7e9b188 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,6 @@ This is in super early development, has no design and only supports albums right
 
 On the immediate todo list:
 
-* Add support for tracks, and maybe artists
 * Use album release year for additional sanity check on matches
-* Do some kind of a design, particularly for the share page
 * Handle expected and unexpected errors better than the current crash-fest
+* Use promises for service searches and do them simultaneously
diff --git a/lib/beats.js b/lib/beats.js
new file mode 100644
index 0000000..a2599a5
--- /dev/null
+++ b/lib/beats.js
@@ -0,0 +1,87 @@
+"use strict";
+var parse = require('url').parse;
+var request = require('superagent');
+
+if (!process.env.BEATS_KEY || !process.env.BEATS_SECRET) {
+  throw new Error("You need to set BEATS_KEY and BEATS_SECRET environment variables");
+}
+
+var credentials = {
+  key: process.env.BEATS_KEY,
+  secret: process.env.BEATS_SECRET
+};
+
+var apiRoot = "https://partner.api.beatsmusic.com/v1/api";
+
+module.exports.lookupId = function(id, next) {
+  if (id.substr(0,2) == "al") {
+    request.get(apiRoot + "/albums/" + id + "/images/default?size=medium&client_id=" + credentials.key).redirects(0).end(function(res) {
+      var artwork = res.headers.location;
+      request.get(apiRoot + "/albums/" + id + "?client_id=" + credentials.key, function(res) {
+        var result = res.body.data;
+        next({
+          service: "beats",
+          type: "album",
+          id: result.id,
+          name: result.title,
+          url: "https://listen.beatsmusic.com/albums/" + result.id,
+          artwork: artwork,
+          artist: {
+            name: result.artist_display_name
+          }
+        });
+      });
+    });
+  } else if (id.substr(0,2) == "tr") {
+    request.get(apiRoot + "/tracks/" + id + "?client_id=" + credentials.key, function(res) {
+      var result = res.body.data;
+      request.get(apiRoot + "/albums/" + result.refs.album.id + "/images/default?size=medium&client_id=" + credentials.key).redirects(0).end(function(res) {
+        var artwork = res.headers.location;
+        next({
+          service: "beats",
+          type: "track",
+          id: result.id,
+          name: result.title,
+          url: "https://listen.beatsmusic.com/albums/" + result.refs.album.id + "/tracks/" + result.id,
+          artwork: artwork,
+          artist: {
+            name: result.artist_display_name
+          },
+          album: {
+            name: result.refs.album.display
+          }
+        });
+      });
+    });
+  }
+};
+
+module.exports.search = function(data, next) {
+  var query;
+  var type = data.type;
+
+  if (type == "album") {
+    query = data.artist.name + " " + data.name;
+  } else if (type == "track") {
+    query = data.artist.name + " " + data.album.name + " " + data.name;
+  }
+
+  var path = "/search?q=" + encodeURIComponent(query) + "&type=" + type + "&client_id=" + credentials.key;
+  request.get(apiRoot + path, function(res) {
+    if (!res.body.data[0]) {
+      next({service: "beats"});
+    } else {
+      module.exports.lookupId(res.body.data[0].id, next);
+    }
+  });
+};
+
+module.exports.parseUrl = function(url, next) {
+  var matches = parse(url).path.match(/\/albums[\/]+([^\/]+)(\/tracks\/)?([^\/]+)?/);
+
+  if (matches && matches[3]) {
+    module.exports.lookupId(matches[3], next);
+  } else if (matches && matches[1]) {
+    module.exports.lookupId(matches[1], next);
+  }
+}
diff --git a/lib/rdio.js b/lib/rdio.js
index 48606ec..6e1724e 100644
--- a/lib/rdio.js
+++ b/lib/rdio.js
@@ -92,13 +92,13 @@ module.exports.search = function(data, next) {
     var result = results.filter(function(result) {
       if (type == "album" && result.name == data.name) {
         return result;
-      } else if (type == "track" && result.album.name == data.album) {
+      } else if (type == "track" && result.album == data.album.name) {
         return result;
       }
     }).shift();
-    console.log(result)
+
     if (!result) {
-      return next({});
+      return next({service: "rdio"});
     }
     var parsed = parse(result.shortUrl)
     var id = parsed.path.replace("/x/", "").replace("/", "");
diff --git a/package.json b/package.json
index 0d9252e..60a4643 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,8 @@
     "playmusic": "^1.1.0",
     "rdio": "^1.5.2",
     "serve-favicon": "~2.1.3",
-    "spotify": "^0.3.0"
+    "spotify": "^0.3.0",
+    "superagent": "^0.21.0"
   },
   "devDependencies": {
     "should": "^4.3.0",
diff --git a/public/images/beats.png b/public/images/beats.png
new file mode 100644
index 0000000000000000000000000000000000000000..e47c634a0c1f96cc1fce9b118ee6b30fecaad607
GIT binary patch
literal 10800
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
b&__(G#$D^SVy<7m|KXGaDNB{TF%JA6?*69H

literal 0
HcmV?d00001

diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 6fabdeb..802489c 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -65,6 +65,9 @@ h2 {
 .album-artwork {
   margin-bottom: 10px;
 }
+.not-found {
+  opacity: 0.3;
+}
 .service-link {
   text-align: center;
 }
diff --git a/routes/index.js b/routes/index.js
index 2f1cd40..14e12ca 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -6,6 +6,7 @@ var router = express.Router();
 var googleplaymusic = require('../lib/googleplaymusic');
 var spotify = require('../lib/spotify');
 var rdio = require('../lib/rdio');
+var beats = require('../lib/beats');
 
 var cache = {googleplaymusic:{}, spotify:{},rdio:{}};
 
@@ -23,7 +24,10 @@ router.get('/:service/:type/:id', function(req, res) {
           items.push(item);
           rdio.search(result, function(item) {
             items.push(item);
-            res.render(result.type, {items: items});
+            beats.search(result, function(item) {
+              items.push(item);
+              res.render(result.type, {items: items});
+            });
           });
         });
       });
@@ -35,7 +39,10 @@ router.get('/:service/:type/:id', function(req, res) {
           items.push(item);
           rdio.search(result, function(item) {
             items.push(item);
-            res.render(result.type, {items: items});
+            beats.search(result, function(item) {
+              items.push(item);
+              res.render(result.type, {items: items});
+            });
           });
         });
       });
@@ -47,7 +54,25 @@ router.get('/:service/:type/:id', function(req, res) {
           items.push(item);
           spotify.search(result, function(item) {
             items.push(item);
-            res.render(result.type, {items: items});
+            beats.search(result, function(item) {
+              items.push(item);
+              res.render(result.type, {items: items});
+            });
+          });
+        });
+      });
+      break;
+    case "beats":
+      beats.lookupId(id, function(result) {
+        items.push(result);
+        googleplaymusic.search(result, function(item) {
+          items.push(item);
+          spotify.search(result, function(item) {
+            items.push(item);
+            rdio.search(result, function(item) {
+              items.push(item);
+              res.render(result.type, {items: items});
+            });
           });
         });
       });
@@ -56,7 +81,6 @@ router.get('/:service/:type/:id', function(req, res) {
 });
 
 router.post('/search', function(req, res) {
-  // determine spotify or google music
   var url = parse(req.body.url);
 
   if (!url.host) {
@@ -90,6 +114,14 @@ router.post('/search', function(req, res) {
         res.redirect("/google/" + result.type + "/" + result.id);
       }
     });
+  } else if (url.host.match(/beatsmusic\.com$/)) {
+    beats.parseUrl(url.href, function(result) {
+      if (!result.id) {
+        req.flash('search-error', 'No match found for this link');
+        res.redirect('/');
+      }
+      res.redirect("/beats/" + result.type + "/" + result.id);
+    });
   } else {
     req.flash('search-error', 'No match found for this link');
     res.redirect('/');
diff --git a/views/album.ejs b/views/album.ejs
index b503a3e..cedc15a 100644
--- a/views/album.ejs
+++ b/views/album.ejs
@@ -32,10 +32,17 @@
       <div class="col-md-3 col-xs-6">
         <div class="service <%= i==0 ? "source-service" : "" %>">
           <div class="matching-from"><%= i==0 ? "Found matches for this link" : "" %></div>
-          <a href="<%= album.url %>"><img src="<%= album.artwork %>" class="img-rounded album-artwork" width="100%"></a>
-          <div class="service-link">
-            <a href="<%= album.url %>">Listen on <img src="/images/<%= album.service %>.png" class="img-rounded"></a>
-          </div>
+          <% if (album.url) { %>
+            <a href="<%= album.url %>"><img src="<%= album.artwork %>" class="img-rounded album-artwork" width="100%"></a>
+            <div class="service-link">
+              <a href="<%= album.url %>"><img src="/images/<%= album.service %>.png" class="img-rounded"></a>
+            </div>
+          <% } else { %>
+            <img src="<%= items[0].artwork %>" class="img-rounded album-artwork not-found" width="100%"></a>
+            <div class="service-link">
+              <img src="/images/<%= album.service %>.png" class="img-rounded not-found">
+            </div>
+          <% } %>
         </div>
       </div>
     <% } %>
diff --git a/views/track.ejs b/views/track.ejs
index 5ec2271..e2e24a1 100644
--- a/views/track.ejs
+++ b/views/track.ejs
@@ -32,10 +32,17 @@
         <div class="col-md-3 col-xs-6">
           <div class="service <%= i==0 ? "source-service" : "" %>">
             <div class="matching-from"><%= i==0 ? "Found matches for this link" : "" %></div>
-            <a href="<%= track.url %>"><img src="<%= track.artwork %>" class="img-rounded album-artwork" width="100%"></a>
-            <div class="service-link">
-              <a href="<%= track.url %>">Listen on <img src="/images/<%= track.service %>.png" class="img-rounded"></a>
-            </div>
+            <% if (track.url) { %>
+              <a href="<%= track.url %>"><img src="<%= track.artwork %>" class="img-rounded album-artwork" width="100%"></a>
+              <div class="service-link">
+                <a href="<%= track.url %>"><img src="/images/<%= track.service %>.png" class="img-rounded"></a>
+              </div>
+            <% } else { %>
+              <img src="<%= items[0].artwork %>" class="img-rounded album-artwork not-found" width="100%"></a>
+              <div class="service-link">
+                <img src="/images/<%= track.service %>.png" class="img-rounded not-found">
+              </div>
+            <% } %>
           </div>
         </div>
         <% } %>