Compare commits

...

149 commits

Author SHA1 Message Date
Stephan 150bac828c Build/synOTR.sh aktualisiert 2023-08-18 14:21:33 +00:00
Stephan 932b659859 Pack/INFO aktualisiert 2023-08-18 14:19:18 +00:00
Stephan 3b9f44a1b8 Pack/INFO aktualisiert 2023-08-18 14:19:04 +00:00
Stephan e9a70c4ff3 Build/synOTR.sh aktualisiert 2023-08-18 14:17:45 +00:00
Stephan 40924e9aba „Pack/CHANGELOG“ ändern 2023-06-11 10:45:01 +00:00
Stephan 7560d819f3 „Pack/INFO“ ändern 2023-06-11 10:43:45 +00:00
Stephan 5bedaf71dc „Build/synOTR.sh“ ändern 2023-06-11 10:43:19 +00:00
Stephan 6da954447d „Build/synOTR.sh“ ändern 2023-06-11 10:42:56 +00:00
Stephan ced8107114 Dateien hochladen nach „Build/app/bin“ 2023-06-11 10:34:49 +00:00
Stephan 686b8d88f2 „Build/synOTR.sh“ ändern 2021-10-04 17:51:15 +00:00
Stephan f37b2c4756 „Pack/INFO“ ändern 2021-05-16 17:25:12 +00:00
Stephan 78b401d32e „Pack/CHANGELOG“ ändern 2021-05-16 17:16:01 +00:00
Stephan 5d8ae58a7a „build_spk.sh“ ändern 2021-05-11 09:09:08 +00:00
Stephan bb2c2cb935 „build_spk.sh“ ändern 2021-05-11 08:47:04 +00:00
Stephan 9ac4b8a855 Dateien hochladen nach „“ 2021-05-11 08:46:25 +00:00
Stephan dee0ddee50 „build_spk_[v1].sh“ ändern 2021-05-11 08:45:45 +00:00
Stephan b39261798b „Pack/INFO“ ändern 2021-05-11 08:27:04 +00:00
Stephan 94c592d92c „Pack/INFO“ ändern 2021-05-11 08:20:06 +00:00
Stephan 94f43c5a91 „Pack/CHANGELOG“ ändern 2021-05-11 08:16:03 +00:00
Stephan 4e8344d343 Dateien hochladen nach „Build/app/bin“ 2021-04-30 21:03:21 +00:00
Stephan 2e4d1a9ca3 Dateien hochladen nach „Build/app/bin“ 2021-04-30 21:02:23 +00:00
Stephan 9cb5527f5b „Build/synOTR.sh“ ändern 2020-12-22 18:30:56 +00:00
Stephan 6eb314477b „Build/synOTR.sh“ ändern 2020-08-22 16:50:47 +00:00
Stephan a08d72b21c „Build/synOTR.sh“ ändern 2020-08-22 14:18:19 +00:00
Stephan bd746ecc05 „Build/edit.sh“ ändern 2020-02-15 12:52:23 +00:00
Stephan 10b0e57a12 „Build/edit.sh“ ändern 2020-02-15 12:44:29 +00:00
Stephan df550c193e „Build/includes/textersetzung.txt“ ändern 2020-02-09 21:37:45 +00:00
Stephan Geisler 8535cf6016 icons überarbeitet 2019-10-17 12:31:55 +02:00
Stephan d7bec9ac84 „Pack/INFO“ ändern 2019-10-16 21:53:18 +00:00
Stephan ca743e1e16 „Pack/INFO“ ändern 2019-10-16 21:19:05 +00:00
Stephan Geisler 662d118a48 Detailanpassung 2019-10-16 23:15:23 +02:00
Stephan Geisler ef413686e2 altes ionice entfernen 2019-10-16 23:01:47 +02:00
Stephan Geisler f87f9ee7bb ionice 2019-10-16 23:00:31 +02:00
Stephan Geisler e8b6d06477 ionice angepasst 2019-10-16 22:59:01 +02:00
Stephan Geisler f43e22d297 Beschreibung angepasst 2019-10-16 14:05:20 +02:00
Stephan Geisler ff10bb198b Icons neu berechnet 2019-10-16 13:34:25 +02:00
Stephan 0d88baaeda „Pack/CHANGELOG“ ändern 2019-10-16 10:51:26 +00:00
Stephan bb2fe9fd2b „Build/synOTR.sh“ ändern
bestimmte Sonderzeichen im Episodentitel von thetvdb führten zu einer fehlerhaften Umbenennung
2019-10-16 10:50:54 +00:00
Stephan 33856f91f3 Dateien hochladen nach „Build/app/binARMv7l“ 2019-10-16 10:34:31 +00:00
Stephan 8448b20b69 „Pack/CHANGELOG“ ändern 2019-10-16 09:58:11 +00:00
Stephan b838b941a8 „Pack/INFO“ ändern 2019-10-16 09:55:22 +00:00
Stephan b66e409a4e „Pack/CHANGELOG“ ändern 2019-10-16 09:52:49 +00:00
Stephan bf72e7a38c „Pack/CHANGELOG“ ändern 2019-10-16 09:52:14 +00:00
Stephan ac4afc618f „Pack/CHANGELOG“ ändern 2019-10-15 22:25:12 +00:00
Stephan 4627bd4709 Dateien hochladen nach „Build/app/bin“ 2019-10-15 22:18:23 +00:00
Stephan 23617817b2 „Build/synOTR.sh“ ändern 2019-10-15 22:16:44 +00:00
Stephan d30483479f „Build/synOTR.sh“ ändern 2019-10-15 22:16:02 +00:00
Stephan 8534c781ca „Build/synOTR.sh“ ändern
OTRopenrename deaktivert, da otr-serien.de die Pflege neuer Serien eingestellt hat
2019-10-08 14:19:52 +00:00
Stephan 9605308f9d „Build/synOTR.sh“ ändern 2019-10-05 21:28:05 +00:00
Stephan 3ef02ad095 „Build/synOTR.sh“ ändern 2019-09-30 11:27:51 +00:00
Stephan 9c75014f94 „Build/synOTR.sh“ ändern 2019-09-30 11:27:12 +00:00
Stephan 9a91437033 „Build/synOTR.sh“ ändern 2019-09-28 17:39:36 +00:00
Stephan 9023f30109 „Build/synOTR-start.sh“ ändern 2019-09-27 17:03:53 +00:00
Stephan 9b921c884f „Build/synOTR-start.sh“ ändern 2019-09-27 16:55:20 +00:00
Stephan b6974b2b92 „Build/synOTR-start.sh“ ändern 2019-09-21 11:45:33 +00:00
Stephan 7bd55db43b „Pack/CHANGELOG“ ändern 2019-08-06 18:28:31 +00:00
Stephan 3f6b4fdaaf „Pack/CHANGELOG“ ändern 2019-08-06 18:21:37 +00:00
Stephan 38732abad3 „Pack/CHANGELOG“ ändern 2019-08-06 18:20:56 +00:00
Stephan 68859bce24 „Pack/INFO“ ändern 2019-08-06 18:19:40 +00:00
Stephan 3b7b812475 „Build/synOTR.sh“ ändern 2019-08-06 16:47:07 +00:00
Stephan d12ac3c2d8 „Build/includes/textersetzung.txt“ ändern 2019-03-19 23:29:43 +00:00
Stephan 36bcbe63e9 „Pack/CHANGELOG“ ändern 2019-02-22 16:19:41 +00:00
Stephan c3cc4f4abe „Pack/INFO“ ändern 2019-02-22 15:36:38 +00:00
Stephan 550a3f24ae „Build/config“ ändern 2019-02-22 15:32:30 +00:00
Stephan 2000613782 „Build/synOTR.sh“ ändern 2019-02-08 15:52:30 +00:00
Stephan a696611153 „Build/status.sh“ ändern 2019-02-08 13:59:40 +00:00
Stephan 5a729fd927 „Build/synOTR-start.sh“ ändern 2019-02-08 13:58:40 +00:00
Stephan 8c18b93a6f „Pack/WIZARD_UIFILES/upgrade_uifile“ ändern 2019-02-03 18:51:08 +00:00
Stephan 157bf6d615 „build_spk.sh“ ändern 2019-02-01 15:41:30 +00:00
Stephan 6a940792c7 „Pack/INFO“ ändern 2019-02-01 15:17:31 +00:00
Stephan a8d5ccae78 „Build/timer.sh“ ändern 2019-02-01 15:16:53 +00:00
Stephan 01d08e3c3f „Pack/INFO“ ändern 2019-02-01 15:02:05 +00:00
Stephan 9f42123b22 „Build/synOTR.sh“ ändern 2019-02-01 15:00:26 +00:00
Stephan 6a4d8d3f5f „build_spk.sh“ ändern 2019-02-01 14:59:22 +00:00
Stephan 7e35c4de26 „Pack/INFO“ ändern 2019-02-01 14:51:31 +00:00
Stephan 9f05e3ce9c „Pack/INFO“ ändern 2019-02-01 14:42:41 +00:00
Stephan c26df36517 Merge branch '4.0.9' of geimist/synOTR into master 2019-02-01 14:35:58 +00:00
Stephan d8a6b73755 „Pack/CHANGELOG“ ändern 2019-02-01 00:25:34 +00:00
Stephan c9467bce5b „Build/synOTR-start.sh“ ändern 2019-01-29 18:27:02 +00:00
Stephan 5b7124de4b „Pack/CHANGELOG“ ändern 2019-01-27 20:18:15 +00:00
Stephan d79671b75f „Pack/CHANGELOG“ ändern 2019-01-27 20:17:49 +00:00
Stephan 16910b0af9 „Build/edit.sh“ ändern 2019-01-27 20:09:18 +00:00
Stephan d910bb171d „Build/synOTR.sh“ ändern 2019-01-14 17:44:20 +00:00
Stephan bf0e6813d7 „Build/help.sh“ ändern 2019-01-13 14:17:45 +00:00
Stephan 32d6e749f8 „Build/synOTR.sh“ ändern 2019-01-07 16:38:53 +00:00
Stephan 130a1fa57b „Build/synOTR.sh“ ändern 2019-01-06 21:15:15 +00:00
Stephan f00be5e205 „Build/status.sh“ ändern 2019-01-05 23:09:45 +00:00
Stephan b7067c7c61 „Build/synOTR.sh“ ändern 2019-01-03 15:24:10 +00:00
Stephan 26d933d428 „Build/synOTR.sh“ ändern 2019-01-03 15:17:19 +00:00
Stephan 417dfc2761 „Build/synOTR.sh“ ändern 2018-12-31 18:01:55 +00:00
Stephan dd34e39c43 „Build/synOTR.sh“ ändern 2018-12-31 18:00:58 +00:00
Stephan c0c8dbe7d8 „Pack/CHANGELOG“ ändern 2018-12-31 17:52:07 +00:00
Stephan c4ed4b1543 „Pack/CHANGELOG“ ändern 2018-12-31 17:48:39 +00:00
Stephan 4c7d8b0f12 „Build/edit.sh“ ändern 2018-12-31 17:43:45 +00:00
Stephan 547849360c „Build/edit.sh“ ändern 2018-12-31 17:34:09 +00:00
Stephan b461099171 „Build/usersettings/Konfiguration_org.txt“ ändern 2018-12-31 17:27:44 +00:00
Stephan a39c4fbfed „Build/app/etc/Konfiguration.txt“ ändern 2018-12-31 17:26:41 +00:00
Stephan 7393b24cb5 „Build/upgradeconfig.sh“ ändern 2018-12-31 17:25:41 +00:00
Stephan a01f20f742 „build_spk.sh“ ändern 2018-12-27 13:04:19 +00:00
Stephan 2ba1dbb292 „build_spk.sh“ ändern 2018-12-27 10:39:19 +00:00
Stephan 94ba63709d „build_spk.sh“ ändern 2018-12-20 17:27:14 +00:00
Stephan 40b32ff280 „build_spk.sh“ ändern 2018-12-20 17:07:09 +00:00
Stephan f12e1989d0 „Pack/INFO“ ändern 2018-12-20 17:00:08 +00:00
Stephan 323d686acb „Pack/CHANGELOG“ ändern 2018-12-20 16:59:22 +00:00
Stephan c72b993cd7 „Pack/INFO“ ändern 2018-12-20 14:51:32 +00:00
Stephan 2340a050ac PushBullet integriert 2018-12-20 14:50:54 +00:00
Stephan 1a8471f21d PushBullet integriert 2018-12-20 14:40:38 +00:00
Stephan b8b87c3eaf PushBullet integriert 2018-12-20 14:36:01 +00:00
Stephan 2edb0272fc PushBullet integriert 2018-12-20 14:29:26 +00:00
Stephan 9893bb14f2 „Pack/CHANGELOG“ ändern 2018-12-18 20:39:52 +00:00
Stephan 7f7059e721 „Pack/CHANGELOG“ ändern 2018-12-18 19:26:01 +00:00
Stephan 7a606589a8 „Pack/CHANGELOG“ ändern 2018-12-18 19:15:52 +00:00
Stephan 62ad9ef125 „Build/synOTR.sh“ ändern 2018-12-17 17:05:27 +00:00
Stephan b4d6a3cb70 „Build/synOTR.sh“ ändern 2018-12-17 16:48:52 +00:00
Stephan 7c6250e0ec „Build/synOTR.sh“ ändern 2018-12-17 16:24:07 +00:00
Stephan a6daea390e „Build/synOTR.sh“ ändern 2018-12-16 20:33:55 +00:00
Stephan c155cc0263 „Pack/CHANGELOG“ ändern 2018-12-16 20:30:20 +00:00
Stephan 88708895c1 „Pack/INFO“ ändern 2018-12-16 20:29:15 +00:00
Stephan 1be945bbb2 „Build/synOTR.sh“ ändern
Prüfung auf korrekte Cutlist.at-ID
2018-12-16 20:28:46 +00:00
Stephan 9736dd1d2e „Build/synOTR.sh“ ändern 2018-12-16 13:39:58 +00:00
Stephan 3d8fa0b812 „Pack/CHANGELOG“ ändern 2018-12-15 23:25:22 +00:00
Stephan 41b4453d28 „Build/synOTR.sh“ ändern
Grenzwert für Smartrendering von 500 MB auf 490 MB gesenkt
2018-12-15 23:20:00 +00:00
Stephan c3d9db7ab1 Dateien hochladen nach „Build/app/bin“ 2018-12-10 15:01:45 +00:00
Stephan dca3cce8a2 „Pack/CHANGELOG“ ändern 2018-12-10 14:55:32 +00:00
Stephan 6617cd14ca „Build/synOTR.sh“ ändern 2018-12-09 18:09:29 +00:00
Stephan ef6dc03875 „Build/synOTR.sh“ ändern 2018-12-09 18:06:22 +00:00
Stephan 24a6e19b23 „Pack/CHANGELOG“ ändern 2018-11-29 18:10:44 +00:00
Stephan 1d4dedb798 „README.md“ ändern 2018-11-29 18:09:25 +00:00
Stephan 57b9cbdf56 „README.md“ ändern 2018-11-29 18:08:37 +00:00
Stephan c8a03e8f36 „README.md“ ändern 2018-11-29 18:08:15 +00:00
Stephan 545568bf13 „README.md“ ändern 2018-11-26 13:05:14 +00:00
Stephan e1fe932519 „README.md“ ändern 2018-11-12 17:01:09 +00:00
Stephan 3fe8b78562 „README.md“ ändern 2018-10-31 23:46:35 +00:00
Stephan 09036e73ba „build_spk.sh“ ändern 2018-10-30 21:46:47 +00:00
Stephan 808051bda0 „README.md“ ändern 2018-10-29 19:05:20 +00:00
Stephan 591316e49c „README.md“ ändern 2018-10-29 19:04:40 +00:00
Stephan 88d1a2076d „README.md“ ändern 2018-10-29 19:04:09 +00:00
Stephan 2109e6c1f9 „build_spk.sh“ ändern 2018-10-29 19:02:11 +00:00
Stephan 7327e0effd „build_spk.sh“ ändern 2018-10-29 19:00:23 +00:00
Stephan 2ab5304315 „build_spk.sh“ ändern 2018-10-29 17:00:50 +00:00
Stephan 83d8de17bf „README.md“ ändern 2018-10-29 16:34:38 +00:00
Stephan 8937fcab7f „build_spk.sh“ ändern 2018-10-29 16:31:16 +00:00
Stephan 1f02f246b0 „README.md“ ändern 2018-10-28 16:05:48 +00:00
Stephan 994001c2a6 „build_spk.sh“ ändern 2018-10-28 16:04:15 +00:00
Stephan 4617b4a9be Installationshinweise hinzugefügt 2018-10-28 16:00:17 +00:00
Stephan 94102a9bcb „README.md“ ändern
Installationshinweise hinzugefügt
2018-10-28 15:58:24 +00:00
Stephan f4d3264124 „build_spk.sh“ ändern 2018-10-28 15:52:55 +00:00
Stephan da557fb5ef „LICENSE“ löschen 2018-10-28 15:51:50 +00:00
Stephan 90549f2475 „build_spk.sh“ hinzufügen 2018-10-28 15:50:54 +00:00
39 changed files with 2846 additions and 2606 deletions

BIN
Build/app/bin/ionice32 Executable file

Binary file not shown.

BIN
Build/app/bin/ionice64 Executable file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Build/app/binARMv7l/ionice Normal file

Binary file not shown.

View file

@ -51,6 +51,7 @@ dsmtextnotify="on"
MessageTo="admin"
dsmbeepnotify="on"
LOGlevel="1"
LOGmax=""
reindex=1
#--------------------------------------------------------------------

View file

@ -2,8 +2,11 @@
".url": {
"SYNO.SDS.synOTR.Application": {
"type": "legacy",
"allUsers": true,
"allUsers": false,
"allowMultiInstance": false,
"grantPrivilege": "all",
"advanceGrantPrivilege" : true,
"configablePrivilege" : true,
"title": "synOTR",
"desc": "",
"icon": "images/synOTR_{0}.png",

View file

@ -28,7 +28,9 @@ 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" "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"
@ -86,7 +88,9 @@ 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" "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"
@ -358,24 +362,24 @@ if [[ "$page" == "edit" ]]; then
# SMARTRENDERING
echo '
<p>
<label>Smartrendering</label>
<label>Art zu Schneiden</label>
<select name="SMARTRENDERING">'
if [[ "$SMARTRENDERING" == "off" ]]; then
echo '<option value="off" selected>aus</option>'
echo '<option value="off" selected>Cut an Keyframes</option>'
else
echo '<option value="off">aus</option>'
echo '<option value="off">Cut an Keyframes</option>'
fi
if [[ "$SMARTRENDERING" == "on" ]]; then
echo '<option value="on" selected>ein</option>'
echo '<option value="on" selected>Smartrendering</option>'
else
echo '<option value="on">ein</option>'
echo '<option value="on">Smartrendering</option>'
fi
echo '
</select>
<a class="helpbox" href="#HELP">
<img src="images/icon_information_mini@geimist.svg" height="25" width="25"/>
<span>Für das Schneiden an Keyframes wird avisplit/avimerge aus Transcode verwendet. Diese Art geht sehr schnell (fast wie das Kopieren der Dateien auf der Festplatte). Der Nachteil ist, dass die Schnittübergänge um mehrere Sekunden ungenau sind und nur avi-Quelldateien scheidbar sind.
<br><br>Für das framegenaue Schneiden wird das Programm avcut verwendet. Avcut schneidet im Gegensatz zu avisplit framegenau, allerdings ergeben sich daraus erhöhte Anforderungen an die CPU und RAM (min. installiert: 1GB für HD-Aufnahmen und 500MB für HQ-Aufnahmen). Framegenaue Schnitte sind zeitintensiv.
<br><br>Smartrendering: Für das framegenaue Schneiden wird das Programm avcut verwendet. Avcut schneidet im Gegensatz zu avisplit framegenau, allerdings ergeben sich daraus erhöhte Anforderungen an die CPU und RAM (min. installiert: 1GB für HD-Aufnahmen und 500MB für HQ-Aufnahmen). Framegenaue Schnitte sind zeitintensiv.
<br><br>ACHTUNG: mit avcut geschnittene Filme werden derzeit sehr asynchron. Die Option der Konvertierung zu MP4 löst das Problem!</span></a>
</p>'
# WaitOfCutlist
@ -466,7 +470,7 @@ if [[ "$page" == "edit" ]]; then
echo '
<a class="helpbox" href="#HELP">
<img src="images/icon_information_mini@geimist.svg" height="25" width="25"/>
<span>Frameversatz, um Cuts manuell zu justieren (positive Werte verschieben jeden Cut nach hinten, negative nach vorn)<br><br>=> dieser Wert verschiebt den <b>Beginn</b> der gewünschten Filmteile beim framegenauen Schneiden</span></a>
<span>Frameversatz, um Cuts manuell zu justieren (positive Werte verschieben jeden Cut nach hinten, negative nach vorn)<br><br>=> dieser Wert verschiebt den <b>Beginn</b> der gewünschten Filmteile beim framegenauen Schneiden<br><br>(greift nur in Verbindung mit Smartrendering)</span></a>
</p>'
# FrameversatzEndeCut
echo '
@ -480,7 +484,7 @@ if [[ "$page" == "edit" ]]; then
echo '
<a class="helpbox" href="#HELP">
<img src="images/icon_information_mini@geimist.svg" height="25" width="25"/>
<span>Frameversatz, um Cuts manuell zu justieren (positive Werte verschieben jeden Cut nach hinten, negative nach vorn)<br><br>=> dieser Wert verschiebt das <b>Ende</b> der gewünschten Filmteile beim framegenauen Schneiden</span></a>
<span>Frameversatz, um Cuts manuell zu justieren (positive Werte verschieben jeden Cut nach hinten, negative nach vorn)<br><br>=> dieser Wert verschiebt das <b>Ende</b> der gewünschten Filmteile beim framegenauen Schneiden<br><br>(greift nur in Verbindung mit Smartrendering)</span></a>
</p>
</fieldset>
</p>
@ -607,14 +611,14 @@ if [[ "$page" == "edit" ]]; then
</p>
</details>'
# -> Abschnitt .avi's in native MP4's (MAC OS tauglich) umwandeln
# -> Abschnitt .avi's in native MP4's umwandeln
echo '<fieldset>
<hr style="border-style: dashed; size: 1px;">
<br />
<details><p>
<summary>
<span class="detailsitem">AVI-Filme in native MP4-Filme (macOS tauglich) umwandeln</span>
<span class="detailsitem">AVI-Filme in native MP4-Filme umwandeln</span>
</summary></p>
<p>'
@ -743,6 +747,22 @@ if [[ "$page" == "edit" ]]; then
<br>Auf diese Art kann man sich in Verbindung mit dem Paket "Notification Forwarder" über synOTR-Ereignisse z.B. über einen Pushdienst benachrichtigen lassen.
<br>Bleibt der Wert leer, so wird die Gruppe "administrators" benachrichtigt.
</span></a></p>'
# PushBullet-Token
echo '
<p>
<label>PushBullet-Token</label>'
if [ -n "$PBTOKEN" ]; then
echo '<input type="text" name="PBTOKEN" value="'$PBTOKEN'" />'
else
echo '<input type="text" name="PBTOKEN" value="" />'
fi
echo '
<a class="helpbox" href="#HELP">
<img src="images/icon_information_mini@geimist.svg" height="25" width="25"/>
<span>Dein persönlicher PushBullet-Token.
<br>Benachrichtigungen werden an den entsprechenden Account gesendet.
<br>Bei Nichtgebrauch leer lassen.
</span></a></p>'
# dsmbeepnotify
echo '
<p>
@ -792,6 +812,22 @@ if [[ "$page" == "edit" ]]; then
<span>0 => es wird keine Log-Datei erstellt<br>1 => normales Log (standard)<br>2 => erweitertes Log
<br>Die Logs befinden sich im Dekodierverzeichnis/_LOGsynOTR/</span></a>
</p>'
# LOGmax
echo '
<p>
<label>max. Anzahl LOGfiles</label>'
if [ -n "$LOGmax" ]; then
echo '<input type="text" name="LOGmax" value="'$LOGmax'" />'
else
echo '<input type="text" name="LOGmax" value="" />'
fi
echo '
<a class="helpbox" href="#HELP">
<img src="images/icon_information_mini@geimist.svg" height="25" width="25"/>
<span>LOG-Files können automatisch gelöscht werden, indem hier die maximal gewünschte Anzahl angegeben wird.
<br>Sobald hier ein Wert vergeben wird, werden grundsätzlich alle leeren LOGs gelöscht.
<br>(Die Anzahl bezieht sich also nur auf LOGs mit Einträgen)
</span></a></p>'
# reindex
echo '
<p>

View file

@ -16,7 +16,8 @@ echo '
<li>Um synOTR regelmäßig laufen zu lassen (was sich empfiehlt), erstelle als
nächstes <br>einen automatisierten Programmaufruf.
<div class="tab"><br>
Dazu hast du 2 Möglichkeiten:<br>verwende den <a href="index.cgi?page=timer" style="'$synotrred';">Zeitplaner</a> für einen programmierten synOTR-Start.</p><hr>
Dazu hast du 2 Möglichkeiten:<br>verwende den <a href="index.cgi?page=timer" style="'$synotrred';">Zeitplaner</a> für einen programmierten synOTR-Start.
<br><br>Hierbei ist zu beachten, dass der DSM-Sicherheitsbereater den Zusätzlichen Croneintrag (da für DSM unbekannt) bemängelt!</p><hr>
<p>Oder, erstelle alternativ im Aufgabenplaner einen neuen Task mit diesem
Programmpfad<br>(zu empfehlen, sofern du kürzere Intervalle als "stündlich" benötigst):</p>
<p style="margin-left: 40px;"><code>/usr/syno/synoman/webman/3rdparty/synOTR/synOTR-start.sh</code></p>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View file

@ -1,2 +1,5 @@
s/Qüen/Queen/g
s/qüen/queen/g
s/Trü/True/g
s/trü/true/g
s/beqüm/bequem/g

View file

@ -44,9 +44,9 @@
an Daniel Dieth von otr-serien.de für das zur Verfügungstellen seiner Website und seine Unterstützung.
Bitte unterstützt die Seite <a href="http://www.otr-serien.de" rel="external">www.otr-serien.de</a>.
Über die Seite lässt es sich auch sehr einfach nach bestimmten
Episoden suchen. Ihr habt eine ausgestrahlte Serienepisode, die dort
Episoden suchen. <s>Ihr habt eine ausgestrahlte Serienepisode, die dort
nicht automatisch erkannt wurde? Dann gebt doch bei der betroffenen
Episode eine Rückmeldung ab.<br>
Episode eine Rückmeldung ab.</s><br>
<br>
<img class="imageStyle"
alt="LOGO_thetvdb.com"
@ -59,11 +59,11 @@
Bitte unterstützt diesen kostenlosen Service, indem ihr nach
Möglichkeit Informationen und Grafiken beitragt und ergänzt.<br>
<br>
Sollten keine Serieninformationen zu einer Sendung gefunden worden
<s>Sollten keine Serieninformationen zu einer Sendung gefunden worden
sein, so wird die Standardumbenennung verwendet und die Infos in
einer Datenbank gesichert. Werden entsprechende Informationen auf
otr-serien.de ergänzt, so wird nachträglich die Standardumbenennung
in die Serienumbenennung vorgenommen (Suchzeit derzeit 7 Tage).
in die Serienumbenennung vorgenommen (Suchzeit derzeit 7 Tage).</s>
</div>
</li>
<li><span style="color:#0086E5;font-weight:bold; ">Konvertieren

View file

@ -85,24 +85,18 @@ 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:
# ---------------------------------------------------------------------
if [[ "$page" == "status-run-synotr" ]]; then
echo '
<div class="Content_1Col_full">'
/usr/syno/synoman/webman/3rdparty/synOTR/synOTR-start.sh
/usr/syno/synoman/webman/3rdparty/synOTR/synOTR-start.sh GUI
func_main_LastLog
# echo $refreshtime
echo '<meta http-equiv="refresh" content="2; URL=index.cgi?page=status"></div>'

View file

@ -1,6 +1,15 @@
#!/bin/sh
# /usr/syno/synoman/webman/3rdparty/synOTR/synOTR-start.sh
# wechselt in synOTR-Verzeichnis und startet synOTR mit bzw. ohne LOG (je nach Konfiguration)
# wurde das Skript von der GUI aufgerufen (Aufruf mit Parameter "GUI" für )?
callFrom=$1
if [ -z $callFrom ] ; then
callFrom="shell"
else
callFrom="GUI"
fi
# Arbeitsverzeichnis auslesen und hineinwechseln:
APPDIR=$(cd $(dirname $0);pwd)
cd ${APPDIR}
@ -15,20 +24,29 @@
# echo "synOTR läuft bereits!"
# exit
# fi
synOTR_pid=`pidof synOTR.sh`
synOTR_pid=$( /bin/pidof synOTR.sh )
if [ ! -z "$synOTR_pid" ] ; then
echo '<p class="center"><span style="color: #BD0010;"><b>synOTR läuft bereits!</b><br>(Prozess-ID: '$synOTR_pid')</span></p>'
echo '<br /><p class="center"><button name="page" value="status-kill-synotr" style="color: #BD0010;">(Beenden erzwingen?)</button></p><br />'
if [ $callFrom = GUI ] ; then
echo '<p class="center"><span style="color: #BD0010;"><b>synOTR läuft bereits!</b><br>(Prozess-ID: '$synOTR_pid')</span></p>'
echo '<br /><p class="center"><button name="page" value="status-kill-synotr" style="color: #BD0010;">(Beenden erzwingen?)</button></p><br />'
else
echo "synOTR läuft bereits! (Prozess-ID: $synOTR_pid)"
fi
exit
else
echo '<p class="title">synOTR wurde gestartet ...</p><br><br><br><br>
<center><table id="system_msg" style="width: 40%;table-align: center;">
<tr>
<th style="width: 20%;"><img class="imageStyle" alt="status_loading" src="images/status_loading.gif" style="float:left;"></th>
<th style="width: 80%;"><p class="center"><span style="color: #424242;font-weight:normal;">Bitte warten, bis die Dateien<br>fertig abgearbeitet wurden.</span></p></th>
</tr>
</table></center>'
if [ $callFrom = GUI ] ; then
echo '<p class="title">synOTR wurde gestartet ...</p><br><br><br><br>
<center><table id="system_msg" style="width: 40%;table-align: center;">
<tr>
<th style="width: 20%;"><img class="imageStyle" alt="status_loading" src="images/status_loading.gif" style="float:left;"></th>
<th style="width: 80%;"><p class="center"><span style="color: #424242;font-weight:normal;">Bitte warten, bis die Dateien<br>fertig abgearbeitet wurden.</span></p></th>
</tr>
</table></center>'
else
echo "synOTR wurde gestartet ..."
echo "Bitte warten, bis die Dateien fertig abgearbeitet wurden."
fi
fi
# Variablenkorrektur für ältere Konfiguration.txt und Slash anpassen:
@ -37,12 +55,12 @@
fi
if [ -z $WORKDIR ] ; then
# WORKDIR="${destdir%/}/"
WORKDIR="${DESTDIR%/}/"
# echo "Variable WORKDIR nicht gesetzt. Es wird im Ausgabeordner gearbeitet!"
WORKDIR="${DESTDIR%/}/" # Variable WORKDIR nicht gesetzt. Es wird im Ausgabeordner gearbeitet!
else
WORKDIR="${WORKDIR%/}/"
fi
umask 000 # damit Files auch von anderen Usern bearbeitet werden können / http://openbook.rheinwerk-verlag.de/shell_programmierung/shell_011_003.htm
# LOGlevel=0 => Logging inaktiv / 1 => normal / 2 => erweitert
if [ $LOGlevel = "0" ] ; then
@ -51,9 +69,14 @@
DECODIR="${WORKDIR%/}/_decodiert"
if [ ! -d "$DESTDIR" ] || [ "$DESTDIR" = "/" ]; then
echo '
<p class="center"><span style="color: #BD0010;"><b>! ! ! Zielverzeichnis in der Konfiguration prüfen ! ! !</b><br>Programmlauf wird beendet.<br></span></p>'
exit
if [ $callFrom = GUI ] ; then
echo '
<p class="center"><span style="color: #BD0010;"><b>! ! ! Zielverzeichnis in der Konfiguration prüfen ! ! !</b><br>Programmlauf wird beendet.<br></span></p>'
else
echo "! ! ! Zielverzeichnis in der Konfiguration prüfen ! ! !"
echo "Programmlauf wird beendet."
fi
exit 1
fi
if [ $OTRcutactiv = "off" ] ; then

File diff suppressed because it is too large Load diff

View file

@ -156,7 +156,8 @@ timer_scriptname="/usr/syno/synoman/webman/3rdparty/synOTR/synOTR-start.sh"
<p>&nbsp;</p>
<div class="title">Zeitplan einrichten</div>
<div class="info">
<h3>&raquo; 1. Wie oft soll synOTR pro Tag (pro Woche) ausgeführt werden?</h3>
<h3>&raquo; 1. Wie oft soll synOTR pro Tag (pro Woche) ausgeführt werden?<br>
<span style="color: #BD0010;">INFO: Der DSM-Sicherheitsbereater wird den zusätzlichen Croneintrag (da für DSM unbekannt) bemängeln!</span></h3>
<div>
<div>
<input class="left" type="radio" id="radio-one" name="timer_times" value="one" '${checked_one:+checked}' '${disable_times:+disabled}'/>

View file

@ -28,9 +28,15 @@
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
if ! cat ./$CONFIG | grep -q "LOGmax" ; then
echo "LOGmax=\"1\"" >> ./$CONFIG
fi
if ! cat ./$CONFIG | grep -q "reindex" ; then
echo "reindex=\"1\"" >> ./$CONFIG
fi

View file

@ -49,8 +49,10 @@ MP4BOX_DELAY="100"
#--------------------------------------------------------------------
dsmtextnotify="on"
MessageTo="admin"
PBTOKEN=""
dsmbeepnotify="on"
LOGlevel="1"
LOGmax=""
reindex=1
#--------------------------------------------------------------------

126
LICENSE
View file

@ -1,126 +0,0 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright © 2007 Free Software Foundation, Inc. <http s ://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for software and other kinds of works.
The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based on the Program.
To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work.
A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
The Corresponding Source for a work in source code form is that same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices".
c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with this program. If not, see <http s ://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <http s ://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http s ://www.gnu.org/philosophy/why-not-lgpl.html>.

View file

@ -1,4 +1,41 @@
Release Notes
Release Notes
4.2.2 (2023-06-11)
IMPLEMENTIERUNGEN:
- OTR-Decoder (x86_64) für DSM7.2 ergänzt
4.2.1 (2021-05-11)
IMPLEMENTIERUNGEN:
- OTR-Decoder (x86_64) aktualisiert
4.2.0 (RELEASE)
IMPLEMENTIERUNGEN:
- die I/O-Priorität wurde herabgesetzt (möglicherweise nur auf x86_64 / i386 und ARMv7 ungetestet)
- das nachträgliche Suchen von Serieninformationen auf otr-serien.de wurde deaktiviert, da die Informationspflege auf der Seite eingestellt wurde.
BUGFIXES:
- es wurde ein Fehler behoben, aufgrund dessen synOTR gestartet werden konnte, obwohl der vorhergehende Arbeitsablauf noch nicht abgeschlossen war
- bestimmte Sonderzeichen im Episodentitel von thetvdb führten zu einer fehlerhaften Umbenennung
4.1.1 (RELEASE)
IMPLEMENTIERUNGEN:
- Die Berechtigung für das Paket synOTR kann in der DSM-Systemsteuerung > Berechtigung für einzelne User konfiguriert werden (bitte beachte, dass nur eine gemeinsame Konfiguration verwendet wird!).
BUGFIXES:
- es wurde ein Fehler behoben, aufgrund dessen aus dem Autorkommentar einer Cutlist keine Serieninformation abgeleitet werden konnte (der Parameter wurde scheinbar umbenannt).
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
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:
- OTRdecoder für Intel 64bit auf "Dynamisch gelinkt, 64 Bit" gewechselt (Dateien über 4GB ließen sich nicht decodieren)
- Grenzwert für Smartrendering von 500 MB auf 490 MB gesenkt
- Prüfung auf korrekte Cutlist.at-ID (mit ungültiger ID konnten keine Cutlisten heruntergeladen werden)
4.0.7 (RELEASE)
IMPLEMENTIERUNGEN:

View file

@ -1,15 +1,17 @@
package="synOTR"
displayname="synOTR"
version="4.0.7"
version="4.2.2"
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."
description="SynOTR provides a workflow for TV recordings from onlineTVrecorder (OTR / https://onlinetvrecorder.com) for Synology NAS. synOTR performs *decoding *AC3-muxing (BETA) *cutting *MP4 conversion and *renaming (including Series information from www.thetvdb.com and www.otr-serien.de). onlineTVrecorder (OTR) is the free video recorder on the Internet that records almost all broadcasts from around 100 TV stations in Germany, USA, UK and other countries around the clock."
description_enu="SynOTR provides a workflow for TV recordings from onlineTVrecorder (OTR / https://onlinetvrecorder.com) for Synology NAS. synOTR performs *decoding *AC3-muxing (BETA) *cutting *MP4 conversion and *renaming (including Series information from www.thetvdb.com and www.otr-serien.de). onlineTVrecorder (OTR) is the free video recorder on the Internet that records almost all broadcasts from around 100 TV stations in Germany, USA, UK and other countries around the clock."
description_ger="SynOTR liefert einen Workflow für TV-Aufnahmen von onlineTVrecorder (OTR / https://onlinetvrecorder.com) 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"
admin_port=""
arch="noarch"
firmware="6.0-7321"
startable="yes"
reloadui="yes"
silent_install="no"
silent_install="yes"
silent_upgrade="yes"
silent_uninstall="no"
dsmappname=SYNO.SDS.synOTR.Application

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View file

@ -3,8 +3,7 @@
"step_title" : "Wichtiger Hinweis bei einem Upgrade!",
"items" : [
{
"desc" : "<p>Aufgrund eines Problems im DiskStationManager kann synOTR nach einem Upgrade nicht geöffnet werden. Daher <u>ist es nach einem Upgrage notwenig die DSM-Seite zu aktualisieren / neuzuladen (F5)</u> oder synOTR in einem neuen Fenster zu öffnen.</p><br>
<p>Eine Neuinstallation sollte davon nicht betroffen sein.</p>"
"desc" : "<p>Aufgrund eines Problems im DiskStationManager kann synOTR nach einem Upgrade nicht geöffnet werden. Daher <u>ist es nach einem Upgrage notwenig die DSM-Seite zu aktualisieren / neuzuladen (F5)</u> oder synOTR in einem neuen Fenster zu öffnen.</p>"
}
]
}

View file

@ -1,10 +1,32 @@
# synOTR
SynOTR liefert einen Workflow für TV-Aufnahmen von onlineTVrecorder (OTR) auf Synology NAS.
synOTR übernimmt
- decodieren
- AC3-muxing (BETA)
- schneiden
- MP4-Konvertierung
- Umbenennung
SynOTR liefert einen Workflow für TV-Aufnahmen von onlineTVrecorder (OTR) auf Synology NAS.
synOTR übernimmt
- decodieren
- AC3-muxing (BETA)
- schneiden
- MP4-Konvertierung
- Umbenennung
Diskussion gern **[im Forum](https://www.synology-forum.de/showthread.html?61132-synOTR-scriptsammlung-f%C3%BCr-OTR-Workflow-auf-Synology-Diskstation)**.
-----
Hier geht es zur FAQ-Seite: **[FAQ-Seite.](https://synotr.geimist.eu/faq/faq.html)**
-----
Das Change-LOG findest du hier: **[Change-LOG](https://geimist.eu:30443/geimist/synOTR/src/branch/master/Pack/CHANGELOG)**
-----
## Installation:
- benutze bitte das fertige und signierte Paket von **[cphub.net](https://www.cphub.net/?id=37#synOTR)**
- um ein eigenes SPK aus dem repository zu bauen, nutze das Buildskript: build_spk.sh. Lege das Buildskript in einen leeren Ordner und rufe es als root auf. Das Skript setzt eine git-Installation voraus, mit welcher das repository als Grundlage geklont wird. Die gewünschte Version kann man dem Skript als Parameter übergeben (z.B. sh ./build_spk.sh 4.0.7). Wird kein Parameter übergeben, bzw. ist dieser ungültig, wird der master-branch verwendet.

150
build_spk.sh Normal file
View file

@ -0,0 +1,150 @@
#!/bin/bash
#----------------------------------------------------------------------------------------
# Scriptaufruf:
#----------------------------------------------------------------------------------------
# erstellt das SPK aus dem aktuellen master-branch vom Server:
# sh ./build_spk.sh
#
# erstellt das SPK aus dem als Parameter übergebenen Release vom Server:
# sh ./build_spk.sh 4.0.7
#
#----------------------------------------------------------------------------------------
# Ordnerstruktur:
#----------------------------------------------------------------------------------------
# ./APP / Build --> Arbeitsumgebung (erstellen/editieren/verschieben)
# ./PKG / Pack --> Archivordner zum Aufbau des SPK (Startscripte etc.)
#
set -euo pipefail
IFS=$'\n\t'
build_tmp=$(mktemp -d -t tmp.XXXXXXXXXX)
function finish {
git worktree remove --force "$build_tmp"
rm -rf "$build_tmp"
}
trap finish EXIT
#######
project="synOTR"
#######
if ! [ -x "$(command -v git)" ]; then
echo 'Error: git is not installed.' >&2
exit 1
fi
if ! [ -x "$(command -v fakeroot)" ]; then
if [ $(whoami) != "root" ]; then
echo "WARNUNG: fakeroot ist nicht installiert und du bist auch nicht root!" >&2
exit 1
else
FAKEROOT=""
fi
else
FAKEROOT=$(command -v fakeroot)
fi
# Arbeitsverzeichnis auslesen und hineinwechseln:
# ---------------------------------------------------------------------
# shellcheck disable=SC2086
APPDIR=$(cd "$(dirname $0)";pwd)
cd "${APPDIR}"
git pull # aktualisieren
buildversion=${1:-latest}
taggedversions=$(git tag)
echo " - INFO: Erstelle den temporären Buildordner und kopiere Sourcen hinein ..."
git worktree add --force "$build_tmp" "$(git rev-parse --abbrev-ref HEAD)"
pushd "$build_tmp"
#set_spk_version="latest-$(date +%s)-$(git log -1 --format="%h")"
set_spk_version="$(git branch --show-current)_latest_($(date +%Y)-$(date +%m)-$(date +%d)_$(date +%H)-$(date +%M))_$(git log -1 --format="%h")"
if echo "$taggedversions" | egrep -q "$buildversion"; then
echo "git checkout zu $buildversion"
git checkout "$buildversion"
set_spk_version="$buildversion"
else
echo "ACHTUNG: Die gewünschte Version wurde im Repository nicht gefunden!"
echo "Die $(git rev-parse --abbrev-ref HEAD)-branch wird verwendet!"
fi
# fallback to old app dir
if [ -d "$build_tmp"/Build ]; then
APP=Build
else
APP=APP
fi
# fallback to old pkg dir
if [ -d "$build_tmp"/Pack ]; then
PKG=Pack
else
PKG=PKG
fi
build_version=$(grep version "$build_tmp/$PKG/INFO" | awk -F '"' '{print $2}')
#set_spk_version=$build_version
echo " - INFO: Es wird foldende Version geladen und gebaut: $set_spk_version - BUILD-Version (INFO-File): $build_version"
# Ausführung: Erstellen des SPK
echo ""
echo "-----------------------------------------------------------------------------------"
echo " SPK wird erstellt..."
echo "-----------------------------------------------------------------------------------"
# Falls versteckter Ordners /.helptoc vorhanden, diesen nach /helptoc umbenennen
if test -d "${build_tmp}/.helptoc"; then
echo ""
echo " - INFO: Versteckter Ordner /.helptoc wurde lokalisiert und nach /helptoc umbenannt"
mv "${build_tmp}/.helptoc" "${build_tmp}/helptoc"
fi
# Rechte anpassen
echo ""
echo " - INFO: Dateirechte anpassen ..."
for i in $(find "${build_tmp}/$APP/" -type f)
do
# echo "ändere $APP: $i"
chmod 755 "$i"
chown root:root "$i"
done
for i in $(find "${build_tmp}/$PKG/" -type f)
do
# echo "ändere $PKG: $i"
chmod 755 "$i"
chown root:root "$i"
done
# Packen und Ablegen der aktuellen Installation in den entsprechenden /Pack - Ordner
echo ""
echo " - INFO: Das Archiv package.tgz wird erstellt..."
$FAKEROOT tar -C "${build_tmp}"/"$APP" -czf "${build_tmp}"/"$PKG"/package.tgz .
# Wechsel in den Ablageort von package.tgz bezüglich Aufbau des SPK's
cd "${build_tmp}"/"$PKG"
# Erstellen des eigentlichen SPK's
echo ""
echo " - INFO: Das SPK wird erstellt..."
$FAKEROOT tar -cf "${project}"_"$set_spk_version".spk *
cp -f "${project}"_"$set_spk_version".spk "${APPDIR}"
echo ""
echo "-----------------------------------------------------------------------------------"
echo " Das SPK wurde erstellt und befindet sich unter..."
echo "-----------------------------------------------------------------------------------"
echo ""
echo " ${APPDIR}/${project}_$set_spk_version.spk"
echo ""
exit 0

178
build_spk_[v1].sh Executable file
View file

@ -0,0 +1,178 @@
#!/bin/bash
#----------------------------------------------------------------------------------------
# Scriptaufruf:
#----------------------------------------------------------------------------------------
# erstellt das SPK aus dem aktuellen master-branch vom Server:
# sh ./build_spk.sh
#
# erstellt das SPK aus dem als Parameter übergebenen Release vom Server:
# sh ./build_spk.sh 4.0.7
#
#----------------------------------------------------------------------------------------
# Ordnerstruktur:
#----------------------------------------------------------------------------------------
# ./[NAME-DES-SPK]/Build --> Arbeitsumgebung (erstellen/editieren/verschieben)
# ./[NAME-DES-SPK]/Pack --> Archivordner zum Aufbau des SPK (Startscripte etc.)
#
project="synOTR"
skriptuser=`whoami`
if [ ${skriptuser} != "root" ]; then
echo "Dieses Skript muss von Root ausgeführt werden!"
exit 1
fi
# Arbeitsverzeichnis auslesen und hineinwechseln:
# ---------------------------------------------------------------------
APPDIR=$(cd $(dirname $0);pwd)
cd ${APPDIR}
build_tmp="${APPDIR}/build_tmp"
dir=${APPDIR}
buildversion=$1
if [ -d "./${project}" ] ; then
rm -rf "./${project}"
fi
gitpull()
{
gitpath=`which git`
if [ -z ${gitpath} ]; then
echo "Das Programm git konnte nicht gefunden werden."
exit 1
fi
# Ausführung: Erstellen des SPK
echo ""
echo "-----------------------------------------------------------------------------------"
echo " git holt die aktuelle Version ..."
echo "-----------------------------------------------------------------------------------"
if [ -d "./${project}" ] ; then
cd ${project}
git pull
versions=`git tag`
cd ${APPDIR}
else
git clone https://geimist.eu:30443/geimist/${project}.git
cd ${project}
git pull
versions=`git tag`
cd ${APPDIR}
fi
#build_version=`cat "${APPDIR}/${project}/Pack/INFO" | grep version | awk -F '"' '{print $2}'`
# welche Version soll gebaut werden:
if [ -z $buildversion ]; then
echo "git checkout zu master-branch"
cd ${project}
git checkout master
cd ${APPDIR}
set_spk_version="latest_(`date +%Y`-`date +%m`-`date +%d`_`date +%H`-`date +%M`)"
else
if echo "$versions" | egrep -q "$buildversion"; then
echo "git checkout zu $buildversion"
cd ${project}
git checkout "$buildversion"
set_spk_version="$buildversion"
cd ${APPDIR}
else
echo "ACHTUNG: Die gewünschte Version wurde im Repository nicht gefunden!"
echo "Der master-branch wird verwendet!"
cd ${project}
git checkout master
cd ${APPDIR}
set_spk_version="latest_(`date +%Y`-`date +%m`-`date +%d`_`date +%H`-`date +%M`)"
fi
fi
}
gitpull
build_version=$(get_key_value "${APPDIR}/${project}/Pack/INFO" version )
echo " - INFO: Es wird foldende Version geladen und gebaut: $set_spk_version - BUILD-Version (INFO-File): $build_version"
echo " - INFO: Erstelle den temporären Buildordner und kopiere Sourcen hinein ..."
if [ -d "./build_tmp" ] ; then
rm -rf "./build_tmp"
fi
mkdir "${build_tmp}"
cp -r "${APPDIR}/${project}"/* "${build_tmp}/"
# Ausführung: Erstellen des SPK
echo ""
echo "-----------------------------------------------------------------------------------"
echo " SPK wird erstellt..."
echo "-----------------------------------------------------------------------------------"
# Falls versteckter Ordners /.helptoc vorhanden, diesen nach /helptoc umbenennen
if test -d "${build_tmp}/.helptoc"; then
echo ""
echo " - INFO: Versteckter Ordner /.helptoc wurde lokalisiert und nach /helptoc umbenannt"
mv ${build_tmp}/.helptoc ${build_tmp}/helptoc
fi
# Rechte anpassen
echo ""
echo " - INFO: Dateirechte anpassen ..."
for i in $(find "${build_tmp}/Pack/" -type f)
do
# echo "ändere Pack: $i"
chmod 755 "$i"
chown root:root "$i"
done
for i in $(find "${build_tmp}/Build/" -type f)
do
# echo "ändere Build: $i"
chmod 755 "$i"
chown root:root "$i"
done
# Packen und Ablegen der aktuellen Installation in den entsprechenden /Pack - Ordner
echo ""
echo " - INFO: Das Archiv package.tgz wird erstellt..."
tar -C ${build_tmp}/Build -czf ${build_tmp}/Pack/package.tgz .
# Wechsel in den Ablageort von package.tgz bezüglich Aufbau des SPK's
cd ${build_tmp}/Pack
# Erstellen des eigentlichen SPK's
echo ""
echo " - INFO: Das SPK wird erstellt..."
tar -cf ${project}_$set_spk_version.spk *
mv ${project}_$set_spk_version.spk ${APPDIR}
# Löschen der temporären Daten
echo ""
echo " - INFO: Der temporäre Ordner wird wieder geschlöscht ..."
cd ${APPDIR}
if [ -d "./build_tmp" ] ; then
rm -rf "./build_tmp"
fi
echo ""
echo "-----------------------------------------------------------------------------------"
echo " Das SPK wurde erstellt und befindet sich unter..."
echo "-----------------------------------------------------------------------------------"
echo ""
echo " ${APPDIR}/${project}_$set_spk_version.spk"
echo ""
exit 0