Febbweiss/mopidy-touchscreen
1
0
Fork 0
mirror of https://github.com/Febbweiss/mopidy-touchscreen.git synced 2026-03-04 22:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
9and3r
2014-08-04 11:33:40 +02:00
parent efd5201b65
commit cd8d9d1c17
10 changed files with 101 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/conf.py
View File

@@ -12,8 +12,8 @@
# All configuration values have a default; values that are commented out # All configuration values have a default; values that are commented out
# serve to show the default. # serve to show the default.
import sys # import sys
import os # import os
# If extensions (or modules to document with autodoc) are in another directory, # If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the # add these directories to sys.path here. If the directory is relative to the
@@ -181,7 +181,7 @@ htmlhelp_basename = 'Mopidy-Touchscreendoc'
# -- Options for LaTeX output --------------------------------------------- # -- Options for LaTeX output ---------------------------------------------
latex_elements = { latex_elements = {}
# The paper size ('letterpaper' or 'a4paper'). # The paper size ('letterpaper' or 'a4paper').
# 'papersize': 'letterpaper', # 'papersize': 'letterpaper',
@@ -190,7 +190,7 @@ latex_elements = {
# Additional stuff for the LaTeX preamble. # Additional stuff for the LaTeX preamble.
# 'preamble': '', # 'preamble': '',
} # }
# Grouping the document tree into LaTeX files. List of tuples # Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, # (source start file, target name, title,

5
mopidy_touchscreen/dynamic_background.py
View File

@@ -1,5 +1,5 @@
import random
import logging import logging
import random
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -24,7 +24,8 @@ class DynamicBackground():
# Returns an array with 3 integers in range of 0-255 # Returns an array with 3 integers in range of 0-255
# The sum of the three integers will be lower than 255*2 (510) to avoid very bright colors # The sum of the three integers will be lower than 255*2
# (510) to avoid very bright colors
# White text should be seen ok with this background color # White text should be seen ok with this background color

6
mopidy_touchscreen/list_view.py
View File

@@ -1,5 +1,6 @@
import logging
from .screen_objects import ScrollBar, ScreenObjectsManager, TouchAndTextItem
from .touch_manager import TouchManager from .touch_manager import TouchManager
from .screen_objects import *
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -58,7 +59,8 @@ class ListView():
self.screen_objects.render(surface) self.screen_objects.render(surface)
def touch_event(self, touch_event): def touch_event(self, touch_event):
if touch_event.type == TouchManager.click or touch_event.type == TouchManager.long_click: if touch_event.type == TouchManager.click \
or touch_event.type == TouchManager.long_click:
objects = self.screen_objects.get_touch_objects_in_pos( objects = self.screen_objects.get_touch_objects_in_pos(
touch_event.current_pos) touch_event.current_pos)
if objects is not None: if objects is not None:

17
mopidy_touchscreen/main_screen.py
View File

@@ -5,9 +5,10 @@ from threading import Thread
import urllib import urllib
import urllib2 import urllib2
import json import json
import pygame
import logging
from .touch_manager import TouchManager from .touch_manager import TouchManager
from .screen_objects import * from .screen_objects import ScreenObjectsManager, Progressbar, TouchAndTextItem, TextItem
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -40,8 +41,8 @@ class MainScreen():
self.core.playback.time_position.get() / 1000) self.core.playback.time_position.get() / 1000)
self.touch_text_manager.get_touch_object("time_progress").set_text( self.touch_text_manager.get_touch_object("time_progress").set_text(
time.strftime('%M:%S', time.gmtime( time.strftime('%M:%S', time.gmtime(
self.core.playback.time_position.get() / 1000)) + "/" + time.strftime( self.core.playback.time_position.get() / 1000)) + "/" +
'%M:%S', time.gmtime( time.strftime('%M:%S', time.gmtime(
self.track.length / 1000))) self.track.length / 1000)))
self.touch_text_manager.render(screen) self.touch_text_manager.render(screen)
return screen return screen
@@ -136,12 +137,15 @@ class MainScreen():
safe_album = urllib.quote_plus( safe_album = urllib.quote_plus(
MainScreen.get_track_album_name(self.track)) MainScreen.get_track_album_name(self.track))
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'][-1]['#text'] image = data['album']['image'][-1]['#text']
urllib.urlretrieve(image, urllib.urlretrieve(image,
self.get_cover_folder() + self.get_image_file_name()) self.get_cover_folder() +
self.get_image_file_name())
self.load_image() self.load_image()
except: except:
self.download_image(artist_index + 1) self.download_image(artist_index + 1)
@@ -244,4 +248,3 @@ class MainScreen():
return track.album.name return track.album.name
else: else:
return "Unknow Album" return "Unknow Album"

8
mopidy_touchscreen/menu_screen.py
View File

@@ -3,7 +3,7 @@ import socket
import mopidy import mopidy
from .screen_objects import * from .screen_objects import ScreenObjectsManager, TouchAndTextItem
class MenuScreen(): class MenuScreen():
@@ -46,16 +46,10 @@ class MenuScreen():
(0, self.base_size * 4), None) (0, self.base_size * 4), None)
self.screen_objects.set_touch_object("ip", button) self.screen_objects.set_touch_object("ip", button)
#self.list_view = ListView((0,self.base_size),(self.size[0],self.size[1]-2*self.base_size), self.base_size, manager.fonts)
#self.list_view.set_list(["Exit mopidy", "Shutdown", "Restart"])
def update(self, screen): def update(self, screen):
self.screen_objects.render(screen) self.screen_objects.render(screen)
# self.list_view.render(screen)
def touch_event(self, touch_event): def touch_event(self, touch_event):
# clicked = self.list_view.touch_event(touch_event)
clicked = self.screen_objects.get_touch_objects_in_pos( clicked = self.screen_objects.get_touch_objects_in_pos(
touch_event.current_pos) touch_event.current_pos)
for key in clicked: for key in clicked:

21
mopidy_touchscreen/screen_manager.py
View File

@@ -1,11 +1,12 @@
import traceback import traceback
import logging
import mopidy import mopidy
from pkg_resources import Requirement, resource_filename from pkg_resources import Requirement, resource_filename
import pygame
import mopidy.core
from .main_screen import MainScreen from .main_screen import MainScreen
from .touch_manager import TouchManager from .touch_manager import TouchManager
from .screen_objects import * from .screen_objects import ScreenObjectsManager, TouchAndTextItem, Progressbar
from .tracklist import Tracklist from .tracklist import Tracklist
from .playlist_screen import PlaylistScreen from .playlist_screen import PlaylistScreen
from .dynamic_background import DynamicBackground from .dynamic_background import DynamicBackground
@@ -113,7 +114,6 @@ class ScreenManager():
button = TouchAndTextItem(self.fonts['icon'], u" \ue60a", button = TouchAndTextItem(self.fonts['icon'], u" \ue60a",
(x, self.base_size * 7), None) (x, self.base_size * 7), None)
self.screen_objects_manager.set_touch_object("menu_4", button) self.screen_objects_manager.set_touch_object("menu_4", button)
x = button.get_right_pos()
# Down bar # Down bar
self.down_bar = pygame.Surface( self.down_bar = pygame.Surface(
@@ -153,19 +153,19 @@ class ScreenManager():
if objects is not None: if objects is not None:
for key in objects: for key in objects:
if key == "volume": if key == "volume":
value = self.screen_objects_manager.get_touch_object( manager = self.screen_objects_manager
key).get_pos_value( volume = manager.get_touch_object(key)
touch_event.current_pos) pos = touch_event.current_pos
value = volume.get_pos_value(pos)
self.backend.tell( self.backend.tell(
{'action': 'volume', 'value': value}) {'action': 'volume', 'value': value})
self.volume_changed(value) self.volume_changed(value)
elif key == "pause_play": elif key == "pause_play":
if self.core.playback.state.get() == mopidy.core.PlaybackState.PLAYING: if self.core.playback.state.get() == \
mopidy.core.PlaybackState.PLAYING:
self.core.playback.pause() self.core.playback.pause()
logger.error("pausatzen")
else: else:
self.core.playback.play() self.core.playback.play()
logger.error("erreproduzitzen")
elif key == "mute": elif key == "mute":
mute = not self.core.playback.mute.get() mute = not self.core.playback.mute.get()
self.core.playback.set_mute(mute) self.core.playback.set_mute(mute)
@@ -198,7 +198,6 @@ class ScreenManager():
self.screen_objects_manager.get_touch_object("mute").set_text( self.screen_objects_manager.get_touch_object("mute").set_text(
u"\ue621", False) u"\ue621", False)
else: else:
logger.error("sartu naiz")
self.screen_objects_manager.get_touch_object("mute").set_text( self.screen_objects_manager.get_touch_object("mute").set_text(
u"\ue622", False) u"\ue622", False)
self.screen_objects_manager.get_touch_object("volume").set_value(volume) self.screen_objects_manager.get_touch_object("volume").set_value(volume)

9
mopidy_touchscreen/screen_objects.py
View File

@@ -1,6 +1,6 @@
import pygame
import logging import logging
import math import math
import pygame
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -70,7 +70,8 @@ class TextItem(BaseItem):
self.box = self.font.render(text, True, self.color) self.box = self.font.render(text, True, self.color)
if size is not None: if size is not None:
if size[1] == -1: if size[1] == -1:
BaseItem.__init__(self, pos, (size[0], self.font.size(text)[1])) height = self.font.size(text)[1]
BaseItem.__init__(self, pos, (size[0], height))
else: else:
BaseItem.__init__(self, pos, size) BaseItem.__init__(self, pos, size)
else: else:
@@ -180,8 +181,8 @@ class Progressbar(TouchObject):
self.text.set_text(str(self.value), True) self.text.set_text(str(self.value), True)
else: else:
self.text = TextItem(font, text, pos, None) self.text = TextItem(font, text, pos, None)
self.text.pos = (self.pos[0] + self.size[0] / 2 - self.text.size[0] / 2, self.text.pos = (self.pos[0] + self.size[0] / 2 - self.text.size[0] /
self.text.pos[1]) 2, self.text.pos[1])
def update(self): def update(self):
pass pass

3
setup.py
View File

@@ -18,7 +18,8 @@ setup(
license='Apache License, Version 2.0', license='Apache License, Version 2.0',
author='9and3r', author='9and3r',
author_email='9and3r@gmail.com', author_email='9and3r@gmail.com',
description='Mopidy extension to show info on a display and control from it', description='Mopidy extension to show info '
'on a display and control from it',
long_description=open('README.rst').read(), long_description=open('README.rst').read(),
packages=find_packages(exclude=['tests', 'tests.*']), packages=find_packages(exclude=['tests', 'tests.*']),
zip_safe=False, zip_safe=False,