Update the rest of the libraries for bluebird

lib/services/spotify/index.js

@@ -1,36 +1,32 @@
 "use strict";
 var parse = require('url').parse;
-var spotify = require('spotify');
-var Q = require('q');
+var Promise = require('bluebird');
+var spotify = Promise.promisifyAll(require('spotify'));
 
 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 module.exports.lookupId(matches[2], matches[1]);
   }
-  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) {
+  return spotify.lookupAsync({id: id, type: type}).then(function(data) {
+    if (data.error) {
       var error = new Error("Not Found");
       error.status = 404;
-      deferred.reject(error);
-      return;
+      throw error;
     }
 
     var artist = data.artists[0];
 
     if (type == "album") {
-      deferred.resolve({
+      return {
         service: "spotify",
         type: type,
         id: data.id,
@@ -41,9 +37,9 @@ module.exports.lookupId = function(id, type) {
         artist: {
           name: artist.name
         }
-      });
+      };
     } else if (type == "track") {
-      deferred.resolve({
+      return {
         service: "spotify",
         type: type,
         id: data.id,
@@ -57,14 +53,12 @@ module.exports.lookupId = function(id, type) {
         album: {
           name: data.album.name
         }
-      })
+      };
     }
   });
-  return deferred.promise;
 }
 
 module.exports.search = function(data) {
-  var deferred = Q.defer();
   var query, album;
   var type = data.type;
 
@@ -76,12 +70,7 @@ module.exports.search = function(data) {
     album = data.album.name;
   }
 
-  spotify.search({query: query, type: type}, function(err, results) {
-    if ( err ) {
-      deferred.resolve({service: "spotify"});
-      return;
-    }
-
+  return spotify.searchAsync({query: query, type: type}).then(function(results) {
     if (!results[type + "s"].items[0]) {
       var matches = album.match(/^[^\(\[]+/);
       if (matches[0] && matches[0] != album) {
@@ -91,14 +80,13 @@ module.exports.search = function(data) {
         } else if (type == "track") {
           cleanedData.album.name = matches[0].trim();
         }
-        module.exports.search(cleanedData).then(deferred.resolve);
+        return module.exports.search(cleanedData);
       } else {
-        deferred.resolve({service: "spotify"});
+        return {service: "spotify"};
       }
     } else {
-      module.exports.lookupId(results[type + "s"].items[0].id, type).then(deferred.resolve);
+      return module.exports.lookupId(results[type + "s"].items[0].id, type);
     }
 
   });
-  return deferred.promise;
 }