From 9893bb14f2bc34f0a4e1f0b1417991364ef30c8d Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Tue, 18 Dec 2018 20:39:52 +0000 Subject: [PATCH 01/28] =?UTF-8?q?=E2=80=9EPack/CHANGELOG=E2=80=9C=20=C3=A4?= =?UTF-8?q?ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pack/CHANGELOG | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Pack/CHANGELOG b/Pack/CHANGELOG index c04dd8e..7241b92 100644 --- a/Pack/CHANGELOG +++ b/Pack/CHANGELOG @@ -1,4 +1,10 @@ -Release Notes +Release Notes + +4.0.9 (RELEASE) + IMPLEMENTIERUNGEN: + - + BUGFIXES: + - 4.0.8 (RELEASE) BUGFIXES: From 2edb0272fcc0e0972d7d39a7ca4eebef42164a22 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Thu, 20 Dec 2018 14:29:26 +0000 Subject: [PATCH 02/28] PushBullet integriert --- Build/synOTR.sh | 102 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 93 insertions(+), 9 deletions(-) diff --git a/Build/synOTR.sh b/Build/synOTR.sh index f2ea053..756927d 100644 --- a/Build/synOTR.sh +++ b/Build/synOTR.sh @@ -8,8 +8,8 @@ echo " -----------------------------------" echo -e - CLIENTVERSION="4.0.8" # [2018-12-17] - DevChannel="Release" # beta + CLIENTVERSION=`get_key_value /var/packages/synOTR/INFO version` + DevChannel="Release" # beta [2018-12-20] # --------------------------------------------------------------------------------- # GRUNDKONFIGRUATIONEN / INDIVIDUELLE ANPASSUNGEN / Standardwerte | @@ -685,6 +685,18 @@ if [ $decoderactiv = "on" ] && [ ! -z "$filetest" ] ; then echo 2 > /dev/ttyS1 #short beep sleep 1 fi + if [ ! -z $PBTOKEN ] ; then + PB_LOG=`curl $cURLloglevel --header "Access-Token:${PBTOKEN}" https://api.pushbullet.com/v2/pushes -d type=note -d title="synOTR" -d body="Film [$filename] ist fertig."` + if [ $LOGlevel = "2" ] ; then + echo " PushBullet-LOG:" + echo "$PB_LOG" + elif echo "$PB_LOG" | grep -q "error"; then # für Loglevel 1 nur Errorausgabe + echo -n " PushBullet-Error: " + echo "$PB_LOG" | jq -r '.error_code' + fi + else + echo " (PushBullet-TOKEN nicht gesetzt)" + fi wget --timeout=30 --tries=2 -q -O - "http://${synotrdomain}/synOTR/synOTR_FILECOUNT" >/dev/null 2>&1 needindex=1 fi @@ -1577,6 +1589,18 @@ if [ $OTRcutactiv = "on" ] ; then if [ $dsmbeepnotify = "on" ] ; then echo 2 > /dev/ttyS1 #short beep fi + if [ ! -z $PBTOKEN ] ; then + PB_LOG=`curl $cURLloglevel --header "Access-Token:${PBTOKEN}" https://api.pushbullet.com/v2/pushes -d type=note -d title="synOTR" -d body="Film [$filedestname] ist fertig."` + if [ $LOGlevel = "2" ] ; then + echo " PushBullet-LOG:" + echo "$PB_LOG" + elif echo "$PB_LOG" | grep -q "error"; then # für Loglevel 1 nur Errorausgabe + echo -n " PushBullet-Error: " + echo "$PB_LOG" | jq -r '.error_code' + fi + else + echo " (PushBullet-TOKEN nicht gesetzt)" + fi wget --timeout=30 --tries=2 -q -O - "http://${synotrdomain}/synOTR/synOTR_FILECOUNT" >/dev/null 2>&1 needindex=1 fi @@ -1749,7 +1773,7 @@ if [ $OTRcutactiv = "on" ] ; then if [ $dsmtextnotify = "on" ] ; then title=${filename%.*} sleep 1 - synodsmnotify $MessageTo "synOTR" "[$title] ist fertig" + synodsmnotify $MessageTo "synOTR" "Film [$title] ist fertig" sleep 1 fi if [ $dsmbeepnotify = "on" ] ; then @@ -1757,6 +1781,18 @@ if [ $OTRcutactiv = "on" ] ; then echo 2 > /dev/ttyS1 #short beep sleep 1 fi + if [ ! -z $PBTOKEN ] ; then + PB_LOG=`curl $cURLloglevel --header "Access-Token:${PBTOKEN}" https://api.pushbullet.com/v2/pushes -d type=note -d title="synOTR" -d body="Film [$title] ist fertig."` + if [ $LOGlevel = "2" ] ; then + echo " PushBullet-LOG:" + echo "$PB_LOG" + elif echo "$PB_LOG" | grep -q "error"; then # für Loglevel 1 nur Errorausgabe + echo -n " PushBullet-Error: " + echo "$PB_LOG" | jq -r '.error_code' + fi + else + echo " (PushBullet-TOKEN nicht gesetzt)" + fi wget --timeout=30 --tries=2 -q -O - "http://${synotrdomain}/synOTR/synOTR_FILECOUNT" >/dev/null 2>&1 needindex=1 fi @@ -1969,7 +2005,7 @@ if [ $OTRavi2mp4active = "on" ] && [ ! -z "$filetest" ] ; then synoindex -a "${pfad}${title}.mp4" if [ $dsmtextnotify = "on" ] ; then sleep 1 - synodsmnotify $MessageTo "synOTR" "[$title] ist fertig" + synodsmnotify $MessageTo "synOTR" "Film [$title] ist fertig" sleep 1 fi if [ $dsmbeepnotify = "on" ] ; then @@ -1977,6 +2013,18 @@ if [ $OTRavi2mp4active = "on" ] && [ ! -z "$filetest" ] ; then echo 2 > /dev/ttyS1 #short beep sleep 1 fi + if [ ! -z $PBTOKEN ] ; then + PB_LOG=`curl $cURLloglevel --header "Access-Token:${PBTOKEN}" https://api.pushbullet.com/v2/pushes -d type=note -d title="synOTR" -d body="Film [$title] ist fertig."` + if [ $LOGlevel = "2" ] ; then + echo " PushBullet-LOG:" + echo "$PB_LOG" + elif echo "$PB_LOG" | grep -q "error"; then # für Loglevel 1 nur Errorausgabe + echo -n " PushBullet-Error: " + echo "$PB_LOG" | jq -r '.error_code' + fi + else + echo " (PushBullet-TOKEN nicht gesetzt)" + fi wget --timeout=30 --tries=2 -q -O - "http://${synotrdomain}/synOTR/synOTR_FILECOUNT" >/dev/null 2>&1 needindex=1 fi @@ -2285,7 +2333,7 @@ for i in $(find "$WORKDIR" -maxdepth 1 -name "*TVOON*avi" -o -name "*TVOON*mp4" synoindex -a "${WORKDIR}${NewName}" if [ $dsmtextnotify = "on" ] ; then sleep 1 - synodsmnotify $MessageTo "synOTR" "[$title] ist fertig" + synodsmnotify $MessageTo "synOTR" "Film [$title] ist fertig" sleep 1 fi if [ $dsmbeepnotify = "on" ] ; then @@ -2293,6 +2341,18 @@ for i in $(find "$WORKDIR" -maxdepth 1 -name "*TVOON*avi" -o -name "*TVOON*mp4" echo 2 > /dev/ttyS1 #short beep sleep 1 fi + if [ ! -z $PBTOKEN ] ; then + PB_LOG=`curl --header "Access-Token:${PBTOKEN}" https://api.pushbullet.com/v2/pushes -d type=note -d title="synOTR" -d body="Filme [$film] ist fertig."` + if [ $LOGlevel = "2" ] ; then + echo "PushBullet-LOG:" + echo "$PB_LOG" + elif echo "$PB_LOG" | grep -q "error"; then # für Loglevel 1 nur Errorausgabe + echo -n "PushBullet-Error: " + echo "$PB_LOG" | jq -r '.error_code' + fi + else + echo "PushBullet-TOKEN nicht erkannt" + fi wget --timeout=30 --tries=2 -q -O - "http://${synotrdomain}/synOTR/synOTR_FILECOUNT" >/dev/null 2>&1 needindex=1 fi @@ -2404,7 +2464,7 @@ if [ $OTRrenameactiv = "on" ] && [ $firstrunonday == "1" ] ; then if jq -e . >/dev/null 2>&1 <<<"$serieninfo"; then # prüfen, ob korrektes JSON-Format verarbeitet werden kann (https://stackoverflow.com/questions/46954692/check-if-string-is-a-valid-json-with-jq) echo -e "gefunden:" echo "OTRID: $OTRID" - serietitle=`echo "$serieninfo" | jq -r '.Serie' | sed "s/://g" ` # jq ist ein Kommandozeilen-JSON-Parser + serietitle=`echo "$serieninfo" | jq -r '.Serie' | sed "s/://g" ` echo "serietitle: $serietitle" season=`echo "$serieninfo" | awk -F, '{print $3}' | awk -F: '{print $2}' | sed "s/\"//g"` season="$(printf '%02d' "$season")" # 2stellig mit führender Null @@ -2513,7 +2573,7 @@ if [ $OTRrenameactiv = "on" ] && [ $firstrunonday == "1" ] ; then if [ $dsmtextnotify = "on" ] ; then sleep 1 - synodsmnotify $MessageTo "synOTR" "[$title] ist fertig" + synodsmnotify $MessageTo "synOTR" "Film [$title] ist fertig" sleep 1 fi if [ $dsmbeepnotify = "on" ] ; then @@ -2712,7 +2772,7 @@ if [ $useWORKDIR == "yes" ] && [ ! -z "$filetest" ]; then if [ $dsmtextnotify = "on" ] ; then sleep 1 - synodsmnotify $MessageTo "synOTR" "[$filename] ist fertig" + synodsmnotify $MessageTo "synOTR" "Film [$filename] ist fertig" sleep 1 fi if [ $dsmbeepnotify = "on" ] ; then @@ -2720,6 +2780,18 @@ if [ $useWORKDIR == "yes" ] && [ ! -z "$filetest" ]; then echo 2 > /dev/ttyS1 #short beep sleep 1 fi + if [ ! -z $PBTOKEN ] ; then + PB_LOG=`curl $cURLloglevel --header "Access-Token:${PBTOKEN}" https://api.pushbullet.com/v2/pushes -d type=note -d title="synOTR" -d body="Film [$filename] ist fertig."` + if [ $LOGlevel = "2" ] ; then + echo " PushBullet-LOG:" + echo "$PB_LOG" + elif echo "$PB_LOG" | grep -q "error"; then # für Loglevel 1 nur Errorausgabe + echo -n " PushBullet-Error: " + echo "$PB_LOG" | jq -r '.error_code' + fi + else + echo " (PushBullet-TOKEN nicht gesetzt)" + fi wget --timeout=30 --tries=2 -q -O - "http://${synotrdomain}/synOTR/synOTR_FILECOUNT" >/dev/null 2>&1 needindex=1 @@ -2744,7 +2816,7 @@ if [ $useWORKDIR == "yes" ] && [ ! -z "$filetest" ]; then if [ $dsmtextnotify = "on" ] ; then sleep 1 - synodsmnotify $MessageTo "synOTR" "[$filename] ist fertig" + synodsmnotify $MessageTo "synOTR" "Film [$filename] ist fertig" sleep 1 fi if [ $dsmbeepnotify = "on" ] ; then @@ -2752,6 +2824,18 @@ if [ $useWORKDIR == "yes" ] && [ ! -z "$filetest" ]; then echo 2 > /dev/ttyS1 #short beep sleep 1 fi + if [ ! -z $PBTOKEN ] ; then + PB_LOG=`curl $cURLloglevel --header "Access-Token:${PBTOKEN}" https://api.pushbullet.com/v2/pushes -d type=note -d title="synOTR" -d body="Film [$filename] ist fertig."` + if [ $LOGlevel = "2" ] ; then + echo " PushBullet-LOG:" + echo "$PB_LOG" + elif echo "$PB_LOG" | grep -q "error"; then # für Loglevel 1 nur Errorausgabe + echo -n " PushBullet-Error: " + echo "$PB_LOG" | jq -r '.error_code' + fi + else + echo " (PushBullet-TOKEN nicht gesetzt)" + fi wget --timeout=30 --tries=2 -q -O - "http://${synotrdomain}/synOTR/synOTR_FILECOUNT" >/dev/null 2>&1 needindex=1 else From b8b87c3eafaf60bf26326621d0ef63d1289ab766 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Thu, 20 Dec 2018 14:36:01 +0000 Subject: [PATCH 03/28] PushBullet integriert --- Build/upgradeconfig.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Build/upgradeconfig.sh b/Build/upgradeconfig.sh index 7000d49..0a7abc0 100644 --- a/Build/upgradeconfig.sh +++ b/Build/upgradeconfig.sh @@ -28,6 +28,9 @@ if ! cat ./$CONFIG | grep -q "dsmbeepnotify" ; then echo "dsmbeepnotify=\"on\"" >> ./$CONFIG fi + if ! cat ./$CONFIG | grep -q "PBTOKEN" ; then + echo "PBTOKEN=\"\"" >> ./$CONFIG + fi if ! cat ./$CONFIG | grep -q "LOGlevel" ; then echo "LOGlevel=\"1\"" >> ./$CONFIG fi From 1a8471f21d4b51d1b3a3fa00c2de6c9db5b518e8 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Thu, 20 Dec 2018 14:40:38 +0000 Subject: [PATCH 04/28] PushBullet integriert --- Build/usersettings/Konfiguration_org.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Build/usersettings/Konfiguration_org.txt b/Build/usersettings/Konfiguration_org.txt index a1a656e..2788ed9 100644 --- a/Build/usersettings/Konfiguration_org.txt +++ b/Build/usersettings/Konfiguration_org.txt @@ -49,6 +49,7 @@ MP4BOX_DELAY="100" #-------------------------------------------------------------------- dsmtextnotify="on" MessageTo="admin" +PBTOKEN="" dsmbeepnotify="on" LOGlevel="1" reindex=1 From 2340a050aca6492da209bd0baac82a5fb2724327 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Thu, 20 Dec 2018 14:50:54 +0000 Subject: [PATCH 05/28] PushBullet integriert --- Build/edit.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Build/edit.sh b/Build/edit.sh index a16c176..c38c250 100644 --- a/Build/edit.sh +++ b/Build/edit.sh @@ -28,6 +28,7 @@ if [[ "$page" == "edit-save" ]]; then "$set_var" "$dir/app/etc/Konfiguration.txt" "dsmtextnotify" "$dsmtextnotify" "$set_var" "$dir/app/etc/Konfiguration.txt" "MessageTo" "$MessageTo" "$set_var" "$dir/app/etc/Konfiguration.txt" "dsmbeepnotify" "$dsmbeepnotify" + "$set_var" "$dir/app/etc/Konfiguration.txt" "PBTOKEN" "$PBTOKEN" "$set_var" "$dir/app/etc/Konfiguration.txt" "LOGlevel" "$LOGlevel" "$set_var" "$dir/app/etc/Konfiguration.txt" "endgueltigloeschen" "$endgueltigloeschen" "$set_var" "$dir/app/etc/Konfiguration.txt" "reindex" "$reindex" @@ -86,6 +87,7 @@ if [[ "$page" == "edit-import-query" ]] || [[ "$page" == "edit-import" ]]; then "$set_var" "$dir/app/etc/Konfiguration.txt" "dsmtextnotify" "$dsmtextnotify" "$set_var" "$dir/app/etc/Konfiguration.txt" "MessageTo" "$MessageTo" "$set_var" "$dir/app/etc/Konfiguration.txt" "dsmbeepnotify" "$dsmbeepnotify" + "$set_var" "$dir/app/etc/Konfiguration.txt" "PBTOKEN" "$PBTOKEN" "$set_var" "$dir/app/etc/Konfiguration.txt" "LOGlevel" "$LOGlevel" "$set_var" "$dir/app/etc/Konfiguration.txt" "endgueltigloeschen" "$endgueltigloeschen" "$set_var" "$dir/app/etc/Konfiguration.txt" "reindex" "$reindex" @@ -743,6 +745,22 @@ if [[ "$page" == "edit" ]]; then
Auf diese Art kann man sich in Verbindung mit dem Paket "Notification Forwarder" über synOTR-Ereignisse z.B. über einen Pushdienst benachrichtigen lassen.
Bleibt der Wert leer, so wird die Gruppe "administrators" benachrichtigt.

' + # PushBullet-Token + echo ' +

+ ' + if [ -n "$PBTOKEN" ]; then + echo '' + else + echo '' + fi + echo ' + + + Dein persönlicher PushBullet-Token. +
Benachrichtigungen werden an den entsprechenden Account gesendet. +
Bei Nichtgebrauch leer lassen. +

' # dsmbeepnotify echo '

From c72b993cd709efa3d0cc139bf19a4b4559a14456 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Thu, 20 Dec 2018 14:51:32 +0000 Subject: [PATCH 06/28] =?UTF-8?q?=E2=80=9EPack/INFO=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pack/INFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pack/INFO b/Pack/INFO index 62e1073..5022205 100644 --- a/Pack/INFO +++ b/Pack/INFO @@ -1,6 +1,6 @@ package="synOTR" displayname="synOTR" -version="4.0.8" +version="4.0.8.1" thirdparty="yes" description="SynOTR liefert einen Workflow für TV-Aufnahmen von onlineTVrecorder (OTR) auf Synology NAS. synOTR übernimmt *decodieren *AC3-muxing (BETA) *schneiden *MP4-Konvertierung und *umbenennung (inkl. Serieninformationen von www.thetvdb.com und www.otr-serien.de). onlineTVrecorder (OTR) ist der freie Videorecorder im Internet, der rund um die Uhr fast alle Sendungen von rund 100 TV-Sender aus Deutschland, USA, UK und anderen Lädern aufnimmt." maintainer="geimist" From 323d686acb8cb1444caf56f74e736a032084f641 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Thu, 20 Dec 2018 16:59:22 +0000 Subject: [PATCH 07/28] =?UTF-8?q?=E2=80=9EPack/CHANGELOG=E2=80=9C=20=C3=A4?= =?UTF-8?q?ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pack/CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/Pack/CHANGELOG b/Pack/CHANGELOG index 7241b92..ac65cb6 100644 --- a/Pack/CHANGELOG +++ b/Pack/CHANGELOG @@ -2,6 +2,7 @@ Release Notes 4.0.9 (RELEASE) IMPLEMENTIERUNGEN: + - PushBullet integriert. Dazu muss lediglich der persönliche Token in der Konfiguration hinterlegt werden - BUGFIXES: - From f12e1989d059179377367ac5e463198d23da0ca1 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Thu, 20 Dec 2018 17:00:08 +0000 Subject: [PATCH 08/28] =?UTF-8?q?=E2=80=9EPack/INFO=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pack/INFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pack/INFO b/Pack/INFO index 5022205..c7b163f 100644 --- a/Pack/INFO +++ b/Pack/INFO @@ -1,6 +1,6 @@ package="synOTR" displayname="synOTR" -version="4.0.8.1" +version="4.0.9" thirdparty="yes" description="SynOTR liefert einen Workflow für TV-Aufnahmen von onlineTVrecorder (OTR) auf Synology NAS. synOTR übernimmt *decodieren *AC3-muxing (BETA) *schneiden *MP4-Konvertierung und *umbenennung (inkl. Serieninformationen von www.thetvdb.com und www.otr-serien.de). onlineTVrecorder (OTR) ist der freie Videorecorder im Internet, der rund um die Uhr fast alle Sendungen von rund 100 TV-Sender aus Deutschland, USA, UK und anderen Lädern aufnimmt." maintainer="geimist" From 7393b24cb5743634828a04386fbc12473b976f54 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Mon, 31 Dec 2018 17:25:41 +0000 Subject: [PATCH 09/28] =?UTF-8?q?=E2=80=9EBuild/upgradeconfig.sh=E2=80=9C?= =?UTF-8?q?=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/upgradeconfig.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Build/upgradeconfig.sh b/Build/upgradeconfig.sh index 0a7abc0..8d1beaa 100644 --- a/Build/upgradeconfig.sh +++ b/Build/upgradeconfig.sh @@ -34,6 +34,9 @@ if ! cat ./$CONFIG | grep -q "LOGlevel" ; then echo "LOGlevel=\"1\"" >> ./$CONFIG fi + if ! cat ./$CONFIG | grep -q "LOGmax" ; then + echo "LOGmax=\"1\"" >> ./$CONFIG + fi if ! cat ./$CONFIG | grep -q "reindex" ; then echo "reindex=\"1\"" >> ./$CONFIG fi From a39c4fbfedc08098e5d0ceaed441a36ec78d358d Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Mon, 31 Dec 2018 17:26:41 +0000 Subject: [PATCH 10/28] =?UTF-8?q?=E2=80=9EBuild/app/etc/Konfiguration.txt?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/app/etc/Konfiguration.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Build/app/etc/Konfiguration.txt b/Build/app/etc/Konfiguration.txt index 23c268f..ed35e32 100644 --- a/Build/app/etc/Konfiguration.txt +++ b/Build/app/etc/Konfiguration.txt @@ -51,6 +51,7 @@ dsmtextnotify="on" MessageTo="admin" dsmbeepnotify="on" LOGlevel="1" +LOGmax="" reindex=1 #-------------------------------------------------------------------- From b4610991719d50abc7e0e7b27082f430a37178ae Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Mon, 31 Dec 2018 17:27:44 +0000 Subject: [PATCH 11/28] =?UTF-8?q?=E2=80=9EBuild/usersettings/Konfiguration?= =?UTF-8?q?=5Forg.txt=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/usersettings/Konfiguration_org.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Build/usersettings/Konfiguration_org.txt b/Build/usersettings/Konfiguration_org.txt index 2788ed9..1b30891 100644 --- a/Build/usersettings/Konfiguration_org.txt +++ b/Build/usersettings/Konfiguration_org.txt @@ -52,6 +52,7 @@ MessageTo="admin" PBTOKEN="" dsmbeepnotify="on" LOGlevel="1" +LOGmax="" reindex=1 #-------------------------------------------------------------------- From 547849360c8d04945a0ce058f7773c00da1c7bf3 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Mon, 31 Dec 2018 17:34:09 +0000 Subject: [PATCH 12/28] =?UTF-8?q?=E2=80=9EBuild/edit.sh=E2=80=9C=20=C3=A4n?= =?UTF-8?q?dern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/edit.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Build/edit.sh b/Build/edit.sh index c38c250..b23ac3c 100644 --- a/Build/edit.sh +++ b/Build/edit.sh @@ -29,7 +29,8 @@ if [[ "$page" == "edit-save" ]]; then "$set_var" "$dir/app/etc/Konfiguration.txt" "MessageTo" "$MessageTo" "$set_var" "$dir/app/etc/Konfiguration.txt" "dsmbeepnotify" "$dsmbeepnotify" "$set_var" "$dir/app/etc/Konfiguration.txt" "PBTOKEN" "$PBTOKEN" - "$set_var" "$dir/app/etc/Konfiguration.txt" "LOGlevel" "$LOGlevel" + "$set_var" "$dir/app/etc/Konfiguration.txt" "LOGlevel" "$LOGlevel"LOGmax + "$set_var" "$dir/app/etc/Konfiguration.txt" "LOGmax" "$LOGmax" "$set_var" "$dir/app/etc/Konfiguration.txt" "endgueltigloeschen" "$endgueltigloeschen" "$set_var" "$dir/app/etc/Konfiguration.txt" "reindex" "$reindex" "$set_var" "$dir/app/etc/Konfiguration.txt" "cutlistat_ID" "$cutlistat_ID" @@ -89,6 +90,7 @@ if [[ "$page" == "edit-import-query" ]] || [[ "$page" == "edit-import" ]]; then "$set_var" "$dir/app/etc/Konfiguration.txt" "dsmbeepnotify" "$dsmbeepnotify" "$set_var" "$dir/app/etc/Konfiguration.txt" "PBTOKEN" "$PBTOKEN" "$set_var" "$dir/app/etc/Konfiguration.txt" "LOGlevel" "$LOGlevel" + "$set_var" "$dir/app/etc/Konfiguration.txt" "LOGmax" "$LOGmax" "$set_var" "$dir/app/etc/Konfiguration.txt" "endgueltigloeschen" "$endgueltigloeschen" "$set_var" "$dir/app/etc/Konfiguration.txt" "reindex" "$reindex" "$set_var" "$dir/app/etc/Konfiguration.txt" "cutlistat_ID" "$cutlistat_ID" @@ -810,6 +812,22 @@ if [[ "$page" == "edit" ]]; then 0 => es wird keine Log-Datei erstellt
1 => normales Log (standard)
2 => erweitertes Log
Die Logs befinden sich im Dekodierverzeichnis/_LOGsynOTR/

' + # LOGmax + echo ' +

+ ' + if [ -n "$LOGmax" ]; then + echo '' + else + echo '' + fi + echo ' + + + LOG-Files können automatisch gelöscht werden, indem hier die maximal gewünschte Anzahl angegeben wird. +
Sobald hier ein Wert vergeben wird, werden grundsätzlich alle leeren LOGs gelöscht. +
(Die Anzahl bezieht sich also nur auf LOGs mit Einträgen) +

' # reindex echo '

From 4c7d8b0f12e96ffcc7f2853c0ab6e41e48ccbbd6 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Mon, 31 Dec 2018 17:43:45 +0000 Subject: [PATCH 13/28] =?UTF-8?q?=E2=80=9EBuild/edit.sh=E2=80=9C=20=C3=A4n?= =?UTF-8?q?dern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/edit.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Build/edit.sh b/Build/edit.sh index b23ac3c..2cd01e1 100644 --- a/Build/edit.sh +++ b/Build/edit.sh @@ -611,14 +611,14 @@ if [[ "$page" == "edit" ]]; then

' - # -> Abschnitt .avi's in native MP4's (MAC OS tauglich) umwandeln + # -> Abschnitt .avi's in native MP4's umwandeln echo '

- AVI-Filme in native MP4-Filme (macOS tauglich) umwandeln + AVI-Filme in native MP4-Filme umwandeln

' From c4ed4b154351cd32eeecd25c0dd2c64314ebdb83 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Mon, 31 Dec 2018 17:48:39 +0000 Subject: [PATCH 14/28] =?UTF-8?q?=E2=80=9EPack/CHANGELOG=E2=80=9C=20=C3=A4?= =?UTF-8?q?ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pack/CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/Pack/CHANGELOG b/Pack/CHANGELOG index ac65cb6..9c39481 100644 --- a/Pack/CHANGELOG +++ b/Pack/CHANGELOG @@ -3,6 +3,7 @@ Release Notes 4.0.9 (RELEASE) IMPLEMENTIERUNGEN: - PushBullet integriert. Dazu muss lediglich der persönliche Token in der Konfiguration hinterlegt werden + - Die max. Anzahl von LOGs kann nun begrenzt werden (dadurch werden auch alle leeren LOGs gelöscht) - BUGFIXES: - From c0c8dbe7d87d271c9faffddd4d9b4f0b9baf7fe6 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Mon, 31 Dec 2018 17:52:07 +0000 Subject: [PATCH 15/28] =?UTF-8?q?=E2=80=9EPack/CHANGELOG=E2=80=9C=20=C3=A4?= =?UTF-8?q?ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pack/CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pack/CHANGELOG b/Pack/CHANGELOG index 9c39481..25babf8 100644 --- a/Pack/CHANGELOG +++ b/Pack/CHANGELOG @@ -3,7 +3,7 @@ Release Notes 4.0.9 (RELEASE) IMPLEMENTIERUNGEN: - PushBullet integriert. Dazu muss lediglich der persönliche Token in der Konfiguration hinterlegt werden - - Die max. Anzahl von LOGs kann nun begrenzt werden (dadurch werden auch alle leeren LOGs gelöscht) + - Die max. Anzahl von LOGs kann nun begrenzt werden. Dadurch werden zu erst alle leeren Logs und anschließend die überzähligen gelöscht - BUGFIXES: - From dd34e39c43af381175730f3419cf8c7ad0d7976e Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Mon, 31 Dec 2018 18:00:58 +0000 Subject: [PATCH 16/28] =?UTF-8?q?=E2=80=9EBuild/synOTR.sh=E2=80=9C=20?= =?UTF-8?q?=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/synOTR.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/Build/synOTR.sh b/Build/synOTR.sh index 756927d..618641a 100644 --- a/Build/synOTR.sh +++ b/Build/synOTR.sh @@ -2865,6 +2865,47 @@ if [ -f "/usr/syno/bin/synoindex" ] && [ $firstrunonday == "1" ] && [ $reindex = fi } + +PURGELOG() +{ +######################################################################################### +# Diese Funktion löscht zu erst alle leeren Logs und anschließend die überzähligen # +######################################################################################### + +if [ -z $LOGmax ]; then + return +fi + +logdir="${DECODIR}/_LOGsynOTR/" + +# leere Logs löschen: +for i in `ls -tr "${logdir}" | egrep -o '^synOTR.*.log' ` # Auflistung aller LOG-Dateien + do + stringcount=`cat "${logdir}$i" | tail -n7 | head -n4 | wc -c` # Wie viel Zeichen sind in den Zeilen 3-7 von unten enthalten? + if [ $stringcount -le 15 ]; then + rm "${logdir}$i" + +# if [ $endgueltigloeschen = "on" ] ; then # ggf. den Löschordner nutzen? / nicht aktiviert +# rm "$i" +# else +# mv "$i" "$OTRkeydeldir" +# fi + fi + done + +# alte Logs löschen: +logfilecount=`ls -t "${logdir}" | egrep -o '^synOTR.*.log' | wc -l ` # Gesamtanzahl der LOG-Dateien +count2del=`expr $logfilecount - $LOGmax ` # wie viele Dateien sind überzählig + +if [ $count2del -ge 0 ]; then + for i in `ls -tr "${logdir}" | egrep -o '^synOTR.*.log' | head -n${count2del} ` + do + rm "${logdir}$i" + done +fi +} + + # _______________________________________________________________________________ # | | # | AUFRUF DER FUNKTIONEN | @@ -2883,6 +2924,7 @@ fi OTRopenrename MOVE2DESTDIR FRESHUPMEDIAINDEX + PURGELOG echo -e; echo -e From 417dfc2761fdf3d0d1aebdd720ca14c861c62a71 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Mon, 31 Dec 2018 18:01:55 +0000 Subject: [PATCH 17/28] =?UTF-8?q?=E2=80=9EBuild/synOTR.sh=E2=80=9C=20?= =?UTF-8?q?=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/synOTR.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build/synOTR.sh b/Build/synOTR.sh index 618641a..ec36783 100644 --- a/Build/synOTR.sh +++ b/Build/synOTR.sh @@ -9,7 +9,7 @@ echo -e CLIENTVERSION=`get_key_value /var/packages/synOTR/INFO version` - DevChannel="Release" # beta [2018-12-20] + DevChannel="Release" # beta [2018-12-31] # --------------------------------------------------------------------------------- # GRUNDKONFIGRUATIONEN / INDIVIDUELLE ANPASSUNGEN / Standardwerte | From 26d933d428e430014fd5d289597279a628a5a519 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Thu, 3 Jan 2019 15:17:19 +0000 Subject: [PATCH 18/28] =?UTF-8?q?=E2=80=9EBuild/synOTR.sh=E2=80=9C=20?= =?UTF-8?q?=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/synOTR.sh | 60 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/Build/synOTR.sh b/Build/synOTR.sh index ec36783..25c23cf 100644 --- a/Build/synOTR.sh +++ b/Build/synOTR.sh @@ -9,7 +9,7 @@ echo -e CLIENTVERSION=`get_key_value /var/packages/synOTR/INFO version` - DevChannel="Release" # beta [2018-12-31] + DevChannel="Release" # beta [2019-01-03] # --------------------------------------------------------------------------------- # GRUNDKONFIGRUATIONEN / INDIVIDUELLE ANPASSUNGEN / Standardwerte | @@ -2881,28 +2881,58 @@ logdir="${DECODIR}/_LOGsynOTR/" # leere Logs löschen: for i in `ls -tr "${logdir}" | egrep -o '^synOTR.*.log' ` # Auflistung aller LOG-Dateien do - stringcount=`cat "${logdir}$i" | tail -n7 | head -n4 | wc -c` # Wie viel Zeichen sind in den Zeilen 3-7 von unten enthalten? - if [ $stringcount -le 15 ]; then - rm "${logdir}$i" - -# if [ $endgueltigloeschen = "on" ] ; then # ggf. den Löschordner nutzen? / nicht aktiviert -# rm "$i" -# else -# mv "$i" "$OTRkeydeldir" -# fi + if [ $( cat "${logdir}$i" | tail -n7 | head -n4 | wc -c ) -le 15 ]; then + # mv "${logdir}$i" "${logdir}_deleteEMPTY/" + if [ $endgueltigloeschen = "on" ] ; then + rm "${logdir}$i" + else + mv "${logdir}$i" "$OTRkeydeldir" + fi fi done -# alte Logs löschen: -logfilecount=`ls -t "${logdir}" | egrep -o '^synOTR.*.log' | wc -l ` # Gesamtanzahl der LOG-Dateien -count2del=`expr $logfilecount - $LOGmax ` # wie viele Dateien sind überzählig - +# überzählige Logs löschen: +count2del=$( expr $( ls -t "${logdir}" | egrep -o '^synOTR.*.log' | wc -l ) - $LOGmax ) # wie viele Dateien sind überzählig if [ $count2del -ge 0 ]; then for i in `ls -tr "${logdir}" | egrep -o '^synOTR.*.log' | head -n${count2del} ` do - rm "${logdir}$i" + if [ $endgueltigloeschen = "on" ] ; then + rm "${logdir}$i" + else + mv "${logdir}$i" "$OTRkeydeldir" + fi done fi + +# überzählige searches löschen: +count2del=$( expr $(ls -t "${logdir}" | egrep -o '^search.*.xml' | wc -l) - $LOGmax ) +if [ ${count2del} -ge 0 ]; then + echo "mehr als $LOGmax vorhanden " + for i in `ls -tr "${logdir}" | egrep -o '^search.*.xml' | head -n${count2del} ` + do + if [ $endgueltigloeschen = "on" ] ; then + rm "${logdir}$i" + else + mv "${logdir}$i" "$OTRkeydeldir" + fi + done +fi + +# überzählige cutlists löschen: +count2del=$( expr $(ls -t "${logdir}" | egrep -o '.*.cutlist$' | wc -l) - $LOGmax ) +if [ ${count2del} -ge 0 ]; then + echo "mehr als $LOGmax vorhanden " +# for i in `ls -tr "${logdir}" | egrep -o '^search.*.xml' | head -n${count2del} ` + for i in `ls -tr "${logdir}" | egrep -o '.*.cutlist$' | head -n${count2del} ` + do + if [ $endgueltigloeschen = "on" ] ; then + rm "${logdir}$i" + else + mv "${logdir}$i" "$OTRkeydeldir" + fi + done +fi + } From b7067c7c615b2c4baedbd0527942fd5a4a36afb2 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Thu, 3 Jan 2019 15:24:10 +0000 Subject: [PATCH 19/28] =?UTF-8?q?=E2=80=9EBuild/synOTR.sh=E2=80=9C=20?= =?UTF-8?q?=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/synOTR.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Build/synOTR.sh b/Build/synOTR.sh index 25c23cf..f7e13e2 100644 --- a/Build/synOTR.sh +++ b/Build/synOTR.sh @@ -2882,7 +2882,6 @@ logdir="${DECODIR}/_LOGsynOTR/" for i in `ls -tr "${logdir}" | egrep -o '^synOTR.*.log' ` # Auflistung aller LOG-Dateien do if [ $( cat "${logdir}$i" | tail -n7 | head -n4 | wc -c ) -le 15 ]; then - # mv "${logdir}$i" "${logdir}_deleteEMPTY/" if [ $endgueltigloeschen = "on" ] ; then rm "${logdir}$i" else @@ -2907,7 +2906,6 @@ fi # überzählige searches löschen: count2del=$( expr $(ls -t "${logdir}" | egrep -o '^search.*.xml' | wc -l) - $LOGmax ) if [ ${count2del} -ge 0 ]; then - echo "mehr als $LOGmax vorhanden " for i in `ls -tr "${logdir}" | egrep -o '^search.*.xml' | head -n${count2del} ` do if [ $endgueltigloeschen = "on" ] ; then @@ -2921,8 +2919,6 @@ fi # überzählige cutlists löschen: count2del=$( expr $(ls -t "${logdir}" | egrep -o '.*.cutlist$' | wc -l) - $LOGmax ) if [ ${count2del} -ge 0 ]; then - echo "mehr als $LOGmax vorhanden " -# for i in `ls -tr "${logdir}" | egrep -o '^search.*.xml' | head -n${count2del} ` for i in `ls -tr "${logdir}" | egrep -o '.*.cutlist$' | head -n${count2del} ` do if [ $endgueltigloeschen = "on" ] ; then From f00be5e20597da41ab817aa03ab65b5adf7b57e8 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Sat, 5 Jan 2019 23:09:45 +0000 Subject: [PATCH 20/28] =?UTF-8?q?=E2=80=9EBuild/status.sh=E2=80=9C=20?= =?UTF-8?q?=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/status.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Build/status.sh b/Build/status.sh index 54f0d2a..af191f1 100644 --- a/Build/status.sh +++ b/Build/status.sh @@ -85,17 +85,11 @@ func_main_LastLog () { # Dateistatus auslesen: # --------------------------------------------------------------------- # .otrkey-Files: - count_otrkey=0 - for i in $(find "$OTRkeydir" -maxdepth 1 -name "*.otrkey" -type f) - do - count_otrkey=$(( count_otrkey + 1 )) - done + count_otrkey=$( ls -t "${OTRkeydir}" | egrep -o '.*.otrkey$' | wc -l ) # wie viele Dateien + # wait of cutlist: - count_waitofcutlist=0 - for i in $(find "$DECODIR" -maxdepth 1 -name "*.avi" -o -name "*.mp4" -type f) - do - count_waitofcutlist=$(( count_waitofcutlist + 1 )) - done + count_waitofcutlist=$( expr $( ls -t "${DECODIR}" | egrep -o '.*.avi$' | wc -l ) + $( ls -t "${DECODIR}" | egrep -o '.*.mp4$' | wc -l ) ) # wie viele Dateien + # manueller synOTR-Start: # --------------------------------------------------------------------- From 130a1fa57b21bfb14abd73cf8ced09e32130a380 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Sun, 6 Jan 2019 21:15:15 +0000 Subject: [PATCH 21/28] =?UTF-8?q?=E2=80=9EBuild/synOTR.sh=E2=80=9C=20?= =?UTF-8?q?=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/synOTR.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build/synOTR.sh b/Build/synOTR.sh index f7e13e2..7d039bf 100644 --- a/Build/synOTR.sh +++ b/Build/synOTR.sh @@ -1916,7 +1916,7 @@ if [ $OTRavi2mp4active = "on" ] && [ ! -z "$filetest" ] ; then fi elif $(echo "$encoders" | grep -q "AAC (Advanced Audio Coding)" ) ; then # Native FFmpeg AAC encoder echo "Erkannter Encoder: nativ (ffmpeg > 3.0) [2.Wahl]" - if [ $normalizeAudio = "on_" ] ; then + if [ $normalizeAudio = "on" ] ; then # ------- Audio normalisieren: volumeinfo=$(ffmpeg -i "$audiofile" -af "volumedetect" -f null - 2>&1 | awk '-F: ' '/max_volume/ { gsub(/ .*/, "", $2); print $2 }' | sed 's/-//g') # |grep max_volume | awk -F: '{ print $2 }' | sed 's/ dB//g' | sed 's/ -//g') echo "Lautstärkeanhebung um: $volumeinfo dB" From 32d6e749f8042244d2c2093614302a952d282b6b Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Mon, 7 Jan 2019 16:38:53 +0000 Subject: [PATCH 22/28] =?UTF-8?q?=E2=80=9EBuild/synOTR.sh=E2=80=9C=20?= =?UTF-8?q?=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/synOTR.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Build/synOTR.sh b/Build/synOTR.sh index 7d039bf..5c0d5f5 100644 --- a/Build/synOTR.sh +++ b/Build/synOTR.sh @@ -9,7 +9,7 @@ echo -e CLIENTVERSION=`get_key_value /var/packages/synOTR/INFO version` - DevChannel="Release" # beta [2019-01-03] + DevChannel="Release" # beta [2019-01-07] # --------------------------------------------------------------------------------- # GRUNDKONFIGRUATIONEN / INDIVIDUELLE ANPASSUNGEN / Standardwerte | @@ -2879,7 +2879,7 @@ fi logdir="${DECODIR}/_LOGsynOTR/" # leere Logs löschen: -for i in `ls -tr "${logdir}" | egrep -o '^synOTR.*.log' ` # Auflistung aller LOG-Dateien +for i in `ls -tr "${logdir}" | egrep -o '^synOTR.*.log$' ` # Auflistung aller LOG-Dateien do if [ $( cat "${logdir}$i" | tail -n7 | head -n4 | wc -c ) -le 15 ]; then if [ $endgueltigloeschen = "on" ] ; then @@ -2891,9 +2891,9 @@ for i in `ls -tr "${logdir}" | egrep -o '^synOTR.*.log' ` # Au done # überzählige Logs löschen: -count2del=$( expr $( ls -t "${logdir}" | egrep -o '^synOTR.*.log' | wc -l ) - $LOGmax ) # wie viele Dateien sind überzählig +count2del=$( expr $( ls -t "${logdir}" | egrep -o '^synOTR.*.log$' | wc -l ) - $LOGmax ) # wie viele Dateien sind überzählig if [ $count2del -ge 0 ]; then - for i in `ls -tr "${logdir}" | egrep -o '^synOTR.*.log' | head -n${count2del} ` + for i in `ls -tr "${logdir}" | egrep -o '^synOTR.*.log$' | head -n${count2del} ` do if [ $endgueltigloeschen = "on" ] ; then rm "${logdir}$i" @@ -2904,9 +2904,9 @@ if [ $count2del -ge 0 ]; then fi # überzählige searches löschen: -count2del=$( expr $(ls -t "${logdir}" | egrep -o '^search.*.xml' | wc -l) - $LOGmax ) +count2del=$( expr $(ls -t "${logdir}" | egrep -o '^search.*.xml$' | wc -l) - $LOGmax ) if [ ${count2del} -ge 0 ]; then - for i in `ls -tr "${logdir}" | egrep -o '^search.*.xml' | head -n${count2del} ` + for i in `ls -tr "${logdir}" | egrep -o '^search.*.xml$' | head -n${count2del} ` do if [ $endgueltigloeschen = "on" ] ; then rm "${logdir}$i" From bf0e6813d70ef4e772140565af8d7d12e9753bcd Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Sun, 13 Jan 2019 14:17:45 +0000 Subject: [PATCH 23/28] =?UTF-8?q?=E2=80=9EBuild/help.sh=E2=80=9C=20=C3=A4n?= =?UTF-8?q?dern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/help.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Build/help.sh b/Build/help.sh index 803de7a..a455943 100644 --- a/Build/help.sh +++ b/Build/help.sh @@ -16,7 +16,8 @@ echo '

  • Um synOTR regelmäßig laufen zu lassen (was sich empfiehlt), erstelle als nächstes
    einen automatisierten Programmaufruf.

    - Dazu hast du 2 Möglichkeiten:
    verwende den Zeitplaner für einen programmierten synOTR-Start.

    + Dazu hast du 2 Möglichkeiten:
    verwende den Zeitplaner für einen programmierten synOTR-Start. +

    Hierbei ist zu beachten, dass der DSM-Sicherheitsbereater den Zusätzlichen Croneintrag (da für DSM unbekannt) bemängelt!

    Oder, erstelle alternativ im Aufgabenplaner einen neuen Task mit diesem Programmpfad
    (zu empfehlen, sofern du kürzere Intervalle als "stündlich" benötigst):

    /usr/syno/synoman/webman/3rdparty/synOTR/synOTR-start.sh

    From d910bb171dd96d6d77b33498b92264a49ebf23e4 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Mon, 14 Jan 2019 17:44:20 +0000 Subject: [PATCH 24/28] =?UTF-8?q?=E2=80=9EBuild/synOTR.sh=E2=80=9C=20?= =?UTF-8?q?=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/synOTR.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build/synOTR.sh b/Build/synOTR.sh index 5c0d5f5..ab5f676 100644 --- a/Build/synOTR.sh +++ b/Build/synOTR.sh @@ -2881,7 +2881,7 @@ logdir="${DECODIR}/_LOGsynOTR/" # leere Logs löschen: for i in `ls -tr "${logdir}" | egrep -o '^synOTR.*.log$' ` # Auflistung aller LOG-Dateien do - if [ $( cat "${logdir}$i" | tail -n7 | head -n4 | wc -c ) -le 15 ]; then + if [ $( cat "${logdir}$i" | tail -n7 | head -n4 | wc -c ) -le 15 ] && cat "${logdir}$i" | grep -q "synOTR ENDE" ; then if [ $endgueltigloeschen = "on" ] ; then rm "${logdir}$i" else From 16910b0af99c1365e0d2bd1b17143781e89d6a05 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Sun, 27 Jan 2019 20:09:18 +0000 Subject: [PATCH 25/28] =?UTF-8?q?=E2=80=9EBuild/edit.sh=E2=80=9C=20=C3=A4n?= =?UTF-8?q?dern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/edit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build/edit.sh b/Build/edit.sh index 2cd01e1..94ec043 100644 --- a/Build/edit.sh +++ b/Build/edit.sh @@ -29,7 +29,7 @@ if [[ "$page" == "edit-save" ]]; then "$set_var" "$dir/app/etc/Konfiguration.txt" "MessageTo" "$MessageTo" "$set_var" "$dir/app/etc/Konfiguration.txt" "dsmbeepnotify" "$dsmbeepnotify" "$set_var" "$dir/app/etc/Konfiguration.txt" "PBTOKEN" "$PBTOKEN" - "$set_var" "$dir/app/etc/Konfiguration.txt" "LOGlevel" "$LOGlevel"LOGmax + "$set_var" "$dir/app/etc/Konfiguration.txt" "LOGlevel" "$LOGlevel" "$set_var" "$dir/app/etc/Konfiguration.txt" "LOGmax" "$LOGmax" "$set_var" "$dir/app/etc/Konfiguration.txt" "endgueltigloeschen" "$endgueltigloeschen" "$set_var" "$dir/app/etc/Konfiguration.txt" "reindex" "$reindex" From d79671b75f067569cd5fdbf79dc2f7bee99a4792 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Sun, 27 Jan 2019 20:17:49 +0000 Subject: [PATCH 26/28] =?UTF-8?q?=E2=80=9EPack/CHANGELOG=E2=80=9C=20=C3=A4?= =?UTF-8?q?ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pack/CHANGELOG | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Pack/CHANGELOG b/Pack/CHANGELOG index 25babf8..265faec 100644 --- a/Pack/CHANGELOG +++ b/Pack/CHANGELOG @@ -6,7 +6,9 @@ Release Notes - Die max. Anzahl von LOGs kann nun begrenzt werden. Dadurch werden zu erst alle leeren Logs und anschließend die überzähligen gelöscht - BUGFIXES: - - + - es wurde ein Fehler behoben, dass bei aktivem nativen aac-Encoder keine Normalisierung der Tonspur möglich war + - Detailänderungen in der GUI + - Detailänderungen der Benachrichtigungstexte 4.0.8 (RELEASE) BUGFIXES: From 5b7124de4b8589d745f6c5b5fd9e925465054bbf Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Sun, 27 Jan 2019 20:18:15 +0000 Subject: [PATCH 27/28] =?UTF-8?q?=E2=80=9EPack/CHANGELOG=E2=80=9C=20=C3=A4?= =?UTF-8?q?ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pack/CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pack/CHANGELOG b/Pack/CHANGELOG index 265faec..203ee28 100644 --- a/Pack/CHANGELOG +++ b/Pack/CHANGELOG @@ -1,6 +1,6 @@ Release Notes -4.0.9 (RELEASE) +4.1.0 (RELEASE) IMPLEMENTIERUNGEN: - PushBullet integriert. Dazu muss lediglich der persönliche Token in der Konfiguration hinterlegt werden - Die max. Anzahl von LOGs kann nun begrenzt werden. Dadurch werden zu erst alle leeren Logs und anschließend die überzähligen gelöscht From d8a6b73755d14bf9878091589ad0b29d6d181c01 Mon Sep 17 00:00:00 2001 From: Stephan Geisler Date: Fri, 1 Feb 2019 00:25:34 +0000 Subject: [PATCH 28/28] =?UTF-8?q?=E2=80=9EPack/CHANGELOG=E2=80=9C=20=C3=A4?= =?UTF-8?q?ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pack/CHANGELOG | 1 - 1 file changed, 1 deletion(-) diff --git a/Pack/CHANGELOG b/Pack/CHANGELOG index 203ee28..d8c2792 100644 --- a/Pack/CHANGELOG +++ b/Pack/CHANGELOG @@ -4,7 +4,6 @@ Release Notes IMPLEMENTIERUNGEN: - PushBullet integriert. Dazu muss lediglich der persönliche Token in der Konfiguration hinterlegt werden - Die max. Anzahl von LOGs kann nun begrenzt werden. Dadurch werden zu erst alle leeren Logs und anschließend die überzähligen gelöscht - - BUGFIXES: - es wurde ein Fehler behoben, dass bei aktivem nativen aac-Encoder keine Normalisierung der Tonspur möglich war - Detailänderungen in der GUI