Merge remote-tracking branch 'origin/master' into develop

* origin/master:
  Release v0.5.4
  Added API call getSnatched
  Potential fix for #2055
This commit is contained in:
Bas Stottelaar
2015-02-19 20:12:49 +01:00
2 changed files with 9 additions and 4 deletions

View File

@@ -1,7 +1,7 @@
# Changelog
## v0.x.x
Released XX XX 2015
## v0.5.4
Released 05 February 2015
Highlights:
* Added: backported 'Scan Artist' feature from `sarakha63/headphones`
@@ -17,7 +17,7 @@ Highlights:
* Improved: upgraded mutagen to 1.27
* Improved: upgraded beets to 1.3.10
The full list of commits can be found [here](https://github.com/rembo10/headphones/compare/v0.5.3...v0.X.X).
The full list of commits can be found [here](https://github.com/rembo10/headphones/compare/v0.5.3...v0.5.4).
## v0.5.3
Released 15 January 2015

View File

@@ -18,7 +18,7 @@ from headphones import db, mb, updater, importer, searcher, cache, postprocessor
import headphones
import json
cmd_list = ['getIndex', 'getArtist', 'getAlbum', 'getUpcoming', 'getWanted', 'getSimilar', 'getHistory', 'getLogs',
cmd_list = ['getIndex', 'getArtist', 'getAlbum', 'getUpcoming', 'getWanted', 'getSnatched', 'getSimilar', 'getHistory', 'getLogs',
'findArtist', 'findAlbum', 'addArtist', 'delArtist', 'pauseArtist', 'resumeArtist', 'refreshArtist',
'addAlbum', 'queueAlbum', 'unqueueAlbum', 'forceSearch', 'forceProcess', 'forceActiveArtistsUpdate',
'getVersion', 'checkGithub','shutdown', 'restart', 'update', 'getArtistArt', 'getAlbumArt',
@@ -166,6 +166,11 @@ class Api(object):
"SELECT * from albums WHERE Status='Wanted'")
return
def _getSnatched(self, **kwargs):
self.data = self._dic_from_query(
"SELECT * from albums WHERE Status='Snatched'")
return
def _getSimilar(self, **kwargs):
self.data = self._dic_from_query('SELECT * from lastfmcloud')
return