commit e16784d37489d9c04a9a1149d9707751cb9838e1 Author: Ander <9and3r@gmail.com> Date: Mon Jul 14 13:20:52 2014 +0200 First commit diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..a5def4b --- /dev/null +++ b/.coveragerc @@ -0,0 +1,5 @@ +[report] +omit = + */pyshared/* + */python?.?/* + */site-packages/nose/* \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..abc5026 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +*.egg-info +*.pyc +*.swp +.coverage +.tox/ +MANIFEST +build/ +dist/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..d81797d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +language: python + +python: + - "2.7_with_system_site_packages" + +env: + - TOX_ENV=py27 + - TOX_ENV=flake8 + +install: + - "wget -O - http://apt.mopidy.com/mopidy.gpg | sudo apt-key add -" + - "sudo wget -O /etc/apt/sources.list.d/mopidy.list http://apt.mopidy.com/mopidy.list" + - "sudo apt-get update || true" + - "sudo apt-get install mopidy" + - "pip install tox" + +script: + - "tox -e $TOX_ENV" + +after_success: + - "if [ $TOX_ENV == 'py27' ]; then pip install coveralls; coveralls; fi" + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..7a4a3ea --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..e7642bd --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,8 @@ +include .coveragerc +include .travis.yml +include LICENSE +include MANIFEST.in +include README.rst +include mopidy_touchscreen/ext.conf + +recursive-include tests *.py \ No newline at end of file diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..60038cd --- /dev/null +++ b/README.rst @@ -0,0 +1,59 @@ +**************************** +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/modipy-touchscreen/master.png?style=flat + :target: https://travis-ci.org/9and3r/modipy-touchscreen + :alt: Travis CI build status + +.. image:: https://img.shields.io/coveralls/9and3r/modipy-touchscreen/master.svg?style=flat + :target: https://coveralls.io/r/9and3r/modipy-touchscreen?branch=master + :alt: Test coverage + +Mopidy extension to show info on a display and control from it + + +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] + # TODO: Add example of extension config + + +Project resources +================= + +- `Source code `_ +- `Issue tracker `_ +- `Download development snapshot `_ + + +Changelog +========= + +v0.1.0 (UNRELEASED) +---------------------------------------- + +- Initial release. \ No newline at end of file diff --git a/mopidy_touchscreen/__init__.py b/mopidy_touchscreen/__init__.py new file mode 100644 index 0000000..16984ea --- /dev/null +++ b/mopidy_touchscreen/__init__.py @@ -0,0 +1,43 @@ +from __future__ import unicode_literals + +import logging +import os + +# TODO: Remove entirely if you don't register GStreamer elements below +import pygst +pygst.require('0.10') +import gst +import gobject + +from mopidy import config, ext + + +__version__ = '0.1.0' + +# TODO: If you need to log, use loggers named after the current Python module +logger = logging.getLogger(__name__) + + +class Extension(ext.Extension): + + dist_name = 'Mopidy-Touchscreen' + ext_name = 'touchscreen' + version = __version__ + + def get_default_config(self): + conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf') + return config.read(conf_file) + + def get_config_schema(self): + schema = super(Extension, self).get_config_schema() + # TODO: Comment in and edit, or remove entirely + #schema['username'] = config.String() + #schema['password'] = config.Secret() + return schema + + def setup(self, registry): + # You will typically only implement one of the following things + # in a single extension. + from .touch_screen import TouchScreen + registry.add('frontend', TouchScreen) + diff --git a/mopidy_touchscreen/__init__.py~ b/mopidy_touchscreen/__init__.py~ new file mode 100644 index 0000000..6107d48 --- /dev/null +++ b/mopidy_touchscreen/__init__.py~ @@ -0,0 +1,43 @@ +from __future__ import unicode_literals + +import logging +import os + +# TODO: Remove entirely if you don't register GStreamer elements below +import pygst +pygst.require('0.10') +import gst +import gobject + +from mopidy import config, ext + + +__version__ = '0.1.0' + +# TODO: If you need to log, use loggers named after the current Python module +logger = logging.getLogger(__name__) + + +class Extension(ext.Extension): + + dist_name = 'Mopidy-Touchscreen' + ext_name = 'touchscreen' + version = __version__ + + def get_default_config(self): + conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf') + return config.read(conf_file) + + def get_config_schema(self): + schema = super(Extension, self).get_config_schema() + # TODO: Comment in and edit, or remove entirely + #schema['username'] = config.String() + #schema['password'] = config.Secret() + return schema + + def setup(self, registry): + # You will typically only implement one of the following things + # in a single extension. + from .touch_screen import Touch_Screen + registry.add('frontend', Touch_Screen) + diff --git a/mopidy_touchscreen/ext.conf b/mopidy_touchscreen/ext.conf new file mode 100644 index 0000000..259a24f --- /dev/null +++ b/mopidy_touchscreen/ext.conf @@ -0,0 +1,4 @@ +[touchscreen] +enabled = true +# TODO: Add additional config values and their default values here, or remove +# this comment entirely. \ No newline at end of file diff --git a/mopidy_touchscreen/main_screen.py b/mopidy_touchscreen/main_screen.py new file mode 100644 index 0000000..62ab6df --- /dev/null +++ b/mopidy_touchscreen/main_screen.py @@ -0,0 +1,7 @@ +import pygame + + +class MainScreen(): + + def update(self,screen): + screen.fill((255,255,255)) diff --git a/mopidy_touchscreen/main_screen.py~ b/mopidy_touchscreen/main_screen.py~ new file mode 100644 index 0000000..d8422f2 --- /dev/null +++ b/mopidy_touchscreen/main_screen.py~ @@ -0,0 +1,8 @@ +import pygame + + +class MainScreen(): + + def update(self): + surface = pygame.Surface((200,200)).fill((255,255,255)) + return surface diff --git a/mopidy_touchscreen/main_screen~ b/mopidy_touchscreen/main_screen~ new file mode 100644 index 0000000..e69de29 diff --git a/mopidy_touchscreen/proba.py~ b/mopidy_touchscreen/proba.py~ new file mode 100644 index 0000000..e69de29 diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py new file mode 100644 index 0000000..e69de29 diff --git a/mopidy_touchscreen/touch_screen.py b/mopidy_touchscreen/touch_screen.py new file mode 100644 index 0000000..e10c8c4 --- /dev/null +++ b/mopidy_touchscreen/touch_screen.py @@ -0,0 +1,51 @@ +import pykka + +import logging +from threading import Thread +import pygame +from .main_screen import MainScreen + +from mopidy import core + + +logger = logging.getLogger(__name__) + +class TouchScreen(pykka.ThreadingActor, core.CoreListener): + def __init__(self, config, core): + super(TouchScreen, self).__init__() + self.core = core + + def start_thread(self): + pygame.init() + clock = pygame.time.Clock() + main_screen = MainScreen() + screen = pygame.display.set_mode((200,200)); + while self.running: + clock.tick(60) + main_screen.update(screen) + pygame.display.flip() + logger.error("bukatzen") + pygame.quit() + logger.error("bukatu dot") + + + + def on_start(self): + self.running=True + self.thread = Thread(target=self.start_thread) + self.thread.start() + + def on_stop(self): + self.running = False + + + + def track_playback_started(self, tl_track): + pass + #myfont = pygame.font.SysFont("monospace", 15) + + # render text + #label = myfont.render(tl_track.track.name, 1, (255,255,0)) + #self.screen.blit(label, (100, 100)) + #pygame.display.flip() + diff --git a/mopidy_touchscreen/touch_screen.py~ b/mopidy_touchscreen/touch_screen.py~ new file mode 100644 index 0000000..a046c14 --- /dev/null +++ b/mopidy_touchscreen/touch_screen.py~ @@ -0,0 +1,51 @@ +import pykka + +import logging +from threading import Thread +import pygame +from .main_screen import MainScreen + +from mopidy import core + + +logger = logging.getLogger(__name__) + +class TouchScreen(pykka.ThreadingActor, core.CoreListener): + def __init__(self, config, core): + super(TouchScreen, self).__init__() + self.core = core + + def start_thread(self): + pygame.init() + clock = pygame.time.Clock() + main_screen = MainScreen() + screen = pygame.display.set_mode((200,200)); + while self.running: + clock.tick(60) + screen.fill((255,255,255)) + pygame.display.flip() + logger.error("bukatzen") + pygame.quit() + logger.error("bukatu dot") + + + + def on_start(self): + self.running=True + self.thread = Thread(target=self.start_thread) + self.thread.start() + + def on_stop(self): + self.running = False + + + + def track_playback_started(self, tl_track): + pass + #myfont = pygame.font.SysFont("monospace", 15) + + # render text + #label = myfont.render(tl_track.track.name, 1, (255,255,0)) + #self.screen.blit(label, (100, 100)) + #pygame.display.flip() + diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..40ac262 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,6 @@ +[flake8] +application-import-names = mopidy_touchscreen,tests +exclude = .git,.tox + +[wheel] +universal = 1 \ No newline at end of file diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..673ad73 --- /dev/null +++ b/setup.py @@ -0,0 +1,49 @@ +from __future__ import unicode_literals + +import re + +from setuptools import find_packages, setup + + +def get_version(filename): + content = open(filename).read() + metadata = dict(re.findall("__([a-z]+)__ = '([^']+)'", content)) + return metadata['version'] + + +setup( + name='Mopidy-Touchscreen', + version=get_version('mopidy_touchscreen/__init__.py'), + url='https://github.com/9and3r/mopidy-touchscreen', + license='Apache License, Version 2.0', + author='9and3r', + author_email='9and3r@gmail.com', + description='Mopidy extension to show info on a display and control from it', + long_description=open('README.rst').read(), + packages=find_packages(exclude=['tests', 'tests.*']), + zip_safe=False, + include_package_data=True, + install_requires=[ + 'setuptools', + 'Mopidy >= 0.18', + 'Pykka >= 1.1', + ], + test_suite='nose.collector', + tests_require=[ + 'nose', + 'mock >= 1.0', + ], + entry_points={ + 'mopidy.ext': [ + 'touchscreen = mopidy_touchscreen:Extension', + ], + }, + classifiers=[ + 'Environment :: No Input/Output (Daemon)', + 'Intended Audience :: End Users/Desktop', + 'License :: OSI Approved :: Apache Software License', + 'Operating System :: OS Independent', + 'Programming Language :: Python :: 2', + 'Topic :: Multimedia :: Sound/Audio :: Players', + ], +) \ No newline at end of file diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_extension.py b/tests/test_extension.py new file mode 100644 index 0000000..8dd51f6 --- /dev/null +++ b/tests/test_extension.py @@ -0,0 +1,27 @@ +from __future__ import unicode_literals + +import unittest + +from mopidy_touchscreen import Extension, frontend as frontend_lib + + +class ExtensionTest(unittest.TestCase): + + def test_get_default_config(self): + ext = Extension() + + config = ext.get_default_config() + + self.assertIn('[touchscreen]', config) + self.assertIn('enabled = true', config) + + def test_get_config_schema(self): + ext = Extension() + + schema = ext.get_config_schema() + + # TODO Test the content of your config schema + #self.assertIn('username', schema) + #self.assertIn('password', schema) + + # TODO Write more tests \ No newline at end of file diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..f7bed52 --- /dev/null +++ b/tox.ini @@ -0,0 +1,18 @@ +[tox] +envlist = py27, flake8 + +[testenv] +sitepackages = true +deps = + coverage + mock + nose + mopidy==dev +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 + +[testenv:flake8] +deps = + flake8 + flake8-import-order +commands = flake8 \ No newline at end of file