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-02 12:53:50 +02:00
parent eaeb5bc35d
commit 433ac14704
14 changed files with 688 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mopidy_touchscreen/__init__.py
View File

@@ -3,11 +3,12 @@ from __future__ import unicode_literals
import logging import logging
import os import os
from mopidy import config, ext from mopidy import config, ext
from .touch_screen import TouchScreen from .touch_screen import TouchScreen
from .touch_screen_backend import TouchScreenBackend from .touch_screen_backend import TouchScreenBackend
__version__ = '0.1.0' __version__ = '0.1.0'
# TODO: If you need to log, use loggers named after the current Python module # TODO: If you need to log, use loggers named after the current Python module
@@ -15,7 +16,6 @@ logger = logging.getLogger(__name__)
class Extension(ext.Extension): class Extension(ext.Extension):
dist_name = 'Mopidy-Touchscreen' dist_name = 'Mopidy-Touchscreen'
ext_name = 'touchscreen' ext_name = 'touchscreen'
version = __version__ version = __version__
@@ -35,4 +35,6 @@ class Extension(ext.Extension):
def setup(self, registry): def setup(self, registry):
registry.add('frontend', TouchScreen) registry.add('frontend', TouchScreen)
#Backend used for controling volume
registry.add('backend', TouchScreenBackend) registry.add('backend', TouchScreenBackend)

2
mopidy_touchscreen/dynamic_background.py
View File

@@ -5,7 +5,6 @@ logger = logging.getLogger(__name__)
class DynamicBackground(): class DynamicBackground():
def __init__(self): def __init__(self):
self.current = get_valid_color() self.current = get_valid_color()
self.target = get_valid_color() self.target = get_valid_color()
@@ -23,6 +22,7 @@ class DynamicBackground():
self.target = get_valid_color() self.target = get_valid_color()
surface.fill(self.current) surface.fill(self.current)
# 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

8
mopidy_touchscreen/fonts/icomoon/demo.html
View File

@@ -6,13 +6,17 @@
<meta name="description" content="An Icon Font Generated By IcoMoon.io"> <meta name="description" content="An Icon Font Generated By IcoMoon.io">
<meta name="viewport" content="width=device-width"> <meta name="viewport" content="width=device-width">
<link rel="stylesheet" href="demo-files/demo.css"> <link rel="stylesheet" href="demo-files/demo.css">
<link rel="stylesheet" href="style.css"></head> <link rel="stylesheet" href="style.css">
</head>
<body> <body>
<div class="bgc1 clearfix"> <div class="bgc1 clearfix">
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;42)</small></h1> <h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon
<small class="fgc1">(Glyphs:&nbsp;42)</small>
</h1>
</div> </div>
<div class="clearfix mhl ptl"> <div class="clearfix mhl ptl">
<h1 class="mvm mtn bshadow fgc1">Grid Size: 16</h1> <h1 class="mvm mtn bshadow fgc1">Grid Size: 16</h1>
<div class="glyph fs1"> <div class="glyph fs1">
<div class="clearfix bshadow0 pbs"> <div class="clearfix bshadow0 pbs">
<span class="icon-music"></span><span class="mls"> icon-music</span> <span class="icon-music"></span><span class="mls"> icon-music</span>

18
mopidy_touchscreen/library_screen.py
View File

@@ -1,18 +1,21 @@
import logging
import mopidy.models
from .list_view import ListView from .list_view import ListView
from .touch_manager import TouchManager from .touch_manager import TouchManager
import logging
import mopidy.models
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class LibraryScreen(): class LibraryScreen():
def __init__(self, size, base_size, manager): def __init__(self, size, base_size, manager):
self.size = size self.size = size
self.base_size = base_size self.base_size = base_size
self.manager = manager self.manager = manager
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 = ListView((0, self.base_size), (self.size[0], self.size[1] - 2 * self.base_size),
self.base_size, manager.fonts['base'])
self.directory_list = [] self.directory_list = []
self.current_directory = None self.current_directory = None
self.library = None self.library = None
@@ -72,7 +75,8 @@ class LibraryScreen():
self.manager.core.tracklist.clear() self.manager.core.tracklist.clear()
if track: if track:
self.manager.core.tracklist.add(uri=uri) self.manager.core.tracklist.add(uri=uri)
else:
logger.error(uri)
self.manager.core.tracklist.add(tracks=self.manager.core.library.search(query={'any':'*'}, uris=[uri]).get()[0].tracks)
self.manager.core.playback.play() self.manager.core.playback.play()
else:
#TODO: add folder to tracks to play
pass

21
mopidy_touchscreen/list_view.py
View File

@@ -1,40 +1,38 @@
from .screen_objects import ScreenObjectsManager
import logging
import pygame
from .touch_manager import TouchManager from .touch_manager import TouchManager
from .touch_manager import TouchEvent
from .screen_objects import * from .screen_objects import *
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class ListView(): class ListView():
def __init__(self, pos, size, base_size, font):
def __init__(self, pos, size, base_size, fonts):
self.size = size self.size = size
self.pos = pos self.pos = pos
self.base_size = base_size self.base_size = base_size
self.screen_objects = ScreenObjectsManager() self.screen_objects = ScreenObjectsManager()
self.max_rows = self.size[1] / self.base_size self.max_rows = self.size[1] / self.base_size
self.current_item = 0 self.current_item = 0
self.fonts = fonts self.font = font
self.list_size = 0 self.list_size = 0
self.list = [] self.list = []
self.scrollbar = False self.scrollbar = False
self.set_list([]) self.set_list([])
self.selected = [] self.selected = []
#Sets the list for the lisview. It should be an iterable of strings
def set_list(self, item_list): def set_list(self, item_list):
self.list = item_list self.list = item_list
self.list_size = len(item_list) self.list_size = len(item_list)
if self.max_rows < self.list_size: if self.max_rows < self.list_size:
self.scrollbar = True self.scrollbar = True
scroll_bar = ScrollBar((self.pos[0]+self.size[0]-self.base_size,self.pos[1]), (self.base_size, self.size[1]),self.list_size,self.max_rows) scroll_bar = ScrollBar((self.pos[0] + self.size[0] - self.base_size, self.pos[1]),
(self.base_size, self.size[1]), self.list_size, self.max_rows)
self.screen_objects.set_touch_object("scrollbar", scroll_bar) self.screen_objects.set_touch_object("scrollbar", scroll_bar)
else: else:
self.scrollbar = False self.scrollbar = False
self.load_new_item_position(0) self.load_new_item_position(0)
#Will load items currently displaying in item_pos
def load_new_item_position(self, item_pos): def load_new_item_position(self, item_pos):
self.current_item = item_pos self.current_item = item_pos
if self.scrollbar: if self.scrollbar:
@@ -48,7 +46,8 @@ class ListView():
else: else:
width = self.size[0] width = self.size[0]
while i < self.list_size and z < self.max_rows: while i < self.list_size and z < self.max_rows:
item = TouchAndTextItem(self.fonts['base'], self.list[i], (self.pos[0], self.pos[1]+self.base_size*z), (width, -1)) item = TouchAndTextItem(self.font, self.list[i], (self.pos[0], self.pos[1] + self.base_size * z),
(width, -1))
self.screen_objects.set_touch_object(str(i), item) self.screen_objects.set_touch_object(str(i), item)
i += 1 i += 1
z += 1 z += 1
@@ -73,6 +72,9 @@ class ListView():
elif touch_event.direction == TouchManager.down: elif touch_event.direction == TouchManager.down:
self.move_to(1) self.move_to(1)
#Scroll to direction
#direction == 1 will scroll down
#direction == -1 will scroll up
def move_to(self, direction): def move_to(self, direction):
if self.scrollbar: if self.scrollbar:
if direction == 1: if direction == 1:
@@ -89,6 +91,7 @@ class ListView():
self.screen_objects.get_touch_object("scrollbar").set_item(self.current_item) self.screen_objects.get_touch_object("scrollbar").set_item(self.current_item)
self.set_selected(self.selected) self.set_selected(self.selected)
#Set selected items
def set_selected(self, selected): def set_selected(self, selected):
for number in self.selected: for number in self.selected:
try: try:

20
mopidy_touchscreen/main_screen.py
View File

@@ -5,6 +5,7 @@ from threading import Thread
import urllib import urllib
import urllib2 import urllib2
import json import json
from .touch_manager import TouchManager from .touch_manager import TouchManager
from .screen_objects import * from .screen_objects import *
@@ -34,8 +35,11 @@ class MainScreen():
if self.track is not None: if self.track is not None:
if self.image is not None: if self.image is not None:
screen.blit(self.image, (self.base_size / 2, self.base_size + self.base_size / 2)) screen.blit(self.image, (self.base_size / 2, self.base_size + self.base_size / 2))
self.touch_text_manager.get_touch_object("time_progress").set_value(self.core.playback.time_position.get() / 1000) self.touch_text_manager.get_touch_object("time_progress").set_value(
self.touch_text_manager.get_touch_object("time_progress").set_text(time.strftime('%M:%S', time.gmtime(self.core.playback.time_position.get() / 1000)) + "/" + time.strftime('%M:%S', time.gmtime(self.track.length / 1000))) self.core.playback.time_position.get() / 1000)
self.touch_text_manager.get_touch_object("time_progress").set_text(time.strftime('%M:%S', time.gmtime(
self.core.playback.time_position.get() / 1000)) + "/" + time.strftime('%M:%S', time.gmtime(
self.track.length / 1000)))
self.touch_text_manager.render(screen) self.touch_text_manager.render(screen)
return screen return screen
@@ -50,11 +54,13 @@ class MainScreen():
self.artists.append(artist) self.artists.append(artist)
# Track name # Track name
label = TextItem(self.fonts['base'], MainScreen.get_track_name(track), (x, self.base_size * 2), (width, self.size[1])) label = TextItem(self.fonts['base'], MainScreen.get_track_name(track), (x, self.base_size * 2),
(width, self.size[1]))
self.touch_text_manager.set_object("track_name", label) self.touch_text_manager.set_object("track_name", label)
#Album name #Album name
label = TextItem(self.fonts['base'], MainScreen.get_track_album_name(track), (x, self.base_size * 3), (width, self.size[1])) label = TextItem(self.fonts['base'], MainScreen.get_track_album_name(track), (x, self.base_size * 3),
(width, self.size[1]))
self.touch_text_manager.set_object("album_name", label) self.touch_text_manager.set_object("album_name", label)
#Artist #Artist
@@ -129,11 +135,13 @@ class MainScreen():
# There is no cover so it will use all the screen size for the text # There is no cover so it will use all the screen size for the text
width = self.size[0] - self.base_size width = self.size[0] - self.base_size
current = TextItem(self.fonts['base'], MainScreen.get_track_name(self.track), (self.base_size / 2, self.base_size * 2), current = TextItem(self.fonts['base'], MainScreen.get_track_name(self.track),
(self.base_size / 2, self.base_size * 2),
(width, -1)) (width, -1))
self.touch_text_manager.set_object("track_name", current) self.touch_text_manager.set_object("track_name", current)
current = TextItem(self.fonts['base'], MainScreen.get_track_album_name(self.track), (self.base_size / 2, self.base_size * 3), current = TextItem(self.fonts['base'], MainScreen.get_track_album_name(self.track),
(self.base_size / 2, self.base_size * 3),
(width, -1)) (width, -1))
self.touch_text_manager.set_object("album_name", current) self.touch_text_manager.set_object("album_name", current)

23
mopidy_touchscreen/menu_screen.py
View File

@@ -1,12 +1,12 @@
from .list_view import ListView
from .screen_objects import *
import mopidy
import os import os
import socket import socket
import mopidy
from .screen_objects import *
class MenuScreen(): class MenuScreen():
def __init__(self, size, base_size, manager): def __init__(self, size, base_size, manager):
self.size = size self.size = size
self.base_size = base_size self.base_size = base_size
@@ -17,19 +17,22 @@ class MenuScreen():
# Exit mopidy button # Exit mopidy button
button = TouchAndTextItem(self.manager.fonts['icon'], u"\ue611", (0, self.base_size), None) button = TouchAndTextItem(self.manager.fonts['icon'], u"\ue611", (0, self.base_size), None)
self.screen_objects.set_touch_object("exit_icon", button) self.screen_objects.set_touch_object("exit_icon", button)
button = TouchAndTextItem(self.manager.fonts['base'], "Exit Mopidy", (button.get_right_pos(), self.base_size), None) button = TouchAndTextItem(self.manager.fonts['base'], "Exit Mopidy", (button.get_right_pos(), self.base_size),
None)
self.screen_objects.set_touch_object("exit", button) self.screen_objects.set_touch_object("exit", button)
#Shutdown button #Shutdown button
button = TouchAndTextItem(self.manager.fonts['icon'], u"\ue60b", (0, self.base_size * 2), None) button = TouchAndTextItem(self.manager.fonts['icon'], u"\ue60b", (0, self.base_size * 2), None)
self.screen_objects.set_touch_object("shutdown_icon", button) self.screen_objects.set_touch_object("shutdown_icon", button)
button = TouchAndTextItem(self.manager.fonts['base'], "Shutdown", (button.get_right_pos(), self.base_size * 2), None) button = TouchAndTextItem(self.manager.fonts['base'], "Shutdown", (button.get_right_pos(), self.base_size * 2),
None)
self.screen_objects.set_touch_object("shutdown", button) self.screen_objects.set_touch_object("shutdown", button)
#Restart button #Restart button
button = TouchAndTextItem(self.manager.fonts['icon'], u"\ue609", (0, self.base_size * 3), None) button = TouchAndTextItem(self.manager.fonts['icon'], u"\ue609", (0, self.base_size * 3), None)
self.screen_objects.set_touch_object("restart_icon", button) self.screen_objects.set_touch_object("restart_icon", button)
button = TouchAndTextItem(self.manager.fonts['base'], "Restart", (button.get_right_pos(), self.base_size * 3), None) button = TouchAndTextItem(self.manager.fonts['base'], "Restart", (button.get_right_pos(), self.base_size * 3),
None)
self.screen_objects.set_touch_object("restart", button) self.screen_objects.set_touch_object("restart", button)
#IP addres #IP addres
@@ -40,7 +43,6 @@ class MenuScreen():
#self.list_view.set_list(["Exit mopidy", "Shutdown", "Restart"]) #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) # self.list_view.render(screen)
@@ -52,10 +54,15 @@ class MenuScreen():
if key == "exit_icon" or key == "exit": if key == "exit_icon" or key == "exit":
mopidy.utils.process.exit_process() mopidy.utils.process.exit_process()
elif key == "shutdown_icon" or key == "shutdown": elif key == "shutdown_icon" or key == "shutdown":
if os.system("gksu -- shutdown now -h") != 0:
os.system("shutdown now -h") os.system("shutdown now -h")
elif key == "restart_icon" or key == "restart":
if os.system("gksu -- shutdown -r now") != 0:
os.system("shutdown -r now")
elif key == "ip": elif key == "ip":
self.check_connection() self.check_connection()
#Will check internet connection
def check_connection(self): def check_connection(self):
try: try:
self.manager.set_connection(False, True) self.manager.set_connection(False, True)

4
mopidy_touchscreen/playlist_screen.py
View File

@@ -2,12 +2,12 @@ from .list_view import ListView
class PlaylistScreen(): class PlaylistScreen():
def __init__(self, size, base_size, manager): def __init__(self, size, base_size, manager):
self.size = size self.size = size
self.base_size = base_size self.base_size = base_size
self.manager = manager self.manager = manager
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 = ListView((0, self.base_size), (self.size[0], self.size[1] - 2 * self.base_size),
self.base_size, manager.fonts['base'])
self.playlists_strings = [] self.playlists_strings = []
self.playlists = [] self.playlists = []
self.playlists_loaded() self.playlists_loaded()

13
mopidy_touchscreen/screen_manager.py
View File

@@ -1,3 +1,10 @@
import logging
import traceback
import os
import pygame
import mopidy
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 *
@@ -5,12 +12,8 @@ from .tracklist import Tracklist
from .playlist_screen import PlaylistScreen from .playlist_screen import PlaylistScreen
from .dynamic_background import DynamicBackground from .dynamic_background import DynamicBackground
from .library_screen import LibraryScreen from .library_screen import LibraryScreen
import logging
import mopidy
import traceback
import os
from .menu_screen import MenuScreen from .menu_screen import MenuScreen
import pygame
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

7
mopidy_touchscreen/screen_objects.py
View File

@@ -6,7 +6,6 @@ logger = logging.getLogger(__name__)
class ScreenObjectsManager(): class ScreenObjectsManager():
def __init__(self): def __init__(self):
self.touch_objects = {} self.touch_objects = {}
self.text_objects = {} self.text_objects = {}
@@ -49,7 +48,6 @@ class ScreenObjectsManager():
class BaseItem(): class BaseItem():
def __init__(self, pos, size): def __init__(self, pos, size):
self.pos = pos self.pos = pos
self.size = size self.size = size
@@ -64,7 +62,6 @@ class BaseItem():
class TextItem(BaseItem): class TextItem(BaseItem):
def __init__(self, font, text, pos, size): def __init__(self, font, text, pos, size):
self.font = font self.font = font
self.text = text self.text = text
@@ -126,7 +123,6 @@ class TextItem(BaseItem):
class TouchObject(BaseItem): class TouchObject(BaseItem):
def __init__(self, pos, size): def __init__(self, pos, size):
BaseItem.__init__(self, pos, size) BaseItem.__init__(self, pos, size)
self.active = False self.active = False
@@ -139,7 +135,6 @@ class TouchObject(BaseItem):
class TouchAndTextItem(TouchObject, TextItem): class TouchAndTextItem(TouchObject, TextItem):
def __init__(self, font, text, pos, size): def __init__(self, font, text, pos, size):
TextItem.__init__(self, font, text, pos, size) TextItem.__init__(self, font, text, pos, size)
TouchObject.__init__(self, pos, self.size) TouchObject.__init__(self, pos, self.size)
@@ -169,7 +164,6 @@ class TouchAndTextItem(TouchObject, TextItem):
class Progressbar(TouchObject): class Progressbar(TouchObject):
def __init__(self, font, text, pos, size, max_value, value_text): def __init__(self, font, text, pos, size, max_value, value_text):
BaseItem.__init__(self, pos, size) BaseItem.__init__(self, pos, size)
self.value = 0 self.value = 0
@@ -212,7 +206,6 @@ class Progressbar(TouchObject):
class ScrollBar(TouchObject): class ScrollBar(TouchObject):
def __init__(self, pos, size, max_value, items_on_screen): def __init__(self, pos, size, max_value, items_on_screen):
BaseItem.__init__(self, pos, (pos[0] + size[0], pos[1] + size[1])) BaseItem.__init__(self, pos, (pos[0] + size[0], pos[1] + size[1]))
self.pos = pos self.pos = pos

3
mopidy_touchscreen/touch_manager.py
View File

@@ -6,7 +6,6 @@ logger = logging.getLogger(__name__)
class TouchManager(): class TouchManager():
click = 1 click = 1
swipe = 2 swipe = 2
long_click = 3 long_click = 3
@@ -56,7 +55,6 @@ class TouchManager():
self.down_time = time.time() self.down_time = time.time()
def mouse_up(self, event): def mouse_up(self, event):
logger.error(event.button)
self.up_pos = event.pos self.up_pos = event.pos
if abs(self.down_pos[0] - self.up_pos[0]) < self.max_move_margin: if abs(self.down_pos[0] - self.up_pos[0]) < self.max_move_margin:
if abs(self.down_pos[1] - self.up_pos[1]) < self.max_move_margin: if abs(self.down_pos[1] - self.up_pos[1]) < self.max_move_margin:
@@ -72,7 +70,6 @@ class TouchManager():
class TouchEvent(): class TouchEvent():
def __init__(self, event_type, down_pos, current_pos, vertical): def __init__(self, event_type, down_pos, current_pos, vertical):
self.type = event_type self.type = event_type
self.down_pos = down_pos self.down_pos = down_pos

5
mopidy_touchscreen/touch_screen.py
View File

@@ -3,20 +3,19 @@ import traceback
import logging import logging
from threading import Thread from threading import Thread
import pygame import pygame
from .screen_manager import ScreenManager
from mopidy import core from mopidy import core
from .screen_manager import ScreenManager
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class TouchScreen(pykka.ThreadingActor, core.CoreListener): class TouchScreen(pykka.ThreadingActor, core.CoreListener):
def __init__(self, config, core): def __init__(self, config, core):
super(TouchScreen, self).__init__() super(TouchScreen, self).__init__()
self.backend = pykka.ActorRegistry.get_by_class_name("TouchScreenBackend")[0] self.backend = pykka.ActorRegistry.get_by_class_name("TouchScreenBackend")[0]
logger.error(self.backend)
self.core = core self.core = core
self.running = False self.running = False
self.screen_size = (config['touchscreen']['screen_width'], config['touchscreen']['screen_height']) self.screen_size = (config['touchscreen']['screen_width'], config['touchscreen']['screen_height'])

7
mopidy_touchscreen/touch_screen_backend.py
View File

@@ -1,15 +1,16 @@
import pykka import pykka
from mopidy import backend
import logging import logging
from mopidy import backend
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class TouchScreenBackend(pykka.ThreadingActor, backend.Backend):
class TouchScreenBackend(pykka.ThreadingActor, backend.Backend):
def __init__(self, config, audio): def __init__(self, config, audio):
super(TouchScreenBackend, self).__init__() super(TouchScreenBackend, self).__init__()
self.audio = audio self.audio = audio
logger.error("backend funciona")
def on_receive(self, message): def on_receive(self, message):
action = message['action'] action = message['action']

5
mopidy_touchscreen/tracklist.py
View File

@@ -1,13 +1,14 @@
from .list_view import ListView from .list_view import ListView
from .main_screen import MainScreen from .main_screen import MainScreen
class Tracklist():
class Tracklist():
def __init__(self, size, base_size, manager): def __init__(self, size, base_size, manager):
self.size = size self.size = size
self.base_size = base_size self.base_size = base_size
self.manager = manager self.manager = manager
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 = ListView((0, self.base_size), (self.size[0], self.size[1] - 2 * self.base_size),
self.base_size, manager.fonts['base'])
self.tracks = [] self.tracks = []
self.tracks_strings = [] self.tracks_strings = []
self.update_list() self.update_list()