From 9f10867e12e5f17dce343b27d68a2b71d6213bcf Mon Sep 17 00:00:00 2001 From: mandlm Date: Sat, 9 Jan 2016 11:35:29 +0100 Subject: [PATCH] moved mopidy-switcher to own repo --- mopidy-switcher/Makefile | 20 ---- mopidy-switcher/Moped.pyproj | 33 ------ mopidy-switcher/Moped.sln | 20 ---- mopidy-switcher/UserLed.py | 40 ------- mopidy-switcher/moped.py | 45 -------- mopidy-switcher/mopidy-switcher.py | 105 ------------------ mopidy-switcher/service/mopidy-switcher | 61 ---------- .../service/mopidy-switcher.service | 10 -- 8 files changed, 334 deletions(-) delete mode 100644 mopidy-switcher/Makefile delete mode 100644 mopidy-switcher/Moped.pyproj delete mode 100644 mopidy-switcher/Moped.sln delete mode 100755 mopidy-switcher/UserLed.py delete mode 100755 mopidy-switcher/moped.py delete mode 100755 mopidy-switcher/mopidy-switcher.py delete mode 100644 mopidy-switcher/service/mopidy-switcher delete mode 100644 mopidy-switcher/service/mopidy-switcher.service diff --git a/mopidy-switcher/Makefile b/mopidy-switcher/Makefile deleted file mode 100644 index 5b86802..0000000 --- a/mopidy-switcher/Makefile +++ /dev/null @@ -1,20 +0,0 @@ - -BIN_DIR=/usr/local/bin/mopidy-switcher -SYSV_DIR=/etc/init.d -SYSD_DIR=/etc/systemd/system - -install-sysv: service/mopidy-switcher - install -m 755 -t $(SYSV_DIR) service/mopidy-switcher - -install-sysd: service/mopidy-switcher.service - install -m 644 -t $(SYSD_DIR) service/mopidy-switcher.service - -install-switcher: mopidy-switcher.py - install -m 755 -t $(BIN_DIR) -D mopidy-switcher.py - -install: install-sysd install-switcher - -uninstall: - rm -rf $(BIN_DIR) - rm -f $(SYSV_DIR)/mopidy-switcher - rm -f $(SYSD_DIR)/mopidy-switcher.service diff --git a/mopidy-switcher/Moped.pyproj b/mopidy-switcher/Moped.pyproj deleted file mode 100644 index 1571b26..0000000 --- a/mopidy-switcher/Moped.pyproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - Debug - 2.0 - {34cbb86d-9088-41d8-b0b9-68a131d30188} - - moped.py - - . - . - {888888a0-9f3d-457c-b088-3a5042f75d52} - Standard Python launcher - {2af0f10d-7135-4994-9156-5d01c9c11b7e} - 2.7 - - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets - - - - - - - - - - - - \ No newline at end of file diff --git a/mopidy-switcher/Moped.sln b/mopidy-switcher/Moped.sln deleted file mode 100644 index 19644e0..0000000 --- a/mopidy-switcher/Moped.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Moped", "Moped.pyproj", "{34CBB86D-9088-41D8-B0B9-68A131D30188}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {34CBB86D-9088-41D8-B0B9-68A131D30188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34CBB86D-9088-41D8-B0B9-68A131D30188}.Release|Any CPU.ActiveCfg = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/mopidy-switcher/UserLed.py b/mopidy-switcher/UserLed.py deleted file mode 100755 index c9ae68b..0000000 --- a/mopidy-switcher/UserLed.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/python - -import ConfigParser -import RPi.GPIO as GPIO - -yellowLed = 15 -redLed = 17 -greenLed = 18 - -mopidyConf = '/etc/mopidy/mopidy.conf' - -def setLeds(yellow, red, green): - GPIO.output(yellowLed, yellow) - GPIO.output(redLed, red) - GPIO.output(greenLed, green) - -def getConfiguredLedColor(): - config = ConfigParser.ConfigParser() - config.read(mopidyConf) - - return config.get('moped-switcher', 'led') - -def setConfiguredLedColor(): - ledColor = getConfiguredLedColor() - - if ledColor == 'yellow': - setLeds(1, 0, 0) - elif ledColor == 'red': - setLeds(0, 1, 0) - elif ledColor == 'green': - setLeds(0, 0, 1) - -GPIO.setmode(GPIO.BCM) -GPIO.setup(yellowLed, GPIO.OUT) -GPIO.setup(redLed, GPIO.OUT) -GPIO.setup(greenLed, GPIO.OUT) - -setConfiguredLedColor() - -GPIO.cleanup() diff --git a/mopidy-switcher/moped.py b/mopidy-switcher/moped.py deleted file mode 100755 index 43ec2a6..0000000 --- a/mopidy-switcher/moped.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/python - -from time import sleep - -import RPi.GPIO as GPIO - -yellowLed = 15 -redLed = 17 -greenLed = 18 - -buttonPin = 27 - -sleepTimes = [0.75, 0.5, 0.25, 0.125, 0.0625] -sleepTimeIndex = 0 - -def buttonHandler(channel): - global sleepTimeIndex - print 'button pushed' - sleepTimeIndex = (sleepTimeIndex + 1) % len(sleepTimes) - -def setLeds(yellow, red, green): - GPIO.output(yellowLed, yellow) - GPIO.output(redLed, red) - GPIO.output(greenLed, green) - -try: - GPIO.setmode(GPIO.BCM) - GPIO.setup(yellowLed, GPIO.OUT) - GPIO.setup(redLed, GPIO.OUT) - GPIO.setup(greenLed, GPIO.OUT) - - GPIO.setup(buttonPin, GPIO.IN, pull_up_down=GPIO.PUD_UP) - - GPIO.add_event_detect(buttonPin, GPIO.FALLING, callback=buttonHandler, bouncetime=1000) - - while True: - setLeds(1, 0, 0) - sleep(sleepTimes[sleepTimeIndex]) - setLeds(0, 1, 0) - sleep(sleepTimes[sleepTimeIndex]) - setLeds(0, 0, 1) - sleep(sleepTimes[sleepTimeIndex]) -finally: - setLeds(0, 0, 0) - GPIO.cleanup() diff --git a/mopidy-switcher/mopidy-switcher.py b/mopidy-switcher/mopidy-switcher.py deleted file mode 100755 index 08fbebe..0000000 --- a/mopidy-switcher/mopidy-switcher.py +++ /dev/null @@ -1,105 +0,0 @@ -#!/usr/bin/env python - -import glob -import os -import subprocess -import ConfigParser - -import RPi.GPIO as GPIO - -yellowLed = 15 -redLed = 17 -greenLed = 18 - -buttonPin = 27 -dummyPin = 1 - -mopidyConf = '/etc/mopidy/mopidy.conf' -userDir = '/etc/mopidy/conf.user/' - -def setLeds(yellow, red, green): - GPIO.output(yellowLed, yellow) - GPIO.output(redLed, red) - GPIO.output(greenLed, green) - -def getConfiguredLedColor(): - config = ConfigParser.ConfigParser() - config.read(mopidyConf) - - return config.get('moped-switcher', 'led') - -def setConfiguredLedColor(): - ledColor = getConfiguredLedColor() - - if ledColor == 'yellow': - setLeds(1, 0, 0) - elif ledColor == 'red': - setLeds(0, 1, 0) - elif ledColor == 'green': - setLeds(0, 0, 1) - -def stopMopidy(): - command = ['service', 'mopidy', 'stop'] - subprocess.call(command, shell=False) - -def startMopidy(): - command = ['service', 'mopidy', 'start'] - subprocess.call(command, shell=False) - -def getConfigs(): - return sorted(glob.glob(os.path.join(userDir, '*.conf'))) - -def getCurrentConfig(): - if os.path.islink(mopidyConf): - return os.path.realpath(mopidyConf) - else: - return None - -def getNextConfig(): - currentConfig = getCurrentConfig() - availableConfigs = getConfigs() - currentIndex = availableConfigs.index(currentConfig) - nextIndex = (currentIndex + 1) % len(availableConfigs) - return availableConfigs[nextIndex] - -def setConfig(newConfig): - if os.path.islink(mopidyConf) and os.path.isfile(newConfig): - os.unlink(mopidyConf) - os.symlink(newConfig, mopidyConf) - -def switchConfig(): - setConfig(getNextConfig()) - -def buttonHandler(channel): - print 'Switching to ' + getNextConfig() - try: - setLeds(0, 0, 0) - stopMopidy() - switchConfig() - startMopidy() - setConfiguredLedColor() - except OSError as e: - print 'Error: ' + e.strerror - -if __name__ == '__main__': - GPIO.setmode(GPIO.BCM) - - GPIO.setup(yellowLed, GPIO.OUT) - GPIO.setup(redLed, GPIO.OUT) - GPIO.setup(greenLed, GPIO.OUT) - - GPIO.setup(buttonPin, GPIO.IN, pull_up_down=GPIO.PUD_UP) - GPIO.setup(dummyPin, GPIO.IN, pull_up_down=GPIO.PUD_UP) - - GPIO.add_event_detect(buttonPin, GPIO.FALLING, callback=buttonHandler, bouncetime=1000) - - setConfiguredLedColor() - - try: - while True: - GPIO.wait_for_edge(dummyPin, GPIO.RISING) - except KeyboardInterrupt: - print 'exiting' - finally: - setLeds(0, 0, 0) - GPIO.cleanup() diff --git a/mopidy-switcher/service/mopidy-switcher b/mopidy-switcher/service/mopidy-switcher deleted file mode 100644 index 972e761..0000000 --- a/mopidy-switcher/service/mopidy-switcher +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: mopidy-switcher -# Required-Start: $remote_fs $syslog mopidy -# Required-Stop: $remote_fs $syslog mopidy -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Mopidy switcher initscript -### END INIT INFO - -# Change the next 3 lines to suit where you install your script and what you want to call it -DIR=/usr/local/bin/mopidy-switcher -DAEMON=$DIR/mopidy-switcher.py -DAEMON_NAME=mopidy-switcher - -# Add any command line options for your daemon here -DAEMON_OPTS="" - -# This next line determines what user the script runs as. -# Root generally not recommended but necessary if you are using the Raspberry Pi GPIO from Python. -DAEMON_USER=root - -# The process ID of the script when it runs is stored here: -PIDFILE=/var/run/$DAEMON_NAME.pid - -. /lib/lsb/init-functions - -do_start () { - log_daemon_msg "Starting system $DAEMON_NAME daemon" - start-stop-daemon --start --background --pidfile $PIDFILE --make-pidfile --user $DAEMON_USER --chuid $DAEMON_USER --startas $DAEMON -- $DAEMON_OPTS - log_end_msg $? -} -do_stop () { - log_daemon_msg "Stopping system $DAEMON_NAME daemon" - start-stop-daemon --stop --pidfile $PIDFILE --retry 10 - log_end_msg $? -} - -case "$1" in - - start|stop) - do_${1} - ;; - - restart|reload|force-reload) - do_stop - do_start - ;; - - status) - status_of_proc "$DAEMON_NAME" "$DAEMON" && exit 0 || exit $? - ;; - - *) - echo "Usage: /etc/init.d/$DAEMON_NAME {start|stop|restart|status}" - exit 1 - ;; - -esac -exit 0 diff --git a/mopidy-switcher/service/mopidy-switcher.service b/mopidy-switcher/service/mopidy-switcher.service deleted file mode 100644 index a784f6c..0000000 --- a/mopidy-switcher/service/mopidy-switcher.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Mopidy Switcher -After=mopidy.service - -[Service] -User=root -ExecStart=/usr/local/bin/mopidy-switcher/mopidy-switcher.py - -[Install] -WantedBy=multi-user.target