diff options
-rw-r--r-- | HISTORY | 2 | ||||
-rw-r--r-- | doc-src/de/epgsearch.1.txt | 6 | ||||
-rw-r--r-- | doc-src/en/epgsearch.1.txt | 6 | ||||
-rw-r--r-- | doc-src/en/epgsearch.4.txt | 6 | ||||
-rw-r--r-- | epgsearch.c | 6 | ||||
-rwxr-xr-x | scripts/convert_epgsearchdone_data.pl | 2 | ||||
-rwxr-xr-x | scripts/epg2autotimer.sh | 3 | ||||
-rwxr-xr-x | scripts/epg2taste.sh | 3 | ||||
-rwxr-xr-x | scripts/mtdone2epgsearchdone.sh | 4 | ||||
-rwxr-xr-x | scripts/recordingdone.sh | 4 | ||||
-rwxr-xr-x | scripts/recrep.sh | 2 | ||||
-rwxr-xr-x | scripts/rememberevent.sh | 9 | ||||
-rwxr-xr-x | scripts/timerrep.sh | 4 | ||||
-rwxr-xr-x | scripts/undoneepgsearch.sh | 2 |
14 files changed, 31 insertions, 28 deletions
@@ -1153,7 +1153,7 @@ fixes: 2005-04-14: Version 0.9.3 - implemented direct SVDRP communication (no more need for - svdrpsend.pl. For now, the old external method can still be used when you pass + svdrpsend. For now, the old external method can still be used when you pass it with -f as parameter, if you omit -f the internal method is used) - added buttons '<<' and '>>' in detailed epg view (summary) to jump to the previous/next event of the menu behind (schedule, now, next, diff --git a/doc-src/de/epgsearch.1.txt b/doc-src/de/epgsearch.1.txt index 577cda4..5f725a7 100644 --- a/doc-src/de/epgsearch.1.txt +++ b/doc-src/de/epgsearch.1.txt @@ -60,7 +60,7 @@ Teile der Quelltexte basieren auf dem repeating-epg-patch von Gerhard Steiner, d =item -f file, --svdrpsendcmd=file -Pfad zu svdrpsend.pl für externe SVDRP-Kommunikation (Standard ist interne +Pfad zu svdrpsend für externe SVDRP-Kommunikation (Standard ist interne Kommunikation, deshalb ist dieser Paramter normalerweise nicht notwendig) =item -c path, --config=path @@ -707,11 +707,11 @@ keine Sendungen zugeordnet sind. Während der neue EPG an VDR übermittelt wird, kann diese Situation auftreten. Am einfachsten geht das mit dem SVDRP-Befehl SETS im EPG-Update-Skript: -svdrpsend.pl plug epgsearch SETS off +svdrpsend plug epgsearch SETS off <das EPG update Skript> -svdrpsend.pl plug epgsearch SETS on +svdrpsend plug epgsearch SETS on =head3 1.4.6 Timer-Konflikt-Prüfung diff --git a/doc-src/en/epgsearch.1.txt b/doc-src/en/epgsearch.1.txt index a6cf583..4cbce76 100644 --- a/doc-src/en/epgsearch.1.txt +++ b/doc-src/en/epgsearch.1.txt @@ -58,7 +58,7 @@ Parts of the sources are based on the repeating-ECG patch from Gerhard Steiner, =item -f file, --svdrpsendcmd=file -the path to svdrpsend.pl for external SVDRP communication (default is +the path to svdrpsend for external SVDRP communication (default is internal communication, so this is usually not needed anymore) =item -c path, --config=path @@ -688,11 +688,11 @@ situation can exist while the new EPG is feeded to VDR. A simple way to disable search timer updates is to use the SVDRP command SETS in your EPG update script: -svdrpsend.pl plug epgsearch SETS off +svdrpsend plug epgsearch SETS off <your EPG update script> -svdrpsend.pl plug epgsearch SETS on +svdrpsend plug epgsearch SETS on =head3 1.4.6 Timer conflict checking diff --git a/doc-src/en/epgsearch.4.txt b/doc-src/en/epgsearch.4.txt index 16dbe3e..5a54ca9 100644 --- a/doc-src/en/epgsearch.4.txt +++ b/doc-src/en/epgsearch.4.txt @@ -343,10 +343,10 @@ directory with the following lines in it: UseSubtitle=x // 1(default) or 0 UseDescr=x // 1(default) or 0 -Then call Epgsearch via svdrpsend.pl (you must have assigned a key +Then call Epgsearch via svdrpsend (you must have assigned a key to it), e.g. - svdrpsend.pl HITK green + svdrpsend HITK green At startup Epgsearch will look for this file and give you the search results for your search, if it exists. After that the file is @@ -371,7 +371,7 @@ I have added a quick and dirty dummy plugin epgsearch implements a SVDRP interface, that can be accessed for example like this - svdrpsend.pl PLUG epgsearch LSTS + svdrpsend PLUG epgsearch LSTS the following commands are available: diff --git a/epgsearch.c b/epgsearch.c index 1e0cf71..2b0f08b 100644 --- a/epgsearch.c +++ b/epgsearch.c @@ -85,7 +85,7 @@ int cLogFile::loglevellimit = 0; bool cPluginEpgsearch::VDR_readyafterStartup = false; // external SVDRPCommand -const char *cSVDRPClient::SVDRPSendCmd = "svdrpsend.pl"; +const char *cSVDRPClient::SVDRPSendCmd = "svdrpsend"; cPluginEpgsearch::cPluginEpgsearch(void) { @@ -117,7 +117,7 @@ const char* cPluginEpgsearch::Description(void) const char *cPluginEpgsearch::CommandLineHelp(void) { - return " -f file, --svdrpsendcmd=file the path to svdrpsend.pl for external\n" + return " -f file, --svdrpsendcmd=file the path to svdrpsend for external\n" " SVDRP communication (default is internal\n" " communication)\n" " -c path, --config=path to specify a specific config dir for epgsearch\n" @@ -208,7 +208,7 @@ bool cPluginEpgsearch::ProcessArgs(int argc, char *argv[]) if (EPGSearchConfig.useExternalSVDRP && access(cSVDRPClient::SVDRPSendCmd, F_OK) != 0) { - LogFile.eSysLog("ERROR - can't find SVDRPSend script: '%s'", cSVDRPClient::SVDRPSendCmd); + LogFile.eSysLog("ERROR - can't find svdrpsend script: '%s'", cSVDRPClient::SVDRPSendCmd); cSVDRPClient::SVDRPSendCmd = NULL; } diff --git a/scripts/convert_epgsearchdone_data.pl b/scripts/convert_epgsearchdone_data.pl index 719b456..25c7607 100755 --- a/scripts/convert_epgsearchdone_data.pl +++ b/scripts/convert_epgsearchdone_data.pl @@ -18,7 +18,7 @@ # # z.B. convert_epgsearchdone_data.pl /etc/vdr/plugins/ # -# "svdrpsend.pl plug epgsearch updd" nicht vergesssen. +# "svdrpsend plug epgsearch updd" nicht vergesssen. # # Backup erstellen? # diff --git a/scripts/epg2autotimer.sh b/scripts/epg2autotimer.sh index dd07879..524720b 100755 --- a/scripts/epg2autotimer.sh +++ b/scripts/epg2autotimer.sh @@ -11,6 +11,7 @@ # CONFIG START AUTOTIMER_FILE="$SOURCEDIR/vdradmin/vdradmind.at" + SVDRPSEND=/usr/local/bin/svdrpsend # default autotimer settings STATUS=1 # 0 = inactive (by default) / 1 = active @@ -27,6 +28,6 @@ echo "Done..." # jump back at now <<EOF -perl -l -e "printf \"\n/usr/local/bin/svdrpsend.pl HITK BACK\" x 2" | sh +perl -l -e "printf \"\n$SVDRPSEND HITK BACK\" x 2" | sh EOF diff --git a/scripts/epg2taste.sh b/scripts/epg2taste.sh index 0a6f9e7..575b2c3 100755 --- a/scripts/epg2taste.sh +++ b/scripts/epg2taste.sh @@ -9,6 +9,7 @@ # CONFIG START TASTE_FILE="/etc/vdr/plugins/taste.conf" + SVDRPSEND=/usr/local/bin/svdrpsend # default taste settings REGULAR_EXPRESSION=0 # Regular Expression / Regulärer Ausdruck @@ -21,6 +22,6 @@ echo "Done..." # jump back at now <<EOF -perl -l -e "printf \"\n/usr/local/bin/svdrpsend.pl HITK BACK\" x 2" | sh +perl -l -e "printf \"\n$SVDRPSEND HITK BACK\" x 2" | sh EOF diff --git a/scripts/mtdone2epgsearchdone.sh b/scripts/mtdone2epgsearchdone.sh index 52d9062..00d7ecb 100755 --- a/scripts/mtdone2epgsearchdone.sh +++ b/scripts/mtdone2epgsearchdone.sh @@ -22,8 +22,8 @@ ASK_SID=no # What S-ID should be used if no other selected DEFAULT_SID=0 -# adjust the following lines to your path to svdrpsend.pl -SVDRPSEND=/usr/local/bin/svdrpsend.pl +# adjust the following lines to your path to svdrpsend +SVDRPSEND=/usr/local/bin/svdrpsend # Home of EPGsearch EPGSEARCH_HOME="/etc/vdr/plugins" diff --git a/scripts/recordingdone.sh b/scripts/recordingdone.sh index a176841..ce88509 100755 --- a/scripts/recordingdone.sh +++ b/scripts/recordingdone.sh @@ -56,8 +56,8 @@ DEFAULT_SID=-1 # Use the recording-dir's ctime as recording time? CTIME_FROM_RECORDING=yes -# adjust the following lines to your path to svdrpsend.pl -SVDRPSEND=/usr/local/bin/svdrpsend.pl +# adjust the following lines to your path to svdrpsend +SVDRPSEND=/usr/local/bin/svdrpsend # Home of EPGsearch EPGSEARCH_HOME="/etc/vdr/plugins" diff --git a/scripts/recrep.sh b/scripts/recrep.sh index 597d4b2..cb57404 100755 --- a/scripts/recrep.sh +++ b/scripts/recrep.sh @@ -16,7 +16,7 @@ # your plugins config dir PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch -# path to svdrpsend.pl +# path to svdrpsend SVDRPSEND=svdrpsend # the key used to call epgsearch EPGSEARCHKEY=green diff --git a/scripts/rememberevent.sh b/scripts/rememberevent.sh index 9babc74..369ceed 100755 --- a/scripts/rememberevent.sh +++ b/scripts/rememberevent.sh @@ -14,6 +14,7 @@ # CONFIG START ATD_SPOOL=/var/spool/atjobs + SVDRPSEND=svdrpsend # default settings MINSBEFORE=1 # minutes before event for announcement @@ -36,16 +37,16 @@ case $1 in secs=$(($3-$MINSBEFORE*60)) secs_now=`date +%s` if [ $secs -le $secs_now ]; then - echo "svdrpsend.pl MESG '$2 already runs!' >/dev/null" | at now + echo "$SVDRPSEND MESG '$2 already runs!' >/dev/null" | at now else if [ -z "$(find $ATD_SPOOL -exec grep -qs "^$entry$" \{} \; -exec rm -v \{} \;)" ]; then at $(date -d "1970-01-01 $FORMAT $secs seconds" +"%H:%M %m/%d/%Y") <<EOT - svdrpsend.pl MESG '${switch_time#* }: $2' >/dev/null + $SVDRPSEND MESG '${switch_time#* }: $2' >/dev/null sleep $(($MINSBEFORE*60))s if [ $1 -eq 1 ] ; then - svdrpsend.pl CHAN $5 >/dev/null + $SVDRPSEND CHAN $5 >/dev/null else - svdrpsend.pl MESG '$2 starts!' >/dev/null + $SVDRPSEND MESG '$2 starts!' >/dev/null fi $entry EOT diff --git a/scripts/timerrep.sh b/scripts/timerrep.sh index d00ea1c..691e279 100755 --- a/scripts/timerrep.sh +++ b/scripts/timerrep.sh @@ -15,8 +15,8 @@ # adjust the following lines to your config # your plugins config dir PLUGINCONFDIR=/etc/vdr/plugins/epgsearch -# path to svdrpsend.pl -SVDRPSEND=/usr/local/src/VDR/svdrpsend.pl +# path to svdrpsend +SVDRPSEND=/usr/local/src/VDR/svdrpsend # if you are using special subfolders for some recordings, please add them here FOLDERS="Comedy,Wissen,Serien,Magazine" # the key used to call epgsearch diff --git a/scripts/undoneepgsearch.sh b/scripts/undoneepgsearch.sh index 8716ec8..98cdbbc 100755 --- a/scripts/undoneepgsearch.sh +++ b/scripts/undoneepgsearch.sh @@ -32,7 +32,7 @@ EPGSEARCHDONE_FILE="/etc/vdr/plugins/epgsearch/epgsearchdone.data" # Backup epgsearchdone.data before changing it (only once a day) BACKUP=yes -SVDRPSEND=svdrpsend.pl +SVDRPSEND=svdrpsend # For some debugging infos, set to yes DEBUG=no |