Skip to content

Commit 2f3ad98

Browse files
committed
ctbcap: improve model name change handle
1 parent 21c4740 commit 2f3ad98

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

ctbcap

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,11 +414,8 @@ init_path() {
414414
# $STREAM_STAT = { OK | NO_URL (init) | NAME_CHANGE | WRONG_ROOM | BAD_URL | TIN_FOIL_HAT }
415415
# with return { 0 | 1 | 1 | 1 | 1 | 110 }
416416
fetch_m3u() {
417-
[ -n "${MODEL_NEW_NAME}" ] && {
418-
log "(NOTICE) Due to name change, [${MODEL_NEW_NAME}] will now be used for actual requests."
419-
local MODEL="${MODEL_NEW_NAME}"
420-
}
421417
unset STREAM_URL
418+
[ -n "${MODEL_NEW_NAME}" ] && local MODEL="${MODEL_NEW_NAME}"
422419
STREAM_STAT=NO_URL # init
423420

424421
# Core Methods by each Platform.
@@ -471,6 +468,7 @@ fetch_m3u() {
471468
MODEL_NEW_NAME=$(echo "${CONNECT_DUMP}" | grep -oE 'location:[ ]?/[^/]+/' | head -n 1 | cut -d '/' -f2)
472469
[ -n "${MODEL_NEW_NAME}" ] && {
473470
log >&2 "(WARNING) [${MODEL}] has changed her name to [${MODEL_NEW_NAME}]. [${CONNECT_STAT}]"
471+
log "(NOTICE) [${MODEL_NEW_NAME}] will now be used for subsequent requests."
474472
STREAM_STAT=NAME_CHANGE && return 1
475473
} || {
476474
log >&2 "(ERROR) Can't find [${MODEL}] on [${PLATFORM}]. [${CONNECT_STAT}]"

0 commit comments

Comments
 (0)