Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prefer extensions from URIs #82

Open
wants to merge 2,257 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
2257 commits
Select commit Hold shift + click to select a range
b31fdf5
Automatic merge of Transifex translations
Apr 7, 2016
1277af9
Automatic merge of Transifex translations
Apr 10, 2016
9d995a1
Automatic merge of Transifex translations
Apr 14, 2016
45e729d
Automatic merge of Transifex translations
Apr 16, 2016
6321441
Now using MediaSessionCompat everywhere. Improved notification
mrmaffen Apr 8, 2016
d7828d7
Fixed a crash in DatabaseHelper#storeStation
mrmaffen Apr 8, 2016
783159f
Cleaned up TomahawkMainActivity. Moved some functionality to separate…
mrmaffen Apr 9, 2016
9705239
Cache StationPlaylists together with all other Playlists
mrmaffen Apr 10, 2016
b783adb
Major rework of PlaybackService. Exclusively uses MediaSession for co…
mrmaffen Apr 11, 2016
b317faf
Swiping tracks in "Now Playing"-View no longer blocks UI thread
mrmaffen Apr 12, 2016
c358e7a
Smoothly fade blurred background in "Now Playing"-view in/out
mrmaffen Apr 12, 2016
a29709c
Properly show numeration and queue in PlaybackFragment. Fixed a bug i…
mrmaffen Apr 13, 2016
0c6db58
Fix shuffle mode in PlaybackManager
mrmaffen Apr 14, 2016
3e494f1
Fix stations again
mrmaffen Apr 14, 2016
9c83f80
Some minor changes to documentation
mrmaffen Apr 14, 2016
b32b4fc
Fixed and tested PhoneStateListener in PlaybackService
mrmaffen Apr 15, 2016
b502aec
Fixed PlaybackPanel seeking indicator. Added visible buffering state
mrmaffen Apr 15, 2016
9564034
Added support for media browsing on Android Auto/Wear
mrmaffen Apr 16, 2016
2fe774c
Prevent updateAdapter flood in PlaybackFragment
mrmaffen Apr 16, 2016
0540d51
Fixed a simple crash in TomahawkListAdapter#getViewType
mrmaffen Apr 16, 2016
9bcef38
Always check if station needs to be filled in PlaybackService
mrmaffen Apr 16, 2016
a67b2e9
Fixed a simple crash in PlaybackService AudioFocusHelper
mrmaffen Apr 17, 2016
88fc703
Hide the PlaybackPanel when necessary
mrmaffen Apr 17, 2016
a7e417d
Automatic merge of Transifex translations
Apr 17, 2016
312ef5e
Don't ever display a notification if the PlaybackService has been des…
mrmaffen Apr 20, 2016
44050ae
A click on the notification now opens up the PlaybackFragment
mrmaffen Apr 21, 2016
5a08dd6
Properly clean up references of PlaybackService to prevent leaking
mrmaffen Apr 22, 2016
47139c4
Added captures folder to .gitignore
mrmaffen Apr 22, 2016
4bfd796
Cache PlaybackState in TomahawkMainActivity to improve performance
mrmaffen Apr 22, 2016
4c152d6
Added convenience methods to CollectionManager to improve code style
mrmaffen Apr 22, 2016
0603bdb
Automatic merge of Transifex translations
Apr 24, 2016
f6a51d8
Fixed a graphical glitch in PlaybackFragment where the albumart wasn'…
mrmaffen Apr 25, 2016
c0ef2ac
Always correctly restore actionBarState
mrmaffen Apr 25, 2016
8b9547e
Fixed a bug that falsely caused the menu drawer to be locked
mrmaffen Apr 26, 2016
3af6dfc
Minor cleanups in ImageUtils
mrmaffen Apr 26, 2016
b7ee964
Updated LibVLC to 1.9.8. Fixed fetching of local Album art.
mrmaffen Apr 26, 2016
dcc5639
Automatic merge of Transifex translations
Apr 26, 2016
9d8c8ea
Don't crash if parsing of charts fails in ChartsPagerFragment
mrmaffen Apr 27, 2016
06bdf1a
[spotify] Fix charts again
mrmaffen Apr 27, 2016
c068657
Automatic merge of Transifex translations
Apr 27, 2016
7cd15dd
[spotify] Added playlistGenerator implementation
mrmaffen Apr 29, 2016
16a5db4
Make Tomahawk compatible with stations powered by Spotify
mrmaffen Apr 29, 2016
8e547b2
Correctly start playback when skipping to next/previous spotify/deeze…
mrmaffen Apr 29, 2016
872d5ab
Limit tracks that are used to fill a station
mrmaffen Apr 30, 2016
b1e94e6
Fix a simple NPE in PlaylistEntriesFragment
mrmaffen Apr 30, 2016
b642422
Fixed crash in TomahawkMainActivity init process
mrmaffen Apr 30, 2016
9e24c95
Fixed a crash on startup by correcting initializing procedure of Fuzz…
mrmaffen May 1, 2016
9354355
Always release the previously used MediaPlayer in PlaybackService#pre…
mrmaffen May 1, 2016
ce518da
Code style improvements in Segment
mrmaffen May 2, 2016
3fb4620
Don't show numeration in SearchPagerFragment
mrmaffen May 3, 2016
04c3e53
Disable SwipeLayout for now as it's unreliable and clunky
mrmaffen May 3, 2016
bf95329
Only show "connected"-checkBox in ConfigDialogs when necessary
mrmaffen May 3, 2016
25255a2
Code style improvments in ResolverRedirectConfigDialog. Removed unuse…
mrmaffen May 3, 2016
bd69f01
Always start playing a station after setting the playlist
mrmaffen May 4, 2016
6416829
Improved description of objects in log output
mrmaffen May 4, 2016
d6cdfaf
Always check that mMediaSession is not null in PlaybackService
mrmaffen May 4, 2016
57ec30a
Minor code style improvements in PlaybackService
mrmaffen May 4, 2016
13ea17a
Fix memory leak of PlaybackService in PluginMediaPlayer
mrmaffen May 4, 2016
587c3ed
Never show a notification if the PlaybackService is destroyed
mrmaffen May 5, 2016
3a7064c
Fixed a recently introduced issue that broke playback in general
mrmaffen May 5, 2016
a44b5be
Fetch albumArt for next/previous track to improve UX
mrmaffen May 5, 2016
a276ed2
Properly prepare a track when already preparing another one
mrmaffen May 5, 2016
b8b5c99
Added READ_PHONE_STATE permission to manifest again
mrmaffen May 10, 2016
6bab053
[spotify] Fixed a bug in getAccessToken function
mrmaffen May 10, 2016
a30d33a
Added some useful debug output to FragmentUtils
mrmaffen May 11, 2016
59cf8ed
Improved init procedure in TomahawkMainActivity. Improved splash screen
mrmaffen May 11, 2016
a07548d
Externalized PanelSlideListener from TomahawkMainActivity
mrmaffen May 12, 2016
e3a71cd
Added some debug output
mrmaffen May 12, 2016
dafaa64
Always only add root fragments once
mrmaffen May 12, 2016
2862221
Correctly store and restore playbackState in TomahawkMainActivity
mrmaffen May 13, 2016
e844c2d
Code style improvements in FakePreferenceGroup#FakePreference
mrmaffen May 13, 2016
7dd00a3
Centralized all settings stuff in PreferenceUtils
mrmaffen May 13, 2016
0499c4d
Hide "new"-button in UserPagerFragment's header
mrmaffen May 13, 2016
397da79
Automatic merge of Transifex translations
May 13, 2016
e98eeeb
Improved and stabilized track preparation
mrmaffen May 14, 2016
fe8a09e
Only ever post PipeLine.ResultsEvent if query actually changed
mrmaffen May 15, 2016
d9da867
Fixed a minor graphical glitch when loading station
mrmaffen May 16, 2016
f5c562f
Stop all current playback when loading station
mrmaffen May 16, 2016
ec24117
Correctly show "create new"-button in StationsFragment
mrmaffen May 16, 2016
b6d1650
Always show the actual isPlaying state in PluginMediaPlayer
mrmaffen May 16, 2016
feffe6e
Wait for DbCollection to initialize before resolving
mrmaffen May 17, 2016
30df8a0
Split CollectionDb#addTracks into separate db transactions
mrmaffen May 17, 2016
db9c22e
Correctly show navdrawer after WelcomeFragment has been closed
mrmaffen May 17, 2016
8947c7e
If album image not available, show artist image instead
mrmaffen May 17, 2016
16b7b73
Update spotify plugin download links to 0.51
mrmaffen May 18, 2016
d6a3424
Updated spotify download links again
mrmaffen May 18, 2016
28c4fd6
Add a "remove from queue"-button to queued items in PlaybackFragment
mrmaffen May 19, 2016
77deb80
Added some suggested stations to StationsFragment
mrmaffen May 21, 2016
7a3bcf1
Updated spotify plugin download link yet again (to 0.53)
mrmaffen May 21, 2016
cbb1bea
Automatic merge of Transifex translations
May 21, 2016
cb3e9c4
Automatic merge of Transifex translations
May 22, 2016
8af52af
Fixed opening of local files. Properly resolve artist images in Playl…
mrmaffen May 23, 2016
a4f0908
[spotify] Fix format of request arguments for multiple seeds
mrmaffen May 25, 2016
810a4c9
Added feature to create stations based on playlists
mrmaffen May 25, 2016
b8ba9b8
Always play last available track in StationPlaylists first to avoid d…
mrmaffen May 25, 2016
5e6e2b6
Only automatically store Stations that are not based on Playlists
mrmaffen May 25, 2016
5861256
Always fill station with tracks if necessary
mrmaffen May 25, 2016
771cefa
Automatic merge of Transifex translations
May 26, 2016
34146dc
Fixed track-based stations
mrmaffen May 30, 2016
53d2720
Automatic merge of Transifex translations
May 31, 2016
85b8bfd
[spotify] Correctly resolve track ids before filling playlists. Bumpe…
mrmaffen Jun 1, 2016
59953cd
Properly restore track ids in StationPlaylist
mrmaffen Jun 1, 2016
54c1684
Updated tomahawk.js and tomahawk-infosystem.js
mrmaffen Jun 1, 2016
9da6a37
Fixed a crash on start-up on tablet devices
mrmaffen Jun 1, 2016
0d3f1f6
Replaced all placeholder pngs with xml drawables to save ram
mrmaffen Jun 1, 2016
bd59ae3
Automatic merge of Transifex translations
Jun 1, 2016
50b8b8e
Use normal menudrawer UI on tablet devices
mrmaffen Jun 2, 2016
b83db23
Fixed numeration of albums charts
mrmaffen Jun 2, 2016
2dd322f
Improved splash screen on tablet devices
mrmaffen Jun 2, 2016
124b29a
Corrected artist placeholder on tablet devices
mrmaffen Jun 2, 2016
8298290
Fixed a simple NPE crash in ContentHeaderFragment#getMediaController
mrmaffen Jun 2, 2016
2947653
Fixed a NPE when double-tapping in PlaybackFragment without any curre…
mrmaffen Jun 2, 2016
89e1709
Show an image in PlaybackFragment when loading stations
mrmaffen Jun 2, 2016
3510dff
Display error message if station failed to load
mrmaffen Jun 3, 2016
b95bd29
Don't show notification while loading station
mrmaffen Jun 3, 2016
7da0802
Don't block main thread in VLCMediaPlayer#prepare
mrmaffen Jun 3, 2016
e8093ee
Always prefer local tracks
mrmaffen Jun 3, 2016
5f82bea
Get rid of stuck notifications after crashes
mrmaffen Jun 4, 2016
ff6f0f6
Added armv8a, x86_64 and mips build tasks
mrmaffen Jun 4, 2016
108af0f
Updated Amazon resolver
mrmaffen Jun 4, 2016
8de5bfd
Improved enable button in ResolverConfigDialogs
mrmaffen Jun 7, 2016
ef8d119
Get rid of configTestable static capability in js plugins
mrmaffen Jun 7, 2016
fa70337
unregister/register all plugins when disabling/enabling a resolver
mrmaffen Jun 7, 2016
c7acc6f
Don't show query results from disabled resolvers
mrmaffen Jun 7, 2016
cfc24f6
Automatic merge of Transifex translations
Jun 8, 2016
41ac0f0
Handle Thumb Up/Down rating as Love/Unlove
theli-ua Jun 9, 2016
358eefd
Merge pull request #46 from tomahawk-player/thumbup
mrmaffen Jun 9, 2016
226c252
Surround blur transformation with try/catch so it wont crash whole pl…
theli-ua Jun 9, 2016
f2a50e7
Only catch RSRuntimeException in BlurTransformation. Added proper log…
mrmaffen Jun 9, 2016
b5cdb99
Updated buildTools and support libraries
mrmaffen Jun 9, 2016
2fc79b6
Automatic merge of Transifex translations
Jun 9, 2016
f581edd
Add native android MediaPlayer implementation
theli-ua Jun 8, 2016
368cd5e
Call prepare in android's mediaplayer, register AndroidMediaPlayer wi…
theli-ua Jun 9, 2016
3a01272
Handle track completion in ANdroidMediaPlayer
theli-ua Jun 9, 2016
8491c31
Get final url before feeding it to MediaPlayer
theli-ua Jun 10, 2016
cdf2547
Fixed a bug that prevented playlist-based stations from starting
mrmaffen Jun 10, 2016
2c6f96b
Fixed a simple NPE crash in SocialActionsFragment
mrmaffen Jun 10, 2016
19b97e7
Improved look of albumArt/artist image in landscape mode in PlaybackF…
mrmaffen Jun 10, 2016
4f6e7ee
Do not reuse Android's mediaplayer
theli-ua Jun 11, 2016
79d3994
Use AndroidMediaPlayer for amazon's streams
theli-ua Jun 11, 2016
c6e463a
Add BASIC logging for native http requests
theli-ua Jun 11, 2016
fb4d203
Remove unused imports
theli-ua Jun 11, 2016
8abc836
Automatic merge of Transifex translations
Jun 11, 2016
3a0ce47
Fixed a ISE crash in StationPlaylist#fillPlaylist
mrmaffen Jun 12, 2016
6aa6198
Don't crash if mMediaController null in AlbumArtSwipeAdapter. Log err…
mrmaffen Jun 12, 2016
0d48867
Always make sure that default PlaylistGenerator is not null
mrmaffen Jun 14, 2016
5d9ca3a
Show correct background in PlaybackFragment when showing placeholder
mrmaffen Jun 14, 2016
527bb61
Merge pull request #51 from tomahawk-player/LogginInterceptor
mrmaffen Jun 14, 2016
d72fad6
Updated Amazon resolver. Fixed login
mrmaffen Jun 17, 2016
b011273
Remove getFinalUrl, address PR feedback
theli-ua Jun 17, 2016
93ad15a
Merge pull request #50 from tomahawk-player/AndroidMediaPlayer
mrmaffen Jun 17, 2016
2d0a8a0
Always use basic track in ScriptResolver#prepare
mrmaffen Jun 18, 2016
48f89a4
Separate albums with the same name but different albumArtist tags
mrmaffen Jun 18, 2016
212ae5f
Automatic merge of Transifex translations
Jun 19, 2016
a388370
Style fixes in AndroidMediaPlayer. Added a proper license header.
mrmaffen Jun 20, 2016
d32ecb7
Fixed crash in AndroidMediaPlayer that sometimes happened when prepar…
mrmaffen Jun 20, 2016
9e42599
Automatic merge of Transifex translations
Jun 20, 2016
87b2596
bump amzn
theli-ua Jun 21, 2016
e44bd9e
update amzn
theli-ua Jun 22, 2016
7db47f6
Fix flickering song-count textviews in Album views
mrmaffen Jun 20, 2016
e0aba1d
Minor style changes in Playlist. Removed redundant clear method.
mrmaffen Jun 21, 2016
362f7ae
Fixed random restarting of the playback queue
mrmaffen Jun 22, 2016
42a259c
Never except null in PlaybackManager#setPlaylist
mrmaffen Jun 22, 2016
918c281
Fixed Equalizer presets
mrmaffen Jun 22, 2016
9a17dd0
Hide Hatchet resolver in WelcomeFragment
mrmaffen Jun 23, 2016
bb71151
Minor UI fix in SendLogConfigDialog
mrmaffen Jun 23, 2016
b78727e
[soundcloud] Fixed search by removing calls to dead echonest API. Bum…
mrmaffen Jun 23, 2016
bc1e3e3
Minor style fixes in Playlist
mrmaffen Jun 23, 2016
e0028eb
Fix PipeLine#reportResults for fulltext queries (search rather than r…
mrmaffen Jun 23, 2016
5addb05
Show Songs as first page in SearchPagerFragment
mrmaffen Jun 23, 2016
b33a419
Always show resolver icon on search track results
mrmaffen Jun 24, 2016
9ff658f
Make it possible to have multiple instances of one resolver
mrmaffen Jun 24, 2016
562c187
Offer default resolver UI for gmusic if no google account present on …
mrmaffen Jun 24, 2016
9f4a3a8
Fix adding a track to queue without any track playing beforehand
mrmaffen Jun 24, 2016
7c14b41
Don't always show "Remove from playlist"-button in context menu
mrmaffen Jun 24, 2016
b656c11
Fixed a minor bug when clicking station button on album/artist pages
mrmaffen Jun 24, 2016
de27db4
Added "Create Station" button to context menu
mrmaffen Jun 24, 2016
e45dc28
Hide "Remove from Playlist" button in AlbumsFragment
mrmaffen Jun 24, 2016
41b3c89
Always stop playback in AndroidMediaPlayer#release
mrmaffen Jun 24, 2016
0b74b6d
Hide station name when showing context menu
mrmaffen Jun 25, 2016
1175106
Ignore ISEs in AndroidMediaPlayer#release
mrmaffen Jun 25, 2016
e3fdd2e
Fixed lots of graphical glitches in PlaybackPanel
mrmaffen Jun 25, 2016
dce9ae2
Correctly show PlaybackPanel when loading station
mrmaffen Jun 25, 2016
78d1104
Only pay attention to callbacks from current mediaplayer in PlaybackS…
mrmaffen Jun 25, 2016
7e857d6
Correctly show local track icon in FancyDropDown
mrmaffen Jun 25, 2016
f7701da
Automatic merge of Transifex translations
Jun 25, 2016
ff629ff
Automatic merge of Transifex translations
Jun 25, 2016
16c1a93
Don't show context menu for suggested stations
mrmaffen Jun 27, 2016
e6e2bf9
Automatic merge of Transifex translations
Jun 27, 2016
cab7da5
Correctly set background on hatchet login button
mrmaffen Jun 27, 2016
a01a3ba
Bumped version to 0.98 (versionCode 980)
mrmaffen Jun 27, 2016
72066d0
Consistently use the same thread for each TomahawkMediaPlayer
mrmaffen Jun 28, 2016
930609c
Fixed a crash/bug in PlaybackManager#setPlaylist
mrmaffen Jun 29, 2016
02b9f3d
Set mCurrentMediaPlayer before preparing so callbacks don't get ignored
mrmaffen Jun 29, 2016
112f6a4
Always set state variables to null in TomahawkMediaPlayer#release
mrmaffen Jun 29, 2016
3974127
Correctly handle release calls while preparing in TomahawkMediaPlayers
mrmaffen Jun 29, 2016
4d3329c
Get rid of redundant cache map in TomahawkMediaPlayer
mrmaffen Jun 29, 2016
4c3db63
Always stop playback before preparing in AndroidMediaPlayer and Plugi…
mrmaffen Jun 29, 2016
c5e8fc9
Grumpy MediaPlayer likes to complain a lot. Let's shut him up
mrmaffen Jun 29, 2016
07ab1c0
Properly handle playState changes in all TomahawkMediaPlayers while p…
mrmaffen Jun 29, 2016
469112b
Always stop playback in PluginMediaPlayer#release
mrmaffen Jun 29, 2016
f28dc9e
Hide resolver icon when loading station
mrmaffen Jun 29, 2016
023620a
Bumped version to 0.981 (versionCode 981)
mrmaffen Jun 29, 2016
7cb9a25
Always make sure to prepare the correct track. Added some useful log …
mrmaffen Jul 1, 2016
b3e4b28
Update menu drawer in onResume instead of onCreate
mrmaffen Jul 1, 2016
e56703e
Automatic merge of Transifex translations
Jul 2, 2016
a1d94c6
Fixed a minor NPE in SocialActionsFragment
mrmaffen Jul 3, 2016
0c005a2
Remove queued track first, then calculate new index. Add tracks to en…
mrmaffen Jul 3, 2016
68880f3
Fixed a bug where player would infinitely be shown as preparing.
mrmaffen Jul 3, 2016
eb38c16
If Hatchet can't provide a track's album, show top result's album ins…
mrmaffen Jul 3, 2016
3d72d0a
Automatic merge of Transifex translations
Jul 3, 2016
292591f
Fixed two minor ISE crashes in AlbumsFragment
mrmaffen Jul 3, 2016
5c43c30
Make sure that getActivity() != null in GMusicConfigDialog
mrmaffen Jul 3, 2016
7a2f91d
Bumped version to 0.982 (versionCode 982)
mrmaffen Jul 6, 2016
fb9f14c
Automatic merge of Transifex translations
Jul 9, 2016
ae65cca
Automatic merge of Transifex translations
Jul 11, 2016
16ff9c8
[spotify] Improved genre search in PlaylistGenerator. Bumped to 0.4.1
mrmaffen Jul 13, 2016
7017ab9
Correctly update mediasession queue
mrmaffen Jul 13, 2016
2260487
Handle "search" and "play" voice command intents
mrmaffen Jul 13, 2016
c0e6e76
Added a necessary Google Play services meta-tag to the manifest
mrmaffen Jul 13, 2016
7c98654
Version bumped to 0.983 (versionCode 983)
mrmaffen Jul 14, 2016
a2873d0
Properly handle audio focus in PlaybackService
mrmaffen Jul 15, 2016
bc7713a
Remove PhoneStateListener. Let Audio Focus system handle that
mrmaffen Jul 15, 2016
ccf3daf
Bumped version to 0.984 (versionCode 984)
mrmaffen Jul 15, 2016
4ea5fad
Automatic merge of Transifex translations
Jul 23, 2016
52e73b2
fix: load the version and code from git
Avinash-Bhat Jul 23, 2016
db29aa9
Updated gradle tools to 2.1.2 and support lib to 24.1.1
mrmaffen Jul 31, 2016
d02310d
Fixed notification on devices running Android Kitkat and below
mrmaffen Jul 31, 2016
8ebffe9
Use projectDir with fallback in git-version.gradle
mrmaffen Jul 31, 2016
5d43b6d
Some improvements to new versioning method
mrmaffen Jul 31, 2016
0091e94
Fixed a common crash on KitKat devices
mrmaffen Aug 2, 2016
9187d2c
Fixed a crash when calling MenuDrawer#closeDrawer
mrmaffen Aug 2, 2016
fbb1ceb
Hopefully fixed an ISE crash in PlaybackService
mrmaffen Aug 2, 2016
8e12bb7
Fixed a crash in PlaybackService#mFocusChangeListener
mrmaffen Aug 2, 2016
60e2c28
Always synchronize MediaSession setters in PlaybackService to fix ISE
mrmaffen Aug 4, 2016
dcd5144
Correctly show currently playing track in Android Wear and Auto
mrmaffen Aug 5, 2016
aa6ca8c
Automatic merge of Transifex translations
Aug 15, 2016
9695efd
Automatic merge of Transifex translations
Aug 18, 2016
1e6b703
Automatic merge of Transifex translations
Sep 13, 2016
3c380a9
Update amazon
Sep 26, 2016
4495efc
Automatic merge of Transifex translations
Oct 7, 2016
54093fd
Automatic merge of Transifex translations
Oct 13, 2016
419e1b4
amazon: Enable Music Unlimited
Nov 9, 2016
ea54bfe
amazon: Bump version
dschmidt Nov 9, 2016
b564ba0
Fix encoding issues with non-latin chars in amzn, bump version
theli-ua Nov 11, 2016
7af25e0
Automatic merge of Transifex translations
Jan 1, 2017
47b95bf
Automatic merge of Transifex translations
Jan 21, 2017
44d2861
Automatic merge of Transifex translations
Feb 14, 2017
99b0b51
Automatic merge of Transifex translations
Feb 15, 2017
e9ed2ba
Prefer extensions from URIs
elvisangelaccio Mar 3, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated Amazon resolver
mrmaffen committed Jun 4, 2016
commit 108af0f7615380e0cd6aa26ac370c644be26837e
Original file line number Diff line number Diff line change
@@ -90,16 +90,20 @@ var AmazonResolver = Tomahawk.extend( Tomahawk.Resolver, {
},

testConfig: function (config) {
return this._getLoginPromise(config, true).then(function (resp) {
var appConfigRe = /amznMusic.appConfig *?= *?({.*});/g;
if (appConfigRe.exec(resp) != null) {
return Tomahawk.ConfigTestResultType.Success;
} else {
return Tomahawk.ConfigTestResultType.InvalidCredentials;
}
}, function (error) {
return "Internal error.";
});
var that = this;
return that._get(that.api_location + "gp/dmusic/cloudplayer/forceSignOut").then(
function () {
return that._getLoginPromise(config, true).then(function (resp) {
var appConfigRe = /amznMusic.appConfig *?= *?({.*});/g;
if (appConfigRe.exec(resp) != null) {
return Tomahawk.ConfigTestResultType.Success;
} else {
return Tomahawk.ConfigTestResultType.InvalidCredentials;
}
}, function (error) {
return "Internal error.";
});
});
},

_request: function(url, method, options, use_csrf_headers){
@@ -143,8 +147,11 @@ var AmazonResolver = Tomahawk.extend( Tomahawk.Resolver, {
var domains = ['.com', '.de', '.co.uk'];

this.api_location = 'https://www.amazon' + domains[this._region] + '/';
var that = this;

return this._login(config);
return this._get(this.api_location + "gp/dmusic/cloudplayer/forceSignOut").then(function(resp){
return that._login(config);
});
},

_convertTrack: function (entry) {
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
"pluginName": "amazon",
"author": "Creepy Guy In The Corner",
"email": "",
"version": "0.0.3",
"version": "0.0.5",
"website": "http://gettomahawk.com",
"description": "Streams music from Amazon Music",
"type": "resolver/javascript",