nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modify grooveshark module to use the new BaseVideo/ICapVideo classes

Browse source
This commit is contained in:
Romain Bignon 2013-12-22 22:37:51 +01:00
commit 25fe231340
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/grooveshark/browser.py
View file

@ -19,10 +19,11 @@
from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword
from weboob.tools.json import json as simplejson from weboob.tools.json import json as simplejson
from weboob.capabilities.video import BaseVideo
from weboob.capabilities import NotAvailable from weboob.capabilities import NotAvailable
from weboob.tools.capabilities.thumbnail import Thumbnail from weboob.capabilities.image import BaseImage
from weboob.capabilities.video import BaseVideo
from weboob.capabilities.collection import Collection from weboob.capabilities.collection import Collection
import hashlib import hashlib
import copy import copy
import uuid import uuid
@ -136,7 +137,8 @@ class GroovesharkBrowser(BaseBrowser):
video.title = u'Song - %s' % song['SongName'].encode('ascii', 'replace') video.title = u'Song - %s' % song['SongName'].encode('ascii', 'replace')
video.author = u'%s' % song['ArtistName'].encode('ascii', 'replace') video.author = u'%s' % song['ArtistName'].encode('ascii', 'replace')
video.description = u'%s - %s - %s' % (video.author, song['AlbumName'].encode('ascii', 'replace'), song['Year'].encode('ascii', 'replace')) video.description = u'%s - %s - %s' % (video.author, song['AlbumName'].encode('ascii', 'replace'), song['Year'].encode('ascii', 'replace'))
video.thumbnail = Thumbnail(u'http://images.gs-cdn.net/static/albums/40_' + song['CoverArtFilename']) video.thumbnail = BaseImage(u'http://images.gs-cdn.net/static/albums/40_' + song['CoverArtFilename'])
video.thumbnail.url = video.thumbnail.id
video.duration = datetime.timedelta(seconds=int(float(song['EstimateDuration']))) video.duration = datetime.timedelta(seconds=int(float(song['EstimateDuration'])))
video.rating = float(song['AvgRating']) video.rating = float(song['AvgRating'])
try: try:
@ -163,7 +165,8 @@ class GroovesharkBrowser(BaseBrowser):
video.author = u'%s' % song['ArtistName'].encode('ascii', 'replace') video.author = u'%s' % song['ArtistName'].encode('ascii', 'replace')
video.description = u'%s - %s' % (video.author, song['AlbumName'].encode('ascii', 'replace')) video.description = u'%s - %s' % (video.author, song['AlbumName'].encode('ascii', 'replace'))
if song['CoverArtFilename']: if song['CoverArtFilename']:
video.thumbnail = Thumbnail(u'http://images.gs-cdn.net/static/albums/40_' + song['CoverArtFilename']) video.thumbnail = BaseImage(u'http://images.gs-cdn.net/static/albums/40_' + song['CoverArtFilename'])
video.thumbnail.url = video.thumbnail.id
video.duration = datetime.timedelta(seconds=int(float(song['EstimateDuration']))) video.duration = datetime.timedelta(seconds=int(float(song['EstimateDuration'])))
video.date = NotAvailable video.date = NotAvailable
return video return video