Add flags and improvements (#41)

README.md

@@ -1,23 +1,21 @@
 # VideoStation-FFMPEG-Patcher 
 
-<p>
+<p align="center">
   <img src="https://github.com/AlexPresso/VideoStation-FFMPEG-Patcher/blob/main/banner.png?raw=true" height=200px alt="Banner">
 </p>
 
 This patcher is designed to simplify the installation steps from this [Gist](https://gist.github.com/BenjaminPoncet/bbef9edc1d0800528813e75c1669e57e) (huge thanks to [Benjamin Poncet](https://github.com/BenjaminPoncet)) and enable **DTS**, **EAC3** and **TrueHD** support to Synology VideoStation by replacing the ffmpeg library files by a wrapper using SynoCommunity ffmpeg.
 
-## Supported architectures
-([check your NAS architecture here](https://github.com/SynoCommunity/spksrc/wiki/Architecture-per-Synology-model))
-- ARMv8 ✅ (DSM 7.0 ready)
-- Old ARM ✅ (DSM 7.0 ready)
-- x64 ✅ (DSM 7.0 ready)
-- x86 ✅ (DSM 7.0 ready)
-
 ## Dependencies
 - DSM 6.2.2-24922 Update 4 (and above)
 - Video Station 2.4.6-1594 (and above)
 - SynoCommunity ffmpeg 4.2.1-23 (and above) ([help](https://synocommunity.com/#easy-install))
 
+## Supported / Unsupported scenarios
+- [DTS or EAC3 or TrueHD] + [Any non HEVC standard video format]: ✅
+- [no DTS, no EAC3, no TrueHD] + [HEVC]: ✅
+- [DTS or EAC3 or TrueHD] + [HEVC]: ❌ (Please don't submit any more issue related to this scenario, I'm working on it, see [#33](https://github.com/AlexPresso/VideoStation-FFMPEG-Patcher/pull/33))
+
 ## Instructions
 - Check that you meet the required [dependencies](https://github.com/AlexPresso/VideoStation-FFMPEG-Patcher#dependencies)
 - Install SynoCommunity ffmpeg ([help](https://synocommunity.com/#easy-install))
@@ -30,9 +28,9 @@ This patcher is designed to simplify the installation steps from this [Gist](htt
 Basic command:  
 `curl https://raw.githubusercontent.com/AlexPresso/VideoStation-FFMPEG-Patcher/main/patcher.sh | bash`   
 With options:  
-`curl https://raw.githubusercontent.com/AlexPresso/VideoStation-FFMPEG-Patcher/main/patcher.sh | bash -s -- <option>`
+`curl https://raw.githubusercontent.com/AlexPresso/VideoStation-FFMPEG-Patcher/main/patcher.sh | bash -s -- <flags>`
 
-| Options | Description |
-| ------ | ----------- |
-| -patch | patch VideoStation and CodecPack |
-| -unpatch | restore VideoStation and CodecPack to default files 
+| Flags | Required | Description                                                                     |
+|-------|----------|---------------------------------------------------------------------------------|
+| -a    | No       | Action flag: choose between patch or unpatch ; example: `-a patch`              |
+| -b    | No       | Branch flag: allows you to choose the wrapper branch to use ; example `-b main` |                                                        

patcher.sh

@@ -6,11 +6,13 @@
 
 dsm_version=$(cat /etc.defaults/VERSION | grep productversion | sed 's/productversion=//' | tr -d '"')
 repo_base_url=https://github.com/AlexPresso/VideoStation-FFMPEG-Patcher
-vs_bin_path=/var/packages/VideoStation/target/bin
+action="patch"
+branch="main"
+dependencies=("ffmpeg")
+vs_path=/var/packages/VideoStation/target
+libsynovte_path="$vs_path/lib/libsynovte.so"
 cp_bin_path=/var/packages/CodecPack/target/bin
-declare -a cp_to_patch=("ffmpeg41" "ffmpeg27")
-ffmpeg_bin_path=/var/packages/ffmpeg/target/bin
-libsynovte_path=/var/packages/VideoStation/target/lib/libsynovte.so
+cp_to_patch=("ffmpeg41" "ffmpeg27")
 
 ###############################
 #   UTILS
@@ -29,7 +31,7 @@ function error() {
 function welcome_motd() {
   info "ffmpeg-patcher v1.5"
 
-    motd=$(curl -s -L "$repo_base_url/blob/main/motd.txt?raw=true")
+  motd=$(curl -s -L "$repo_base_url/blob/$branch/motd.txt?raw=true")
   if [ "${#motd}" -ge 1 ]; then
     log "Message of the day"
     echo ""
@@ -49,10 +51,12 @@ function restart_packages() {
 }
 
 function check_dependencies() {
-    if [[ ! -d $ffmpeg_bin_path ]]; then
-        error "Missing SynoCommunity ffmpeg package, please install it and re-run the patcher."
+  for dependecy in "${dependencies[@]}"; do
+    if [[ ! -d "/var/packages/$dependecy" ]]; then
+      error "Missing $dependecy package, please install it and re-run the patcher."
       exit 1
     fi
+  done
 }
 
 ################################
@@ -60,16 +64,16 @@ function check_dependencies() {
 ################################
 
 function patch() {
-    info "====== Patching procedure ======"
+  info "====== Patching procedure (branch: $branch) ======"
 
   info "Saving current ffmpeg as ffmpeg.orig"
-    mv -n "$vs_bin_path/ffmpeg" "$vs_bin_path/ffmpeg.orig"
+  mv -n "$vs_path/bin/ffmpeg" "$vs_path/bin/ffmpeg.orig"
 
   info "Downloading ffmpeg's wrapper..."
-    wget -q -O - "$repo_base_url/blob/main/ffmpeg-wrapper.sh?raw=true" > "$vs_bin_path/ffmpeg"
-    chown root:VideoStation "$vs_bin_path/ffmpeg"
-    chmod 750 "$vs_bin_path/ffmpeg"
-    chmod u+s "$vs_bin_path/ffmpeg"
+  wget -q -O - "$repo_base_url/blob/$branch/ffmpeg-wrapper.sh?raw=true" > "$vs_path/bin/ffmpeg"
+  chown root:VideoStation "$vs_path/bin/ffmpeg"
+  chmod 750 "$vs_path/bin/ffmpeg"
+  chmod u+s "$vs_path/bin/ffmpeg"
 
   if [[ -d $cp_bin_path ]]; then
     for filename in "${cp_to_patch[@]}"; do
@@ -77,7 +81,7 @@ function patch() {
         info "Patching CodecPack's $filename"
 
         mv -n "$cp_bin_path/$filename" "$cp_bin_path/$filename.orig"
-                ln -s -f "$vs_bin_path/ffmpeg" "$cp_bin_path/$filename"
+        ln -s -f "$vs_path/bin/ffmpeg" "$cp_bin_path/$filename"
       fi
     done
   fi
@@ -102,11 +106,10 @@ function unpatch() {
   mv -f "$libsynovte_path.orig" "$libsynovte_path"
 
   info "Restoring VideoStation's ffmpeg"
-    mv -f "$vs_bin_path/ffmpeg.orig" "$vs_bin_path/ffmpeg"
+  mv -f "$vs_path/bin/ffmpeg.orig" "$vs_path/bin/ffmpeg"
 
   if [[ -d $cp_bin_path ]]; then
-        find $cp_bin_path -type f -name "ffmpeg*.orig" | while read filename
-        do
+    find $cp_bin_path -type f -name "ffmpeg*.orig" | while read filename; do
       info "Restoring CodecPack's $filename"
       mv -T -f "$filename" "${filename::-5}"
     done
@@ -121,23 +124,24 @@ function unpatch() {
 ################################
 #   ENTRYPOINT
 ################################
-welcome_motd
-arg1=${1:--patch}
+while getopts a:b: flag; do
+  case "${flag}" in
+    a) action=${OPTARG};;
+    b) branch=${OPTARG};;
+    *) echo "usage: $0 [-a patch|unpatch] [-b branch]" >&2; exit 1;;
+  esac
+done
 
+welcome_motd
 check_dependencies
 
 info "You're running DSM $dsm_version"
 if [[ $dsm_version > 7.0 ]]; then
   cp_bin_path=/var/packages/CodecPack/target/pack/bin
-
   info "Tuned script for DSM $dsm_version"
 fi
 
-case "$arg1" in
-    -unpatch)
-        unpatch
-    ;;
-    -patch)
-        patch
-    ;;
+case "$action" in
+  unpatch) unpatch;;
+  patch) patch;;
 esac