From cbd553cebdf1549d74d8fa434f9ae1ce4bbbf063 Mon Sep 17 00:00:00 2001 From: Ander <9and3r@gmail.com> Date: Thu, 22 Jan 2015 02:12:49 +0100 Subject: [PATCH] Code cleanup Create packages --- mopidy_touchscreen/graphic_utils/__init__.py | 4 ++++ .../{ => graphic_utils}/dynamic_background.py | 0 .../{ => graphic_utils}/list_view.py | 4 ++-- .../{ => graphic_utils}/screen_objects.py | 0 mopidy_touchscreen/input/__init__.py | 2 ++ .../{ => input}/gpio_inpput_manager.py | 0 mopidy_touchscreen/{ => input}/input_manager.py | 0 mopidy_touchscreen/screen_manager.py | 17 +++-------------- mopidy_touchscreen/screens/__init__.py | 7 +++++++ mopidy_touchscreen/{ => screens}/base_screen.py | 0 .../{ => screens}/library_screen.py | 4 ++-- mopidy_touchscreen/{ => screens}/main_screen.py | 11 +++-------- mopidy_touchscreen/{ => screens}/menu_screen.py | 7 +++---- .../{ => screens}/playlist_screen.py | 4 ++-- .../{ => screens}/search_screen.py | 9 +++------ mopidy_touchscreen/{ => screens}/tracklist.py | 4 ++-- mopidy_touchscreen/touch_screen.py | 5 +---- 17 files changed, 34 insertions(+), 44 deletions(-) create mode 100644 mopidy_touchscreen/graphic_utils/__init__.py rename mopidy_touchscreen/{ => graphic_utils}/dynamic_background.py (100%) rename mopidy_touchscreen/{ => graphic_utils}/list_view.py (98%) rename mopidy_touchscreen/{ => graphic_utils}/screen_objects.py (100%) create mode 100644 mopidy_touchscreen/input/__init__.py rename mopidy_touchscreen/{ => input}/gpio_inpput_manager.py (100%) rename mopidy_touchscreen/{ => input}/input_manager.py (100%) create mode 100644 mopidy_touchscreen/screens/__init__.py rename mopidy_touchscreen/{ => screens}/base_screen.py (100%) rename mopidy_touchscreen/{ => screens}/library_screen.py (97%) rename mopidy_touchscreen/{ => screens}/main_screen.py (98%) rename mopidy_touchscreen/{ => screens}/menu_screen.py (96%) rename mopidy_touchscreen/{ => screens}/playlist_screen.py (96%) rename mopidy_touchscreen/{ => screens}/search_screen.py (96%) rename mopidy_touchscreen/{ => screens}/tracklist.py (95%) diff --git a/mopidy_touchscreen/graphic_utils/__init__.py b/mopidy_touchscreen/graphic_utils/__init__.py new file mode 100644 index 0000000..fe01797 --- /dev/null +++ b/mopidy_touchscreen/graphic_utils/__init__.py @@ -0,0 +1,4 @@ +# flake8: noqa +from dynamic_background import DynamicBackground +from list_view import ListView +from screen_objects import * diff --git a/mopidy_touchscreen/dynamic_background.py b/mopidy_touchscreen/graphic_utils/dynamic_background.py similarity index 100% rename from mopidy_touchscreen/dynamic_background.py rename to mopidy_touchscreen/graphic_utils/dynamic_background.py diff --git a/mopidy_touchscreen/list_view.py b/mopidy_touchscreen/graphic_utils/list_view.py similarity index 98% rename from mopidy_touchscreen/list_view.py rename to mopidy_touchscreen/graphic_utils/list_view.py index 4b7dda9..cc39b7c 100644 --- a/mopidy_touchscreen/list_view.py +++ b/mopidy_touchscreen/graphic_utils/list_view.py @@ -1,7 +1,7 @@ import logging -from .input_manager import InputManager -from .screen_objects import ScreenObjectsManager, ScrollBar, \ +from ..input import * +from screen_objects import ScreenObjectsManager, ScrollBar, \ TouchAndTextItem logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/screen_objects.py b/mopidy_touchscreen/graphic_utils/screen_objects.py similarity index 100% rename from mopidy_touchscreen/screen_objects.py rename to mopidy_touchscreen/graphic_utils/screen_objects.py diff --git a/mopidy_touchscreen/input/__init__.py b/mopidy_touchscreen/input/__init__.py new file mode 100644 index 0000000..d7b4196 --- /dev/null +++ b/mopidy_touchscreen/input/__init__.py @@ -0,0 +1,2 @@ +# flake8: noqa +from input_manager import InputManager \ No newline at end of file diff --git a/mopidy_touchscreen/gpio_inpput_manager.py b/mopidy_touchscreen/input/gpio_inpput_manager.py similarity index 100% rename from mopidy_touchscreen/gpio_inpput_manager.py rename to mopidy_touchscreen/input/gpio_inpput_manager.py diff --git a/mopidy_touchscreen/input_manager.py b/mopidy_touchscreen/input/input_manager.py similarity index 100% rename from mopidy_touchscreen/input_manager.py rename to mopidy_touchscreen/input/input_manager.py diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py index 08de44f..8ba4a30 100644 --- a/mopidy_touchscreen/screen_manager.py +++ b/mopidy_touchscreen/screen_manager.py @@ -1,22 +1,11 @@ import logging import traceback - from pkg_resources import Requirement, resource_filename - import pygame -from .dynamic_background import DynamicBackground -from .input_manager import InputManager -from .library_screen import LibraryScreen -from .main_screen import MainScreen -from .menu_screen import MenuScreen -from .playlist_screen import PlaylistScreen -from .screen_objects import ScreenObjectsManager, \ - TouchAndTextItem -from .search_screen import SearchScreen - - -from .tracklist import Tracklist +from graphic_utils import * +from input import * +from screens import * logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/screens/__init__.py b/mopidy_touchscreen/screens/__init__.py new file mode 100644 index 0000000..51dc1c4 --- /dev/null +++ b/mopidy_touchscreen/screens/__init__.py @@ -0,0 +1,7 @@ +# flake8: noqa +from library_screen import LibraryScreen +from main_screen import MainScreen +from menu_screen import MenuScreen +from playlist_screen import PlaylistScreen +from search_screen import SearchScreen +from tracklist import Tracklist \ No newline at end of file diff --git a/mopidy_touchscreen/base_screen.py b/mopidy_touchscreen/screens/base_screen.py similarity index 100% rename from mopidy_touchscreen/base_screen.py rename to mopidy_touchscreen/screens/base_screen.py diff --git a/mopidy_touchscreen/library_screen.py b/mopidy_touchscreen/screens/library_screen.py similarity index 97% rename from mopidy_touchscreen/library_screen.py rename to mopidy_touchscreen/screens/library_screen.py index dbaf0a5..0a8cfac 100644 --- a/mopidy_touchscreen/library_screen.py +++ b/mopidy_touchscreen/screens/library_screen.py @@ -1,7 +1,7 @@ import mopidy.models -from .base_screen import BaseScreen -from .list_view import ListView +from base_screen import BaseScreen +from ..graphic_utils import * class LibraryScreen(BaseScreen): diff --git a/mopidy_touchscreen/main_screen.py b/mopidy_touchscreen/screens/main_screen.py similarity index 98% rename from mopidy_touchscreen/main_screen.py rename to mopidy_touchscreen/screens/main_screen.py index a3ad9ab..4c4e347 100644 --- a/mopidy_touchscreen/main_screen.py +++ b/mopidy_touchscreen/screens/main_screen.py @@ -6,16 +6,11 @@ import time import urllib import urllib2 from threading import Thread - import mopidy.core -import pygame - - -from .base_screen import BaseScreen -from .input_manager import InputManager -from .screen_objects import (Progressbar, ScreenObjectsManager, - TouchAndTextItem) +from base_screen import BaseScreen +from ..input import InputManager +from ..graphic_utils import * logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/menu_screen.py b/mopidy_touchscreen/screens/menu_screen.py similarity index 96% rename from mopidy_touchscreen/menu_screen.py rename to mopidy_touchscreen/screens/menu_screen.py index ff67bf8..1e62e29 100644 --- a/mopidy_touchscreen/menu_screen.py +++ b/mopidy_touchscreen/screens/menu_screen.py @@ -1,11 +1,10 @@ import os import socket - import mopidy -from .base_screen import BaseScreen -from .input_manager import InputManager -from .screen_objects import ScreenObjectsManager, TouchAndTextItem +from base_screen import BaseScreen +from ..input import InputManager +from ..graphic_utils import * class MenuScreen(BaseScreen): diff --git a/mopidy_touchscreen/playlist_screen.py b/mopidy_touchscreen/screens/playlist_screen.py similarity index 96% rename from mopidy_touchscreen/playlist_screen.py rename to mopidy_touchscreen/screens/playlist_screen.py index a14bc04..bdb7f53 100644 --- a/mopidy_touchscreen/playlist_screen.py +++ b/mopidy_touchscreen/screens/playlist_screen.py @@ -1,5 +1,5 @@ -from .base_screen import BaseScreen -from .list_view import ListView +from base_screen import BaseScreen +from ..graphic_utils import * class PlaylistScreen(BaseScreen): diff --git a/mopidy_touchscreen/search_screen.py b/mopidy_touchscreen/screens/search_screen.py similarity index 96% rename from mopidy_touchscreen/search_screen.py rename to mopidy_touchscreen/screens/search_screen.py index 9c5129b..a8b4d7f 100644 --- a/mopidy_touchscreen/search_screen.py +++ b/mopidy_touchscreen/screens/search_screen.py @@ -1,11 +1,8 @@ import pygame -from .base_screen import BaseScreen -from .input_manager import InputManager -from .list_view import ListView -from .screen_objects import ScreenObjectsManager, \ - TextItem, TouchAndTextItem - +from base_screen import BaseScreen +from ..input import InputManager +from ..graphic_utils import * mode_track_name = 0 mode_album_name = 1 diff --git a/mopidy_touchscreen/tracklist.py b/mopidy_touchscreen/screens/tracklist.py similarity index 95% rename from mopidy_touchscreen/tracklist.py rename to mopidy_touchscreen/screens/tracklist.py index 65d95bf..deba7ab 100644 --- a/mopidy_touchscreen/tracklist.py +++ b/mopidy_touchscreen/screens/tracklist.py @@ -1,5 +1,5 @@ -from .base_screen import BaseScreen -from .list_view import ListView +from base_screen import BaseScreen +from ..graphic_utils import * from .main_screen import MainScreen diff --git a/mopidy_touchscreen/touch_screen.py b/mopidy_touchscreen/touch_screen.py index 00819e4..ad826ca 100644 --- a/mopidy_touchscreen/touch_screen.py +++ b/mopidy_touchscreen/touch_screen.py @@ -2,11 +2,8 @@ import logging import os import traceback from threading import Thread - from mopidy import core, utils - import pygame - import pykka from .screen_manager import ScreenManager @@ -45,7 +42,7 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener): self.gpio = config['touchscreen']['gpio'] if self.gpio: - from .gpio_inpput_manager import GPIOManager + from input import GPIOManager pins = {} pins['left'] = config['touchscreen']['gpio_left']