From d0ee69265cf9bb315f0481d643413b80f80415a8 Mon Sep 17 00:00:00 2001 From: Keine_Ahnung Date: Wed, 1 May 2013 20:17:15 +0200 Subject: changed PLUGIN_UACTIVITY_COMMAND Renamed Run to uactivityRun k_Setup to kNone Extra Error check for #20-yaUSBir_watchdog Changed activity script parameters from command line to enviromet (key and watchdog scripts also changed) New info value "UACTIVITY_INFO_VIDEODIR" Fixed missing Symbol Error from commit e01109af --- Make.config.template | 2 +- Makefile.1.6 | 2 +- Makefile.1.7.x | 2 +- run.c | 19 ++++++--- run.h | 3 +- script/uactivity/key/#10-syslog_demo | 34 ++++++++++------- script/uactivity/key/#20-toggle_demo | 18 +++++---- script/uactivity/watchdog/#10-syslog_demo | 42 +++++++++++--------- script/uactivity/watchdog/#20-yaUSBir_watchdog | 3 +- script/vdr-uactivity | 53 ++++++++++---------------- uactivity.c | 12 +++--- 11 files changed, 103 insertions(+), 87 deletions(-) mode change 100644 => 100755 script/vdr-uactivity diff --git a/Make.config.template b/Make.config.template index eaa22fa..c3d5c30 100644 --- a/Make.config.template +++ b/Make.config.template @@ -6,7 +6,7 @@ # The shell command used -PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r %1$$s -o %2$$s -v %3$$s -C %4$$s -c %5$$s -R %6$$s +PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r \"%1$$s\" -o \"%2$$s\" -C \"%3$$s\" -c \"%4$$s\" -R \"%5$$s\" -A \"%6$$s\" -K \"%7$$s\" -V \"%8$$s\" diff --git a/Makefile.1.6 b/Makefile.1.6 index af6c6cc..e9e884c 100644 --- a/Makefile.1.6 +++ b/Makefile.1.6 @@ -43,7 +43,7 @@ TMPDIR ?= /tmp ### Default values: -PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r %1$$s -o %2$$s -v %3$$s -C %4$$s -c %5$$s -R %6$$s +PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r \"%1$$s\" -o \"%2$$s\" -C \"%3$$s\" -c \"%4$$s\" -R \"%5$$s\" -A \"%6$$s\" -K \"%7$$s\" -V \"%8$$s\" ### The version number of VDR's plugin API (taken from VDR's "config.h"): diff --git a/Makefile.1.7.x b/Makefile.1.7.x index b22528e..beeb73e 100644 --- a/Makefile.1.7.x +++ b/Makefile.1.7.x @@ -49,7 +49,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Default values: -PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r %1$$s -o %2$$s -v %3$$s -C %4$$s -c %5$$s -R %6$$s +PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r \"%1$$s\" -o \"%2$$s\" -C \"%3$$s\" -c \"%4$$s\" -R \"%5$$s\" -A \"%6$$s\" -K \"%7$$s\" -V \"%8$$s\" ### The name of the distribution archive: diff --git a/run.c b/run.c index c8bcead..4f47dae 100644 --- a/run.c +++ b/run.c @@ -1,8 +1,9 @@ #include "run.h" #include +#include -cRun Run; +cRun uactivityRun; cRun::~cRun() { @@ -33,6 +34,14 @@ const char *cRun::ActivityStatusToString(bool Active) return ActivityStatusStr; } +const char *cRun::KeyToString(eKeys Key) +{ + if (Key == kNone) + return ""; + else + return myKey.ToString(Key); +} + void cRun::SetConfigDirectory(const char *Directory) { myConfigDirectory = strdup(Directory); @@ -51,15 +60,15 @@ void cRun::SetResourceDirectory(const char *Directory) void cRun::CallActivity(eOrgin Orgin, bool Active) { char *buffer; - asprintf(&buffer, UACTIVITY_COMMAND, "activity", OrginToString(Orgin), ActivityStatusToString(Active), myConfigDirectory, myCacheDirectory, myResourceDirectory); + asprintf(&buffer, UACTIVITY_COMMAND, "activity", OrginToString(Orgin), myConfigDirectory, myCacheDirectory, myResourceDirectory, ActivityStatusToString(Active), KeyToString(kNone), VideoDirectory); SystemExec(buffer, true); free(buffer); } -void cRun::CallKey(eOrgin Orgin, eKeys Key) +void cRun::CallKey(eOrgin Orgin, bool Active, eKeys Key) { char *buffer; - asprintf(&buffer, UACTIVITY_COMMAND, "key", OrginToString(Orgin), myKey.ToString(Key), myConfigDirectory, myCacheDirectory, myResourceDirectory); + asprintf(&buffer, UACTIVITY_COMMAND, "key", OrginToString(Orgin), myConfigDirectory, myCacheDirectory, myResourceDirectory, ActivityStatusToString(Active), KeyToString(Key), VideoDirectory); SystemExec(buffer, true); free(buffer); } @@ -67,7 +76,7 @@ void cRun::CallKey(eOrgin Orgin, eKeys Key) void cRun::CallWatchdog(eOrgin Orgin, bool Active) { char *buffer; - asprintf(&buffer, UACTIVITY_COMMAND, "watchdog", OrginToString(Orgin), ActivityStatusToString(Active), myConfigDirectory, myCacheDirectory, myResourceDirectory); + asprintf(&buffer, UACTIVITY_COMMAND, "watchdog", OrginToString(Orgin), myConfigDirectory, myCacheDirectory, myResourceDirectory, ActivityStatusToString(Active), KeyToString(kNone), VideoDirectory); SystemExec(buffer, true); free(buffer); } diff --git a/run.h b/run.h index 4be6a6e..831e5a3 100644 --- a/run.h +++ b/run.h @@ -13,6 +13,7 @@ private: cKey myKey; static const char *OrginToString(eOrgin Orgin); static const char *ActivityStatusToString(bool Active); + const char *KeyToString(eKeys Key); public: cRun() { }; ~cRun(); @@ -20,7 +21,7 @@ public: void SetCacheDirectory(const char *Directory); void SetResourceDirectory(const char *Directory); void CallActivity(eOrgin Orgin, bool Active); - void CallKey(eOrgin Orgin, eKeys Key); + void CallKey(eOrgin Orgin, bool Active, eKeys Key); void CallWatchdog(eOrgin Orgin, bool Active); }; diff --git a/script/uactivity/key/#10-syslog_demo b/script/uactivity/key/#10-syslog_demo index ee794a7..767ee55 100755 --- a/script/uactivity/key/#10-syslog_demo +++ b/script/uactivity/key/#10-syslog_demo @@ -1,29 +1,37 @@ #!/bin/sh -case "${1}" in +case "${UACTIVITY_ORGIN}" in startup) logger -t "uactivity [key/$(basename ${0})]" "key starting up" - logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; started) logger -t "uactivity [key/$(basename ${0})]" "key started" - logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; shutdown) logger -t "uactivity [key/$(basename ${0})]" "key shutting down" - logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; running) logger -t "uactivity [key/$(basename ${0})]" "key \"${2}\" pressed" - logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; esac diff --git a/script/uactivity/key/#20-toggle_demo b/script/uactivity/key/#20-toggle_demo index 3ec3cfb..1127a2e 100755 --- a/script/uactivity/key/#20-toggle_demo +++ b/script/uactivity/key/#20-toggle_demo @@ -1,27 +1,29 @@ #!/bin/sh # do not use names starting with [0-9][0-9] for data files -FLAG="${4}/key/flag.$(basename ${0})" +FLAG_DIR="${UACTIVITY_CACHEDIRECTORY}/key/$(basename ${0}).data" +FLAG_FILE="${FLAG_DIR}/flag" + -case "${1}" in +case "${UACTIVITY_ORGIN}" in startup) # create flag directory (using cache directory) - mkdir -p "${4}/key/" + mkdir -p "${FLAG_DIR}" # delete flag (may leftover from previus vdr crash) # kepp the flag if toggle state should be keep over vdr sessions - rm -f "${FLAG}" + rm -f "${FLAG_FILE}" ;; running) # we are interested in Key "1" - if [ "${2}" = "1" ]; then - if [ -f "${FLAG}" ]; then + if [ "${UACTIVITY_INFO_KEY}" = "1" ]; then + if [ -f "${FLAG_FILE}" ]; then # here we do our "off" action logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) off" - rm -f "${FLAG}" + rm -f "${FLAG_FILE}" else # here we do our "on" action logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) on" - touch "${FLAG}" + touch "${FLAG_FILE}" fi fi ;; diff --git a/script/uactivity/watchdog/#10-syslog_demo b/script/uactivity/watchdog/#10-syslog_demo index 8ff6ca3..bcb36b7 100755 --- a/script/uactivity/watchdog/#10-syslog_demo +++ b/script/uactivity/watchdog/#10-syslog_demo @@ -1,41 +1,49 @@ #!/bin/sh -case "${1}" in +case "${UACTIVITY_ORGIN}" in startup) logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog starting up" - [ "${2}" = "true" ] \ + [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \ && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \ || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" - logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; started) logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog started" - [ "${2}" = "true" ] \ + [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \ && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \ || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" - logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; shutdown) logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog shutting down" - [ "${2}" = "true" ] \ + [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \ && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \ || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" - logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; running) logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog triggered" - [ "${2}" = "true" ] \ + [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \ && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \ || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" - logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; esac diff --git a/script/uactivity/watchdog/#20-yaUSBir_watchdog b/script/uactivity/watchdog/#20-yaUSBir_watchdog index d6e70dc..4307a55 100755 --- a/script/uactivity/watchdog/#20-yaUSBir_watchdog +++ b/script/uactivity/watchdog/#20-yaUSBir_watchdog @@ -13,6 +13,7 @@ IRSEND="irsend -d /var/run/lirc/ya_usbir SEND_ONCE yaUsbIR_control C_WATCHDOG %s trigger_watchdog(){ # Calculate n1, n2 and n3 values + OK=false eval $(bc < /dev/null watchdog = ${WATCHDOG_TIME} @@ -57,7 +58,7 @@ deactivate_watchdog(){ -case "${1}" in +case "${UACTIVITY_ORGIN}" in startup) trigger_watchdog || exit 1 ;; diff --git a/script/vdr-uactivity b/script/vdr-uactivity old mode 100644 new mode 100755 index eecdc3e..f4203cc --- a/script/vdr-uactivity +++ b/script/vdr-uactivity @@ -9,70 +9,57 @@ mylog() { } usage(){ - ${LOG} "Usage: $(basename $0) -r -o -v " + ${LOG} "Usage: $(basename $0) -r -o " ${LOG} " -C -c -R " + ${LOG} " -A -K -V