diff --git a/.gitignore b/.gitignore index 37fcd87..3743efb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,9 @@ *.swp *~ .coverage +.idea/ .tox/ MANIFEST build/ dist/ -.idea/ +xunit-*.xml diff --git a/MANIFEST.in b/MANIFEST.in index b325d23..a597401 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,5 +5,9 @@ include MANIFEST.in include README.rst include mopidy_touchscreen/ext.conf include mopidy_touchscreen/icomoon.ttf +include tox.ini recursive-include tests *.py + +prune docs +prune mopidy_touchscreen/fonts diff --git a/README.rst b/README.rst index 929ae5f..9a68d93 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,6 @@ -**************************** +****************** Mopidy-Touchscreen -**************************** +****************** .. image:: https://img.shields.io/pypi/v/Mopidy-Touchscreen.svg?style=flat :target: https://pypi.python.org/pypi/Mopidy-Touchscreen/ @@ -10,25 +10,28 @@ Mopidy-Touchscreen :target: https://pypi.python.org/pypi/Mopidy-Touchscreen/ :alt: Number of PyPI downloads -.. image:: https://img.shields.io/travis/9and3r/mopidy-touchscreen/master.png?style=flat +.. image:: https://img.shields.io/travis/9and3r/mopidy-touchscreen/develop.svg?style=flat :target: https://travis-ci.org/9and3r/mopidy-touchscreen :alt: Travis CI build status -.. image:: https://img.shields.io/coveralls/9and3r/mopidy-touchscreen/master.svg?style=flat - :target: https://coveralls.io/r/9and3r/mopidy-touchscreen?branch=master +.. image:: https://img.shields.io/coveralls/9and3r/mopidy-touchscreen/develop.svg?style=flat + :target: https://coveralls.io/r/9and3r/mopidy-touchscreen?branch=develop :alt: Test coverage -Extension for displaying track info and controlling Mopidy from a touch screen using `PyGame `_/SDL. +Extension for displaying track info and controlling Mopidy from a touch screen +using `PyGame `_/SDL. Cover images are downloaded from `last.fm `_ + Dependencies ============ -- ``Mopidy`` >= 0.18 +- ``Mopidy`` >= 1.0 - ``Pykka`` >= 1.1 - ``pygame`` + Installation ============ @@ -50,18 +53,32 @@ Mopidy-Touchscreen to your Mopidy configuration file:: enabled = true screen_width = 320 screen_height = 240 + resolution_factor = 8 cursor = True fullscreen = False cache_dir = $XDG_CACHE_DIR/mopidy/touchscreen The following configuration values are available: - -- ``touchscreen/enabled``: If the Touchscreen extension should be enabled or not. -- ``touchscreen/screen_width``: The width of the resolution you want to use in pixels. -- ``touchscreen/screen_height``: The width of the resolution you want to use in pixels. -- ``touchscreen/cursor``: If the mouse cursor should be shown. (If you use a touchscreen it should be false) -- ``touchscreen/fullscreen``: If you want to be shown as a window or in fullscreen. -- ``touchscreen/cache_dir``: The folder to be used as cache. Defaults to ``$XDG_CACHE_DIR/mopidy/touchscreen``, which usually means + +- ``touchscreen/enabled``: If the Touchscreen extension should be enabled or + not. + +- ``touchscreen/screen_width``: The width of the resolution you want to use in + pixels. + +- ``touchscreen/screen_height``: The width of the resolution you want to use in + pixels. + +- ``touchscreen/resolutin_factor``: This value sets how big content is shown. Smaller values will make content bigger and less content will be displayed at once. + +- ``touchscreen/cursor``: If the mouse cursor should be shown. (If you use a + touchscreen it should be false) + +- ``touchscreen/fullscreen``: If you want to be shown as a window or in + fullscreen. + +- ``touchscreen/screen_width``: The folder to be used as cache. Defaults to + ``$XDG_CACHE_DIR/mopidy/touchscreen``, which usually means ``~/.cache/mopidy/touchscreen`` @@ -70,13 +87,27 @@ How to Setup Use the basic configuration to setup as most standard screens works fine without further configuration. -Raspberry Pi and LCD Shields ----------------------------- +Raspberry Pi +------------ -If you are using a LCD Shield in Raspberry Pi you need to config your LCD and run mopidy with root privileges: +If you are using this on a raspberry pi you have to run mopidy with root privileges: + +Run Mopidy with root privileges +``````````````````````````````` + +You can use ``sudo mopidy``. + +In case you are using musicbox edit ``/etc/init.d/mopidy`` file. Change ``DAEMON_USER=mopidy`` to ``DAEMON_USER=root`` + +Do not forget that this is a workaround and that mopidy will run with root privileges. + +LCD Shields +``````````` + +If you are using a LCD Shield in Raspberry Pi you need to config your LCD: Configure your LCD Shield -````````````````````````` +''''''''''''''''''''''''' Add to the config the next variables:: @@ -84,7 +115,7 @@ Add to the config the next variables:: sdl_fbdev = /dev/fb1 sdl_mousdrv = TSLIB sdl_mousedev = event0 - + This is just an example. It may work but each LCD Shield seems to have its own configuration. To find your values find an example of using pygame with your LCD Shield and it should be something like this in the code:: @@ -92,27 +123,51 @@ To find your values find an example of using pygame with your LCD Shield and it os.environ["SDL_MOUSEDRV"] = "TSLIB" os.environ["SDL_MOUSEDEV"] = "event0" -Run mopidy with root privileges -``````````````````````````````` - -You can use ``sudo mopidy``. +GPIO Buttons +```````````` -In case you are using musicbox edit ``/etc/init.d/mopidy`` file. Change ``DAEMON_USER=mopidy`` to ``DAEMON_USER=root`` +You can use GPIO buttons to controll mopidy touchscreen. To do that set the configuration:: -Do not forget that this is a workaround and that mopidy will run with root privileges. - + [touchscreen] + gpio = True + gpio_left = 4 + gpio_right = 27 + gpio_up = 22 + gpio_down = 23 + gpio_enter = 24 + +You can choose what pins to use: + +- ``touchscreen/gpio``: If you want to use gpio buttons. If this is set to false other gpio configuration values will be ignored. +- ``touchscreen/gpio_left``: Pin used to simulate left key press. +- ``touchscreen/gpio_right``: Pin used to simulate right key press. +- ``touchscreen/gpio_up``: Pin used to simulate up key press. +- ``touchscreen/gpio_down``: Pin used to simulate down key press. +- ``touchscreen/gpio_enter``: Pin used to simulate enter key press. +All pins numbers are in BCM mode. You can check `here `_ to see the numbers for your board. + +The buttons must be connected to GROUND. + +Pin - Button - Ground + +How To Use +========== + +You can use it with a touchscreen or mouse clicking on the icons. +In case you are using a keyboard use arrow keys to navigate and enter to select. +The GPIO buttons simulate keyboard keys so the use is exactly the same as using a keyboard. + Help ==== You can use `mopidy discuss `_ or send an email to `9and3r@gmail.com `_ + Features ======== -Working -------- * See track info (track name, album, artist, cover image) * Seek Track @@ -126,22 +181,21 @@ Working * Repeat one/on/off * Playback list and song selection * Playlists - -Planned -------- - * Use keyboard or GPIO buttons instead of touchscreen + Screenshots =========== -.. image:: http://i60.tinypic.com/qqsait.jpg +.. image:: http://oi57.tinypic.com/29yjgwo.jpg + Video ===== `Example video running the extension `_ + Project resources ================= @@ -153,25 +207,32 @@ Project resources Changelog ========= -v0.3.2 ----------------------------------------- +v1.0.0 (2015-05-26) +------------------- + +- Require Mopidy v1.0 +- Update to work with changed core playback API in Mopidy 1.0 +- Search working +- GPIO and Keyboard support +- Resolution factor to adapt the interface for different screen sizes (Thanks to `Syco54645 `_) +- Background image +- Lower CPU usage (Update screen only when needed) +- Bug Fixes + +v0.3.2 (2015-01-09) +------------------- - Bug Fixes - UI changes - Smoth text scrolling - Search albums, artist or songs (Not fully implemented. Basic functionality) -v0.2.1 ----------------------------------------- +v0.2.1 (2014-08-02) +------------------- - Font will be included on installation -v0.2.0 ----------------------------------------- +v0.2.0 (2014-08-02) +------------------- - First working version - -v0.1.0 (UNRELEASED) ----------------------------------------- - -- Initial release. diff --git a/docs/Makefile b/docs/Makefile deleted file mode 100644 index 6d23234..0000000 --- a/docs/Makefile +++ /dev/null @@ -1,177 +0,0 @@ -# Makefile for Sphinx documentation -# - -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = -BUILDDIR = _build - -# User-friendly check for sphinx-build -ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) -$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/) -endif - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . -# the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . - -.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext - -help: - @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " xml to make Docutils-native XML files" - @echo " pseudoxml to make pseudoxml-XML files for display purposes" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -clean: - rm -rf $(BUILDDIR)/* - -html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." - -singlehtml: - $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml - @echo - @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." - -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json - @echo - @echo "Build finished; now you can process the JSON files." - -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp." - -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Mopidy-Touchscreen.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Mopidy-Touchscreen.qhc" - -devhelp: - $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp - @echo - @echo "Build finished." - @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/Mopidy-Touchscreen" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Mopidy-Touchscreen" - @echo "# devhelp" - -epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub - @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub." - -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make' in that directory to run these through (pdf)latex" \ - "(use \`make latexpdf' here to do that automatically)." - -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -latexpdfja: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through platex and dvipdfmx..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -text: - $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text - @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." - -man: - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man - @echo - @echo "Build finished. The manual pages are in $(BUILDDIR)/man." - -texinfo: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo - @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." - @echo "Run \`make' in that directory to run these through makeinfo" \ - "(use \`make info' here to do that automatically)." - -info: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo "Running Texinfo files through makeinfo..." - make -C $(BUILDDIR)/texinfo info - @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." - -gettext: - $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale - @echo - @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." - -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes - @echo - @echo "The overview file is in $(BUILDDIR)/changes." - -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in $(BUILDDIR)/linkcheck/output.txt." - -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in $(BUILDDIR)/doctest/output.txt." - -xml: - $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml - @echo - @echo "Build finished. The XML files are in $(BUILDDIR)/xml." - -pseudoxml: - $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml - @echo - @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." diff --git a/docs/conf.py b/docs/conf.py deleted file mode 100644 index 776a179..0000000 --- a/docs/conf.py +++ /dev/null @@ -1,259 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Mopidy-Touchscreen documentation build configuration file, created by -# sphinx-quickstart on Mon Aug 4 00:48:14 2014. -# -# This file is execfile()d with the current directory set to its -# containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -# import sys -# import os - -# 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 -# documentation root, use os.path.abspath to make it absolute, like shown here. -# sys.path.insert(0, os.path.abspath('.')) - -# -- General configuration ------------------------------------------------ - -# If your documentation needs a minimal Sphinx version, state it here. -# needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom -# ones. -extensions = [] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The encoding of source files. -# source_encoding = 'utf-8-sig' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = u'Mopidy-Touchscreen' -copyright = u'2014, 9and3r' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = '0.2.1' -# The full version, including alpha/beta/rc tags. -release = '0.2.1' - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -# language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -# today = '' -# Else, today_fmt is used as the format for a strftime call. -# today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = ['_build'] - -# The reST default role (used for this markup: `text`) to use for all -# documents. -# default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -# add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -# add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -# show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -# modindex_common_prefix = [] - -# If true, keep warnings as "system message" paragraphs in the built documents. -# keep_warnings = False - - -# -- Options for HTML output ---------------------------------------------- - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -html_theme = 'default' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -# html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -# html_theme_path = [] - -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -# html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -# html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -# html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -# html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] - -# Add any extra paths that contain custom files (such as robots.txt or -# .htaccess) here, relative to this directory. These files are copied -# directly to the root of the documentation. -# html_extra_path = [] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -# html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -# html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -# html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -# html_additional_pages = {} - -# If false, no module index is generated. -# html_domain_indices = True - -# If false, no index is generated. -# html_use_index = True - -# If true, the index is split into individual pages for each letter. -# html_split_index = False - -# If true, links to the reST sources are added to the pages. -# html_show_sourcelink = True - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -# html_show_sphinx = True - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -# html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -# html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -# html_file_suffix = None - -# Output file base name for HTML help builder. -htmlhelp_basename = 'Mopidy-Touchscreendoc' - - -# -- Options for LaTeX output --------------------------------------------- - -latex_elements = {} -# The paper size ('letterpaper' or 'a4paper'). -# 'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -# 'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -# 'preamble': '', -# } - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, -# author, documentclass [howto, manual, or own class]). -latex_documents = [ - ('index', 'Mopidy-Touchscreen.tex', - u'Mopidy-Touchscreen Documentation', - u'9and3r', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -# latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -# latex_use_parts = False - -# If true, show page references after internal links. -# latex_show_pagerefs = False - -# If true, show URL addresses after external links. -# latex_show_urls = False - -# Documents to append as an appendix to all manuals. -# latex_appendices = [] - -# If false, no module index is generated. -# latex_domain_indices = True - - -# -- Options for manual page output --------------------------------------- - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'mopidy-touchscreen', u'Mopidy-Touchscreen Documentation', - [u'9and3r'], 1) -] - -# If true, show URL addresses after external links. -# man_show_urls = False - - -# -- Options for Texinfo output ------------------------------------------- - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - ('index', 'Mopidy-Touchscreen', u'Mopidy-Touchscreen Documentation', - u'9and3r', 'Mopidy-Touchscreen', 'One line description of project.', - 'Miscellaneous'), -] - -# Documents to append as an appendix to all manuals. -# texinfo_appendices = [] - -# If false, no module index is generated. -# texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -# texinfo_show_urls = 'footnote' - -# If true, do not generate a @detailmenu in the "Top" node's menu. -# texinfo_no_detailmenu = False diff --git a/docs/index.rst b/docs/index.rst deleted file mode 100644 index 92df9a9..0000000 --- a/docs/index.rst +++ /dev/null @@ -1,125 +0,0 @@ -**************************** -Mopidy-Touchscreen -**************************** - -.. image:: https://img.shields.io/pypi/v/Mopidy-Touchscreen.svg?style=flat - :target: https://pypi.python.org/pypi/Mopidy-Touchscreen/ - :alt: Latest PyPI version - -.. image:: https://img.shields.io/pypi/dm/Mopidy-Touchscreen.svg?style=flat - :target: https://pypi.python.org/pypi/Mopidy-Touchscreen/ - :alt: Number of PyPI downloads - -.. image:: https://img.shields.io/travis/9and3r/mopidy-touchscreen/master.png?style=flat - :target: https://travis-ci.org/9and3r/mopidy-touchscreen - :alt: Travis CI build status - -.. image:: https://img.shields.io/coveralls/9and3r/mopidy-touchscreen/master.svg?style=flat - :target: https://coveralls.io/r/9and3r/mopidy-touchscreen?branch=master - :alt: Test coverage - -Extension for displaying track info and controlling Mopidy from a touch screen using `PyGame `_/SDL. - -Cover images are downloaded from `last.fm `_ - -Dependencies -============ - -- ``Mopidy`` >= 0.18 -- ``Pykka`` >= 1.1 -- ``pygame`` - -Installation -============ - -Install by running:: - - pip install Mopidy-Touchscreen - -Or, if available, install the Debian/Ubuntu package from `apt.mopidy.com -`_. - - -Configuration -============= - -Before starting Mopidy, you must add configuration for -Mopidy-Touchscreen to your Mopidy configuration file:: - - [touchscreen] - enabled = true - screen_width = 320 - screen_height = 240 - cursor = True - fullscreen = False - cache_dir = $XDG_CACHE_DIR/mopidy/touchscreen - -The following configuration values are available: - -- ``touchscreen/enabled``: If the Touchscreen extension should be enabled or not. -- ``touchscreen/screen_width``: The width of the resolution you want to use in pixels. -- ``touchscreen/screen_height``: The width of the resolution you want to use in pixels. -- ``touchscreen/cursor``: If the mouse cursor should be shown. (If you use a touchscreen it should be false) -- ``touchscreen/fullscreen``: If you want to be shown as a window or in fullscreen. -- ``touchscreen/screen_width``: The folder to be used as cache. Defaults to ``$XDG_CACHE_DIR/mopidy/touchscreen``, which usually means - ``~/.cache/mopidy/spotify`` - -Features -============= - -Working -------- - -* See track info (track name, album, artist, cover image) -* Seek Track -* Play/Pause -* Mute/Unmute -* Change volume -* Next/Previous track -* Library -* Menu (exit mopidy, restart...) -* Shuffle on/off -* Repeat one/on/off -* Playback list and song selection -* Playlists - -Planned -------- - -* Use keyboard or GPIO buttons instead of touchscreen - -Screenshots -=========== - -.. image:: http://i60.tinypic.com/qqsait.jpg - -Video -===== - -`Example video running the extension `_ - -Project resources -================= - -- `Source code `_ -- `Issue tracker `_ -- `Download development snapshot `_ - - -Changelog -========= - -v0.2.1 ----------------------------------------- - --Font will be included on instalation - -v0.2.0 ----------------------------------------- - -- First working version - -v0.1.0 (UNRELEASED) ----------------------------------------- - -- Initial release. diff --git a/docs/make.bat b/docs/make.bat deleted file mode 100644 index 95b1665..0000000 --- a/docs/make.bat +++ /dev/null @@ -1,242 +0,0 @@ -@ECHO OFF - -REM Command file for Sphinx documentation - -if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=sphinx-build -) -set BUILDDIR=_build -set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . -set I18NSPHINXOPTS=%SPHINXOPTS% . -if NOT "%PAPER%" == "" ( - set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% - set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS% -) - -if "%1" == "" goto help - -if "%1" == "help" ( - :help - echo.Please use `make ^` where ^ is one of - echo. html to make standalone HTML files - echo. dirhtml to make HTML files named index.html in directories - echo. singlehtml to make a single large HTML file - echo. pickle to make pickle files - echo. json to make JSON files - echo. htmlhelp to make HTML files and a HTML help project - echo. qthelp to make HTML files and a qthelp project - echo. devhelp to make HTML files and a Devhelp project - echo. epub to make an epub - echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter - echo. text to make text files - echo. man to make manual pages - echo. texinfo to make Texinfo files - echo. gettext to make PO message catalogs - echo. changes to make an overview over all changed/added/deprecated items - echo. xml to make Docutils-native XML files - echo. pseudoxml to make pseudoxml-XML files for display purposes - echo. linkcheck to check all external links for integrity - echo. doctest to run all doctests embedded in the documentation if enabled - goto end -) - -if "%1" == "clean" ( - for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i - del /q /s %BUILDDIR%\* - goto end -) - - -%SPHINXBUILD% 2> nul -if errorlevel 9009 ( - echo. - echo.The 'sphinx-build' command was not found. Make sure you have Sphinx - echo.installed, then set the SPHINXBUILD environment variable to point - echo.to the full path of the 'sphinx-build' executable. Alternatively you - echo.may add the Sphinx directory to PATH. - echo. - echo.If you don't have Sphinx installed, grab it from - echo.http://sphinx-doc.org/ - exit /b 1 -) - -if "%1" == "html" ( - %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/html. - goto end -) - -if "%1" == "dirhtml" ( - %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. - goto end -) - -if "%1" == "singlehtml" ( - %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml. - goto end -) - -if "%1" == "pickle" ( - %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can process the pickle files. - goto end -) - -if "%1" == "json" ( - %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can process the JSON files. - goto end -) - -if "%1" == "htmlhelp" ( - %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can run HTML Help Workshop with the ^ -.hhp project file in %BUILDDIR%/htmlhelp. - goto end -) - -if "%1" == "qthelp" ( - %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can run "qcollectiongenerator" with the ^ -.qhcp project file in %BUILDDIR%/qthelp, like this: - echo.^> qcollectiongenerator %BUILDDIR%\qthelp\Mopidy-Touchscreen.qhcp - echo.To view the help file: - echo.^> assistant -collectionFile %BUILDDIR%\qthelp\Mopidy-Touchscreen.ghc - goto end -) - -if "%1" == "devhelp" ( - %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. - goto end -) - -if "%1" == "epub" ( - %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The epub file is in %BUILDDIR%/epub. - goto end -) - -if "%1" == "latex" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. - goto end -) - -if "%1" == "latexpdf" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - cd %BUILDDIR%/latex - make all-pdf - cd %BUILDDIR%/.. - echo. - echo.Build finished; the PDF files are in %BUILDDIR%/latex. - goto end -) - -if "%1" == "latexpdfja" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - cd %BUILDDIR%/latex - make all-pdf-ja - cd %BUILDDIR%/.. - echo. - echo.Build finished; the PDF files are in %BUILDDIR%/latex. - goto end -) - -if "%1" == "text" ( - %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The text files are in %BUILDDIR%/text. - goto end -) - -if "%1" == "man" ( - %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The manual pages are in %BUILDDIR%/man. - goto end -) - -if "%1" == "texinfo" ( - %SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo. - goto end -) - -if "%1" == "gettext" ( - %SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The message catalogs are in %BUILDDIR%/locale. - goto end -) - -if "%1" == "changes" ( - %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes - if errorlevel 1 exit /b 1 - echo. - echo.The overview file is in %BUILDDIR%/changes. - goto end -) - -if "%1" == "linkcheck" ( - %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck - if errorlevel 1 exit /b 1 - echo. - echo.Link check complete; look for any errors in the above output ^ -or in %BUILDDIR%/linkcheck/output.txt. - goto end -) - -if "%1" == "doctest" ( - %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest - if errorlevel 1 exit /b 1 - echo. - echo.Testing of doctests in the sources finished, look at the ^ -results in %BUILDDIR%/doctest/output.txt. - goto end -) - -if "%1" == "xml" ( - %SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The XML files are in %BUILDDIR%/xml. - goto end -) - -if "%1" == "pseudoxml" ( - %SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml. - goto end -) - -:end diff --git a/mopidy_touchscreen/__init__.py b/mopidy_touchscreen/__init__.py index 0f038d0..958d584 100644 --- a/mopidy_touchscreen/__init__.py +++ b/mopidy_touchscreen/__init__.py @@ -1,16 +1,13 @@ from __future__ import unicode_literals -import logging import os + from mopidy import config, ext from .touch_screen import TouchScreen -__version__ = '0.3.2' - -# TODO: If you need to log, use loggers named after the current Python module -logger = logging.getLogger(__name__) +__version__ = '1.0.0' class Extension(ext.Extension): @@ -27,6 +24,7 @@ class Extension(ext.Extension): schema = super(Extension, self).get_config_schema() schema['screen_width'] = config.Integer(minimum=1) schema['screen_height'] = config.Integer(minimum=1) + schema['resolution_factor'] = config.Integer(minimum=6) schema['cursor'] = config.Boolean() schema['fullscreen'] = config.Boolean() schema['cache_dir'] = config.Path() diff --git a/mopidy_touchscreen/base_screen.py b/mopidy_touchscreen/base_screen.py deleted file mode 100644 index 085cb41..0000000 --- a/mopidy_touchscreen/base_screen.py +++ /dev/null @@ -1,16 +0,0 @@ -__author__ = 'ander' - - -class BaseScreen(): - - def __init__(self, size, base_size, manager, fonts): - self.size = size - self.base_size = base_size - self.manager = manager - self.fonts = fonts - - def update(self, surface): - pass - - def event(self, event): - pass diff --git a/mopidy_touchscreen/dynamic_background.py b/mopidy_touchscreen/dynamic_background.py deleted file mode 100644 index 250e99f..0000000 --- a/mopidy_touchscreen/dynamic_background.py +++ /dev/null @@ -1,39 +0,0 @@ -import random - - -class DynamicBackground(): - def __init__(self): - self.current = get_valid_color() - self.target = get_valid_color() - - def draw_background(self, surface): - same = True - for x in range(0, 3): - if self.current[x] > self.target[x]: - self.current[x] -= 1 - elif self.current[x] < self.target[x]: - self.current[x] += 1 - if self.current != self.target: - same = False - if same: - self.target = get_valid_color() - surface.fill(self.current) - - -# 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 -# White text should be seen ok with this background color - - -def get_valid_color(): - color = [0, 0, 0] - total = 0 - for i in range(0, 3): - color[i] = random.randint(0, 255) - total += color[i] - extra = total - 510 - if extra > 0: - i = random.randint(0, 2) - color[i] -= extra - return color \ No newline at end of file diff --git a/mopidy_touchscreen/ext.conf b/mopidy_touchscreen/ext.conf index f02c0f1..d504e42 100644 --- a/mopidy_touchscreen/ext.conf +++ b/mopidy_touchscreen/ext.conf @@ -2,6 +2,7 @@ enabled = true screen_width = 320 screen_height = 240 +resolution_factor = 8 cursor = True fullscreen = False cache_dir = $XDG_CACHE_DIR/mopidy/touchscreen @@ -11,8 +12,8 @@ gpio_right = 27 gpio_up = 22 gpio_down = 23 gpio_enter = 24 -sdl_fbdev = /dev/fb1 -sdl_mousdrv = TSLIB -sdl_mousedev = event0 +sdl_fbdev = none +sdl_mousdrv = none +sdl_mousedev = none sdl_audiodriver = disk sdl_path_dsp = /dev/null diff --git a/mopidy_touchscreen/graphic_utils/__init__.py b/mopidy_touchscreen/graphic_utils/__init__.py new file mode 100644 index 0000000..ca52232 --- /dev/null +++ b/mopidy_touchscreen/graphic_utils/__init__.py @@ -0,0 +1,4 @@ +# flake8: noqa +from background_manager import DynamicBackground +from list_view import ListView +from screen_objects import * diff --git a/mopidy_touchscreen/graphic_utils/background_manager.py b/mopidy_touchscreen/graphic_utils/background_manager.py new file mode 100644 index 0000000..e53b274 --- /dev/null +++ b/mopidy_touchscreen/graphic_utils/background_manager.py @@ -0,0 +1,53 @@ +import pygame + +change_speed = 2 + + +class DynamicBackground: + + def __init__(self, size): + self.image_loaded = False + self.size = size + self.surface = pygame.Surface(self.size).convert() + self.surface.fill((145, 16, 16)) + self.surface_image = pygame.Surface(self.size).convert() + self.update = True + + def draw_background(self): + if self.image_loaded: + return self.surface_image.copy() + else: + return self.surface.copy() + + def should_update(self): + if self.update: + self.update = False + return True + else: + return False + + def set_background_image(self, image): + if image is not None: + image_size = get_aspect_scale_size(image, self.size) + target = pygame.transform.smoothscale(image, image_size) + target.set_alpha(150) + self.image_loaded = True + self.surface_image.fill((0, 0, 0)) + pos = ((self.size[0] - image_size[0])/2, + (self.size[1] - image_size[1])/2) + self.surface_image.blit(target, pos) + else: + self.image_loaded = False + self.update = True + + +def get_aspect_scale_size(img, new_size): + size = img.get_size() + aspect_x = new_size[0] / float(size[0]) + aspect_y = new_size[1] / float(size[1]) + if aspect_x > aspect_y: + aspect = aspect_x + else: + aspect = aspect_y + new_size = (int(aspect*size[0]), int(aspect*size[1])) + return new_size diff --git a/mopidy_touchscreen/list_view.py b/mopidy_touchscreen/graphic_utils/list_view.py similarity index 54% rename from mopidy_touchscreen/list_view.py rename to mopidy_touchscreen/graphic_utils/list_view.py index bdad9ed..f079794 100644 --- a/mopidy_touchscreen/list_view.py +++ b/mopidy_touchscreen/graphic_utils/list_view.py @@ -1,8 +1,9 @@ import logging -from .screen_objects import ScreenObjectsManager, ScrollBar, \ +from screen_objects import ScreenObjectsManager, ScrollBar, \ TouchAndTextItem -from .input_manager import InputManager + +from ..input import InputManager logger = logging.getLogger(__name__) @@ -19,10 +20,13 @@ class ListView(): self.list_size = 0 self.list = [] self.scrollbar = False + self.selected = None + self.active = [] self.set_list([]) - self.selected = [] + self.update_keys = [] - # Sets the list for the lisview. It should be an iterable of strings + # Sets the list for the lisview. + # It should be an iterable of strings def set_list(self, item_list): self.screen_objects.clear() self.list = item_list @@ -38,10 +42,15 @@ class ListView(): scroll_bar) else: self.scrollbar = False + if self.list_size > 0: + self.selected = 0 + else: + self.selected = None self.load_new_item_position(0) # Will load items currently displaying in item_pos def load_new_item_position(self, item_pos): + self.update_keys = [] self.current_item = item_pos if self.scrollbar: self.screen_objects.clear_touch(["scrollbar"]) @@ -53,19 +62,36 @@ class ListView(): width = self.size[0] - self.base_size else: width = self.size[0] + self.should_update_always = False while i < self.list_size and z < self.max_rows: item = TouchAndTextItem(self.font, self.list[i], ( - self.pos[0], self.pos[1] + self.base_size * z), - (width, -1)) + self.pos[0], + self.pos[1] + self.base_size * z), (width, -1)) + if not item.fit_horizontal: + self.update_keys.append(str(i)) self.screen_objects.set_touch_object(str(i), item) i += 1 z += 1 + self.reload_selected() + def should_update(self): + if len(self.update_keys) > 0: + return True + else: + return False - def render(self, surface): - self.screen_objects.render(surface) + def render(self, surface, update_all, rects): + if update_all: + self.screen_objects.render(surface) + else: + for key in self.update_keys: + object = self.screen_objects.get_touch_object(key) + object.update() + object.render(surface) + rects.append(object.rect_in_pos) def touch_event(self, touch_event): + self.must_update = True if touch_event.type == InputManager.click \ or touch_event.type == InputManager.long_click: objects = self.screen_objects.get_touch_objects_in_pos( @@ -73,12 +99,22 @@ class ListView(): if objects is not None: for key in objects: if key == "scrollbar": - direction = self.screen_objects.get_touch_object( - key).touch(touch_event.current_pos) + direction = \ + self.screen_objects.get_touch_object( + key).touch(touch_event.current_pos) if direction != 0: self.move_to(direction) else: return int(key) + elif (touch_event.type == InputManager.key and + self.selected is not None): + if touch_event.direction == InputManager.enter: + if self.selected is not None: + return self.selected + elif touch_event.direction == InputManager.up: + self.set_selected(self.selected-1) + elif touch_event.direction == InputManager.down: + self.set_selected(self.selected+1) elif touch_event.type == InputManager.swipe: if touch_event.direction == InputManager.up: self.move_to(-1) @@ -106,22 +142,62 @@ class ListView(): self.screen_objects.get_touch_object( "scrollbar").set_item( self.current_item) - self.set_selected(self.selected) + self.set_active(self.active) - # Set selected items - def set_selected(self, selected): - for number in self.selected: + # Set active items + def set_active(self, active): + self.must_update = True + for number in self.active: try: self.screen_objects.get_touch_object( str(number)).set_active( False) except KeyError: pass - for number in selected: + for number in active: try: self.screen_objects.get_touch_object( str(number)).set_active( True) except KeyError: pass - self.selected = selected + self.active = active + + def set_selected(self, selected): + self.must_update = True + if selected > -1 and selected < len(self.list): + if self.selected is not None: + try: + self.screen_objects.get_touch_object( + str(self.selected)).set_selected( + False) + except KeyError: + pass + if selected is not None: + try: + self.screen_objects.get_touch_object( + str(selected)).set_selected( + True) + except KeyError: + pass + self.selected = selected + self.set_selected_on_screen() + + def set_selected_on_screen(self): + self.must_update = True + if self.current_item + self.max_rows <= self.selected: + self.move_to(1) + self.set_selected_on_screen() + elif self.current_item > self.selected: + self.move_to(-1) + self.set_selected_on_screen() + + def reload_selected(self): + self.must_update = True + if self.selected is not None: + try: + self.screen_objects.get_touch_object( + str(self.selected)).set_selected( + True) + except KeyError: + pass diff --git a/mopidy_touchscreen/screen_objects.py b/mopidy_touchscreen/graphic_utils/screen_objects.py similarity index 51% rename from mopidy_touchscreen/screen_objects.py rename to mopidy_touchscreen/graphic_utils/screen_objects.py index 02ee4dd..01a1871 100644 --- a/mopidy_touchscreen/screen_objects.py +++ b/mopidy_touchscreen/graphic_utils/screen_objects.py @@ -1,14 +1,13 @@ import logging import math -import pygame -from .input_manager import InputManager +import pygame logger = logging.getLogger(__name__) -class ScreenObjectsManager(): +class ScreenObjectsManager: def __init__(self): self.touch_objects = {} self.text_objects = {} @@ -31,7 +30,6 @@ class ScreenObjectsManager(): def get_touch_object(self, key): return self.touch_objects[key] - def render(self, surface): for key in self.text_objects: self.text_objects[key].update() @@ -67,134 +65,6 @@ class ScreenObjectsManager(): self.selected = None self.selected_key = None - def change_selected(self, direction, pos): - if pos is None: - pos = self.selected.pos - if direction == InputManager.right: - bests = self.find_nearest_objects( - self.find_in_quadrant(False, True, pos), True, pos) - best_key = self.find_best_object(bests, False, True, pos) - elif direction == InputManager.left: - bests = self.find_nearest_objects( - self.find_in_quadrant(False, False, pos), True, pos) - best_key = self.find_best_object(bests, False, False, pos) - elif direction == InputManager.down: - bests = self.find_nearest_objects( - self.find_in_quadrant(True, True, pos), False, pos) - best_key = self.find_best_object(bests, True, True, pos) - elif direction == InputManager.up: - bests = self.find_nearest_objects( - self.find_in_quadrant(True, False, pos), False, pos) - best_key = self.find_best_object(bests, True, False, pos) - if best_key is None: - return False - else: - self.set_selected(best_key) - return True - - # Find touch objects on specified quadrant - # The quadrant is the normal math one with x and y - # x is positive on the bottom as pygame x - # The quadrant origin (0,0) is the selected pos - def find_in_quadrant(self, vertical, positive, pos): - objects = {} - if vertical: - if positive: - for key in self.touch_objects: - current = self.touch_objects[key] - if current.pos[1] > pos[1]: - objects[key] = current - else: - for key in self.touch_objects: - current = self.touch_objects[key] - if current.pos[1] < pos[1]: - objects[key] = current - else: - if positive: - for key in self.touch_objects: - current = self.touch_objects[key] - if current.pos[0] > pos[0]: - objects[key] = current - else: - for key in self.touch_objects: - current = self.touch_objects[key] - if current.pos[0] < pos[0]: - objects[key] = current - return objects - - # Find the objects that are nearest - def find_nearest_objects(self, objects, vertical, pos): - best_pos = None - min_value = None - best_objects = {} - if vertical: - for key in objects: - if min_value is None: - best_pos = objects[key].pos[1] - min_value = abs(objects[key].pos[1] - pos[1]) - elif abs(objects[key].pos[1] - pos[1]) < min_value: - min_value = abs(objects[key].pos[1] - pos[1]) - best_pos = objects[key].pos[1] - for key in objects: - if objects[key].pos[1] == best_pos: - best_objects[key] = objects[key] - return best_objects - else: - for key in objects: - if min_value is None: - best_pos = objects[key].pos[0] - min_value = abs(objects[key].pos[0] - pos[0]) - elif abs(objects[key].pos[0] - pos[0]) < min_value: - min_value = abs(objects[key].pos[0] - pos[0]) - best_pos = objects[key].pos[0] - for key in objects: - if objects[key].pos[0] == best_pos: - best_objects[key] = objects[key] - return best_objects - - def find_best_object(self, objects, vertical, positive, pos): - best_key = None - best_pos = None - if vertical: - if positive: - for key in objects: - if best_pos is None: - best_pos = objects[key].pos[1] - best_key = key - elif objects[key].pos[1] >= pos[1] and \ - objects[key].pos[1] < best_pos: - best_pos = objects[key].pos[1] - best_key = key - else: - for key in objects: - if best_pos is None: - best_pos = objects[key].pos[1] - best_key = key - elif objects[key].pos[1] <= pos[1] and \ - objects[key].pos[1] > best_pos: - best_pos = objects[key].pos[1] - best_key = key - else: - if positive: - for key in objects: - if best_pos is None: - best_pos = objects[key].pos[0] - best_key = key - elif objects[key].pos[0] >= pos[0] and \ - objects[key].pos[0] < best_pos: - best_pos = objects[key].pos[0] - best_key = key - else: - for key in objects: - if best_pos is None: - best_pos = objects[key].pos[0] - best_key = key - elif objects[key].pos[0] <= pos[0] and \ - objects[key].pos[0] > best_pos: - best_pos = objects[key].pos[0] - best_key = key - return best_key - class BaseItem(): def __init__(self, pos, size): @@ -208,17 +78,23 @@ class BaseItem(): def get_right_pos(self): return self.pos[0] + self.size[0] - def update(self): - pass + return False class TextItem(BaseItem): - def __init__(self, font, text, pos, size, center=False): + + scroll_speed = 2 + + def __init__(self, font, text, pos, size, center=False, background=None, + scroll_no_fit=True): self.font = font self.text = text + self.scroll_no_fit = scroll_no_fit self.color = (255, 255, 255) self.box = self.font.render(text, True, self.color) + self.box = self.box.convert_alpha() + self.background = background if size is not None: if size[1] == -1: height = self.font.size(text)[1] @@ -232,6 +108,8 @@ class TextItem(BaseItem): size[0]: self.fit_horizontal = False self.step = 0 + self.step_2 = None + self.scroll_white_gap = self.font.get_height() * 4 else: self.fit_horizontal = True if self.pos[1] + self.box.get_rect().height > pos[1] + \ @@ -246,35 +124,69 @@ class TextItem(BaseItem): self.center = center if self.center: if self.fit_horizontal: - self.margin = (self.size[0]-self.box.get_rect().width)/2 + self.margin = (self.size[0] - + self.box.get_rect().width)/2 def update(self): - if not self.fit_horizontal: - if self.step > self.box.get_rect().width: - self.step = -self.size[0] + if self.scroll_no_fit and not self.fit_horizontal: + self.step += TextItem.scroll_speed + if self.step_2 is None: + if (self.box.get_rect().width - self.step + + self.scroll_white_gap) < self.size[0]: + self.step_2 = \ + self.box.get_rect().width - \ + self.step + self.scroll_white_gap else: - self.step = self.step + 1 + self.step_2 -= TextItem.scroll_speed + if self.step_2 < 0: + self.step = 0 - self.step_2 + self.step_2 = None return True else: return BaseItem.update(self) def render(self, surface): + if self.background: + surface.fill(self.background, rect=self.rect_in_pos) + pygame.draw.rect(surface, (0, 0, 0), self.rect_in_pos, 1) if self.fit_horizontal: - surface.blit(self.box, ((self.pos[0] + self.margin), self.pos[1]), area=self.rect) + surface.blit( + self.box, ((self.pos[0] + self.margin), + self.pos[1]), area=self.rect) else: - surface.blit(self.box, self.pos, - area=pygame.Rect(self.step, 0, self.size[0], - self.size[1])) - + if self.scroll_no_fit: + surface.blit(self.box, self.pos, + area=pygame.Rect(self.step, 0, self.size[0], + self.size[1])) + if self.step_2 is not None: + surface.blit(self.box, (self.pos[0]+self.step_2, + self.pos[1]), + area=pygame.Rect(0, 0, + self.size[0] - + self.step_2, + self.size[1])) + else: + step = self.box.get_rect().width - self.size[0] + surface.blit(self.box, self.pos, + area=pygame.Rect(step, 0, self.size[0], + self.size[1])) def set_text(self, text, change_size): if text != self.text: if change_size: TextItem.__init__(self, self.font, text, self.pos, - None, self.center) + None, self.center, self.background, + self.scroll_no_fit) else: TextItem.__init__(self, self.font, text, self.pos, - self.size, self.center) + self.size, self.center, self.background, + self.scroll_no_fit) + + def add_text(self, add_text, change_size): + self.set_text(self.text+add_text, change_size) + + def remove_text(self, chars, change_size): + self.set_text(self.text[:-chars], change_size) class TouchObject(BaseItem): @@ -282,6 +194,15 @@ class TouchObject(BaseItem): BaseItem.__init__(self, pos, size) self.active = False self.selected = False + self.selected_box = pygame.Surface(size, pygame.SRCALPHA) + self.selected_box = self.selected_box.convert_alpha() + self.selected_box.fill((0, 0, 0, 128)) + self.selected_box_rectangle = pygame.Surface(size, pygame.SRCALPHA) + self.selected_box_rectangle = \ + self.selected_box_rectangle.convert_alpha() + pygame.draw.rect(self.selected_box_rectangle, (255, 255, 255), + self.selected_box_rectangle.get_rect(), + size[1]/10+1) def is_pos_inside(self, pos): return self.rect_in_pos.collidepoint(pos) @@ -292,38 +213,51 @@ class TouchObject(BaseItem): def set_selected(self, selected): self.selected = selected + def render(self, surface): + if self.selected: + surface.blit(self.selected_box, self.pos) + surface.blit(self.selected_box_rectangle, self.pos) + + def pre_render(self, surface): + if self.selected: + surface.blit(self.selected_box, self.pos) + + def post_render(self, surface): + if self.selected: + surface.blit(self.selected_box_rectangle, self.pos) + class TouchAndTextItem(TouchObject, TextItem): - def __init__(self, font, text, pos, size, center=False): - TextItem.__init__(self, font, text, pos, size, center=center) + def __init__(self, font, text, pos, size, center=False, background=None, + scroll_no_fit=True): + TextItem.__init__(self, font, text, pos, size, center=center, + background=background, scroll_no_fit=scroll_no_fit) TouchObject.__init__(self, pos, self.size) self.active_color = (0, 150, 255) - self.selected_color = (150, 0, 255) + self.normal_box = self.box self.active_box = self.font.render(text, True, self.active_color) - self.selected_box = self.font.render(text, True, - self.selected_color) def update(self): - TextItem.update(self) + return TextItem.update(self) def set_text(self, text, change_size): TextItem.set_text(self, text, change_size) + self.normal_box = self.box self.active_box = self.font.render(text, True, self.active_color) - self.selected_box = self.font.render(text, True, - self.selected_color) + + def set_active(self, active): + TouchObject.set_active(self, active) + if self.active: + self.box = self.active_box + else: + self.box = self.normal_box def render(self, surface): - if not self.fit_horizontal: - self.rect = pygame.Rect(self.step, 0, self.size[0], - self.size[1]) - if self.selected: - surface.blit(self.selected_box, (self.pos[0]+self.margin, self.pos[1]), area=self.rect) - elif self.active: - surface.blit(self.active_box, (self.pos[0]+self.margin, self.pos[1]), area=self.rect) - else: - surface.blit(self.box, (self.pos[0]+self.margin, self.pos[1]), area=self.rect) + TouchObject.pre_render(self, surface) + TextItem.render(self, surface) + TouchObject.post_render(self, surface) class Progressbar(TouchObject): @@ -332,25 +266,34 @@ class Progressbar(TouchObject): self.value = 0 self.max = max_value self.back_color = (0, 0, 0, 128) - self.main_color = (0, 150, 255) - self.surface = pygame.Surface(self.size, pygame.SRCALPHA) + self.main_color = (0, 150, 255, 150) + self.surface = pygame.Surface(self.size, pygame.SRCALPHA)\ + .convert_alpha() self.surface.fill(self.back_color) self.value_text = value_text if value_text: self.text = TextItem(font, str(max_value), pos, None) - self.text.pos = ( - self.pos[0] + self.size[0] / 2 - self.text.size[0] / - 2, self.text.pos[1]) + self.text.pos = (self.pos[0] + + self.size[0] / 2 - + self.text.size[0] / + 2, self.text.pos[1]) self.text.set_text(str(self.value), True) else: 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[1]) + self.pos[0] + self.size[0] / 2 - self.text.size[0] / + 2, self.text.pos[1]) + # Rectangle + self.rectangle = pygame.Surface(size, pygame.SRCALPHA)\ + .convert_alpha() + pygame.draw.rect(self.rectangle, (255, 255, 255), + self.rectangle.get_rect(), + size[1]/20+1) def render(self, surface): surface.blit(self.surface, self.pos) + surface.blit(self.rectangle, self.pos) self.text.render(surface) def set_value(self, value): @@ -358,9 +301,10 @@ class Progressbar(TouchObject): self.value = value if self.value_text: self.set_text(str(self.value)) - self.text.pos = ( - self.pos[0] + self.size[0] / 2 - self.text.size[0] / - 2, self.text.pos[1]) + self.text.pos = (self.pos[0] + + self.size[0] / 2 - + self.text.size[0] + / 2, self.text.pos[1]) self.surface.fill(self.back_color) pos_pixel = value * self.size[0] / self.max rect = pygame.Rect(0, 0, pos_pixel, self.size[1]) @@ -383,7 +327,8 @@ class ScrollBar(TouchObject): self.max = max_value self.items_on_screen = items_on_screen self.current_item = 0 - self.back_bar = pygame.Surface(self.size, pygame.SRCALPHA) + self.back_bar = pygame.Surface(self.size, pygame.SRCALPHA)\ + .convert_alpha() self.back_bar.fill((255, 255, 255, 128)) self.bar_pos = 0 if self.max < 1: @@ -392,7 +337,7 @@ class ScrollBar(TouchObject): self.bar_size = math.ceil( float(self.items_on_screen) / float(self.max) * float( self.size[1])) - self.bar = pygame.Surface((self.size[0], self.bar_size)) + self.bar = pygame.Surface((self.size[0], self.bar_size)).convert() self.bar.fill((255, 255, 255)) def render(self, surface): diff --git a/mopidy_touchscreen/input/__init__.py b/mopidy_touchscreen/input/__init__.py new file mode 100644 index 0000000..15a27ca --- /dev/null +++ b/mopidy_touchscreen/input/__init__.py @@ -0,0 +1,6 @@ +# flake8: noqa +from input_manager import InputManager +try: + from gpio_inpput_manager import GPIOManager +except ImportError: + pass \ 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 94% rename from mopidy_touchscreen/gpio_inpput_manager.py rename to mopidy_touchscreen/input/gpio_inpput_manager.py index dc6ea6e..4e6b012 100644 --- a/mopidy_touchscreen/gpio_inpput_manager.py +++ b/mopidy_touchscreen/input/gpio_inpput_manager.py @@ -1,8 +1,9 @@ import logging -import pygame import RPi.GPIO as GPIO +import pygame + logger = logging.getLogger(__name__) @@ -45,6 +46,7 @@ def right(channel): type = pygame.KEYUP else: type = pygame.KEYDOWN + dict['unicode'] = None dict['key'] = pygame.K_RIGHT event = pygame.event.Event(type, dict) pygame.event.post(event) @@ -56,6 +58,7 @@ def left(channel): type = pygame.KEYUP else: type = pygame.KEYDOWN + dict['unicode'] = None dict['key'] = pygame.K_RIGHT event = pygame.event.Event(type, dict) pygame.event.post(event) @@ -67,6 +70,7 @@ def down(channel): type = pygame.KEYUP else: type = pygame.KEYDOWN + dict['unicode'] = None dict['key'] = pygame.K_DOWN event = pygame.event.Event(type, dict) pygame.event.post(event) @@ -78,6 +82,7 @@ def up(channel): type = pygame.KEYUP else: type = pygame.KEYDOWN + dict['unicode'] = None dict['key'] = pygame.K_UP event = pygame.event.Event(type, dict) pygame.event.post(event) @@ -89,11 +94,7 @@ def enter(channel): type = pygame.KEYUP else: type = pygame.KEYDOWN + dict['unicode'] = None dict['key'] = pygame.K_RETURN event = pygame.event.Event(type, dict) pygame.event.post(event) - - - - - diff --git a/mopidy_touchscreen/input_manager.py b/mopidy_touchscreen/input/input_manager.py similarity index 73% rename from mopidy_touchscreen/input_manager.py rename to mopidy_touchscreen/input/input_manager.py index 5d76127..dcdd1fa 100644 --- a/mopidy_touchscreen/input_manager.py +++ b/mopidy_touchscreen/input/input_manager.py @@ -20,6 +20,9 @@ class InputManager(): right = 3 enter = 4 + special_keys = [pygame.K_DOWN, pygame.K_UP, pygame.K_LEFT, + pygame.K_RIGHT, pygame.K_RETURN] + def __init__(self, size): self.down_pos = (0, 0) self.up_pos = (0, 0) @@ -37,13 +40,13 @@ class InputManager(): touch_event = InputEvent(InputManager.swipe, self.down_pos, self.up_pos, True, - InputManager.up) + InputManager.up, None) return touch_event elif event.button == 5: touch_event = InputEvent(InputManager.swipe, self.down_pos, self.up_pos, True, - InputManager.down) + InputManager.down, None) return touch_event elif event.button == 1 and self.down_button == 1: touch_event = self.mouse_up(event) @@ -51,7 +54,7 @@ class InputManager(): elif event.button == 3 and self.down_button == 3: touch_event = InputEvent(InputManager.long_click, self.down_pos, self.up_pos, - None, None) + None, None, None) return touch_event else: return None @@ -59,14 +62,20 @@ class InputManager(): self.mouse_down(event) return None elif event.type == pygame.KEYDOWN: - self.key_down(event) - return None + return self.key_down(event) elif event.type == pygame.KEYUP: return self.key_up(event) def key_down(self, event): - self.last_key = event.key - self.down_time = time.time() + if event.unicode is not None\ + and len(event.unicode) > 0 and event.key not in \ + InputManager.special_keys: + return InputEvent(InputManager.key, None, None, None, + None, event.unicode) + else: + self.last_key = event.key + self.down_time = time.time() + return None def key_up(self, event): if self.last_key == event.key: @@ -83,8 +92,14 @@ class InputManager(): else: return None if direction is not None: + if time.time() - self.down_time > \ + InputManager.long_click_min_time: + longpress = True + else: + longpress = False return InputEvent(InputManager.key, None, None, None, - direction) + direction, self.last_key, + longpress=longpress) def mouse_down(self, event): self.down_pos = event.pos @@ -93,10 +108,10 @@ class InputManager(): def mouse_up(self, event): 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 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() - InputManager.long_click_min_time > \ self.down_time: return InputEvent(InputManager.long_click, @@ -106,23 +121,25 @@ class InputManager(): return InputEvent(InputManager.click, self.down_pos, self.up_pos, None, None) - elif abs(self.down_pos[1] - self.up_pos[ - 1]) > self.min_swipe_move: + elif abs(self.down_pos[1] - self.up_pos[1])\ + > self.min_swipe_move: return InputEvent(InputManager.swipe, self.down_pos, self.up_pos, True, None) elif self.down_pos[1] - self.up_pos[1] < self.max_move_margin: - if abs(self.down_pos[0] - self.up_pos[ - 0]) > self.min_swipe_move: + if abs(self.down_pos[0] - self.up_pos[0]) > \ + self.min_swipe_move: return InputEvent(InputManager.swipe, self.down_pos, self.up_pos, False, None) -class InputEvent(): +class InputEvent: def __init__(self, event_type, down_pos, current_pos, vertical, - direction): + direction, unicode=None, longpress=False): self.type = event_type self.down_pos = down_pos self.current_pos = current_pos + self.unicode = unicode + self.longpress = longpress if event_type is InputManager.swipe and direction is None: if vertical: if self.down_pos[1] < self.current_pos[1]: diff --git a/mopidy_touchscreen/library_screen.py b/mopidy_touchscreen/library_screen.py deleted file mode 100644 index ecde1ae..0000000 --- a/mopidy_touchscreen/library_screen.py +++ /dev/null @@ -1,89 +0,0 @@ -import logging -import mopidy.models - -from .list_view import ListView -from .input_manager import InputManager -from .base_screen import BaseScreen - -logger = logging.getLogger(__name__) - - -class LibraryScreen(BaseScreen): - def __init__(self, size, base_size, manager, fonts): - BaseScreen.__init__(self, size, base_size, manager, fonts) - self.list_view = ListView((0, 0), ( - self.size[0], self.size[1] - self.base_size), - self.base_size, - self.fonts['base']) - self.directory_list = [] - self.current_directory = None - self.library = None - self.library_strings = None - self.lookup_uri(None) - - def get_dirty_area(self): - return self.list_view.get_dirty_area() - - def go_inside_directory(self, uri): - self.directory_list.append(self.current_directory) - self.current_directory = uri - self.lookup_uri(uri) - - def lookup_uri(self, uri): - self.library_strings = [] - if uri is not None: - self.library_strings.append("..") - self.library = self.manager.core.library.browse(uri).get() - for lib in self.library: - self.library_strings.append(lib.name) - self.list_view.set_list(self.library_strings) - - def go_up_directory(self): - if len(self.directory_list): - directory = self.directory_list.pop() - self.current_directory = directory - self.lookup_uri(directory) - - def update(self, screen, update_all): - self.list_view.render(screen) - - def touch_event(self, touch_event): - clicked = self.list_view.touch_event(touch_event) - if clicked is not None: - if touch_event.type == InputManager.long_click: - if self.current_directory is not None: - if clicked == 0: - self.go_up_directory() - else: - self.play_uri(self.library[clicked - 1].uri, - False) - else: - self.play_uri(self.library[clicked].uri, False) - else: - if self.current_directory is not None: - if clicked == 0: - self.go_up_directory() - else: - if self.library[ - clicked - 1].type == mopidy.models.Ref.TRACK: - self.play_uri( - self.library[clicked - 1].uri, True) - else: - self.go_inside_directory( - self.library[clicked - 1].uri) - else: - if self.library[ - clicked].type == mopidy.models.Track: - self.play_uri(self.library[clicked].uri, True) - else: - self.go_inside_directory( - self.library[clicked].uri) - - def play_uri(self, uri, track): - self.manager.core.tracklist.clear() - if track: - self.manager.core.tracklist.add(uri=uri) - self.manager.core.playback.play() - else: - # TODO: add folder to tracks to play - pass diff --git a/mopidy_touchscreen/menu_screen.py b/mopidy_touchscreen/menu_screen.py deleted file mode 100644 index 27874c2..0000000 --- a/mopidy_touchscreen/menu_screen.py +++ /dev/null @@ -1,92 +0,0 @@ -import os -import socket -import mopidy - -from .screen_objects import ScreenObjectsManager, TouchAndTextItem -from .input_manager import InputManager -from .base_screen import BaseScreen - - -class MenuScreen(BaseScreen): - def __init__(self, size, base_size, manager, fonts): - BaseScreen.__init__(self, size, base_size, manager, fonts) - self.ip = None - self.screen_objects = ScreenObjectsManager() - - # Exit mopidy button - button = TouchAndTextItem(self.manager.fonts['icon'], - u"\ue611", - (0, 0), None) - self.screen_objects.set_touch_object("exit_icon", button) - button = TouchAndTextItem(self.fonts['base'], - "Exit Mopidy", - (button.get_right_pos(), - 0), - None) - self.screen_objects.set_touch_object("exit", button) - - # Shutdown button - button = TouchAndTextItem(self.fonts['icon'], - u"\ue60b", - (0, self.base_size * 1), None) - self.screen_objects.set_touch_object("shutdown_icon", button) - button = TouchAndTextItem(self.fonts['base'], - "Shutdown", - (button.get_right_pos(), - self.base_size * 1), - None) - self.screen_objects.set_touch_object("shutdown", button) - - # Restart button - button = TouchAndTextItem(self.fonts['icon'], - u"\ue609", - (0, self.base_size * 2), None) - self.screen_objects.set_touch_object("restart_icon", button) - button = TouchAndTextItem(self.fonts['base'], - "Restart", - (button.get_right_pos(), - self.base_size * 2), - None) - self.screen_objects.set_touch_object("restart", button) - - # IP addres - button = TouchAndTextItem(self.fonts['base'], "IP: ", - (0, self.base_size * 3), None) - self.screen_objects.set_touch_object("ip", button) - - def update(self, screen, update_all): - self.screen_objects.render(screen) - - def touch_event(self, event): - if event.type == InputManager.click: - clicked = self.screen_objects.get_touch_objects_in_pos( - event.current_pos) - for key in clicked: - if key == "exit_icon" or key == "exit": - mopidy.utils.process.exit_process() - elif key == "shutdown_icon" or key == "shutdown": - if os.system("gksu -- shutdown now -h") != 0: - 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": - self.check_connection() - - # Will check internet connection - def check_connection(self): - try: - self.manager.set_connection(False, True) - s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - s.connect(("8.8.8.8", 80)) - self.ip = s.getsockname()[0] - s.close() - self.screen_objects.get_touch_object("ip").set_text( - "IP: " + self.ip, "None") - self.manager.set_connection(True, False) - except socket.error: - s.close() - self.ip = None - self.screen_objects.get_touch_object("ip").set_text( - "IP: No internet", "None") - self.manager.set_connection(False, False) diff --git a/mopidy_touchscreen/playlist_screen.py b/mopidy_touchscreen/playlist_screen.py deleted file mode 100644 index 81246e8..0000000 --- a/mopidy_touchscreen/playlist_screen.py +++ /dev/null @@ -1,33 +0,0 @@ -from .list_view import ListView -from .base_screen import BaseScreen - - -class PlaylistScreen(BaseScreen): - def __init__(self, size, base_size, manager, fonts): - BaseScreen.__init__(self, size, base_size, manager, fonts) - self.list_view = ListView((0, 0), ( - self.size[0], self.size[1] - self.base_size), - self.base_size, - self.fonts['base']) - self.playlists_strings = [] - self.playlists = [] - self.playlists_loaded() - - def update(self, screen, update_all): - self.list_view.render(screen) - - def playlists_loaded(self): - self.playlists_strings = [] - self.playlists = [] - for playlist in self.manager.core.playlists.playlists.get(): - self.playlists.append(playlist) - self.playlists_strings.append(playlist.name) - self.list_view.set_list(self.playlists_strings) - - def touch_event(self, touch_event): - clicked = self.list_view.touch_event(touch_event) - if clicked is not None: - self.manager.core.tracklist.clear() - self.manager.core.tracklist.add( - uri=self.playlists[clicked].uri) - self.manager.core.playback.play() diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py index e3c13f5..9ab51f5 100644 --- a/mopidy_touchscreen/screen_manager.py +++ b/mopidy_touchscreen/screen_manager.py @@ -1,18 +1,17 @@ import logging import traceback -import pygame + +from graphic_utils import DynamicBackground, \ + ScreenObjectsManager, TouchAndTextItem +from input import InputManager + from pkg_resources import Requirement, resource_filename -from .search_screen import SearchScreen -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 .input_manager import InputManager -from .tracklist import Tracklist -from .dynamic_background import DynamicBackground +import pygame + +from screens import BaseScreen, Keyboard, LibraryScreen, MainScreen, MenuScreen,\ + PlaylistScreen, SearchScreen, Tracklist + logger = logging.getLogger(__name__) @@ -25,69 +24,89 @@ menu_index = 5 class ScreenManager(): - def __init__(self, size, core, cache): - self.size = size + + def __init__(self, size, core, cache, resolution_factor): self.core = core + self.cache = cache self.fonts = {} - self.background = DynamicBackground() - self.current_screen = 0 - self.base_size = self.size[1] / 8 - font = resource_filename( - Requirement.parse("mopidy-touchscreen"), - "mopidy_touchscreen/icomoon.ttf") - self.fonts['base'] = pygame.font.SysFont("verdana", - self.base_size) - self.fonts['icon'] = pygame.font.Font(font, self.base_size) - try: - self.screens = [ - SearchScreen(size, self.base_size, self, self.fonts), - MainScreen(size, self.base_size, self, self.fonts, cache, core), - Tracklist(size, self.base_size, self, self.fonts), - LibraryScreen(size, self.base_size, self, self.fonts), - PlaylistScreen(size, self.base_size, self, self.fonts), - MenuScreen(size, self.base_size, self, self.fonts)] - except: - traceback.print_exc() + self.background = None + self.current_screen = library_index + + # Init variables in init + self.base_size = None + self.size = None + self.screens = None self.track = None self.input_manager = InputManager(size) self.down_bar_objects = ScreenObjectsManager() - self.screen_changed = True + self.down_bar = None + self.keyboard = None + self.update_type = BaseScreen.update_all + + self.resolution_factor = resolution_factor + + self.init_manager(size) + + def init_manager(self, size): + self.size = size + + self.background = DynamicBackground(self.size) + self.base_size = self.size[1] / self.resolution_factor + font = resource_filename( + Requirement.parse("mopidy-touchscreen"), + "mopidy_touchscreen/icomoon.ttf") + self.fonts['base'] = pygame.font.SysFont("arial", + int(self.base_size*0.9)) + self.fonts['icon'] = pygame.font.Font(font, int(self.base_size*0.9)) + try: + self.screens = [ + SearchScreen(size, self.base_size, self, self.fonts), + MainScreen(size, self.base_size, self, self.fonts, + self.cache, self.core, self.background), + Tracklist(size, self.base_size, self, self.fonts), + LibraryScreen(size, self.base_size, self, self.fonts), + PlaylistScreen(size, + self.base_size, self, self.fonts), + MenuScreen(size, self.base_size, self, self.fonts, self.core)] + except: + traceback.print_exc() + self.track = None # Menu buttons button_size = (self.size[0] / 6, self.base_size) - # Search button + # Search button button = TouchAndTextItem(self.fonts['icon'], u" \ue986", - (0, self.base_size * 7), + (0, self.size[1] - self.base_size), button_size, center=True) self.down_bar_objects.set_touch_object("menu_0", button) x = button.get_right_pos() # Main button button = TouchAndTextItem(self.fonts['icon'], u" \ue600", - (x, self.base_size * 7), + (x, self.size[1] - self.base_size), button_size, center=True) self.down_bar_objects.set_touch_object("menu_1", button) x = button.get_right_pos() # Tracklist button button = TouchAndTextItem(self.fonts['icon'], u" \ue60d", - (x, self.base_size * 7), + (x, self.size[1] - self.base_size), button_size, center=True) self.down_bar_objects.set_touch_object("menu_2", button) x = button.get_right_pos() # Library button button = TouchAndTextItem(self.fonts['icon'], u" \ue604", - (x, self.base_size * 7), + (x, self.size[1] - self.base_size), button_size, center=True) self.down_bar_objects.set_touch_object("menu_3", button) x = button.get_right_pos() # Playlist button button = TouchAndTextItem(self.fonts['icon'], u" \ue605", - (x, self.base_size * 7), + (x, self.size[1] - self.base_size), button_size, center=True) self.down_bar_objects.set_touch_object("menu_4", button) @@ -95,31 +114,64 @@ class ScreenManager(): # Menu button button = TouchAndTextItem(self.fonts['icon'], u" \ue60a", - (x, self.base_size * 7), button_size, center=True) + (x, self.size[1] - self.base_size), + button_size, + center=True) self.down_bar_objects.set_touch_object("menu_5", button) # Down bar self.down_bar = pygame.Surface( - (self.size[0], self.size[1] - self.base_size * 7), + (self.size[0], self.size[1] - self.base_size), pygame.SRCALPHA) - self.down_bar.fill((0, 0, 0, 128)) + self.down_bar.fill((0, 0, 0, 200)) self.options_changed() self.mute_changed(self.core.playback.mute.get()) - self.playback_state_changed(self.core.playback.state.get(), - self.core.playback.state.get()) + playback_state = self.core.playback.state.get() + self.playback_state_changed(playback_state, + playback_state) self.screens[menu_index].check_connection() - self.change_screen(library_index) - def update(self): - surface = pygame.Surface(self.size) - self.background.draw_background(surface) - self.screens[self.current_screen].update(surface, - self.screen_changed) - surface.blit(self.down_bar, (0, self.base_size * 7)) - self.down_bar_objects.render(surface) - self.screen_changed = False - return surface + self.change_screen(self.current_screen) + + self.update_type = BaseScreen.update_all + + def get_update_type(self): + if self.update_type == BaseScreen.update_all: + self.update_type = BaseScreen.no_update + return BaseScreen.update_all + else: + if self.keyboard: + return BaseScreen.no_update + else: + if self.background.should_update(): + return BaseScreen.update_all + else: + if self.screens[self.current_screen].should_update(): + return BaseScreen.update_partial + else: + return BaseScreen.no_update + + def update(self, screen): + update_type = self.get_update_type() + if update_type != BaseScreen.no_update: + rects = [] + surface = self.background.draw_background() + if self.keyboard: + self.keyboard.update(surface) + else: + self.screens[self.current_screen].\ + update(surface, update_type, rects) + surface.blit(self.down_bar, (0, self.size[1] - self.base_size)) + self.down_bar_objects.render(surface) + + if update_type == BaseScreen.update_all or len(rects) < 1: + screen.blit(surface, (0, 0)) + pygame.display.flip() + else: + for rect in rects: + screen.blit(surface, rect, area=rect) + pygame.display.update(rects) def track_started(self, track): self.track = track @@ -127,43 +179,66 @@ class ScreenManager(): self.screens[tracklist_index].track_started(track) def track_playback_ended(self, tl_track, time_position): - self.screens[main_screen_index].track_playback_ended(tl_track, time_position) + self.screens[main_screen_index].track_playback_ended( + tl_track, time_position) def event(self, event): event = self.input_manager.event(event) if event is not None: - if not self.manage_event(event): + if self.keyboard is not None: + self.keyboard.touch_event(event) + elif not self.manage_event(event): self.screens[self.current_screen].touch_event(event) + self.update_type = BaseScreen.update_all def manage_event(self, event): if event.type == InputManager.click: - objects = self.down_bar_objects.get_touch_objects_in_pos(event.current_pos) + objects = \ + self.down_bar_objects.get_touch_objects_in_pos( + event.current_pos) return self.click_on_objects(objects, event) else: + if event.type == InputManager.key and not event.longpress: + dir = event.direction + if dir == InputManager.right or dir == InputManager.left: + if not self.screens[self.current_screen]\ + .change_screen(dir): + if dir == InputManager.right: + self.change_screen(self.current_screen+1) + else: + self.change_screen(self.current_screen-1) + return True return False def volume_changed(self, volume): self.screens[main_screen_index].volume_changed(volume) + self.update_type = BaseScreen.update_all def playback_state_changed(self, old_state, new_state): - self.screens[main_screen_index].playback_state_changed(old_state, new_state) + self.screens[main_screen_index].playback_state_changed( + old_state, new_state) + self.update_type = BaseScreen.update_all def mute_changed(self, mute): self.screens[main_screen_index].mute_changed(mute) + self.update_type = BaseScreen.update_all def tracklist_changed(self): self.screens[tracklist_index].tracklist_changed() + self.update_type = BaseScreen.update_all def options_changed(self): - self.screens[main_screen_index].options_changed() + self.screens[menu_index].options_changed() + self.update_type = BaseScreen.update_all def change_screen(self, new_screen): - self.screen_changed = True - self.down_bar_objects.get_touch_object( - "menu_" + str(self.current_screen)).set_active(False) - self.current_screen = new_screen - self.down_bar_objects.get_touch_object( - "menu_" + str(new_screen)).set_active(True) + if new_screen > -1 and new_screen < len(self.screens): + self.down_bar_objects.get_touch_object( + "menu_" + str(self.current_screen)).set_active(False) + self.current_screen = new_screen + self.down_bar_objects.get_touch_object( + "menu_" + str(new_screen)).set_active(True) + self.update_type = BaseScreen.update_all def click_on_objects(self, objects, event): if objects is not None: @@ -175,12 +250,21 @@ class ScreenManager(): def playlists_loaded(self): self.screens[playlist_index].playlists_loaded() - - def set_connection(self, connection, loading): - self.screens[main_screen_index].set_connection(connection, loading) - - def check_connection(self): - self.screens[menu_index].check_connection() + self.update_type = BaseScreen.update_all def search(self, query, mode): self.screens[search_index].search(query, mode) + self.update_type = BaseScreen.update_all + + def resize(self, event): + self.init_manager(event.size) + self.update_type = BaseScreen.update_all + + def open_keyboard(self, input_listener): + self.keyboard = Keyboard(self.size, self.base_size, self, + self.fonts, input_listener) + self.update_type = BaseScreen.update_all + + def close_keyboard(self): + self.keyboard = None + self.update_type = BaseScreen.update_all diff --git a/mopidy_touchscreen/screens/__init__.py b/mopidy_touchscreen/screens/__init__.py new file mode 100644 index 0000000..326b14e --- /dev/null +++ b/mopidy_touchscreen/screens/__init__.py @@ -0,0 +1,9 @@ +# flake8: noqa +from base_screen import BaseScreen +from library_screen import LibraryScreen +from keyboard_screen import Keyboard +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/screens/base_screen.py b/mopidy_touchscreen/screens/base_screen.py new file mode 100644 index 0000000..2ae16c8 --- /dev/null +++ b/mopidy_touchscreen/screens/base_screen.py @@ -0,0 +1,30 @@ +class BaseScreen(): + + update_all = 0 + update_partial = 1 + no_update = 2 + + def __init__(self, size, base_size, manager, fonts): + self.size = size + self.base_size = base_size + self.manager = manager + self.fonts = fonts + + def update(self, surface, update_type, rects): + """ + Draw this screen to the surface + + :param surface: + :param update_type: + :param rects: + """ + pass + + def event(self, event): + pass + + def change_screen(self, direction): + return False + + def should_update(self): + return BaseScreen.update_partial diff --git a/mopidy_touchscreen/screens/keyboard_screen.py b/mopidy_touchscreen/screens/keyboard_screen.py new file mode 100644 index 0000000..b453d5a --- /dev/null +++ b/mopidy_touchscreen/screens/keyboard_screen.py @@ -0,0 +1,252 @@ +import pygame + +from .base_screen import BaseScreen +from ..graphic_utils import ScreenObjectsManager, TouchAndTextItem +from ..input import InputManager + + +class Keyboard(BaseScreen): + + def __init__(self, size, base_size, manager, fonts, listener): + BaseScreen.__init__(self, size, base_size, manager, fonts) + self.base_width = size[0]/10 + self.base_height = size[1]/5 + self.listener = listener + self.manager = manager + self.selected_row = 0 + self.selected_col = 0 + self.selected_others = -1 + self.font = pygame.font.SysFont("arial", size[1]/6) + self.keyboards = [ScreenObjectsManager(), ScreenObjectsManager()] + self.other_objects = ScreenObjectsManager() + self.current_keyboard = 0 + + self.keys = [[['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p'], + ['a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', '-'], + [',', 'z', 'x', 'c', 'v', 'b', 'n', 'm', '.', '_']], + + [['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'], + ['!', '@', '#', '$', '%', '&', '/', '(', ')', '='], + ['?', '{', '}', '_', '[', ']', '+', '<', '>', '*']]] + + line = self.base_height + for row in self.keys[self.current_keyboard]: + pos = 0 + for key in row: + button = \ + TouchAndTextItem(self.font, key, + (pos, line), + (self.base_width, self.base_height), + center=True, background=(150, 150, 150)) + self.keyboards[self.current_keyboard].\ + set_touch_object(key, button) + pos += self.base_width + line += self.base_height + + self.current_keyboard = 1 + line = self.base_height + for row in self.keys[self.current_keyboard]: + pos = 0 + for key in row: + button = \ + TouchAndTextItem(self.font, key, (pos, line), + (self.base_width, self.base_height), + center=True, background=(150, 150, 150), + scroll_no_fit=False) + self.keyboards[self.current_keyboard].\ + set_touch_object(key, button) + pos += self.base_width + line += self.base_height + self.current_keyboard = 0 + + # Symbol button + button = TouchAndTextItem(self.font, "123", + (0, self.base_height*4), + (self.base_width*2, self.base_height), + center=True, background=(150, 150, 150), + scroll_no_fit=False) + self.other_objects.set_touch_object("symbols", button) + + # remove button + button = TouchAndTextItem(self.font, "<-", + (self.base_width*2, self.base_height*4), + (self.base_width*2, self.base_height), + center=True, background=(150, 150, 150), + scroll_no_fit=False) + self.other_objects.set_touch_object("remove", button) + + # Space button + button = TouchAndTextItem(self.font, " ", + (self.base_width*4, self.base_height*4), + (self.base_width*4, self.base_height), + center=True, background=(150, 150, 150), + scroll_no_fit=False) + self.other_objects.set_touch_object("space", button) + + # OK button + button = TouchAndTextItem(self.font, "->", + (self.base_width*8, self.base_height*4), + (self.base_width*2, self.base_height), + center=True, background=(150, 150, 150), + scroll_no_fit=False) + self.other_objects.set_touch_object("ok", button) + + # EditText button + button = TouchAndTextItem(self.font, "", + (0, 0), + (self.size[0], self.base_height), + center=False, scroll_no_fit=False) + self.other_objects.set_object("text", button) + self.change_selected(0, 0) + + def update(self, screen): + screen.fill((0, 0, 0)) + self.keyboards[self.current_keyboard].render(screen) + self.other_objects.render(screen) + + def touch_event(self, touch_event): + if touch_event.type == InputManager.click: + keys = self.keyboards[self.current_keyboard]\ + .get_touch_objects_in_pos(touch_event.current_pos) + for key in keys: + self.other_objects.get_object("text").add_text(key, False) + keys = self.other_objects.get_touch_objects_in_pos( + touch_event.current_pos) + for key in keys: + if key == 'symbols': + self.change_keyboard() + elif key == "remove": + self.other_objects.get_object("text").remove_text(1, False) + elif key == "space": + self.other_objects.get_object("text").add_text(" ", False) + elif key == "ok": + text = self.other_objects.get_object("text").text + self.listener.text_input(text) + self.manager.close_keyboard() + elif touch_event.type == InputManager.key: + if not isinstance(touch_event.unicode, int): + if touch_event.unicode == u'\x08': + self.other_objects.get_object("text").remove_text(1, False) + else: + self.other_objects.get_object("text").add_text( + touch_event.unicode, False) + elif touch_event.direction is not None: + x = 0 + y = 0 + if touch_event.direction == InputManager.left: + x = -1 + elif touch_event.direction == InputManager.right: + x = 1 + elif touch_event.direction == InputManager.up: + y = -1 + elif touch_event.direction == InputManager.down: + y = 1 + if touch_event.direction == InputManager.enter: + self.selected_click() + else: + self.change_selected(x, y) + + def change_keyboard(self): + if self.current_keyboard == 0: + self.current_keyboard = 1 + else: + self.current_keyboard = 0 + if self.selected_others < 0: + self.change_selected(0, 0) + + def change_selected(self, x, y): + if self.selected_others < 0: + # We are on the keyboard + + # Update col + self.selected_col += x + if self.selected_col < 0: + self.selected_col = 0 + elif self.selected_col > 9: + self.selected_col = 9 + + # Update row + self.selected_row += y + if self.selected_row < 0: + self.selected_row = 0 + elif self.selected_row > 2: + + # Change to the bottom part + if self.selected_col < 2: + self.selected_others = 0 + elif self.selected_col < 4: + self.selected_others = 1 + elif self.selected_col < 8: + self.selected_others = 2 + else: + self.selected_others = 3 + + # Update selected + if self.selected_others < 0: + key = self.keys[self.current_keyboard][ + self.selected_row][self.selected_col] + self.keyboards[self.current_keyboard].set_selected(key) + else: + self.keyboards[0].set_selected(None) + self.keyboards[1].set_selected(None) + self.set_selected_other() + else: + # We are on the bottom part + if y < 0: + # we are returning to the keyboard + + # Select col + if self.selected_others == 0: + self.selected_col = 0 + elif self.selected_others == 1: + self.selected_col = 2 + elif self.selected_others == 2: + self.selected_col = 4 + else: + self.selected_col = 8 + + self.selected_others = -1 + self.set_selected_other() + + self.selected_row = 2 + key = self.keys[self.current_keyboard][ + self.selected_row][self.selected_col] + self.keyboards[self.current_keyboard].set_selected(key) + elif x != 0: + # We change in horizontal + self.selected_others += x + if self.selected_others < 0: + self.selected_others = 0 + elif self.selected_others > 3: + self.selected_others = 3 + self.set_selected_other() + + def selected_click(self): + if self.selected_others >= 0: + if self.selected_others == 0: + self.change_keyboard() + elif self.selected_others == 1: + self.other_objects.get_object("text").remove_text(1, False) + elif self.selected_others == 2: + self.other_objects.get_object("text").add_text(" ", False) + elif self.selected_others == 3: + text = self.other_objects.get_object("text").text + self.listener.text_input(text) + self.manager.close_keyboard() + else: + key = self.keys[self.current_keyboard][ + self.selected_row][self.selected_col] + self.other_objects.get_object("text").add_text( + key, False) + + def set_selected_other(self): + key = None + if self.selected_others == 0: + key = "symbols" + elif self.selected_others == 1: + key = "remove" + elif self.selected_others == 2: + key = "space" + elif self.selected_others == 3: + key = "ok" + self.other_objects.set_selected(key) diff --git a/mopidy_touchscreen/screens/library_screen.py b/mopidy_touchscreen/screens/library_screen.py new file mode 100644 index 0000000..f1d23f4 --- /dev/null +++ b/mopidy_touchscreen/screens/library_screen.py @@ -0,0 +1,75 @@ +from base_screen import BaseScreen + +import mopidy.models + +from ..graphic_utils import ListView + + +class LibraryScreen(BaseScreen): + def __init__(self, size, base_size, manager, fonts): + BaseScreen.__init__(self, size, base_size, manager, fonts) + self.list_view = ListView((0, 0), ( + self.size[0], self.size[1] - + self.base_size), self.base_size, self.fonts['base']) + self.directory_list = [] + self.current_directory = None + self.library = None + self.library_strings = None + self.browse_uri(None) + + def go_inside_directory(self, uri): + self.directory_list.append(self.current_directory) + self.current_directory = uri + self.browse_uri(uri) + + def browse_uri(self, uri): + self.library_strings = [] + if uri is not None: + self.library_strings.append("../") + self.library = self.manager.core.library.browse(uri).get() + for lib in self.library: + self.library_strings.append(lib.name) + self.list_view.set_list(self.library_strings) + + def go_up_directory(self): + if len(self.directory_list): + directory = self.directory_list.pop() + self.current_directory = directory + self.browse_uri(directory) + + def should_update(self): + return self.list_view.should_update() + + def update(self, screen, update_type, rects): + update_all = (update_type == BaseScreen.update_all) + self.list_view.render(screen, update_all, rects) + + def touch_event(self, touch_event): + clicked = self.list_view.touch_event(touch_event) + if clicked is not None: + if self.current_directory is not None: + if clicked == 0: + self.go_up_directory() + else: + if self.library[clicked - 1].type\ + == mopidy.models.Ref.TRACK: + self.play_uri(clicked-1) + else: + self.go_inside_directory( + self.library[clicked - 1].uri) + else: + self.go_inside_directory(self.library[clicked].uri) + + def play_uri(self, track_pos): + self.manager.core.tracklist.clear() + tracks = [] + for item in self.library: + if item.type == mopidy.models.Ref.TRACK: + tracks.append(self.manager.core.library.lookup( + item.uri).get()[0]) + else: + track_pos -= 1 + self.manager.core.tracklist.add(tracks) + self.manager.core.playback.play( + tl_track=self.manager.core.tracklist.tl_tracks.get() + [track_pos]) diff --git a/mopidy_touchscreen/main_screen.py b/mopidy_touchscreen/screens/main_screen.py similarity index 57% rename from mopidy_touchscreen/main_screen.py rename to mopidy_touchscreen/screens/main_screen.py index fbcfa42..2eca417 100644 --- a/mopidy_touchscreen/main_screen.py +++ b/mopidy_touchscreen/screens/main_screen.py @@ -3,30 +3,38 @@ import json import logging import os import time -import mopidy.core import urllib import urllib2 from threading import Thread -import pygame -from .base_screen import BaseScreen -from .screen_objects import (Progressbar, ScreenObjectsManager, - TextItem, - TouchAndTextItem) -from .input_manager import InputManager + +from base_screen import BaseScreen + +import mopidy.core + +import pygame + +from ..graphic_utils import Progressbar, \ + ScreenObjectsManager, TextItem, TouchAndTextItem +from ..input import InputManager logger = logging.getLogger(__name__) class MainScreen(BaseScreen): - def __init__(self, size, base_size, manager, fonts, cache, core): + def __init__(self, size, base_size, manager, fonts, cache, core, + background): BaseScreen.__init__(self, size, base_size, manager, fonts) self.core = core self.track = None self.cache = cache self.image = None self.artists = None + self.update_next_frame = True + self.background = background + self.update_keys = [] + self.current_track_pos = 0 self.track_duration = "00:00" self.touch_text_manager = ScreenObjectsManager() current_track = self.core.playback.current_track.get() @@ -34,8 +42,7 @@ class MainScreen(BaseScreen): self.track_playback_ended(None, None) else: self.track_started(current_track) - - + # Top bar self.top_bar = pygame.Surface((self.size[0], self.base_size), pygame.SRCALPHA) @@ -47,30 +54,6 @@ class MainScreen(BaseScreen): self.touch_text_manager.set_touch_object("pause_play", button) x = button.get_right_pos() - # Random - button = TouchAndTextItem(self.fonts['icon'], u"\ue629 ", - (x, 0), None) - self.touch_text_manager.set_touch_object("random", button) - x = button.get_right_pos() - - # Repeat - button = TouchAndTextItem(self.fonts['icon'], u"\ue626", - (x, 0), None) - self.touch_text_manager.set_touch_object("repeat", button) - x = button.get_right_pos() - - # Single - button = TouchAndTextItem(self.fonts['base'], " 1 ", (x, 0), - None) - self.touch_text_manager.set_touch_object("single", button) - x = button.get_right_pos() - - # Internet - button = TouchAndTextItem(self.fonts['icon'], u"\ue602 ", - (x, 0), None) - self.touch_text_manager.set_touch_object("internet", button) - x = button.get_right_pos() - # Mute button = TouchAndTextItem(self.fonts['icon'], u"\ue61f ", (x, 0), None) @@ -84,25 +67,53 @@ class MainScreen(BaseScreen): self.touch_text_manager.set_touch_object("volume", progress) progress.set_value(self.core.playback.volume.get()) - def update(self, screen, update_all): - screen.blit(self.top_bar, (0, 0)) - if self.track is not None: - 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_text( - time.strftime('%M:%S', time.gmtime( - self.core.playback.time_position.get() / 1000)) + "/" + self.track_duration) + def should_update(self): + if len(self.update_keys) > 0: + return True + else: + track_pos_millis = self.core.playback.time_position.get() + new_track_pos = track_pos_millis / 1000 + if new_track_pos != self.current_track_pos: + return True + else: + return False + + def update(self, screen, update_type, rects): + if update_type == BaseScreen.update_all: + screen.blit(self.top_bar, (0, 0)) + self.touch_text_manager.render(screen) if self.image is not None: screen.blit(self.image, ( - self.base_size / 2, self.base_size + self.base_size / 2)) - self.touch_text_manager.render(screen) - return screen + self.base_size / 2, self.base_size + + self.base_size / 2)) + + elif update_type == BaseScreen.update_partial \ + and self.track is not None: + track_pos_millis = self.core.playback.time_position.get() + new_track_pos = track_pos_millis / 1000 + + if new_track_pos != self.current_track_pos: + progress = self.touch_text_manager.get_touch_object( + "time_progress") + progress.set_value(track_pos_millis) + self.current_track_pos = new_track_pos + progress.set_text( + time.strftime('%M:%S', time.gmtime( + self.current_track_pos)) + + "/" + self.track_duration) + progress.render(screen) + rects.append(progress.rect_in_pos) + + for key in self.update_keys: + object = self.touch_text_manager.get_object(key) + object.update() + object.render(screen) + rects.append(object.rect_in_pos) def track_started(self, track): + self.update_keys = [] self.image = None - x = self.base_size * 5 + x = self.size[1] - self.base_size * 3 width = self.size[0] - self.base_size / 2 - x self.track_duration = time.strftime('%M:%S', time.gmtime( @@ -114,58 +125,69 @@ class MainScreen(BaseScreen): self.artists.append(artist) # Track name - label = TouchAndTextItem(self.fonts['base'], + label = TextItem(self.fonts['base'], MainScreen.get_track_name(track), - (x, self.base_size * 2), + (x, (self.size[1]-self.base_size*3)/2 + - self.base_size*0.5), (width, -1)) - self.touch_text_manager.set_touch_object("track_name", label) + if not label.fit_horizontal: + self.update_keys.append("track_name") + self.touch_text_manager.set_object("track_name", label) # Album name - label = TouchAndTextItem(self.fonts['base'], - MainScreen.get_track_album_name(track), - (x, self.base_size * 3), + label = TextItem(self.fonts['base'], + MainScreen.get_track_album_name + (track), + (x, (self.size[1]-self.base_size*3)/2 + + self.base_size*0.5), (width, -1)) - self.touch_text_manager.set_touch_object("album_name", label) + if not label.fit_horizontal: + self.update_keys.append("album_name") + self.touch_text_manager.set_object("album_name", label) # Artist - label = TouchAndTextItem(self.fonts['base'], self.get_artist_string(), - (x, self.base_size * 4), + label = TextItem(self.fonts['base'], + self.get_artist_string(), + (x, (self.size[1]-self.base_size*3)/2 + + self.base_size*1.5), (width, -1)) - self.touch_text_manager.set_touch_object("artist_name", label) + if not label.fit_horizontal: + self.update_keys.append("artist_name") + self.touch_text_manager.set_object("artist_name", label) # Previous track button button = TouchAndTextItem(self.fonts['icon'], u"\ue61c", - (0, self.base_size * 6), None) + (0, self.size[1] - self.base_size * 2), None) self.touch_text_manager.set_touch_object("previous", button) size_1 = button.get_right_pos() size_2 = self.fonts['icon'].size(u"\ue61d")[0] button = TouchAndTextItem(self.fonts['icon'], u"\ue61d", (self.size[0] - size_2, - self.base_size * 6), + self.size[1] - self.base_size * 2), None) self.touch_text_manager.set_touch_object("next", button) # Progress progress = Progressbar(self.fonts['base'], time.strftime('%M:%S', time.gmtime( - 0)) + "/" + time.strftime('%M:%S', - time.gmtime( - 0)), - (size_1, self.base_size * 6), + 0)) + "/" + time.strftime( + '%M:%S', time.gmtime(0)), + (size_1, self.size[1] - self.base_size * 2), ( self.size[0] - size_1 - size_2, self.base_size), - track.length / 1000, False) + track.length, False) self.touch_text_manager.set_touch_object("time_progress", progress) self.track = track if not self.is_image_in_cache(): - thread = Thread(target=self.download_image(0)) + thread = Thread(target=self.download_image) thread.start() else: - self.load_image() + thread = Thread(target=self.load_image) + thread.start() def get_artist_string(self): artists_string = '' @@ -193,7 +215,18 @@ class MainScreen(BaseScreen): return os.path.isfile( self.get_cover_folder() + self.get_image_file_name()) - def download_image(self, artist_index): + def download_image(self): + image_uris = self.core.library.get_images( + {self.track.uri}).get()[self.track.uri] + if len(image_uris) > 0: + urllib.urlretrieve(image_uris[0].uri, + self.get_cover_folder() + + self.get_image_file_name()) + self.load_image() + else: + self.download_image_last_fm(0) + + def download_image_last_fm(self, artist_index): if artist_index < len(self.artists): try: safe_artist = urllib.quote_plus( @@ -214,75 +247,86 @@ class MainScreen(BaseScreen): self.get_image_file_name()) self.load_image() except: - self.download_image(artist_index + 1) + self.download_image_last_fm(artist_index + 1) else: logger.info("Cover could not be downloaded") - # 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 - current = TouchAndTextItem(self.fonts['base'], - MainScreen.get_track_name(self.track), + current = TextItem(self.fonts['base'], + MainScreen.get_track_name + (self.track), (self.base_size / 2, self.base_size * 2), (width, -1)) - self.touch_text_manager.set_touch_object("track_name", current) + if not current.fit_horizontal: + self.update_keys.append("track_name") + self.touch_text_manager.set_object("track_name", current) - current = TouchAndTextItem(self.fonts['base'], - MainScreen.get_track_album_name( - self.track), + current = TextItem(self.fonts['base'], + MainScreen.get_track_album_name + (self.track), (self.base_size / 2, self.base_size * 3), (width, -1)) - self.touch_text_manager.set_touch_object("album_name", current) + if not current.fit_horizontal: + self.update_keys.append("album_name") + self.touch_text_manager.set_object("album_name", current) - current = TouchAndTextItem(self.fonts['base'], + current = TextItem(self.fonts['base'], self.get_artist_string(), (self.base_size / 2, self.base_size * 4), (width, -1)) - self.touch_text_manager.set_touch_object("artist_name", current) + if not current.fit_horizontal: + self.update_keys.append("artist_name") + self.touch_text_manager.set_object("artist_name", current) + + self.background.set_background_image(None) def track_playback_ended(self, tl_track, time_position): - if self.image is not None: - self.dirty_area.append(pygame.Rect(self.base_size / 2, - self.base_size + self.base_size / 2, - self.image.get_rect().width, - self.image.get_rect().height)) - self.image = None - + self.background.set_background_image(None) + self.image = None self.track_duration = "00:00" width = self.size[0] - self.base_size - current = TouchAndTextItem(self.fonts['base'], "", - (self.base_size / 2, self.base_size * 2), + current = TextItem(self.fonts['base'], "", + (self.base_size / 2, + self.base_size * 2), (width, -1)) - self.touch_text_manager.set_touch_object("track_name", current) + self.touch_text_manager.set_object("track_name", current) - current = TouchAndTextItem(self.fonts['base'], "", - (self.base_size / 2, self.base_size * 3), + current = TextItem(self.fonts['base'], "", + (self.base_size / 2, + self.base_size * 3), (width, -1)) - self.touch_text_manager.set_touch_object("album_name", current) + self.touch_text_manager.set_object("album_name", current) - current = TouchAndTextItem(self.fonts['base'], "", - (self.base_size / 2, self.base_size * 4), + current = TextItem(self.fonts['base'], "", + (self.base_size / 2, + self.base_size * 4), (width, -1)) - self.touch_text_manager.set_touch_object("artist_name", current) + self.touch_text_manager.set_object("artist_name", current) def load_image(self): - size = self.base_size * 4 - self.image = pygame.transform.scale( - pygame.image.load( - self.get_cover_folder() + - self.get_image_file_name()).convert(), - (size, size)) + size = self.size[1] - self.base_size * 4 + image_original = pygame.image.load( + self.get_cover_folder() + + self.get_image_file_name()) + image = pygame.transform.scale(image_original, (size, size)) + image = image.convert() + self.image = image + self.background.set_background_image(image_original) def touch_event(self, event): if event.type == InputManager.click: - objects = self.touch_text_manager.get_touch_objects_in_pos( - event.current_pos) + objects = \ + self.touch_text_manager.get_touch_objects_in_pos( + event.current_pos) if objects is not None: self.click_on_objects(objects, event) @@ -295,22 +339,40 @@ class MainScreen(BaseScreen): volume = self.core.playback.volume.get() + 10 if volume > 100: volume = 100 - self.core.playback.volume = volume - self.manager.volume_changed(volume) + self.core.mixer.set_volume(volume) elif event.direction == InputManager.down: volume = self.core.playback.volume.get() - 10 if volume < 0: volume = 0 - self.core.playback.volume = volume - self.manager.volume_changed(volume) - + self.core.mixer.set_volume(volume) + elif event.type == InputManager.key: + if event.direction == InputManager.enter: + self.click_on_objects(["pause_play"], None) + elif event.direction == InputManager.up: + vol = self.core.mixer.get_volume().get() + vol += 3 + if vol > 100: + vol = 100 + self.core.mixer.set_volume(vol) + elif event.direction == InputManager.down: + vol = self.core.mixer.get_volume().get() + vol -= 3 + if vol < 0: + vol = 0 + self.core.mixer.set_volume(vol) + elif event.longpress: + if event.direction == InputManager.left: + self.click_on_objects(["previous"], None) + elif event.direction == InputManager.right: + self.click_on_objects(["next"], None) + def click_on_objects(self, objects, event): if objects is not None: for key in objects: if key == "time_progress": value = self.touch_text_manager.get_touch_object( - key).get_pos_value( - event.current_pos) * 1000 + key).get_pos_value( + event.current_pos) self.core.playback.seek(value) elif key == "previous": @@ -329,33 +391,22 @@ class MainScreen(BaseScreen): mute = not self.core.playback.mute.get() self.core.playback.set_mute(mute) self.mute_changed(mute) - elif key == "random": - random = not self.core.tracklist.random.get() - self.core.tracklist.set_random(random) - self.options_changed() - elif key == "repeat": - self.core.tracklist.set_repeat( - not self.core.tracklist.repeat.get()) - elif key == "single": - self.core.tracklist.set_single( - not self.core.tracklist.single.get()) - elif key == "internet": - self.manager.check_connection() - elif key == "track_name": - self.manager.search(self.track.name, 0) - elif key == "album_name": - self.manager.search(self.track.album.name, 1) - elif key == "artist_name": - self.manager.search(self.get_artist_string(), 2) def change_volume(self, event): manager = self.touch_text_manager volume = manager.get_touch_object("volume") pos = event.current_pos value = volume.get_pos_value(pos) - self.core.playback.volume = value - self.volume_changed(value) - + self.core.mixer.set_volume(value) + + def playback_state_changed(self, old_state, new_state): + if new_state == mopidy.core.PlaybackState.PLAYING: + self.touch_text_manager.get_touch_object( + "pause_play").set_text(u"\ue616", False) + else: + self.touch_text_manager.get_touch_object( + "pause_play").set_text(u"\ue615", False) + def volume_changed(self, volume): if not self.core.playback.mute.get(): if volume > 80: @@ -376,14 +427,6 @@ class MainScreen(BaseScreen): u"\ue622", False) self.touch_text_manager.get_touch_object("volume").set_value( volume) - - def options_changed(self): - self.touch_text_manager.get_touch_object("random").set_active( - self.core.tracklist.random.get()) - self.touch_text_manager.get_touch_object("repeat").set_active( - self.core.tracklist.repeat.get()) - self.touch_text_manager.get_touch_object("single").set_active( - self.core.tracklist.single.get()) def mute_changed(self, mute): self.touch_text_manager.get_touch_object("mute").set_active( @@ -393,24 +436,6 @@ class MainScreen(BaseScreen): u"\ue623", False) else: self.volume_changed(self.core.playback.volume.get()) - - def playback_state_changed(self, old_state, new_state): - if new_state == mopidy.core.PlaybackState.PLAYING: - self.touch_text_manager.get_touch_object( - "pause_play").set_text(u"\ue616", False) - else: - self.touch_text_manager.get_touch_object( - "pause_play").set_text(u"\ue615", False) - - def set_connection(self, connection, loading): - internet = self.touch_text_manager.get_touch_object("internet") - if loading: - internet.set_text(u"\ue627", None) - internet.set_active(False) - else: - internet.set_text(u"\ue602", None) - internet.set_active(connection) - @staticmethod def get_track_name(track): @@ -421,8 +446,8 @@ class MainScreen(BaseScreen): @staticmethod def get_track_album_name(track): - if track.album is not None and track.album.name is not None and len( - track.album.name) > 0: + if track.album is not None and track.album.name is not None \ + and len(track.album.name) > 0: return track.album.name else: return "Unknow Album" diff --git a/mopidy_touchscreen/screens/menu_screen.py b/mopidy_touchscreen/screens/menu_screen.py new file mode 100644 index 0000000..d4cbfa7 --- /dev/null +++ b/mopidy_touchscreen/screens/menu_screen.py @@ -0,0 +1,90 @@ +import os +import socket + +from base_screen import BaseScreen + +from ..graphic_utils import ListView + + +class MenuScreen(BaseScreen): + def __init__(self, size, base_size, manager, fonts, core): + BaseScreen.__init__(self, size, base_size, manager, fonts) + self.ip = None + self.core = core + self.list = ListView((0, 0), (size[0], size[1]-base_size), + base_size, fonts['base']) + + self.list_items = ["Random", "Repeat", "Single", "Consume", + "Exit Mopidy", "Shutdown", "Restart", "IP: "] + + self.list.set_list(self.list_items) + + def should_update(self): + return self.list.should_update() + + def update(self, screen, update_type, rects): + update_all = (update_type == BaseScreen.update_all) + self.list.render(screen, update_all, rects) + + def touch_event(self, event): + clicked = self.list.touch_event(event) + if clicked is not None: + if clicked == 0: + random = not self.core.tracklist.get_random().get() + self.core.tracklist.set_random(random) + elif clicked == 1: + repeat = not self.core.tracklist.get_repeat().get() + self.core.tracklist.set_repeat(repeat) + elif clicked == 2: + single = not self.core.tracklist.get_single().get() + self.core.tracklist.set_single(single) + elif clicked == 3: + consume = not self.core.tracklist.get_consume().get() + self.core.tracklist.set_consume(consume) + elif clicked == 4: + os.system("pkill mopidy") + elif clicked == 5: + if os.system("gksu -- shutdown now -h") != 0: + os.system("sudo shutdown now -h") + elif clicked == 6: + if os.system("gksu -- shutdown -r now") != 0: + os.system("sudo shutdown -r now") + elif clicked == 7: + self.check_connection() + + # Will check internet connection + def check_connection(self): + try: + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + s.connect(("8.8.8.8", 80)) + self.ip = s.getsockname()[0] + s.close() + self.list_items[7] = "IP: " + self.ip + self.list.set_list(self.list_items) + except socket.error: + s.close() + self.ip = None + self.list_items[7] = "IP: No internet" + self.list.set_list(self.list_items) + + def options_changed(self): + active = [] + if self.core.tracklist.random.get(): + active.append(0) + if self.core.tracklist.repeat.get(): + active.append(1) + if self.core.tracklist.single.get(): + active.append(2) + if self.core.tracklist.consume.get(): + active.append(3) + self.list.set_active(active) + + def set_connection(self, connection, loading): + internet = self.touch_text_manager.get_touch_object( + "internet") + if loading: + internet.set_text(u"\ue627", None) + internet.set_active(False) + else: + internet.set_text(u"\ue602", None) + internet.set_active(connection) diff --git a/mopidy_touchscreen/screens/playlist_screen.py b/mopidy_touchscreen/screens/playlist_screen.py new file mode 100644 index 0000000..70957f1 --- /dev/null +++ b/mopidy_touchscreen/screens/playlist_screen.py @@ -0,0 +1,60 @@ +from base_screen import BaseScreen + +from ..graphic_utils import ListView + + +class PlaylistScreen(BaseScreen): + def __init__(self, size, base_size, manager, fonts): + BaseScreen.__init__(self, size, base_size, manager, fonts) + self.list_view = ListView((0, 0), ( + self.size[0], self.size[1] - + self.base_size), self.base_size, + self.fonts['base']) + self.playlists_strings = [] + self.playlists = [] + self.selected_playlist = None + self.playlist_tracks = [] + self.playlist_tracks_strings = [] + self.playlists_loaded() + + def should_update(self): + return self.list_view.should_update() + + def update(self, screen, update_type, rects): + update_all = (update_type == BaseScreen.update_all) + self.list_view.render(screen, update_all, rects) + + def playlists_loaded(self): + self.selected_playlist = None + self.playlists_strings = [] + self.playlists = [] + for playlist in self.manager.core.playlists.playlists.get(): + self.playlists.append(playlist) + self.playlists_strings.append(playlist.name) + self.list_view.set_list(self.playlists_strings) + + def playlist_selected(self, playlist): + self.selected_playlist = playlist + self.playlist_tracks = playlist.tracks + self.playlist_tracks_strings = ["../"] + for track in self.playlist_tracks: + self.playlist_tracks_strings.append(track.name) + self.list_view.set_list(self.playlist_tracks_strings) + + def touch_event(self, touch_event): + clicked = self.list_view.touch_event(touch_event) + if clicked is not None: + if self.selected_playlist is None: + self.playlist_selected(self.playlists[clicked]) + else: + if clicked == 0: + self.selected_playlist = None + self.list_view.set_list(self.playlists_strings) + else: + self.manager.core.tracklist.clear() + self.manager.core.tracklist.add( + self.playlist_tracks) + self.manager.core.playback.play( + tl_track=self.manager.core. + tracklist.tl_tracks.get() + [clicked-1]) diff --git a/mopidy_touchscreen/search_screen.py b/mopidy_touchscreen/screens/search_screen.py similarity index 52% rename from mopidy_touchscreen/search_screen.py rename to mopidy_touchscreen/screens/search_screen.py index c733697..02b59ee 100644 --- a/mopidy_touchscreen/search_screen.py +++ b/mopidy_touchscreen/screens/search_screen.py @@ -1,15 +1,11 @@ -from .list_view import ListView -import logging +from base_screen import BaseScreen import pygame -from .screen_objects import Progressbar, ScreenObjectsManager, \ - TouchAndTextItem, TextItem -from .base_screen import BaseScreen -from .input_manager import InputManager - -logger = logging.getLogger(__name__) +from ..graphic_utils import ListView,\ + ScreenObjectsManager, TouchAndTextItem +from ..input import InputManager mode_track_name = 0 mode_album_name = 1 @@ -20,66 +16,85 @@ class SearchScreen(BaseScreen): def __init__(self, size, base_size, manager, fonts): BaseScreen.__init__(self, size, base_size, manager, fonts) self.list_view = ListView((0, self.base_size*2), ( - self.size[0], self.size[1] - 3*self.base_size), - self.base_size, - manager.fonts['base']) + self.size[0], self.size[1] - + 3*self.base_size), self.base_size, manager.fonts['base']) self.results_strings = [] self.results = [] self.screen_objects = ScreenObjectsManager() self.query = "" + # Search button + button = TouchAndTextItem(self.fonts['icon'], u" \ue986", + (0, self.base_size), + None, center=True) + self.screen_objects.set_touch_object( + "search", button) + + x = button.get_right_pos() + # Query text - text = TextItem(self.fonts['base'],self.query, (0, 0), (self.size[0], self.base_size), center=True) - self.screen_objects.set_object("query", text) + text = TouchAndTextItem(self.fonts['base'], self.query, (0, 0), + (self.size[0], self.base_size), center=True) + self.screen_objects.set_touch_object("query", text) # Mode buttons - button_size = (self.size[0] / 3, self.base_size) - self.mode_objects_keys = ["mode_track", "mode_album", "mode_artist"] + button_size = ((self.size[0]-x)/3, self.base_size) + self.mode_objects_keys = ["mode_track", "mode_album", + "mode_artist"] # Track button button = TouchAndTextItem(self.fonts['base'], "Track", - (0, self.base_size), - button_size, center=True) - self.screen_objects.set_touch_object(self.mode_objects_keys[0], button) + (x, self.base_size), + (button_size[0], self.base_size), + center=True) + self.screen_objects.set_touch_object( + self.mode_objects_keys[0], button) # Album button button = TouchAndTextItem(self.fonts['base'], "Album", - (button_size[0], self.base_size), + (button_size[0]+x, self.base_size), button_size, center=True) - self.screen_objects.set_touch_object(self.mode_objects_keys[1], button) + self.screen_objects.set_touch_object( + self.mode_objects_keys[1], button) # Artist button button = TouchAndTextItem(self.fonts['base'], "Artist", - (button_size[0]*2, self.base_size), + (button_size[0]*2+x, self.base_size), button_size, center=True) - self.screen_objects.set_touch_object(self.mode_objects_keys[2], button) - + self.screen_objects.set_touch_object( + self.mode_objects_keys[2], button) # Top Bar self.top_bar = pygame.Surface( (self.size[0], self.base_size * 2), pygame.SRCALPHA) self.top_bar.fill((0, 0, 0, 128)) - - self.mode = -100 + self.mode = -1 self.set_mode(mode=mode_track_name) - self.set_query("") + self.set_query("Search") - def update(self, screen, update_all): + def should_update(self): + return self.list_view.should_update() + + def update(self, screen, update_type, rects): screen.blit(self.top_bar, (0, 0)) self.screen_objects.render(screen) - self.list_view.render(screen) + update_all = (update_type == BaseScreen.update_all) + self.list_view.render(screen, update_all, rects) def set_mode(self, mode=mode_track_name): if mode is not self.mode: self.mode = mode for key in self.mode_objects_keys: - self.screen_objects.get_touch_object(key).set_active(False) - self.screen_objects.get_touch_object(self.mode_objects_keys[self.mode]).set_active(True) + self.screen_objects.get_touch_object(key).\ + set_active(False) + self.screen_objects.get_touch_object( + self.mode_objects_keys[self.mode]).set_active(True) def set_query(self, query=""): self.query = query - self.screen_objects.get_object("query").set_text(self.query, False) + self.screen_objects.get_touch_object("query").set_text( + self.query, False) def search(self, query=None, mode=None): if query is not None: @@ -92,8 +107,9 @@ class SearchScreen(BaseScreen): search_query = {'album': [self.query]} else: search_query = {'artist': [self.query]} - if len(self.query)>0: - current_results = self.manager.core.library.search(search_query).get() + if len(self.query) > 0: + current_results = self.manager.core.library.search( + search_query).get() self.results = [] self.results_strings = [] for backend in current_results: @@ -109,8 +125,6 @@ class SearchScreen(BaseScreen): self.results_strings.append(result.name) self.list_view.set_list(self.results_strings) - - def touch_event(self, touch_event): if touch_event.type == InputManager.click: clicked = self.list_view.touch_event(touch_event) @@ -120,7 +134,8 @@ class SearchScreen(BaseScreen): uri=self.results[clicked].uri) self.manager.core.playback.play() else: - clicked = self.screen_objects.get_touch_objects_in_pos(touch_event.down_pos) + clicked = self.screen_objects.get_touch_objects_in_pos( + touch_event.down_pos) if len(clicked) > 0: clicked = clicked[0] if clicked == self.mode_objects_keys[0]: @@ -129,5 +144,28 @@ class SearchScreen(BaseScreen): self.search(mode=1) if clicked == self.mode_objects_keys[2]: self.search(mode=2) + if clicked == "query" or clicked == "search": + self.manager.open_keyboard(self) else: - self.list_view.touch_event(touch_event) \ No newline at end of file + pos = self.list_view.touch_event(touch_event) + if pos is not None: + self.manager.core.tracklist.clear() + self.manager.core.tracklist.add( + uri=self.results[pos].uri) + self.manager.core.playback.play() + + def change_screen(self, direction): + if direction == InputManager.right: + if self.mode < 2: + self.set_mode(self.mode+1) + return True + elif direction == InputManager.left: + if self.mode > 0: + self.set_mode(self.mode-1) + return True + else: + self.manager.open_keyboard(self) + return False + + def text_input(self, text): + self.search(text, self.mode) diff --git a/mopidy_touchscreen/tracklist.py b/mopidy_touchscreen/screens/tracklist.py similarity index 62% rename from mopidy_touchscreen/tracklist.py rename to mopidy_touchscreen/screens/tracklist.py index 25208cc..d44660a 100644 --- a/mopidy_touchscreen/tracklist.py +++ b/mopidy_touchscreen/screens/tracklist.py @@ -1,6 +1,7 @@ -from .list_view import ListView +from base_screen import BaseScreen + from .main_screen import MainScreen -from .base_screen import BaseScreen +from ..graphic_utils import ListView class Tracklist(BaseScreen): @@ -10,13 +11,20 @@ class Tracklist(BaseScreen): self.base_size = base_size self.manager = manager self.list_view = ListView((0, 0), ( - self.size[0], self.size[1] - self.base_size), self.base_size, self.fonts['base']) + self.size[0], self.size[1] - + self.base_size), self.base_size, self.fonts['base']) self.tracks = [] self.tracks_strings = [] self.update_list() + self.track_started( + self.manager.core.playback.current_tl_track.get()) - def update(self, screen, update_all): - self.list_view.render(screen) + def should_update(self): + return self.list_view.should_update() + + def update(self, screen, update_type, rects): + update_all = (update_type == BaseScreen.update_all) + self.list_view.render(screen, update_all, rects) def tracklist_changed(self): self.update_list() @@ -32,9 +40,8 @@ class Tracklist(BaseScreen): def touch_event(self, touch_event): pos = self.list_view.touch_event(touch_event) if pos is not None: - self.manager.core.playback.change_track(self.tracks[pos], - on_error_step=1) + self.manager.core.playback.play(self.tracks[pos]) def track_started(self, track): - self.list_view.set_selected( + self.list_view.set_active( [self.manager.core.tracklist.index(track).get()]) diff --git a/mopidy_touchscreen/touch_screen.py b/mopidy_touchscreen/touch_screen.py index 581baf0..d72ffcc 100644 --- a/mopidy_touchscreen/touch_screen.py +++ b/mopidy_touchscreen/touch_screen.py @@ -1,11 +1,13 @@ import logging +import os import traceback from threading import Thread -import os + +from mopidy import core, exceptions + import pygame + import pykka -import mopidy -from mopidy import core from .screen_manager import ScreenManager @@ -23,30 +25,35 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener): self.fullscreen = config['touchscreen']['fullscreen'] self.screen_size = (config['touchscreen']['screen_width'], config['touchscreen']['screen_height']) - os.environ["SDL_FBDEV"] = config['touchscreen']['sdl_fbdev'] - os.environ["SDL_MOUSEDRV"] = config['touchscreen'][ - 'sdl_mousdrv'] - os.environ["SDL_MOUSEDEV"] = config['touchscreen'][ - 'sdl_mousedev'] - os.environ["SDL_AUDIODRIVER"] = config['touchscreen']['sdl_audiodriver'] + self.resolution_factor = (config['touchscreen']['resolution_factor']) + if config['touchscreen']['sdl_fbdev'].lower() != "none": + os.environ["SDL_FBDEV"] = config['touchscreen']['sdl_fbdev'] + if config['touchscreen']['sdl_mousdrv'].lower() != "none": + os.environ["SDL_MOUSEDRV"] = ( + config['touchscreen']['sdl_mousdrv']) + + if config['touchscreen']['sdl_mousedev'].lower() != "none": + os.environ["SDL_MOUSEDEV"] = config['touchscreen']['sdl_mousedev'] + + if config['touchscreen']['sdl_audiodriver'].lower() != "none": + os.environ["SDL_AUDIODRIVER"] = ( + config['touchscreen']['sdl_audiodriver']) + os.environ["SDL_PATH_DSP"] = config['touchscreen']['sdl_path_dsp'] pygame.init() pygame.display.set_caption("Mopidy-Touchscreen") - if self.fullscreen: - self.screen = pygame.display.set_mode(self.screen_size, - pygame.FULLSCREEN) - else: - self.screen = pygame.display.set_mode(self.screen_size) + self.get_display_surface(self.screen_size) pygame.mouse.set_visible(self.cursor) self.screen_manager = ScreenManager(self.screen_size, self.core, - self.cache_dir) - + self.cache_dir, + self.resolution_factor) # Raspberry pi GPIO 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'] @@ -56,21 +63,32 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener): pins['enter'] = config['touchscreen']['gpio_enter'] self.gpio_manager = GPIOManager(pins) + def get_display_surface(self, size): + try: + if self.fullscreen: + self.screen = pygame.display.set_mode( + size, pygame.FULLSCREEN) + else: + self.screen = pygame.display.set_mode(size, pygame.RESIZABLE) + except Exception: + raise exceptions.FrontendError("Error on display init:\n" + + traceback.format_exc()) + def start_thread(self): clock = pygame.time.Clock() + pygame.event.set_blocked(pygame.MOUSEMOTION) while self.running: - clock.tick(15) - self.screen.blit(self.screen_manager.update(), (0, 0)) - pygame.display.flip() + clock.tick(12) + self.screen_manager.update(self.screen) for event in pygame.event.get(): if event.type == pygame.QUIT: - self.running = False - elif event.type == pygame.KEYUP and event.key == pygame.K_q: - self.running = False + os.system("pkill mopidy") + elif event.type == pygame.VIDEORESIZE: + self.get_display_surface(event.size) + self.screen_manager.resize(event) else: self.screen_manager.event(event) pygame.quit() - mopidy.utils.process.exit_process() def on_start(self): try: diff --git a/setup.py b/setup.py index 745acf5..92a8418 100644 --- a/setup.py +++ b/setup.py @@ -6,9 +6,9 @@ from setuptools import find_packages, setup def get_version(filename): - content = open(filename).read() - metadata = dict(re.findall("__([a-z]+)__ = '([^']+)'", content)) - return metadata['version'] + with open(filename) as fh: + metadata = dict(re.findall("__([a-z]+)__ = '([^']+)'", fh.read())) + return metadata['version'] setup( @@ -26,7 +26,7 @@ setup( include_package_data=True, install_requires=[ 'setuptools', - 'Mopidy >= 0.18', + 'Mopidy >= 1.0', 'Pykka >= 1.1', 'pygame' ], diff --git a/setuptools-5.4.2.zip b/setuptools-5.4.2.zip deleted file mode 100644 index 6be4f21..0000000 Binary files a/setuptools-5.4.2.zip and /dev/null differ diff --git a/tests/test_extension.py b/tests/test_extension.py index c52e8fc..cc1a857 100644 --- a/tests/test_extension.py +++ b/tests/test_extension.py @@ -27,5 +27,3 @@ class ExtensionTest(unittest.TestCase): # TODO Test the content of your config schema # self.assertIn('username', schema) # self.assertIn('password', schema) - - # TODO Write more tests diff --git a/tox.ini b/tox.ini index f7bed52..8a66165 100644 --- a/tox.ini +++ b/tox.ini @@ -4,15 +4,22 @@ envlist = py27, flake8 [testenv] sitepackages = true deps = - coverage mock - nose mopidy==dev + pytest + pytest-cov + pytest-xdist install_command = pip install --allow-unverified=mopidy --pre {opts} {packages} -commands = nosetests -v --with-xunit --xunit-file=xunit-{envname}.xml --with-coverage --cover-package=mopidy_touchscreen +commands = + py.test \ + --basetemp={envtmpdir} \ + --junit-xml=xunit-{envname}.xml \ + --cov=mopidy_touchscreen --cov-report=term-missing \ + {posargs} [testenv:flake8] deps = flake8 flake8-import-order -commands = flake8 \ No newline at end of file +skip_install = true +commands = flake8