From 69020a89de10cafc71d32d3aea50caad60eab131 Mon Sep 17 00:00:00 2001 From: 9and3r <9and3r@gmail.com> Date: Mon, 4 Aug 2014 13:54:59 +0200 Subject: [PATCH] Code cleanup --- mopidy_touchscreen/list_view.py | 1 + mopidy_touchscreen/screen_manager.py | 12 +++++++----- mopidy_touchscreen/touch_manager.py | 10 ++++++---- mopidy_touchscreen/touch_screen_backend.py | 5 +++-- tests/test_extension.py | 6 +++--- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/mopidy_touchscreen/list_view.py b/mopidy_touchscreen/list_view.py index bc5f583..008a928 100644 --- a/mopidy_touchscreen/list_view.py +++ b/mopidy_touchscreen/list_view.py @@ -2,6 +2,7 @@ import logging from .touch_manager import TouchManager from .screen_objects import ScreenObjectsManager, TouchAndTextItem, ScrollBar + logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py index 611feeb..3e8b5cd 100644 --- a/mopidy_touchscreen/screen_manager.py +++ b/mopidy_touchscreen/screen_manager.py @@ -13,6 +13,7 @@ from .dynamic_background import DynamicBackground from .library_screen import LibraryScreen from .menu_screen import MenuScreen + logger = logging.getLogger(__name__) @@ -200,15 +201,16 @@ class ScreenManager(): else: self.screen_objects_manager.get_touch_object("mute").set_text( 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) def playback_state_changed(self, old_state, new_state): if new_state == mopidy.core.PlaybackState.PLAYING: - self.screen_objects_manager.get_touch_object("pause_play").set_text( - u"\ue616", False) + self.screen_objects_manager.get_touch_object( + "pause_play").set_text(u"\ue616", False) else: - self.screen_objects_manager.get_touch_object("pause_play").set_text( - u"\ue615", False) + self.screen_objects_manager.get_touch_object( + "pause_play").set_text(u"\ue615", False) def mute_changed(self, mute): self.screen_objects_manager.get_touch_object("mute").set_active( diff --git a/mopidy_touchscreen/touch_manager.py b/mopidy_touchscreen/touch_manager.py index bc02ae7..9147a02 100644 --- a/mopidy_touchscreen/touch_manager.py +++ b/mopidy_touchscreen/touch_manager.py @@ -1,6 +1,7 @@ -import pygame import logging import time +import pygame + logger = logging.getLogger(__name__) @@ -43,8 +44,8 @@ class TouchManager(): touch_event = self.mouse_up(event) return touch_event elif event.button == 3 and self.down_button == 3: - touch_event = TouchEvent(TouchManager.long_click, self.down_pos, - self.up_pos, None) + touch_event = TouchEvent(TouchManager.long_click, + self.down_pos, self.up_pos, None) return touch_event else: return None @@ -61,7 +62,8 @@ class TouchManager(): self.up_pos = event.pos 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 time.time() - TouchManager.long_click_min_time > self.down_time: + if time.time() - TouchManager.long_click_min_time > \ + self.down_time: return TouchEvent(TouchManager.long_click, self.down_pos, self.up_pos, None) else: diff --git a/mopidy_touchscreen/touch_screen_backend.py b/mopidy_touchscreen/touch_screen_backend.py index 67f15bd..997ec3e 100644 --- a/mopidy_touchscreen/touch_screen_backend.py +++ b/mopidy_touchscreen/touch_screen_backend.py @@ -1,5 +1,6 @@ -import pykka import logging +import pykka + from mopidy import backend @@ -19,4 +20,4 @@ class TouchScreenBackend(pykka.ThreadingActor, backend.Backend): elif action == "mute": self.audio.set_mute(message['value']) elif action == "random": - self.audio.set_random(message['value']) \ No newline at end of file + self.audio.set_random(message['value']) diff --git a/tests/test_extension.py b/tests/test_extension.py index 35fc285..7db9b04 100644 --- a/tests/test_extension.py +++ b/tests/test_extension.py @@ -18,10 +18,10 @@ class ExtensionTest(unittest.TestCase): def test_get_config_schema(self): ext = Extension() - schema = ext.get_config_schema() + # schema = ext.get_config_schema() # TODO Test the content of your config schema - #self.assertIn('username', schema) - #self.assertIn('password', schema) + # self.assertIn('username', schema) + # self.assertIn('password', schema) # TODO Write more tests