From fd0b180960993adb67e2a42f3385b32092d1d9c0 Mon Sep 17 00:00:00 2001 From: dhumphrey7 <47798651+dhumphrey7@users.noreply.github.com> Date: Wed, 20 Mar 2019 09:00:22 -0500 Subject: [PATCH 1/4] Changing templates folder to correct path --- apps/nzbget-mp4.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/nzbget-mp4.yml b/apps/nzbget-mp4.yml index 32404cd..a3b65f1 100644 --- a/apps/nzbget-mp4.yml +++ b/apps/nzbget-mp4.yml @@ -57,7 +57,7 @@ - name: 'Copy custom init scripts into directory for {{pgrole}}' copy: - src: /opt/communityapps/apps/templates/nzbget-mp4/cont-init.d/30-config + src: /opt/communityapps/apps/templates/{{pgrole}}/cont-init.d/30-config dest: /opt/appdata/{{pgrole}}/cont-init.d directory_mode: yes force: yes @@ -67,7 +67,7 @@ - name: 'Copy custom install scripts into directory for {{pgrole}}' copy: - src: /opt/communityapps/apps/templates/nzbget-mp4/installer/installer.sh + src: /opt/communityapps/apps/templates/{{pgrole}}/installer/installer.sh dest: /opt/appdata/{{pgrole}}/installer directory_mode: yes force: yes @@ -77,7 +77,7 @@ - name: 'Copy custom mp4 config into directory for {{pgrole}}' copy: - src: /opt/communityapps/apps/templates/nzbget-mp4/MP4_Automator/autoProcess.ini + src: /opt/communityapps/apps/templates/{{pgrole}}/MP4_Automator/autoProcess.ini dest: /opt/appdata/{{pgrole}}/scripts/MP4_Automator directory_mode: yes force: yes @@ -87,7 +87,7 @@ - name: 'Copy custom NZBGetPostProcess script config into directory for {{pgrole}}' copy: - src: /opt/communityapps/apps/templates/nzbget-mp4/MP4_Automator/TEMPLATEPPScript + src: /opt/communityapps/apps/templates/{{pgrole}}/MP4_Automator/TEMPLATEPPScript dest: /opt/appdata/{{pgrole}}/ directory_mode: yes force: yes @@ -97,7 +97,7 @@ - name: 'Copy ffmpeg build script into directory for {{pgrole}}' copy: - src: /opt/communityapps/apps/templates/nzbget-mp4/ffmpeg-build/web-install.sh + src: /opt/communityapps/apps/templates/{{pgrole}}/ffmpeg-build/web-install.sh dest: /opt/appdata/{{pgrole}}/ffmpeg-build directory_mode: yes force: yes @@ -107,7 +107,7 @@ - name: 'Copy ffmpeg build script into directory for {{pgrole}}' copy: - src: /opt/communityapps/apps/templates/nzbget-mp4/ffmpeg-build/build-ffmpeg + src: /opt/communityapps/apps/templates/{{pgrole}}/ffmpeg-build/build-ffmpeg dest: /opt/appdata/{{pgrole}}/ffmpeg-build directory_mode: yes force: yes @@ -117,7 +117,7 @@ - name: 'Copy custom init scripts into directory for {{pgrole}}' copy: - src: /opt/communityapps/apps/templates/nzbget-mp4/services.d/run + src: /opt/communityapps/apps/templates/{{pgrole}}/services.d/run dest: /opt/appdata/{{pgrole}}/services.d directory_mode: yes force: yes From 1457880eac35190d50129e139128171d62364d1b Mon Sep 17 00:00:00 2001 From: dhumphrey7 <47798651+dhumphrey7@users.noreply.github.com> Date: Wed, 20 Mar 2019 09:07:56 -0500 Subject: [PATCH 2/4] Updates nasm to 2.14.02 2.13 has issues with gcc 8 --- apps/templates/nzgbet/ffmpeg-build/build-ffmpeg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/templates/nzgbet/ffmpeg-build/build-ffmpeg b/apps/templates/nzgbet/ffmpeg-build/build-ffmpeg index 9aad5c4..54bd986 100644 --- a/apps/templates/nzgbet/ffmpeg-build/build-ffmpeg +++ b/apps/templates/nzgbet/ffmpeg-build/build-ffmpeg @@ -175,8 +175,8 @@ if build "yasm"; then fi if build "nasm"; then - download "http://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.gz" "nasm.tar.gz" - cd $PACKAGES/nasm-2.13.03 || exit + download "http://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.14.02.tar.gz" "nasm.tar.gz" + cd $PACKAGES/nasm-2.14.02 || exit execute ./configure --prefix=${WORKSPACE} --disable-shared --enable-static execute make -j $MJOBS execute make install From 64aad0e9d18f9b2ae1d417df8ddb74e145992d27 Mon Sep 17 00:00:00 2001 From: dhumphrey7 <47798651+dhumphrey7@users.noreply.github.com> Date: Wed, 20 Mar 2019 09:14:44 -0500 Subject: [PATCH 3/4] Update autoProcess.ini --- apps/templates/nzgbet/mp4_automator/autoProcess.ini | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/templates/nzgbet/mp4_automator/autoProcess.ini b/apps/templates/nzgbet/mp4_automator/autoProcess.ini index 83b18aa..d0427a6 100644 --- a/apps/templates/nzgbet/mp4_automator/autoProcess.ini +++ b/apps/templates/nzgbet/mp4_automator/autoProcess.ini @@ -24,7 +24,7 @@ apikey = [MP4] ffmpeg = /config/ffmpeg-build/workspace/bin/ffmpeg ffprobe = /config/ffmpeg-build/workspace/bin/ffprobe -threads = 1 +threads = 0 output_directory = copy_to = move_to = @@ -38,7 +38,8 @@ video-crf = 18 video-max-width = h264-max-level = 4.1 use-qsv-decoder-with-encoder = True -ios-audio = libfdk_aac +use-hevc-qsv-decoder = False +ios-audio = True ios-first-track-only = False ios-audio-filter = dynaudnorm max-audio-channels = @@ -47,17 +48,17 @@ audio-language = eng audio-default-language = eng audio-channel-bitrate = 256 audio-filter = -subtitle-codec = srt +subtitle-codec = mov_text subtitle-language = eng subtitle-default-language = subtitle-encoding = fullpathguess = True -convert-mp4 = True +convert-mp4 = False tagfile = True tag-language = en download-artwork = Poster download-subs = True -embed-subs = False +embed-subs = True sub-providers = addic7ed,podnapisi,thesubdb,opensubtitles permissions = 0777 post-process = False From da0317efb492c9b5cd5a295cdee7ef6faece2d7b Mon Sep 17 00:00:00 2001 From: root Date: Wed, 20 Mar 2019 12:25:32 -0500 Subject: [PATCH 4/4] fixed directory names --- .../mp4_automator => nzbget/MP4_Automator}/TEMPLATEPPScript | 0 .../mp4_automator => nzbget/MP4_Automator}/autoProcess.ini | 0 apps/templates/{nzgbet => nzbget}/cont-init.d/30-config | 0 apps/templates/{nzgbet => nzbget}/ffmpeg-build/build-ffmpeg | 0 apps/templates/{nzgbet => nzbget}/ffmpeg-build/web-install.sh | 0 apps/templates/{nzgbet => nzbget}/installer/installer.sh | 0 apps/templates/{nzgbet => nzbget}/scripts/DeleteSamples.py | 0 apps/templates/{nzgbet => nzbget}/scripts/flatten.py | 0 apps/templates/{nzgbet => nzbget}/scripts/hash.py | 0 apps/templates/{nzgbet => nzbget}/scripts/rarfile/__init__.py | 0 apps/templates/{nzgbet => nzbget}/scripts/rarfile/rarfile.py | 0 apps/templates/{nzgbet => nzbget}/scripts/reverse_name.py | 0 apps/templates/{nzgbet => nzbget}/scripts/unzip.py | 0 apps/templates/{nzgbet => nzbget}/services.d/run | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename apps/templates/{nzgbet/mp4_automator => nzbget/MP4_Automator}/TEMPLATEPPScript (100%) rename apps/templates/{nzgbet/mp4_automator => nzbget/MP4_Automator}/autoProcess.ini (100%) rename apps/templates/{nzgbet => nzbget}/cont-init.d/30-config (100%) rename apps/templates/{nzgbet => nzbget}/ffmpeg-build/build-ffmpeg (100%) rename apps/templates/{nzgbet => nzbget}/ffmpeg-build/web-install.sh (100%) rename apps/templates/{nzgbet => nzbget}/installer/installer.sh (100%) rename apps/templates/{nzgbet => nzbget}/scripts/DeleteSamples.py (100%) rename apps/templates/{nzgbet => nzbget}/scripts/flatten.py (100%) rename apps/templates/{nzgbet => nzbget}/scripts/hash.py (100%) rename apps/templates/{nzgbet => nzbget}/scripts/rarfile/__init__.py (100%) rename apps/templates/{nzgbet => nzbget}/scripts/rarfile/rarfile.py (100%) rename apps/templates/{nzgbet => nzbget}/scripts/reverse_name.py (100%) rename apps/templates/{nzgbet => nzbget}/scripts/unzip.py (100%) rename apps/templates/{nzgbet => nzbget}/services.d/run (100%) diff --git a/apps/templates/nzgbet/mp4_automator/TEMPLATEPPScript b/apps/templates/nzbget/MP4_Automator/TEMPLATEPPScript similarity index 100% rename from apps/templates/nzgbet/mp4_automator/TEMPLATEPPScript rename to apps/templates/nzbget/MP4_Automator/TEMPLATEPPScript diff --git a/apps/templates/nzgbet/mp4_automator/autoProcess.ini b/apps/templates/nzbget/MP4_Automator/autoProcess.ini similarity index 100% rename from apps/templates/nzgbet/mp4_automator/autoProcess.ini rename to apps/templates/nzbget/MP4_Automator/autoProcess.ini diff --git a/apps/templates/nzgbet/cont-init.d/30-config b/apps/templates/nzbget/cont-init.d/30-config similarity index 100% rename from apps/templates/nzgbet/cont-init.d/30-config rename to apps/templates/nzbget/cont-init.d/30-config diff --git a/apps/templates/nzgbet/ffmpeg-build/build-ffmpeg b/apps/templates/nzbget/ffmpeg-build/build-ffmpeg similarity index 100% rename from apps/templates/nzgbet/ffmpeg-build/build-ffmpeg rename to apps/templates/nzbget/ffmpeg-build/build-ffmpeg diff --git a/apps/templates/nzgbet/ffmpeg-build/web-install.sh b/apps/templates/nzbget/ffmpeg-build/web-install.sh similarity index 100% rename from apps/templates/nzgbet/ffmpeg-build/web-install.sh rename to apps/templates/nzbget/ffmpeg-build/web-install.sh diff --git a/apps/templates/nzgbet/installer/installer.sh b/apps/templates/nzbget/installer/installer.sh similarity index 100% rename from apps/templates/nzgbet/installer/installer.sh rename to apps/templates/nzbget/installer/installer.sh diff --git a/apps/templates/nzgbet/scripts/DeleteSamples.py b/apps/templates/nzbget/scripts/DeleteSamples.py similarity index 100% rename from apps/templates/nzgbet/scripts/DeleteSamples.py rename to apps/templates/nzbget/scripts/DeleteSamples.py diff --git a/apps/templates/nzgbet/scripts/flatten.py b/apps/templates/nzbget/scripts/flatten.py similarity index 100% rename from apps/templates/nzgbet/scripts/flatten.py rename to apps/templates/nzbget/scripts/flatten.py diff --git a/apps/templates/nzgbet/scripts/hash.py b/apps/templates/nzbget/scripts/hash.py similarity index 100% rename from apps/templates/nzgbet/scripts/hash.py rename to apps/templates/nzbget/scripts/hash.py diff --git a/apps/templates/nzgbet/scripts/rarfile/__init__.py b/apps/templates/nzbget/scripts/rarfile/__init__.py similarity index 100% rename from apps/templates/nzgbet/scripts/rarfile/__init__.py rename to apps/templates/nzbget/scripts/rarfile/__init__.py diff --git a/apps/templates/nzgbet/scripts/rarfile/rarfile.py b/apps/templates/nzbget/scripts/rarfile/rarfile.py similarity index 100% rename from apps/templates/nzgbet/scripts/rarfile/rarfile.py rename to apps/templates/nzbget/scripts/rarfile/rarfile.py diff --git a/apps/templates/nzgbet/scripts/reverse_name.py b/apps/templates/nzbget/scripts/reverse_name.py similarity index 100% rename from apps/templates/nzgbet/scripts/reverse_name.py rename to apps/templates/nzbget/scripts/reverse_name.py diff --git a/apps/templates/nzgbet/scripts/unzip.py b/apps/templates/nzbget/scripts/unzip.py similarity index 100% rename from apps/templates/nzgbet/scripts/unzip.py rename to apps/templates/nzbget/scripts/unzip.py diff --git a/apps/templates/nzgbet/services.d/run b/apps/templates/nzbget/services.d/run similarity index 100% rename from apps/templates/nzgbet/services.d/run rename to apps/templates/nzbget/services.d/run