Major refactor of service libs, more tests

lib/services/spotify/index.js

@@ -0,0 +1,104 @@
+"use strict";
+var parse = require('url').parse;
+var spotify = require('spotify');
+var Q = require('q');
+
+module.exports.id = "spotify";
+
+module.exports.match = require('./url').match;
+
+module.exports.parseUrl = function(url) {
+  var deferred = Q.defer();
+  var matches = parse(url).path.match(/\/(album|track)[\/]+([^\/]+)/);
+
+  if (matches && matches[2]) {
+    module.exports.lookupId(matches[2], matches[1]).then(deferred.resolve);
+  }
+  return deferred.promise;
+}
+
+module.exports.lookupId = function(id, type) {
+  var deferred = Q.defer();
+  spotify.lookup({id: id, type: type}, function(err, data) {
+    if ( err || data.error) {
+      var error = new Error("Not Found");
+      error.status = 404;
+      deferred.reject(error);
+      return;
+    }
+
+    var artist = data.artists[0];
+
+    if (type == "album") {
+      deferred.resolve({
+        service: "spotify",
+        type: type,
+        id: data.id,
+        name: data.name,
+        streamUrl: "https://play.spotify.com/" + type + "/" + data.id,
+        purchaseUrl: null,
+        artwork: data.images ? data.images[1].url.replace("http:", "https:") : data.album.images[1].url.replace("http:", "https:"),
+        artist: {
+          name: artist.name
+        }
+      });
+    } else if (type == "track") {
+      deferred.resolve({
+        service: "spotify",
+        type: type,
+        id: data.id,
+        name: data.name,
+        streamUrl: "https://play.spotify.com/" + type + "/" + data.id,
+        purchaseUrl: null,
+        artwork: data.images ? data.images[1].url.replace("http:", "https:") : data.album.images[1].url.replace("http:", "https:"),
+        artist: {
+          name: artist.name
+        },
+        album: {
+          name: data.album.name
+        }
+      })
+    }
+  });
+  return deferred.promise;
+}
+
+module.exports.search = function(data) {
+  var deferred = Q.defer();
+  var query, album;
+  var type = data.type;
+
+  if (type == "album") {
+    query = "artist:" + data.artist.name.replace(":", "") + " album:" + data.name.replace(":", "");
+    album = data.name;
+  } else if (type == "track") {
+    query = "artist:" + data.artist.name.replace(":", "") + " album:" + data.album.name.replace(":", "") + " track:" + data.name.replace(":", "");
+    album = data.album.name;
+  }
+
+  spotify.search({query: query, type: type}, function(err, results) {
+    if ( err ) {
+      deferred.resolve({service: "spotify"});
+      return;
+    }
+
+    if (!results[type + "s"].items[0]) {
+      var matches = album.match(/^[^\(\[]+/);
+      if (matches[0] && matches[0] != album) {
+        var cleanedData = JSON.parse(JSON.stringify(data));
+        if (type == "album") {
+          cleanedData.name = matches[0].trim();
+        } else if (type == "track") {
+          cleanedData.album.name = matches[0].trim();
+        }
+        module.exports.search(cleanedData).then(deferred.resolve);
+      } else {
+        deferred.resolve({service: "spotify"});
+      }
+    } else {
+      module.exports.lookupId(results[type + "s"].items[0].id, type).then(deferred.resolve);
+    }
+
+  });
+  return deferred.promise;
+}

lib/services/spotify/url.js

@@ -0,0 +1,12 @@
+"use strict";
+var parse = require('url').parse;
+
+module.exports.match = function(url, type) {
+  var parsed = parse(url);
+  if (!parsed.host.match(/spotify\.com$/)) {
+    return false;
+  }
+
+  var matches = parse(url).path.match(/\/(album|track)[\/]+([^\/]+)/);
+  return !!matches[2];
+};