From 2b0b6395b129daf85b0032d0fcb41b33fadae630 Mon Sep 17 00:00:00 2001 From: 9and3r <9and3r@gmail.com> Date: Sat, 19 Jul 2014 22:12:45 +0200 Subject: [PATCH 1/9] Delete setup.py~ --- setup.py~ | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 setup.py~ diff --git a/setup.py~ b/setup.py~ deleted file mode 100644 index 48fb16a..0000000 --- a/setup.py~ +++ /dev/null @@ -1,49 +0,0 @@ -from __future__ import unicode_literals - -import re - -from setuptools import find_packages, setup - - -def get_version(filename): - content = open(filename).read() - metadata = dict(re.findall("__([a-z]+)__ = '([^']+)'", content)) - return metadata['version'] - - -setup( - name='Mopidy-Touchscreen', - version=get_version('mopidy_touchscreen/__init__.py'), - url='https://github.com/9and3r/mopidy-touchscreen', - license='Apache License, Version 2.0', - author='9and3r', - author_email='9and3r@gmail.com', - description='Mopidy extension to show info on a display and control from it', - long_description=open('README.rst').read(), - packages=find_packages(exclude=['tests', 'tests.*']), - zip_safe=False, - include_package_data=True, - install_requires=[ - 'setuptools', - 'Mopidy >= 0.17', - 'Pykka >= 1.1', - ], - test_suite='nose.collector', - tests_require=[ - 'nose', - 'mock >= 1.0', - ], - entry_points={ - 'mopidy.ext': [ - 'touchscreen = mopidy_touchscreen:Extension', - ], - }, - classifiers=[ - 'Environment :: No Input/Output (Daemon)', - 'Intended Audience :: End Users/Desktop', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: OS Independent', - 'Programming Language :: Python :: 2', - 'Topic :: Multimedia :: Sound/Audio :: Players', - ], -) From 0aa1c88414c83341e2dd18e994f871e45f3d70e0 Mon Sep 17 00:00:00 2001 From: 9and3r <9and3r@gmail.com> Date: Sat, 19 Jul 2014 22:13:01 +0200 Subject: [PATCH 2/9] Delete __init__.py~ --- mopidy_touchscreen/__init__.py~ | 43 --------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 mopidy_touchscreen/__init__.py~ diff --git a/mopidy_touchscreen/__init__.py~ b/mopidy_touchscreen/__init__.py~ deleted file mode 100644 index 6107d48..0000000 --- a/mopidy_touchscreen/__init__.py~ +++ /dev/null @@ -1,43 +0,0 @@ -from __future__ import unicode_literals - -import logging -import os - -# TODO: Remove entirely if you don't register GStreamer elements below -import pygst -pygst.require('0.10') -import gst -import gobject - -from mopidy import config, ext - - -__version__ = '0.1.0' - -# TODO: If you need to log, use loggers named after the current Python module -logger = logging.getLogger(__name__) - - -class Extension(ext.Extension): - - dist_name = 'Mopidy-Touchscreen' - ext_name = 'touchscreen' - version = __version__ - - def get_default_config(self): - conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf') - return config.read(conf_file) - - def get_config_schema(self): - schema = super(Extension, self).get_config_schema() - # TODO: Comment in and edit, or remove entirely - #schema['username'] = config.String() - #schema['password'] = config.Secret() - return schema - - def setup(self, registry): - # You will typically only implement one of the following things - # in a single extension. - from .touch_screen import Touch_Screen - registry.add('frontend', Touch_Screen) - From fd12e868bf726e9301b44ee86d06d14b1ffee907 Mon Sep 17 00:00:00 2001 From: 9and3r <9and3r@gmail.com> Date: Sat, 19 Jul 2014 22:13:08 +0200 Subject: [PATCH 3/9] Delete dynamic_background.py~ --- mopidy_touchscreen/dynamic_background.py~ | 25 ----------------------- 1 file changed, 25 deletions(-) delete mode 100644 mopidy_touchscreen/dynamic_background.py~ diff --git a/mopidy_touchscreen/dynamic_background.py~ b/mopidy_touchscreen/dynamic_background.py~ deleted file mode 100644 index eac73da..0000000 --- a/mopidy_touchscreen/dynamic_background.py~ +++ /dev/null @@ -1,25 +0,0 @@ -import random - -class DynamicBackground(): - - def __init__(self): - self.current=[0,0,0] - self.target=[0,0,0] - for x in range(0, 3): - self.target[x]=random.randint(0,255) - - def drawBackground(self,surface): - same = True - for x in range(0, 3): - if self.current[x]> self.target[x]: - self.current[x]=self.current[x]-1 - elif self.current[x] Date: Sat, 19 Jul 2014 22:13:17 +0200 Subject: [PATCH 4/9] Delete image_manager.py~ --- mopidy_touchscreen/image_manager.py~ | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 mopidy_touchscreen/image_manager.py~ diff --git a/mopidy_touchscreen/image_manager.py~ b/mopidy_touchscreen/image_manager.py~ deleted file mode 100644 index ac4986a..0000000 --- a/mopidy_touchscreen/image_manager.py~ +++ /dev/null @@ -1,6 +0,0 @@ -class ImageManager(): - - def __init__(self,cache): - self.cache = cache - - def isImageInCache(self,imagename): From b7491ea47213db5dacb9a22722ad03b6138713e9 Mon Sep 17 00:00:00 2001 From: 9and3r <9and3r@gmail.com> Date: Sat, 19 Jul 2014 22:13:27 +0200 Subject: [PATCH 5/9] Delete main_screen.py~ --- mopidy_touchscreen/main_screen.py~ | 86 ------------------------------ 1 file changed, 86 deletions(-) delete mode 100644 mopidy_touchscreen/main_screen.py~ diff --git a/mopidy_touchscreen/main_screen.py~ b/mopidy_touchscreen/main_screen.py~ deleted file mode 100644 index c5c244d..0000000 --- a/mopidy_touchscreen/main_screen.py~ +++ /dev/null @@ -1,86 +0,0 @@ -import pygame -import logging -import hashlib -import os -import urllib -from mopidy.audio import PlaybackState -from .dynamic_background import DynamicBackground - - -logger = logging.getLogger(__name__) - -class MainScreen(): - - - - def __init__(self,size,manager,cache): - self.size=size - self.manager=manager - self.background=DynamicBackground() - self.track = None - self.cache=cache - self.imageStatus = -1 - - 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.name,False,(255,255,255)) - screen.blit(text_surface,(0,0)) - return screen - - def track_started(self,track): - self.track=track - logger.error("track started") - if(not self.isImageInCache()): - logger.error("deskarga hasiko da") - self.downloadImage() - - else: - self.imageStatus = 1 - logger.error("supuestamente irudia badago") - - def getImageFileName(self): - logger.error("izena sortzen") - name = self.track.album.name - logger.error(name) - md5name = hashlib.md5(name).hexdigest() - logger.error("izena ondo") - return md5name - - def getCoverFolder(self): - logger.error("cover karpeta lortzen") - if(not os.path.isdir(self.cache+"/covers")): - logger.error("cover carpeta sortu da") - os.makedirs(self.cache+"/covers") - else: - logger.error("ez da cover carpeta sortu") - return self.cache+"/covers/" - - def isImageInCache(self): - logger.error("imagen en katxe hasiera") - self.getCoverFolder() - logger.error("imagen en katxe bukaerar") - return os.path.isfile(self.cache+self.getCoverFolder()+self.getImageFileName()) - - - def downloadImage(self): - logger.error("deskarga hasi da jaja") - self.imageStatus = 0 - #safe_artist=urllib.quote_plus(self.track.artists) - safe_artist='' - logger.error("-1") - safe_album=urllib.quote_plus(self.track.album.name) - logger.error("1") - 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'] - urllib.urlretrieve(image, folder+"00000001.jpg") - self.imageStatus = 1 - - - - From 35f198ebf221de92c362cf9be39065286acc1be4 Mon Sep 17 00:00:00 2001 From: 9and3r <9and3r@gmail.com> Date: Sat, 19 Jul 2014 22:13:37 +0200 Subject: [PATCH 6/9] Delete main_screen~ --- mopidy_touchscreen/main_screen~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mopidy_touchscreen/main_screen~ diff --git a/mopidy_touchscreen/main_screen~ b/mopidy_touchscreen/main_screen~ deleted file mode 100644 index e69de29..0000000 From bff5a42ca0aea10ce5ea0e3bf35ce7a247fadfa4 Mon Sep 17 00:00:00 2001 From: 9and3r <9and3r@gmail.com> Date: Sat, 19 Jul 2014 22:13:48 +0200 Subject: [PATCH 7/9] Delete proba.py~ --- mopidy_touchscreen/proba.py~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mopidy_touchscreen/proba.py~ diff --git a/mopidy_touchscreen/proba.py~ b/mopidy_touchscreen/proba.py~ deleted file mode 100644 index e69de29..0000000 From 4e62630d0a53d8cbc4d1f0051dc7e619a1facd3d Mon Sep 17 00:00:00 2001 From: 9and3r <9and3r@gmail.com> Date: Sat, 19 Jul 2014 22:13:55 +0200 Subject: [PATCH 8/9] Delete screen_manager.py~ --- mopidy_touchscreen/screen_manager.py~ | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 mopidy_touchscreen/screen_manager.py~ diff --git a/mopidy_touchscreen/screen_manager.py~ b/mopidy_touchscreen/screen_manager.py~ deleted file mode 100644 index 8e2026a..0000000 --- a/mopidy_touchscreen/screen_manager.py~ +++ /dev/null @@ -1,24 +0,0 @@ -from .main_screen import MainScreen -import pygame -import logging - -logger = logging.getLogger(__name__) - -class ScreenManager(): - - - - def __init__(self,size): - logger.error("track started") - self.screen_size=size - self.screens=[MainScreen(size,self,"/home/ander")] - self.track=None - - def update(self,core): - return self.screens[0].update(core) - - def track_started(self,track): - logger.error("track started") - self.track=track - self.screens[0].track_started(track.track) - From c05fa12f348cc91f88553803a7c01f45776bac65 Mon Sep 17 00:00:00 2001 From: 9and3r <9and3r@gmail.com> Date: Sat, 19 Jul 2014 22:14:01 +0200 Subject: [PATCH 9/9] Delete touch_screen.py~ --- mopidy_touchscreen/touch_screen.py~ | 43 ----------------------------- 1 file changed, 43 deletions(-) delete mode 100644 mopidy_touchscreen/touch_screen.py~ diff --git a/mopidy_touchscreen/touch_screen.py~ b/mopidy_touchscreen/touch_screen.py~ deleted file mode 100644 index 7b21230..0000000 --- a/mopidy_touchscreen/touch_screen.py~ +++ /dev/null @@ -1,43 +0,0 @@ -import pykka - -import logging -from threading import Thread -import pygame -from .screen_manager import ScreenManager - -from mopidy import core - - -logger = logging.getLogger(__name__) - -class TouchScreen(pykka.ThreadingActor, core.CoreListener): - def __init__(self, config, core): - super(TouchScreen, self).__init__() - self.core = core - self.screen_size=(320, 240) - - 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() - - - - def on_start(self): - self.running=True - thread = Thread(target=self.start_thread) - thread.start() - def on_stop(self): - self.running = False - - - - def track_playback_started(self, tl_track): - self.screen_manager.track_started(tl_track) -