Merge branch 'master' of https://github.com/9and3r/mopidy-touchscreen

mopidy_touchscreen/__init__.py~

@@ -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)
-        

mopidy_touchscreen/dynamic_background.py~

@@ -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]<self.target[x]:
-				self.current[x]=self.current[x]+1
-			if(self.current != self.target):
-				same = False
-		if same:
-			for x in range(0, 3):
-				self.target[x]=random.randint(0,255)
-		surface.fill(self.current)
-
-		

mopidy_touchscreen/image_manager.py~

@@ -1,6 +0,0 @@
-class ImageManager():
-
-	def __init__(self,cache):
-		self.cache = cache
-
-	def isImageInCache(self,imagename):

mopidy_touchscreen/main_screen.py~

@@ -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
-		
-
-
-	

mopidy_touchscreen/screen_manager.py~

@@ -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)
-

mopidy_touchscreen/touch_screen.py~

@@ -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)
- 

setup.py~

@@ -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',
-    ],
-)