fix: adapt upstream changes

Signed-off-by: Tianling Shen <[email protected]>

root/etc/init.d/unblockneteasemusic

@@ -30,9 +30,14 @@ enable="$(uci_get_by_type "$NAME" "enable" "0")"
 
 music_source="$(uci_get_by_type "$NAME" "music_source" "default")"
 
-enable_flac="$(uci_get_by_type "$NAME" "enable_flac" "0")"
-[ "${enable_flac}" -eq "1" ] && export ENABLE_FLAC="true"
-replace_music_source="$(uci_get_by_type "$NAME" "replace_music_source" "dont_replace")"
+[ "$(uci_get_by_type "$NAME" "enable_flac" "0")" = "1" ] && export ENABLE_FLAC="true"
+
+case "$(uci_get_by_type "$NAME" "replace_music_source" "dont_replace")" in
+"lower_than_192kbps") export MIN_BR="192000" ;;
+"lower_than_320kbps") export MIN_BR="320000" ;;
+"lower_than_999kbps") export MIN_BR="999000" ;;
+"replace_all") export MIN_BR="999999" ;;
+esac
 
 use_remote_qq_server="$(uci_get_by_type "$NAME" "use_remote_qq_server")"
 
@@ -197,20 +202,6 @@ start()
 	[ ! -e "/usr/share/$NAME/core/app.js" ] && { rm -f "/usr/share/$NAME/local_ver"; sh "/usr/share/$NAME/update.sh" "update_core_non_restart"; }
 	[ ! -e "/usr/share/$NAME/core/app.js" ] && { echo "Core Not Found, please download it before starting." >> "/tmp/$NAME.log"; exit 1; }
 
-	quality_check_line="$(awk "/item.code != 200 \|\| item.freeTrialInfo/{print NR}" "/usr/share/$NAME/core/src/hook.js")"
-	sed -i "${quality_check_line}d" "/usr/share/$NAME/core/src/hook.js"
-	if [ "${replace_music_source}" = "dont_replace" ]; then
-		sed -i -e "${quality_check_line}i \\\t\\t\\t(item.code != 200 || item.freeTrialInfo) &&" "/usr/share/$NAME/core/src/hook.js"
-	elif [ "${replace_music_source}" = "lower_than_192kbps" ]; then
-		sed -i -e "${quality_check_line}i \\\t\\t\\t(item.code != 200 || item.freeTrialInfo || item.br < 192000) &&" "/usr/share/$NAME/core/src/hook.js"
-	elif [ "${replace_music_source}" = "lower_than_320kbps" ]; then
-		sed -i -e "${quality_check_line}i \\\t\\t\\t(item.code != 200 || item.freeTrialInfo || item.br < 320000) &&" "/usr/share/$NAME/core/src/hook.js"
-	elif [ "${replace_music_source}" = "lower_than_999kbps" ]; then
-		sed -i -e "${quality_check_line}i \\\t\\t\\t(item.code != 200 || item.freeTrialInfo || item.br < 999000) &&" "/usr/share/$NAME/core/src/hook.js"
-	elif [ "${replace_music_source}" = "replace_all" ]; then
-		sed -i -e "${quality_check_line}i \\\t\\t\\t(item.code != 200 || item.freeTrialInfo || true) &&" "/usr/share/$NAME/core/src/hook.js"
-	fi
-
 	[ "${hijack_ways}" = "use_hosts" ] && { http_port="80"; https_port="443"; }
 	[ "${music_source}" = "default" ] && music_source="" || music_source="-o ${music_source}"
 	node "/usr/share/$NAME/core/app.js" -a "${addr}" -p "${http_port}":"${https_port}" ${music_source} -e "${endpoint_url}" ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >> "/tmp/$NAME.log" 2>&1 &

root/usr/share/unblockneteasemusic/update.sh

@@ -9,11 +9,6 @@ function check_core_if_already_running(){
 	[ "${running_tasks}" -gt "2" ] && { echo -e "\nA task is already running." >> "/tmp/$NAME.log"; exit 2; }
 }
 
-function check_luci_if_already_running(){
-	running_tasks="$(ps |grep "$NAME" |grep "update.sh" |grep "update_luci" |grep -v "grep" |awk '{print $1}' |wc -l)"
-	[ "${running_tasks}" -gt "2" ] && { echo -e "\nA task is already running." >> "/tmp/$NAME.log"; exit 2; }
-}
-
 function clean_log(){
 	echo "" > "/tmp/$NAME.log"
 }
@@ -23,16 +18,16 @@ function check_core_latest_version(){
 	[ -z "${core_latest_ver}" ] && { echo -e "\nFailed to check latest core version, please try again later." >> "/tmp/$NAME.log"; exit 1; }
 	if [ ! -e "/usr/share/$NAME/core_local_ver" ]; then
 		clean_log
-		echo -e "Local version: NOT FOUND, cloud version: ${core_latest_ver}." >> "/tmp/$NAME.log"
+		echo -e "Local version: NOT FOUND, latest version: ${core_latest_ver}." >> "/tmp/$NAME.log"
 		update_core
 	else
 		if [ "$(cat /usr/share/$NAME/core_local_ver)" != "${core_latest_ver}" ]; then
 			clean_log
-			echo -e "Local core version: $(cat /usr/share/$NAME/core_local_ver 2>"/dev/null"), cloud core version: ${core_latest_ver}." >> "/tmp/$NAME.log"
+			echo -e "Local version: $(cat /usr/share/$NAME/core_local_ver 2>"/dev/null"), latest version: ${core_latest_ver}." >> "/tmp/$NAME.log"
 			update_core
 		else
-			echo -e "\nLocal core version: $(cat /usr/share/$NAME/core_local_ver 2>"/dev/null"), cloud core version: ${core_latest_ver}." >> "/tmp/$NAME.log"
-			echo -e "You're already using the latest core version." >> "/tmp/$NAME.log"
+			echo -e "\nLocal version: $(cat /usr/share/$NAME/core_local_ver 2>"/dev/null"), latest version: ${core_latest_ver}." >> "/tmp/$NAME.log"
+			echo -e "You're already using the latest version." >> "/tmp/$NAME.log"
 			exit 3
 		fi
 	fi
@@ -78,6 +73,6 @@ case "$1" in
 		check_core_latest_version
 		;;
 	*)
-		echo -e "Usage: ./update.sh {update_luci|update_core}"
+		echo -e "Usage: ./update.sh update_core"
 		;;
 esac