diff --git a/assets/js/controllers/queue.controller.js b/assets/js/controllers/queue.controller.js index c752d3c..c2fd66b 100644 --- a/assets/js/controllers/queue.controller.js +++ b/assets/js/controllers/queue.controller.js @@ -1,7 +1,5 @@ -mpdClient.controller('queue', function ($scope, $resource, serverEvents) { - var Queue = $resource('/api/queue') - - $scope.queueSongs = Queue.query() +mpdClient.controller('queue', function ($scope, $resource, api, serverEvents) { + $scope.queueSongs = api.getQueue().query() $scope.updateQueue = function(data) { $scope.queueSongs = data diff --git a/assets/js/controllers/transport.controller.js b/assets/js/controllers/transport.controller.js index 4392121..c2408cd 100644 --- a/assets/js/controllers/transport.controller.js +++ b/assets/js/controllers/transport.controller.js @@ -1,9 +1,7 @@ -mpdClient.controller('transport', function ($scope, $http, serverEvents) { - var Status = $http({ method: 'GET', url: '/api/status' }) - +mpdClient.controller('transport', function ($scope, $http, api, serverEvents) { $scope.status = {} - Status.success(function (data, status, headers, config) { + api.getStatus().success(function (data, status, headers, config) { $scope.updateStatus(data) }) @@ -17,9 +15,7 @@ mpdClient.controller('transport', function ($scope, $http, serverEvents) { $scope.totalTime = data[1] } - $scope.sendCommand = function (command) { - $http({ method: 'PUT', url: '/api/control/' + command }) - } + $scope.sendCommand = api.sendCommand $scope.stopped = function () { return $scope.status.state == 'stop' diff --git a/assets/js/services/api.service.js b/assets/js/services/api.service.js new file mode 100644 index 0000000..1d0b68a --- /dev/null +++ b/assets/js/services/api.service.js @@ -0,0 +1,18 @@ +mpdClient.factory('api', function ($rootScope, $http, $resource) { + + var apiUrl = '/api' + + return { + sendCommand: function (command) { + $http({ method: 'PUT', url: apiUrl + '/control/' + command }) + }, + + getStatus: function () { + return $http({ method: 'GET', url: apiUrl + '/status' }) + }, + + getQueue: function () { + return $resource(apiUrl + '/queue') + } + } +})