Febbweiss/mopidy-touchscreen
1
0
Fork 0
mirror of https://github.com/Febbweiss/mopidy-touchscreen.git synced 2026-03-05 06:35:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Track info: album and artist

Browse Source
This commit is contained in:
9and3r
2014-07-18 00:56:01 +02:00
parent d37a42e8e4
commit 1e2df3dba9
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mopidy_touchscreen/main_screen.py
View File

@@ -2,6 +2,7 @@ import pygame
import logging import logging
import hashlib import hashlib
import os import os
from threading import Thread
import urllib import urllib
import urllib2 import urllib2
import json import json
@@ -29,22 +30,31 @@ class MainScreen():
self.background.drawBackground(screen) self.background.drawBackground(screen)
if self.track!=None: if self.track!=None:
if self.image is not None: if self.image is not None:
screen.blit(self.image, (0, 0)) screen.blit(self.image, ((self.size[0]-self.image.get_rect().width)/2, 0))
self.touch_text_manager.render(screen) self.touch_text_manager.render(screen)
return screen return screen
def track_started(self, track): def track_started(self, track):
self.track = track self.track = track
logger.error("hemen nago") self.image = None
self.touch_text_manager.add_text_object(self.track.name,(0,0), self.size, (255.255,255)) self.touch_text_manager.add_text_object("track_name",self.track.name,(0,0), self.size, (255, 255, 255))
self.touch_text_manager.add_text_object("album_name",self.track.album.name,(0,20), self.size, (255, 255, 255))
self.touch_text_manager.add_text_object("artist_name",self.getFirstArtist(),(0,40), self.size, (255, 255, 255))
if not self.is_image_in_cache(): if not self.is_image_in_cache():
self.downloadImage() thread = Thread(target=self.downloadImage())
thread.start()
else: else:
self.loadImage() self.loadImage()
def getFirstArtist(self):
artist = next(iter(self.track.artists)).name
if "," in artist:
artist = artist.split(',')[0]
return artist
def getImageFileName(self): def getImageFileName(self):
name = self.track.album.name name = self.track.album.name + '-' + self.getFirstArtist()
md5name = hashlib.md5(name).hexdigest()+".png" md5name = hashlib.md5(name).hexdigest()+".png"
return md5name return md5name
@@ -58,20 +68,17 @@ class MainScreen():
return os.path.isfile(self.cache+self.getCoverFolder()+self.getImageFileName()) return os.path.isfile(self.cache+self.getCoverFolder()+self.getImageFileName())
def downloadImage(self): def downloadImage(self):
self.imageStatus = 0 safe_artist=urllib.quote_plus(self.getFirstArtist())
#safe_artist=urllib.quote_plus(self.track.artists)
safe_artist='clean+bandit'
safe_album=urllib.quote_plus(self.track.album.name) safe_album=urllib.quote_plus(self.track.album.name)
url="http://ws.audioscrobbler.com/2.0/?" url="http://ws.audioscrobbler.com/2.0/?"
params="method=album.getinfo&api_key=59a04c6a73fb99d6e8996e01db306829&artist="+safe_artist+"&album="+safe_album+"&format=json" params="method=album.getinfo&api_key=59a04c6a73fb99d6e8996e01db306829&artist="+safe_artist+"&album="+safe_album+"&format=json"
response = urllib2.urlopen(url+params) response = urllib2.urlopen(url+params)
data = json.load(response) data = json.load(response)
image = data['album']['image'][2]['#text'] image = data['album']['image'][-1]['#text']
logger.error(image)
urllib.urlretrieve(image, self.getCoverFolder()+self.getImageFileName()) urllib.urlretrieve(image, self.getCoverFolder()+self.getImageFileName())
self.loadImage() self.loadImage()
def loadImage(self): def loadImage(self):
size = self.size[0]/2 - margin size = self.size[1]
self.image = pygame.transform.scale(pygame.image.load(self.getCoverFolder()+self.getImageFileName()),(size,size)) self.image = pygame.transform.scale(pygame.image.load(self.getCoverFolder()+self.getImageFileName()),(size,size))

5
mopidy_touchscreen/touch_screen.py
View File

@@ -31,7 +31,6 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
pygame.quit() pygame.quit()
def on_start(self): def on_start(self):
logger.error("hemen nago")
self.running=True self.running=True
thread = Thread(target=self.start_thread) thread = Thread(target=self.start_thread)
thread.start() thread.start()
@@ -40,5 +39,9 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
self.running = False self.running = False
def track_playback_started(self, tl_track): def track_playback_started(self, tl_track):
try:
self.screen_manager.track_started(tl_track) self.screen_manager.track_started(tl_track)
except:
traceback.print_exc()