remove profile conversion and legacy modules check

programminghoch10 · programminghoch10 · commit 8fa563f4e4e6 · 2022-02-14T23:54:39.000+01:00
supporting 3 versions of legacy profiles is not important anybody updating from such an old version might as well recreate their profiles or use the profile converter zip flying around in https://t.me/ViPER4AndroidFX Same applies for removing the old modules, we just don't expect any such old modules to be there, nor for anyone to install this module without removing the old ones beforehand no need to keep legacy checks around
diff --git a/magiskmodule/common/install.sh b/magiskmodule/common/install.sh
@@ -1,181 +1,3 @@
-convert_legacy() {
-  ui_print "   Old ViPER4Android folder detected at: $FOL!"
-  ui_print "   If new preset already exists, it will be skipped"
-  ui_print " "
-
-  mkdir -p $FOL/Preset 2>/dev/null
-  . $MODPATH/common/keys.sh
-  for i in "bt_a2dp.xml" "headset.xml" "usb_device.xml"; do
-    cp -f $MODPATH/common/blanks/default.xml $MODPATH/common/blanks/$i
-  done
-
-  find $FOL/Profile -mindepth 1 -maxdepth 1 -type d 2>/dev/null | while read PROFILE; do
-    ui_print "   Converting $(basename "$PROFILE")"
-    for DEVICE in bluetooth headset speaker usb; do
-      case $DEVICE in
-        bluetooth) DEST="$FOL/Preset/$(basename "$PROFILE")-$DEVICE/bt_a2dp.xml";;
-        headset) DEST="$FOL/Preset/$(basename "$PROFILE")-$DEVICE/headset.xml";;
-        speaker) DEST="$FOL/Preset/$(basename "$PROFILE")-$DEVICE/speaker.xml";;
-        usb) DEST="$FOL/Preset/$(basename "$PROFILE")-$DEVICE/usb_device.xml";;
-      esac
-      for FORMAT in txt xml; do
-        if [ "$FORMAT" == "xml" ]; then
-          SOURCE="$PROFILE/com.vipercn.viper4android_v2.$DEVICE.xml"
-          DEST="$(echo "$DEST" | sed "s|-$DEVICE|-$DEVICE-Legacy|")"
-          [ -f "$SOURCE" ] || continue
-          [ -d "$(dirname "$DEST")" ] && { ui_print "     New $(basename $DEVICE) preset already exists! Skipping..."; continue; }
-          [ "$(head -n1 "$SOURCE")" == "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>" ] || { ui_print "     $(basename "$PROFILE") $(basename $DEVICE) profile bugged! Skipping!"; continue; }
-        else
-          SOURCE="$PROFILE/$DEVICE.txt"
-          [ -f "$SOURCE" ] || continue
-          [ -d "$(dirname "$DEST")" ] && { ui_print "     New $(basename $DEVICE) preset already exists! Skipping..."; continue; }
-          [ "$(head -n1 "$SOURCE")" == "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>" ] && { ui_print "     $(basename "$PROFILE") $(basename $DEVICE) profile bugged! Skipping!"; continue; }
-        fi
-        [ "$FORMAT" == "xml" ] && ui_print "     Creating new $DEVICE-legacy profile..." || ui_print "     Creating new $DEVICE profile..."
-        mkdir "$(dirname "$DEST")" 2>/dev/null
-        cp -f $MODPATH/common/blanks/$(basename "$DEST") "$DEST"
-        while read LINE; do
-          [ "$(echo "$LINE" | grep 'ddcblock')" ] && continue # Skip ddcblock lines - not used and just slow down script
-          if [ "$FORMAT" == "xml" ]; then
-            case "$LINE" in
-              *"string name="*) VALUE="$(echo "$LINE" | sed -r -e "s|.*>(.*)</.*|\1|" -e "s/FILE://")"; LINE="$(echo "$LINE" | sed -r -e "s|.*name=\"viper4android.[A-Za-z]*\.(.*)\".*|\1|" -e "s/viperddc/ddc/" -e "s/\./_/g")";;
-              *"boolean name="*) VALUE="$(echo "$LINE" | sed -r "s|.*value=\"(.*)\" />.*|\1|")"; LINE="$(echo "$LINE" | sed -r -e "s|.*name=\"viper4android.[A-Za-z]*\.(.*)\" v.*|\1|" -e "s/viperddc/ddc/" -e "s/\./_/g")";;
-              *) continue;;
-            esac
-            # Change speaker entry names
-            [ "$DEVICE" == "speaker" ]&& { case "$LINE" in
-                                             convolver*|fet*|fireq*|limiter|outvol|playback*|reverb*) LINE="speaker_$LINE";;
-                                           esac; }
-            # Change dynamicsystem_bass
-            [ "$LINE" == "dynamicsystem_bass" ] && VALUE=$((VALUE * 20 + 100))
-          else
-            case "$LINE" in
-              [A-Z-a-z.]*) VALUE="$(echo "$LINE" | sed -e "s|^.*=||" -e "s/FILE://")"; LINE="$(echo "$LINE" | sed -e "s|=.*$||" -e "s/viperddc/ddc/" -e "s/\./_/g")";;
-              *) continue;;
-            esac
-            # Change speaker entry names
-            [ "$DEVICE" == "speaker" -a "$LINE" == "speaker_enable" ] && LINE=enable
-            # Change vse value
-            [ "$LINE" == "vse_value" ] && { VALUE="$(echo $VALUE | sed "s/;.*//")"; VALUE=$(awk -v VALUE=$VALUE 'BEGIN{VALUE=(VALUE/5.6); print VALUE;}'); }
-          fi
-          # Change names
-          case "$LINE" in
-            *fireq) continue;;
-            *fireq_custom) LINE="$(echo $LINE | sed "s/_custom//")";;
-            dynamicsystem_coeffs) LINE=dynamicsystem_device;;
-            dynamicsystem_bass) LINE=dynamicsystem_strength;;
-            tube_enable) LINE=tube_simulator_enable;;
-            channelpan) LINE=gate_channelpan;;
-            *limiter) LINE=gate_limiter;;
-            *outvol) LINE=gate_outputvolume;;
-            *reverb*) LINE="$(echo $LINE | sed -e "s/reverb_/reverberation_/" -e "s/roomwidth/room_width/")";;
-            *fetcompressor*) LINE="$(echo $LINE | sed "s|fetcompressor_|fet_|")";;
-            vhs_qual) LINE=vhs_quality;;
-            fidelity_bass_freq) LINE=fidelity_bass_frequency;;
-            spkopt_enable|speaker_optimize) LINE=speaker_optimization;;
-          esac
-          case "$LINE" in
-            fidelity_bass_mode|fidelity_clarity_mode|ddc_device|*fireq|*convolver_kernel|dynamicsystem_device)
-              VALUE="$(basename "$VALUE")"
-              [ "$LINE" == "ddc_device" -o "$LINE" == "convolver_kernel" ] && [ "$VALUE" ] && [ $VALUE -eq $VALUE ] 2>/dev/null && VALUE="$(grep "$VALUE" $MODPATH/common/VDCIndex.txt | sed -r "s/^[0-9]*=\"(.*)\"/\1/").vdc"
-              LINE="$(eval echo \$$LINE)"
-              sed -i "/$LINE/ s|>.*</string>|>$VALUE</string>|" "$DEST";;
-            *) LINE="$(eval echo \$$LINE)"
-               if [ -z $LINE ]; then
-                 continue
-               else  
-                 # Convert to integer
-                 case "$VALUE" in
-                   [0-9]*.[0-9]*) VALUE=$(awk -v VALUE=$VALUE 'BEGIN{VALUE=(VALUE*100); print VALUE;}');;
-                   [0-9]*\;[0-9]*) VALUE="$(echo $VALUE | sed "s/;.*//")";; #colorfulmusic_coeffs
-                 esac
-                 # Round to Tenth place due to profile saving bug in original v4a
-                 case "$LINE" in
-                   *reverberation_room*) VALUE=$(awk -v VALUE=$VALUE 'BEGIN{VALUE = sprintf("%1.0e\n",VALUE); printf "%d\n", VALUE}');;
-                 esac
-                 sed -i "/$LINE/ s|value=\".*\"|value=\"$VALUE\"|" "$DEST"
-               fi;;
-          esac
-        done < "$SOURCE"
-      done
-    done
-  done
-}
-
-convert() {
-  if [ "$1" != "-s" ]; then
-    ui_print "   Old ViPER4Android folder detected at: $FOL!"
-    ui_print "   If new preset already exists, it will be skipped"
-    ui_print " "
-  fi
-
-  find $FOL/Preset -mindepth 2 -maxdepth 2 -type f 2>/dev/null | while read PRESET; do
-    NEWPRESET="$FOL/Preset/$(basename "`dirname "$PRESET"`")-$(basename "$PRESET")"
-    [ -f "$NEWPRESET" ] && continue
-    [ "$1" != "-s" ] && ui_print "   Converting $(basename "`dirname "$PRESET"`")"
-    cp -f "$PRESET" "$NEWPRESET"
-
-    # Convert values
-    [ "$(basename "$PRESET")" == "speaker.xml" ] && sed -i '\|^</map>$|i    <int name="32775" value="2" />' "$NEWPRESET" || sed -i '\|^</map>$|i    <int name="32775" value="1" />' "$NEWPRESET"
-    local math value count
-    for key in 65587 65554 65555 65556 65558 65560 65561 65573 65576 65577 65580 65586 65588 65608 65609 65566 65605 65567 65606 65568 65607; do
-      unset math; count=0
-      value=$(sed -n "/int name=\"$key\"/p" "$NEWPRESET" | sed -r "s/.*value=\"([0-9]*)\".*/\1/")
-      [ -z $value ] && continue
-      case "$key" in
-        65587) math="($value + 100) / 2";; # Limiter - channelPan
-        65554|65555) math="($value - 120) / 10";; # FieldSurround - width, midImage
-        65556) math="($value - 200) / 75";; # FieldSurround - depth
-        65558) math="$value / 100 - 1";; # DifferentialSurround - strength
-        65560|65561|65598|65599) math="$value / 10";; # Speaker/Reverberation - roomSize, roomWidth
-        65573) math="($value - 100) / 20";; # DynamicSystem - strength
-        65576) math="$value - 15";; # ViPERBass - cutOffFrequency
-        65577) math="($value - 50) / 50";; # ViPERBass - strength
-        65580) math="$value / 50";; # ViPERClarity - strength
-        65586|65608)
-          for i in 1 5 10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160 170 180 190 200; do
-            [ $value -eq $i ] && { math=$count; break; }
-            count=$((count + 1))
-          done
-          ;; # Speaker/Limiter - Output gain, Speaker/Playback gain control - Output threshold
-        65588|65609|65568|65607)
-          for i in 30 50 70 80 90 100; do
-            [ $value -eq $i ] && { math=$count; break; }
-            count=$((count + 1))
-          done
-          ;; # Speaker/Limiter - Threshold limit
-        65566|65605)
-          for i in 50 100 300; do
-            [ $value -eq $i ] && { math=$count; break; }
-            count=$((count + 1))
-          done
-          ;; # Speaker/Playback gain control - Strength
-        65567|65606)
-          for i in 100 200 300 400 500 600 700 800 900 1000 3000; do
-            [ $value -eq $i ] && { math=$count; break; }
-            count=$((count + 1))
-          done
-          ;; # Speaker/Playback gain control - Maximum gain
-      esac
-      [ "$math" ] || math=0
-      value=$(($math))
-      sed -ri "/int name=\"$key\"/ s/(value=\")[0-9]*\"/\1$value\"/" "$NEWPRESET"
-    done
-  done
-}
-
-profile_convert() {
-  ui_print "- Converting old profiles to new format..."
-  if [ "$(find $FOL/Preset -type d -mindepth 1 -maxdepth 1 2>/dev/null)" ]; then
-    convert
-  elif [ "$(ls -A $FOL/Profile 2>/dev/null)" ]; then
-    convert_legacy
-    convert -s
-  else
-     ui_print "- No old profiles found, nothing to convert"
-     return
-  fi 
-}
 
 [ "`getenforce`" == "Enforcing" ] && ENFORCE=true || ENFORCE=false
 FOL="/storage/emulated/0/ViPER4Android"
@@ -184,19 +6,9 @@ NEWFOL="/storage/emulated/0/Android/data/com.pittvandewitt.viperfx/files"
 # Backup existing presets
 [ -d "$NEWFOL" ] && cp -rf $NEWFOL/* $FOL/
 
-# Uninstall existing v4a installs
-ui_print "- Removing old v4a app installs..."
-for i in $(find /data/app -maxdepth 1 -type d -name "*com.pittvandewitt.viperfx*" -o -name "*com.audlabs.viperfx*" -o -name "*com.vipercn.viper4android_v2*"); do
-  case "$i" in
-    *"com.pittvandewitt.viperfx"*) pm uninstall com.pittvandewitt.viperfx >/dev/null 2>&1;;
-    *"com.audlabs.viperfx"*) pm uninstall com.audlabs.viperfx >/dev/null 2>&1;;
-    *"com.vipercn.viper4android"*) pm uninstall com.vipercn.viper4android_v2 >/dev/null 2>&1;;
-  esac
-done
-# Remove remnants of any old v4a installs
-for i in $(find /data/data -maxdepth 1 -name "*ViPER4AndroidFX*" -o -name "*com.audlabs.viperfx*" -o -name "*com.vipercn.viper4android_v2*"); do
-  rm -rf $i 2>/dev/null
-done
+# Uninstall v4a app if installed
+VIPERFXPACKAGE="com.pittvandewitt.viperfx"
+[ -n "$(pm list packages | grep "$VIPERFXPACKAGE")" ] && pm uninstall "$VIPERFXPACKAGE" >/dev/null 2>&1
 
 # Tell user aml is needed if applicable
 FILES=$(find $NVBASE/modules/*/system $MODULEROOT/*/system -type f -name "*audio_effects*.conf" -o -name "*audio_effects*.xml" 2>/dev/null | sed "/$MODID/d")
@@ -209,9 +21,6 @@ if [ ! -z "$FILES" ] && [ ! "$(echo $FILES | grep '/aml/')" ]; then
   sleep 3
 fi
 
-# Convert old profiles to new presets
-profile_convert
-
 # Copy to new scoped storage directory
 ui_print " "
 ui_print "- Placing Files to New Directory:"
@@ -268,13 +77,3 @@ $ENFORCE && setenforce 1
 
 # Install temporary service script
 install_script -l $MODPATH/common/service.sh
-
-
-REMS=$(find $NVBASE/modules/*/system $MODULEROOT/*/system -type f -name "ViPER4AndroidFX.apk" 2>/dev/null)
-if [ "$REMS" ]; then
-  ui_print "- Marking all old v4a modules for deletion..."
-  for i in ${REMS}; do
-    i="$(echo "$i" | sed "s|/system/.*|/|")"
-    touch $i/remove
-  done
-fi
