diff --git a/mopidy_touchscreen/main_screen.py b/mopidy_touchscreen/main_screen.py index d1d690b..1e0bcfd 100644 --- a/mopidy_touchscreen/main_screen.py +++ b/mopidy_touchscreen/main_screen.py @@ -1,40 +1,77 @@ import pygame import logging +import hashlib +import os +import urllib +import urllib2 +import json from mopidy.audio import PlaybackState +from .touch_text_manager import TouchTextManager from .dynamic_background import DynamicBackground -import musicbrainzngs as musicb - logger = logging.getLogger(__name__) +margin = 10 + class MainScreen(): + def __init__(self,size,manager,cache): + self.size = size + self.manager = manager + self.background = DynamicBackground() + self.track = None + self.cache = cache + self.image = None + self.touch_text_manager = TouchTextManager(size) + def update(self,core): + screen = pygame.Surface(self.size) + self.background.drawBackground(screen) + if self.track!=None: + if self.image is not None: + screen.blit(self.image, (0, 0)) + self.touch_text_manager.render(screen) - def __init__(self,size,manager): - self.size=size - self.manager=manager - self.background=DynamicBackground() - self.track = None + return screen - def update(self,core): - screen = pygame.Surface(self.size) - self.background.drawBackground(screen) - text = pygame.font.SysFont("arial",20) - if(self.track!=None): - text_surface=text.render(self.track.album.musicbrainz_id,False,(255,255,255)) - screen.blit(text_surface,(0,0)) - #logger.error(self.track.album.musicbrainz_id) - return screen + def track_started(self, track): + self.track = track + logger.error("hemen nago") + self.touch_text_manager.add_text_object(self.track.name,(0,0), self.size, (255.255,255)) + if not self.is_image_in_cache(): + self.downloadImage() + else: + self.loadImage() - def track_started(self,track): - self.track=track - self.downloadImage() + def getImageFileName(self): + name = self.track.album.name + md5name = hashlib.md5(name).hexdigest()+".png" + return md5name - def downloadImage(self): - logger.error("hemen nago") - logger.error(musicb.search_releases(artist=self.track.artist.name, limit=1)) - + def getCoverFolder(self): + if(not os.path.isdir(self.cache+"/covers")): + os.makedirs(self.cache+"/covers") + return self.cache+"/covers/" + def is_image_in_cache(self): + self.getCoverFolder() + return os.path.isfile(self.cache+self.getCoverFolder()+self.getImageFileName()) + + def downloadImage(self): + self.imageStatus = 0 + #safe_artist=urllib.quote_plus(self.track.artists) + safe_artist='clean+bandit' + safe_album=urllib.quote_plus(self.track.album.name) + url="http://ws.audioscrobbler.com/2.0/?" + params="method=album.getinfo&api_key=59a04c6a73fb99d6e8996e01db306829&artist="+safe_artist+"&album="+safe_album+"&format=json" + response = urllib2.urlopen(url+params) + data = json.load(response) + image = data['album']['image'][2]['#text'] + logger.error(image) + urllib.urlretrieve(image, self.getCoverFolder()+self.getImageFileName()) + self.loadImage() + + def loadImage(self): + size = self.size[0]/2 - margin + self.image = pygame.transform.scale(pygame.image.load(self.getCoverFolder()+self.getImageFileName()),(size,size)) - diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py index f8b5905..2dae133 100644 --- a/mopidy_touchscreen/screen_manager.py +++ b/mopidy_touchscreen/screen_manager.py @@ -1,11 +1,16 @@ from .main_screen import MainScreen import pygame +import logging + +logger = logging.getLogger(__name__) class ScreenManager(): + + def __init__(self,size): self.screen_size=size - self.screens=[MainScreen(size,self)] + self.screens=[MainScreen(size,self,"/home/ander")] self.track=None def update(self,core): @@ -13,4 +18,5 @@ class ScreenManager(): def track_started(self,track): self.track=track + self.screens[0].track_started(track.track) diff --git a/mopidy_touchscreen/touch_screen.py b/mopidy_touchscreen/touch_screen.py index 46b292c..54cbf14 100644 --- a/mopidy_touchscreen/touch_screen.py +++ b/mopidy_touchscreen/touch_screen.py @@ -1,5 +1,6 @@ import pykka +import traceback import logging from threading import Thread import pygame @@ -12,33 +13,32 @@ logger = logging.getLogger(__name__) class TouchScreen(pykka.ThreadingActor, core.CoreListener): def __init__(self, config, core): - super(TouchScreen, self).__init__() + super(TouchScreen, self).__init__() self.core = core - self.screen_size=(320, 240) + self.screen_size=(320, 240) + self.screen_manager = ScreenManager(self.screen_size) + def start_thread(self): - self.screen_manager = ScreenManager(self.screen_size) - pygame.init() - clock = pygame.time.Clock() - screen = pygame.display.set_mode(self.screen_size) - while self.running: - clock.tick(60) - screen.blit(self.screen_manager.update(self.core),(0,0)) - pygame.display.flip() - pygame.quit() - - + pygame.init() + clock = pygame.time.Clock() + screen = pygame.display.set_mode(self.screen_size) + while self.running: + clock.tick(30) + screen.blit(self.screen_manager.update(self.core),(0,0)) + pygame.display.flip() + + pygame.quit() def on_start(self): - self.running=True - thread = Thread(target=self.start_thread) - thread.start() - pass + logger.error("hemen nago") + self.running=True + thread = Thread(target=self.start_thread) + thread.start() + def on_stop(self): - self.running = False - - + self.running = False def track_playback_started(self, tl_track): - self.screen_manager.track_started(tl_track) + self.screen_manager.track_started(tl_track)