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

[WIP] Party like it's 2015 #92

Open
wants to merge 643 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
643 commits
Select commit Hold shift + click to select a range
1f2d7cd
[deezer-metadata] Bump version
xhochy Nov 5, 2014
56bcb66
[deezer-metadata] Don't use ampersands in descriptions as this will b…
xhochy Nov 5, 2014
79b84d5
Add Node to HACKING.md
xhochy Nov 6, 2014
dab6852
Remove ampersand and bump version for Tomahk and Rdio metadata resolvers
jherskowitz Nov 6, 2014
9c68706
Remove ampersand from Spotify metadata resolver and bump version
jherskowitz Nov 6, 2014
8a07dc4
[gmusic] Add note about using the mobile apps first
xhochy Nov 6, 2014
e5131a0
[gmusic] Bump version
xhochy Nov 6, 2014
0444126
Add Urllookup to capabilities.
rotzbouw Nov 7, 2014
f01d7f8
- Initially, allow any URL.
rotzbouw Nov 7, 2014
1587f14
Merge pull request #58 from rotzbouw/master
xhochy Nov 7, 2014
6f816f4
[spotify] Extract exit request handling in its own function
xhochy Nov 7, 2014
a09fcf3
[spotify] Debug--
xhochy Nov 7, 2014
b2a1a3d
- Open Tomahawk's artist page when dropping a Bandcamp artist page to…
rotzbouw Nov 7, 2014
04cebe0
Merge branch 'master' of https://github.com/tomahawk-player/tomahawk-…
rotzbouw Nov 7, 2014
214630f
Add Bandcamp to the capabilities table.
rotzbouw Nov 7, 2014
f27c8d5
Version bump.
rotzbouw Nov 7, 2014
261ea93
[spotify] Style fix
xhochy Nov 7, 2014
86c24fd
[spofify] newConfigSaved is outdated, mark with FIXME
xhochy Nov 7, 2014
489b420
[spotify] We also require user/pw for the binary part until the Deskt…
xhochy Nov 7, 2014
32d57cf
Depend on node-tomahawkjs@0.3.4
xhochy Nov 7, 2014
ba5e2f7
[spotify] Add getStreamUrl skeleton
xhochy Nov 7, 2014
e3158df
Add tool to query the stream URL for (artist, track, album)
xhochy Nov 7, 2014
541a231
Initial Urllookup commit.
rotzbouw Nov 11, 2014
70a6729
Drag'n'drop YouTube video URLs to Tomahawk. Playlists = WIP.
rotzbouw Nov 12, 2014
be55059
Add link to 2-step auth instructions
jherskowitz Nov 12, 2014
b2d0bf6
Enable drag and drop of YouTube URLs for both, single videos and play…
rotzbouw Nov 12, 2014
45f7fd4
Merge branch 'master' of https://github.com/tomahawk-player/tomahawk-…
rotzbouw Nov 12, 2014
f9b7ffd
Add YouTube-Metadata to capabilities table.
rotzbouw Nov 12, 2014
3fba825
[hatchet-metadata] Fix reference
mrmaffen Nov 12, 2014
5937b94
Bump version on gmusic
jherskowitz Nov 12, 2014
e8bac8f
- Use correct naming of resolver
rotzbouw Nov 12, 2014
5a4bf02
Merge branch 'master' of https://github.com/tomahawk-player/tomahawk-…
rotzbouw Nov 12, 2014
57af64c
Allow all possible subdomain names and fix dropping of artist URLs.
rotzbouw Nov 14, 2014
013b687
Don't just accept any url as a new playlist in Bandcamp and YouTube r…
muesli Nov 15, 2014
e39fe76
Fixed typo.
muesli Nov 19, 2014
1368c74
Add more info to help troubleshoot google music login failures.
illogic-al Nov 30, 2014
2904387
Caress wording in the google music resolver dialog, for clarity.
illogic-al Nov 30, 2014
db968e2
Merge pull request #60 from illogic-al/gmusic-doc-update
muesli Dec 1, 2014
5de2015
Fix returning of result for actually correctly named tracks on YouTube.
rotzbouw Dec 7, 2014
95e7c32
Fancy icons
jherskowitz Dec 15, 2014
776edec
Fancy icons
jherskowitz Dec 15, 2014
3711688
Fancy icons
jherskowitz Dec 15, 2014
f20af5a
Fancy icons
jherskowitz Dec 15, 2014
6f40826
Fancy icons
jherskowitz Dec 15, 2014
c52932c
Fancy icons
jherskowitz Dec 15, 2014
71c869a
Fancy icons
jherskowitz Dec 15, 2014
1796dd1
Fancy icons
jherskowitz Dec 15, 2014
5304578
Fancy icons
jherskowitz Dec 15, 2014
8fd76af
Fancy icons
jherskowitz Dec 15, 2014
35c7cff
Fancy icons
jherskowitz Dec 15, 2014
189df58
Fancy icons
jherskowitz Dec 15, 2014
13fb993
Fancy icons
jherskowitz Dec 15, 2014
30be7bb
[beatsmusic] Added configTest functionality to beatsmusic resolver.
mrmaffen Dec 16, 2014
ca969cc
[beets] Added new configTest functionality to beets resolver.
mrmaffen Dec 16, 2014
66a5584
[gmusic] Added new configTest functionality to gmusic resolver. Persi…
mrmaffen Dec 16, 2014
56f9ce1
Change block to black
jherskowitz Dec 17, 2014
7a768a6
[rdio-metadata] Put a spell on those super secret keys.
mrmaffen Dec 17, 2014
8d4c07a
[rdio-metadata] Fix indentation in metadata.json
mrmaffen Dec 17, 2014
8620a78
[deezer-metadata] Fix indentation in metadata.json
mrmaffen Dec 17, 2014
e2582de
Add Deezer and Rdio resolver (metadata + resolving)
mrmaffen Dec 17, 2014
37399a8
[Grooveshark] Change block to orange
jherskowitz Dec 17, 2014
21a090d
[gmusic] Match orange to their app
jherskowitz Dec 17, 2014
283c5d4
[Hatchet metadata] Blue tweak
jherskowitz Dec 17, 2014
0da7504
Color match all of the fancy icons to original source's colors
jherskowitz Dec 17, 2014
f31c617
[spotify-metadata] Actually add iconBackground and iconWhite pngs. Fi…
mrmaffen Dec 17, 2014
b483436
[rdio] Use official rdio blue in icon background (#008fd5)
mrmaffen Dec 17, 2014
2b5fea9
[deezer] Use black icon background.
mrmaffen Dec 17, 2014
73923b4
[rdio-metadata] Use official rdio blue in icon background (#008fd5)
mrmaffen Dec 17, 2014
8443487
[hatchet-metadata] Fixed regexps in canParseUrl and lookupUrl functions.
mrmaffen Dec 18, 2014
653d617
[soundcloud] Replaced tabs with spaces. Fixed indentation.
mrmaffen Dec 18, 2014
c16afef
Fix grammar in Google Play Music Resolver
camconn Dec 19, 2014
dad5fd7
Further improved spelling and grammar
camconn Dec 19, 2014
d2a4e21
Merge pull request #62 from camconn/master
jherskowitz Dec 19, 2014
1848429
[ampache] Always prepare handshake before configTest.
mrmaffen Jan 6, 2015
a8c181d
[hatchet-metadata] Add capability to parse playlists
mrmaffen Jan 13, 2015
d8af0c2
[gmusic] Still get AllAccess results when no locker tracks available.
mrmaffen Jan 22, 2015
8544b9c
URL-encode passwords for Google Music
interfect Feb 9, 2015
1e38cbc
[hatchet-metadata] Always replace "+" with " " when decoding url.
mrmaffen Feb 13, 2015
a343752
[tomahk-metadata] Always replace "+" with " " when decoding url.
mrmaffen Feb 13, 2015
d8fc21e
TIDAL (tidalhifi.com) resolver
theli-ua Feb 14, 2015
4c92a27
Merge pull request #64 from interfect/patch-1
mrmaffen Feb 15, 2015
a499f5f
Improved and merged "Add iOS only support. #61" PR by DAlOG
mrmaffen Feb 15, 2015
ba08f71
Use higher res icon
theli-ua Feb 16, 2015
4006c2c
Bump TIDAL's weight to 91
theli-ua Feb 16, 2015
d268362
remove hyphens from metadata when resolving on TIDAL as it breaks sea…
theli-ua Feb 17, 2015
c98f119
Implemented Promises. VERY UNTESTED, but it resolves. Added more logi…
willstott101 Feb 17, 2015
8857d3e
Actually implemented Promises. Return more correct bit-rate values. A…
willstott101 Feb 18, 2015
c6ec35e
Implemented a getStreamUrl promise abstraction.
willstott101 Feb 18, 2015
6e334fd
Merge pull request #1 from willstott101/theli-master
theli-ua Feb 19, 2015
568f35d
[spotify] Improved auth procedure. Redirect to WebView and store refr…
mrmaffen Feb 21, 2015
0b5ce2a
[gmusic] Report proper config test result when no connection available.
mrmaffen Feb 22, 2015
50e04dc
Un-limit search results. Limit resolve results. Implemented working d…
willstott101 Feb 20, 2015
f5ca959
Added lookupUrl capabilities.
willstott101 Feb 24, 2015
3c3a4ed
Added a useful debug object printing function. Now log all drop respo…
willstott101 Feb 24, 2015
82486b3
Fix metadata resolving for tidalhifi.com
theli-ua Mar 3, 2015
907956c
Add resolve hints to tidal playlists
theli-ua Mar 3, 2015
be59fc2
Fix tidal playlists being limited to 10 tracks
theli-ua Mar 3, 2015
75b1342
[tidal] split lookupUrl into 2 separate methods to be ready once new …
theli-ua Mar 4, 2015
77f5893
Implement testConfig
theli-ua Mar 4, 2015
1f470f6
Always throw an error if API calls are made when not logged in. Plus …
willstott101 Mar 4, 2015
b53defc
Styling changes. Removed now defunct type additions to URL responses.
willstott101 Mar 4, 2015
015a3ae
Updated lookupUrl regex to not expect http(s):// (drag and drop from …
willstott101 Mar 4, 2015
9ab6830
Escape . in regex.
willstott101 Mar 4, 2015
5353658
Don't let beatsmusic resolver run into timeout if not logged in
dschmidt Mar 4, 2015
6a0d8bb
Fix blindly commited code
dschmidt Mar 4, 2015
0cac9f2
last.fm: use https for resolving and for playback
dschmidt Mar 4, 2015
20d59a7
jamendo: use https for resolving, searching and playback
dschmidt Mar 4, 2015
6f77f3e
Merge pull request #2 from willstott101/theli-fork
theli-ua Mar 10, 2015
b565b18
subsonic: go back to server url config to support subfolders and to a…
dschmidt Mar 10, 2015
a696190
Bump version
dschmidt Mar 10, 2015
d5c7e60
Merge pull request #67 from tomahawk-player/go-back-to-subsonic-serve…
muesli Mar 14, 2015
4144c8d
Merge pull request #65 from theli-ua/master
muesli Mar 14, 2015
7fb88d1
Set correct origin for TIDAL login request
theli-ua Mar 18, 2015
c903963
Merge pull request #68 from theli-ua/master
muesli Mar 18, 2015
c8b32ef
Bumped Tidal to 0.0.3.
muesli Mar 18, 2015
f7b62f1
[spotify] Added "show_dialog=true" parameter to allow for user-switching
mrmaffen Mar 31, 2015
4bfc8a2
Start documentation using mkdocs
xhochy Mar 14, 2015
e7c2343
Add missing verb
xhochy Mar 22, 2015
e15b557
Ignore generated metadata.desktop files
xhochy Apr 4, 2015
f1dd0f9
Avoid making a notification on invalid conf in tidal if it is disabled
theli-ua Apr 7, 2015
aad1fd4
Merge pull request #69 from theli-ua/master
dschmidt Apr 7, 2015
97eda28
Dummy resolver to test HLS streaming
theli-ua Apr 8, 2015
c40096e
Fix name for TIDAL resolver as service is called just TIDAL
theli-ua Apr 9, 2015
ea44dec
Merge pull request #71 from theli-ua/TIDAL
muesli Apr 11, 2015
704c011
Bump version to 0.0.4.
muesli Apr 11, 2015
4894403
A bit more work on the documentation
xhochy Apr 13, 2015
b8412ca
Turn HLS streaming plugin into general purpose test streaming one
theli-ua Apr 13, 2015
8c95959
Merge pull request #70 from theli-ua/master
muesli Apr 13, 2015
0d14554
[spotify] Minor fixes to the way the access token is reported
mrmaffen Apr 16, 2015
6e57d64
Reimplement vk.com resolver from scratch. Now requires authorisation …
theli-ua Apr 17, 2015
7a192b7
Bump vk.com version to 0.2.0
theli-ua Apr 17, 2015
25a6fc8
Add favicon and github to docs
xhochy Apr 19, 2015
b2e6811
Added some workarounds for vk.com not having a proper album field and…
theli-ua Apr 21, 2015
9e02838
Use at most 1 api call per resolve
theli-ua Apr 22, 2015
e1fad89
Batch resolve requests in vk.com to minimize api calls
theli-ua Apr 23, 2015
913f833
cleanup vk.com search function
theli-ua Apr 23, 2015
8144f54
Style and object.create.null
theli-ua Apr 23, 2015
b4b4dde
Merge pull request #72 from theli-ua/master
dschmidt Apr 23, 2015
2cba91f
Strict mode fixes for beatsmusic, jamendo and soundcloud
dschmidt Apr 27, 2015
85314db
youtube: comment out debug spam
dschmidt Apr 29, 2015
842e7f9
beatsmusic: lint and strict mode fixes
dschmidt Apr 29, 2015
eec011f
[tidal] Improved icon.png, added iconWhite.png and iconBackground.png
mrmaffen Apr 30, 2015
152039e
Cleanup, minor fixes and minor version bump.
rotzbouw May 1, 2015
39f5e90
Minor fixes, minor version bump.
rotzbouw May 1, 2015
60a9918
Add Urllookup (i.e. dropping of last.fm artist, album or track URLs).
rotzbouw May 1, 2015
ed37d57
Update last.fm Urllookup capabilities in chart.
rotzbouw May 1, 2015
9f64be8
Fix inclusion of parameters for artist/album/track drops.
rotzbouw May 1, 2015
9ab9594
ZV.fm resolver
theli-ua May 6, 2015
f97989c
Add resolver for pleer.com
theli-ua May 8, 2015
97bf095
Use json api
theli-ua May 8, 2015
36d5ae3
Merge pull request #75 from theli-ua/zv.fm
dschmidt May 10, 2015
5ef90f7
Merge pull request #76 from theli-ua/prostopleer
dschmidt May 10, 2015
3cd7486
Reduce delay for VK.com and remove some excessive debug loggging
theli-ua May 11, 2015
0d6fbf6
Increase timeout for pleer.com as that site is often slowish
theli-ua May 13, 2015
a672484
Merge pull request #78 from theli-ua/pleer
dschmidt May 15, 2015
3a84dd5
Mark vkontakte urls as checked as they are reliable
theli-ua May 19, 2015
47eb18a
Merge pull request #77 from theli-ua/master
dschmidt May 19, 2015
34789bd
Filter out any songs which are not available to stream. Because Tomah…
willstott101 May 30, 2015
a7a2e52
[gmusic] Fixed auth. Added dependency asmcrypto.js.
mrmaffen Jun 1, 2015
eaba0fd
Merge pull request #81 from willstott101/track-filter
dschmidt Jun 3, 2015
d1eeb04
[gmusic] Move asmcrypto.js into gmusic.js to avoid problems with Sync…
mrmaffen Jun 3, 2015
33c3592
[rdio] Added authentication functionality. Updated everything to reso…
mrmaffen Jun 3, 2015
33fd084
[rdio] Improved way of returning Promises in resolve and lookupUrl. B…
mrmaffen Jun 3, 2015
e69cf0d
[spotify] Updated to resolver API version 0.9. Bumped version to 0.3.0
mrmaffen Jun 3, 2015
0409901
[spotify] Some minor style fixes
mrmaffen Jun 3, 2015
0751be2
[deezer] Added auth functionality. Updated to resolver API version 0.…
mrmaffen Jun 4, 2015
f68d452
[tidal] Updated to completely conform with new 0.9 resolver API
mrmaffen Jun 4, 2015
48c950f
[tidal] Some minor style fixes
mrmaffen Jun 4, 2015
dc92587
Updated HACKING.md to include some information about the new resolver…
mrmaffen Jun 24, 2015
47a88ab
Added IntelliJ specific files to .gitignore
mrmaffen Jun 24, 2015
38d4ecd
Updated javascript example resolver to new 0.9 API
mrmaffen Jun 24, 2015
21fd558
[spotify] Directly return results instead of wrapping in an RSVP.Promise
mrmaffen Jun 24, 2015
3514e18
[soundcloud] Minor style fixes
mrmaffen Jun 24, 2015
6026eaf
[soundcloud] Fixed some minor issues
mrmaffen Jun 25, 2015
9a25c7a
[soundcloud] Cleaned up _isValidTrack function
mrmaffen Jun 25, 2015
bfb6d8c
[soundcloud] Cleaned up metadata-guessing function
mrmaffen Jun 25, 2015
9eea076
[soundcloud] Improved result quality. Updated to 0.9 resolver API.
mrmaffen Jun 26, 2015
40c7cd6
[beets] Some minor style fixes
mrmaffen Jun 26, 2015
b50804a
[beets] Updated to 0.9 resolver API
mrmaffen Jul 2, 2015
f1dccf8
[gmusic] Few minor style fixes
mrmaffen Jul 2, 2015
62aee26
[gmusic] Updated to new 0.9 resolver API.
mrmaffen Jul 4, 2015
11fe674
[jamendo] Few style fixes
mrmaffen Jul 5, 2015
8e6fce7
[jamendo] Complete rework. Moved over to 0.9 resolver API
mrmaffen Jul 5, 2015
fedabb4
[officialfm] Some minor style fixes
mrmaffen Jul 5, 2015
32d8b0a
[officialfm] Complete rework. Moved over to 0.9 resolver API
mrmaffen Jul 5, 2015
5edc757
[hatchet-metadata] Few minor style fixes
mrmaffen Jul 5, 2015
9e0aca7
[hatchet-metadata] Moved to new 0.9 resolver API
mrmaffen Jul 5, 2015
16a22b1
Moved dilandau to archive
mrmaffen Jul 5, 2015
17c1631
[tomahawk-metadata] Updated to 0.9 resolver api
mrmaffen Jul 5, 2015
ff9e4ab
[tomahk-metadata] Updated to 0.9 resolver api
mrmaffen Jul 5, 2015
6ab90e5
[subsonic] Few style fixes
mrmaffen Jul 6, 2015
041cbd4
[subsonic] Complete rework. Moved to new 0.9 resolver API
mrmaffen Jul 6, 2015
5bf2dad
Port Ampache to new Promise API
dschmidt Jan 12, 2015
92169bd
[ampache] Support album view
dschmidt Jan 12, 2015
d40d7dd
[ampache] Support track view
dschmidt Jan 12, 2015
a1a8dd2
[ampache] Fix ownCloud detection for newer ownCloud versions
dschmidt Jan 12, 2015
fa18c58
[ampache] style fixes
mrmaffen Jul 6, 2015
1397c9e
[ampache] Added support for new ScriptResolver collection. Full 0.9 r…
mrmaffen Jul 7, 2015
824d815
Always extend from Tomahawk.Resolver instead of TomahawkResolver in 0…
mrmaffen Jul 8, 2015
358cffc
Always use the provided config object in the testConfig function
mrmaffen Jul 14, 2015
074e26f
When making an .axe file, include iconWhite and iconBackground if ava…
mrmaffen Jul 14, 2015
aee119b
Fix link in HACKING.md
mrmaffen Jul 15, 2015
459bc5d
[ampache] Fix testConfig function
mrmaffen Jul 15, 2015
11bf26a
[beets] Properly sanitize the config. Fix a bug in testConfig.
mrmaffen Jul 16, 2015
cbc04d0
[gmusic] Add support for directly providing an auth token to log in.
mrmaffen Jul 17, 2015
662686c
[gmusic] Fix a minor bug in testConfig
mrmaffen Jul 25, 2015
9b0d3ab
[spotify] Fix and improve getAccessToken procedure
mrmaffen Aug 3, 2015
2903293
[spotify] Fix output format in resolve and search
mrmaffen Aug 3, 2015
b035ebb
[spotify] Fix and improve resolve/search
mrmaffen Aug 3, 2015
18df26e
[ampache] Register collection before fetching tracks
mrmaffen Aug 7, 2015
24dbb49
[beets] Register collection before fetching tracks
mrmaffen Aug 7, 2015
123845a
[gmusic] Register collection before fetching tracks
mrmaffen Aug 7, 2015
3932f69
[subsonic] Register collection before fetching tracks and properly sa…
mrmaffen Aug 7, 2015
fe4bd93
[soundcloud] Also guess track name in resolve to improve results
mrmaffen Aug 28, 2015
2bd0e8a
[tidal] Updated to new api url tidal.com
mrmaffen Aug 29, 2015
d269140
[tidal] Properly format response in getStreamUrl
mrmaffen Aug 29, 2015
eb56a58
[rdio] Fixed auth and other minor issues.
mrmaffen Aug 30, 2015
4cd6144
[gmusic] use new settings endpoint
theli-ua Sep 9, 2015
7120a5f
[gmusic] testConfig no longer changes this._token. Bumped version to …
mrmaffen Sep 9, 2015
a9aeb2a
[gmusic] Fix all-access search. Bumped version to 0.6.2.
mrmaffen Sep 11, 2015
b928b6d
[gmusic] Use iOS device id if available. Bumped version to 0.6.3
mrmaffen Sep 12, 2015
034e706
[spotify] Fix resolving. Bumped version to 0.3.1
mrmaffen Sep 16, 2015
eab3a3f
Add Netease resolver
theli-ua Sep 18, 2015
6afcf6a
[netease]add stream quality selection
theli-ua Sep 18, 2015
cef0753
[netease]Fix url replace
theli-ua Sep 18, 2015
5ee3ea8
Merge pull request #88 from theli-ua/netease
dschmidt Sep 19, 2015
61ee9f3
Add rhapsody resolver
theli-ua Sep 21, 2015
a41c6e1
[rhapsody]process rtmp urls
theli-ua Sep 23, 2015
685bc93
[rhapsody]Support stream quality selection
theli-ua Sep 23, 2015
58ada42
[rdio] Also enable functionality in lookupUrl when not logged in. Bum…
mrmaffen Sep 22, 2015
6b3306c
[example] Fix docs for getConfigUi-method.
mrmaffen Sep 22, 2015
68a3404
[example] Fix lookupUrl
mrmaffen Sep 22, 2015
b28e522
[hatchet-metadata] Properly match all possible track links in lookupU…
mrmaffen Sep 23, 2015
00f0698
[hatchet-metadata] Fix processing of playlist links in lookupUrl
mrmaffen Sep 23, 2015
5a2d647
[rhapsody]cleanup
theli-ua Sep 23, 2015
ae0084f
[rhapsody]more cleanup
theli-ua Sep 23, 2015
9968e63
Merge pull request #91 from theli-ua/rhapsody
dschmidt Sep 23, 2015
2849e24
[tomahk-metadata] Correctly parse track links for all possible urls. …
mrmaffen Sep 24, 2015
89a57e0
[tidal] Use Tomahawk.UrlType instead of deprecated TomahawkUrlType in…
mrmaffen Oct 14, 2015
47c63a3
wip
dschmidt Oct 24, 2015
9fa6e6c
woopsie
dschmidt Oct 24, 2015
0a20fb9
Start adding es6ified parts of tomahawk.js
dschmidt Oct 25, 2015
ef06437
Port Soundcloud to new es6 syntax
dschmidt Oct 25, 2015
8368707
Remove debug spam
dschmidt Oct 25, 2015
bd924fd
Import valueForSubNode to Ampache, it's the only resolver using it an…
dschmidt Oct 25, 2015
ebfb470
Add utility functions
dschmidt Oct 25, 2015
a1d4ee2
Add collection implementation
dschmidt Oct 25, 2015
5c3c415
Add legacy hacks
dschmidt Oct 25, 2015
a00085d
Remove dead migrator code
dschmidt Oct 26, 2015
723db97
Port testConfig fix
dschmidt Nov 13, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,15 @@ Makefile*
moc_*
*~
.DS_Store
build
*.axe
*.md5
node_modules/
metadata.desktop

###IntelliJ###

*.iml
*.ipr
*.iws
.idea/
77 changes: 0 additions & 77 deletions 4shared/4shared-resolver.js

This file was deleted.

Binary file added 4shared/content/contents/code/4shared-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
110 changes: 110 additions & 0 deletions 4shared/content/contents/code/4shared.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
*
* Copyright 2011, lasconic <lasconic@gmail.com>
* Fixed in 2014 by Lorenz Hübschle-Schneider <lorenz@4z2.de>
*
* Tomahawk is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Tomahawk is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
*/

var FSharedResolver = Tomahawk.extend(TomahawkResolver, {
settings: {
name: '4shared',
icon: '4shared-icon.png',
weight: 50,
timeout: 5
},
resolve: function (qid, artist, album, title) {
// Parse a file detail page
var parseFileDetailPage = function (fileXhr) {

var response = fileXhr.responseText,
urlRegex = /<\!-- file: (https?:\/\/.*\.mp3) -->/gi,
durationRegex = /options_[0-9]+\['duration'\] = '([0-9]+).0';/gi,
bitrateRegex = /<b>Bit Rate:<\/b>\n\s+([0-9]+) kbps \|/gi,
match;

// Find mp3 URL
match = urlRegex.exec(response);
if (!match) {
return;
}
var mp3Url = match[1];

// Find track duration
match = durationRegex.exec(response);
var duration = match ? parseInt(match[1], 10) : null;

// Try to find bit rate (only present on some files)
match = bitrateRegex.exec(response);
var bitrate = match ? parseInt(match[1], 10) : 128;

var result = {
artist: artist,
album: album,
track: title,
source: that.settings.name,
url: mp3Url,
duration: duration,
extension: 'mp3',
bitrate: bitrate,
score: 0.80
};

// return this result
Tomahawk.addTrackResults({
qid: qid,
results: [result]
});
};

// build query to 4shared
var request = [title, artist].join(" ").trim();

var url = "http://search.4shared.com/network/searchXml.jsp?q=";
url += encodeURIComponent(request);
url += "&searchExtention=mp3&sortType=1&sortOrder=1&searchmode=3";

// send request and parse it into javascript
var that = this;
Tomahawk.asyncRequest(url, function (xhr) {
// parse xml
var domParser = new DOMParser(),
xmlDoc = domParser.parseFromString(xhr.responseText, "text/xml"),
results = xmlDoc.getElementsByTagName("result-files");

// check the response
if (results.length > 0 && results[0].childNodes.length > 0) {
var links = xmlDoc.getElementsByTagName("file"),
link, fileDetailUrl;

// walk through the results
for (var i = 0; i < links.length; i++) {
link = links[i];
fileDetailUrl = link.getElementsByTagName("url")[0].textContent;
fileDetailUrl = decodeURI(fileDetailUrl);
// process this file detail page
Tomahawk.asyncRequest(fileDetailUrl, parseFileDetailPage);
}
}
});
},
search: function (qid, searchString) {
return {
qid: qid,
results: []
};
}
});

Tomahawk.resolver.instance = FSharedResolver;
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions 4shared/content/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "4Shared",
"pluginName": "4shared",
"author": "lasconic",
"email": "lasconic@gmail.com",
"version": "0.1.6",
"website": "http://gettomahawk.com",
"description": "Looks for tracks to play from www.4shared.com.",
"type": "resolver/javascript",
"manifest": {
"main": "contents/code/4shared.js",
"scripts": [],
"icon": "contents/images/icon.png",
"resources": [
"contents/code/4shared-icon.png"
]
}
}
Binary file added 8tracks/content/contents/code/8tracks-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 18 additions & 3 deletions 8tracks/8tracks.js → 8tracks/content/contents/code/8tracks.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
/*
* (c) 2011 Janez Troha (https://github.com/dz0ny)
* (c) 2011 Leo Franchi <lfranchi@kde.org)
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
*
* Copyright 2011, Janez Troha (https://github.com/dz0ny)
* Copyright 2011, Leo Franchi <lfranchi@kde.org>
*
* Tomahawk is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Tomahawk is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
*/

var EightTracksResolver = Tomahawk.extend(TomahawkResolver, {
settings: {
name: '8tracks Resolver',
Expand Down
Binary file added 8tracks/content/contents/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions 8tracks/content/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "8tracks",
"pluginName": "8tracks",
"author": "Janez and Leo",
"email": "lfranchi@kde.org",
"version": "0.1",
"website": "http://gettomahawk.com",
"description": "Looks for tracks to play from 8tracks.com.",
"type": "resolver/javascript",
"manifest": {
"main": "contents/code/8tracks.js",
"scripts": [],
"icon": "contents/images/icon.png",
"resources": [
"contents/code/8tracks-icon.png"
]
}
}
Loading