diff --git a/firmware_mod/autoupdate.sh b/firmware_mod/autoupdate.sh index 0f5b82b..39b3cf9 100755 --- a/firmware_mod/autoupdate.sh +++ b/firmware_mod/autoupdate.sh @@ -48,6 +48,7 @@ usage() echo "Usage this script to update the ${REPO} github repo from ${BRANCH} (default) branch" echo "Options:" echo "-b (--backup) backup erased file (add extension ${BACKUPEXT} to the local file before ovewrite it) " + echo "-x (--repo) to set the repo" echo "-r (--branch) to set the branch" echo "-f (--force) force update" echo "-d (--dest) set the destination folder (default is ${DESTFOLDER})" @@ -169,7 +170,7 @@ countdownreboot() # Generate VERSION file generateVersionFile () { - echo "{\"date\":\"${REMOTECOMMITDATE}\",\"branch\":\"${BRANCH}\",\"commit\":\"${REMOTECOMMITID}\"}" > $VERSION_FILE + echo "{\"date\":\"${REMOTECOMMITDATE}\",\"repo\":\"${REPO}\",\"branch\":\"${BRANCH}\",\"commit\":\"${REMOTECOMMITID}\"}" > $VERSION_FILE } ########################################################################## # Curl with optional authentication @@ -228,6 +229,11 @@ do _PROGRESS=1; shift ;; + -x | --repo) + REPO=$2; + shift + shift + ;; -r | --branch) BRANCH=$2 shift @@ -263,15 +269,22 @@ fi action "rm -rf ${DESTOVERRIDE} 2>/dev/null" if [ -f "$VERSION_FILE" ]; then - LOCALCOMMITID=$(${JQ} -r .commit ${VERSION_FILE}) - if [ ${LOCALCOMMITID} = ${REMOTECOMMITID} ]; then + LOCALCOMMITID=$(${JQ} -r .commit ${VERSION_FILE}) + LOCALREPO=$(${JQ} -r .repo ${VERSION_FILE}) + if [ -z "$LOCALREPO" ]; then LOCALREPO="$REPO"; fi + if [ ${LOCALREPO} = ${REPO} ] && [ ${LOCALCOMMITID} = ${REMOTECOMMITID} ]; then logerror "You are currently on the latest version" echo "You are currently on the latest version" exit 1 - else + elif [ ${LOCALREPO} = ${REPO} ]; then echo "Need to upgrade from ${LOCALCOMMITID} to ${REMOTECOMMITID}" log "Getting list of remote files." FILES=$(curl -s ${GITHUBURL}/${REPO}/compare/${LOCALCOMMITID}...${REMOTECOMMITID} | ${JQ} -r '.files[].raw_url' | grep ${REMOTEFOLDER}) + else + echo "Repo has changed. Upgrade to last commit ${REMOTECOMMITID}" + log "Getting list of remote files." + FIRST=$(curl -s ${GITHUBURL}/${REPO}/contents/${REMOTEFOLDER}?ref=${BRANCH}) + FILES=$(getfiles "${FIRST}") fi else echo "Version file missing. Upgrade to last commit ${REMOTECOMMITID}" @@ -306,10 +319,10 @@ do fi # sometimes zero byte files are received, which overwrite the local files, we ignore those files # exception: files that are hidden i.e. start with dot. Ex: files like ".gitkeep" - if [[ ! -s ${TMPFILE} ]] && [[ $(basename ${LOCALFILE} | cut -c1-1) != "." ]]; then - echo "Received zero byte file $i, exiting." - exit 1 - fi + if [[ ! -s ${TMPFILE} ]] && [[ $(basename ${LOCALFILE} | cut -c1-1) != "." ]]; then + echo "Received zero byte file $i, exiting." + exit 1 + fi # Check the file exists in local if [ -f "${DESTFOLDER}/${LOCALFILE}" ]; then REMOTESHA=$(${SHA} ${TMPFILE} 2>/dev/null | cut -d "=" -f 2) diff --git a/firmware_mod/scripts/common_functions.sh b/firmware_mod/scripts/common_functions.sh index a741428..6511d4d 100755 --- a/firmware_mod/scripts/common_functions.sh +++ b/firmware_mod/scripts/common_functions.sh @@ -803,13 +803,15 @@ github_curl() { # Check commit between VERSION file and github check_commit() { if [ -s /system/sdcard/VERSION ]; then + localrepo=$(/system/sdcard/bin/jq -r .repo /system/sdcard/VERSION) + if [ -z "$localrepo" ]; then localrepo="EliasKotlyar"; fi localcommit=$(/system/sdcard/bin/jq -r .commit /system/sdcard/VERSION) localbranch=$(/system/sdcard/bin/jq -r .branch /system/sdcard/VERSION) - remotecommit=$(github_curl -s https://api.github.com/repos/EliasKotlyar/Xiaomi-Dafang-Hacks/commits/${localbranch} | /system/sdcard/bin/jq -r '.sha[0:7]') + remotecommit=$(github_curl -s https://api.github.com/repos/${localrepo}/commits/${localbranch} | /system/sdcard/bin/jq -r '.sha[0:7]') if [ ${localcommit} = ${remotecommit} ]; then echo "${localcommit} ( No update available)" else - commitbehind=$(github_curl -s https://api.github.com/repos/EliasKotlyar/Xiaomi-Dafang-Hacks/compare/${remotecommit}...${localcommit} | /system/sdcard/bin/jq -r '.behind_by') + commitbehind=$(github_curl -s https://api.github.com/repos/${localrepo}/compare/${remotecommit}...${localcommit} | /system/sdcard/bin/jq -r '.behind_by') echo "${localcommit} ( ${commitbehind} commits behind Github)" fi else diff --git a/firmware_mod/www/cgi-bin/action.cgi b/firmware_mod/www/cgi-bin/action.cgi index fc9256c..e7fe8a6 100755 --- a/firmware_mod/www/cgi-bin/action.cgi +++ b/firmware_mod/www/cgi-bin/action.cgi @@ -533,10 +533,14 @@ auto_night_mode_status) update) processId=$(ps | grep autoupdate.sh | grep -v grep) - release="" - if [ $F_release == "beta" ]; then - release="-r beta" - fi + repo=$(printf '%b' "${F_repo//%/\\x}") + if [ -n "$repo" ]; then + repo="-x $repo" + fi + release=$(printf '%b' "${F_release//%/\\x}") + if [ -n "$release" ]; then + release="-r $release" + fi if [ $F_mode == "full" ]; then mv /system/sdcard/VERSION /system/sdcard/VERSION.old fi @@ -545,9 +549,9 @@ auto_night_mode_status) date >> /var/log/update.log github_token=$(get_config /system/sdcard/config/updates.conf github_token) if [ "$github_token" != "" ]; then - /system/sdcard/bin/busybox nohup /system/sdcard/autoupdate.sh -s -v -f ${release} -t "$github_token" >> "/system/sdcard/log/update.log" & + /system/sdcard/bin/busybox nohup /system/sdcard/autoupdate.sh -s -v -f ${repo} ${release} -t "$github_token" >> "/system/sdcard/log/update.log" & else - /system/sdcard/bin/busybox nohup /system/sdcard/autoupdate.sh -s -v -f ${release} >> "/system/sdcard/log/update.log" & + /system/sdcard/bin/busybox nohup /system/sdcard/autoupdate.sh -s -v -f ${repo} ${release} >> "/system/sdcard/log/update.log" & fi processId=$(ps | grep autoupdate.sh | grep -v grep) fi @@ -695,17 +699,19 @@ motion_detection_mqtt_snapshot_status) ;; check_update) if [ -s /system/sdcard/VERSION ]; then + localrepo=$(/system/sdcard/bin/jq -r .repo /system/sdcard/VERSION) + if [ -z "$localrepo" ]; then localrepo="EliasKotlyar"; fi localcommit=$(/system/sdcard/bin/jq -r .commit /system/sdcard/VERSION) localbranch=$(/system/sdcard/bin/jq -r .branch /system/sdcard/VERSION) - remotecommit=$(github_curl -s https://api.github.com/repos/EliasKotlyar/Xiaomi-Dafang-Hacks/commits/${localbranch} | /system/sdcard/bin/jq -r '.sha[0:7]') - commitbehind=$(github_curl -s https://api.github.com/repos/EliasKotlyar/Xiaomi-Dafang-Hacks/compare/${remotecommit}...${localcommit} | /system/sdcard/bin/jq -r '.behind_by') + remotecommit=$(github_curl -s https://api.github.com/repos/${localrepo}/commits/${localbranch} | /system/sdcard/bin/jq -r '.sha[0:7]') + commitbehind=$(github_curl -s https://api.github.com/repos/${localrepo}/compare/${remotecommit}...${localcommit} | /system/sdcard/bin/jq -r '.behind_by') if [ ${localcommit} = ${remotecommit} ]; then - echo "${localbranch}:0" + echo "${localrepo}:${localbranch}:0" else - echo "${localbranch}:${commitbehind}" + echo "${localrepo}:${localbranch}:${commitbehind}" fi else - echo "null:-1" + echo "null:null:-1" fi return ;; diff --git a/firmware_mod/www/js/control.js b/firmware_mod/www/js/control.js index 8995b16..df45e6d 100755 --- a/firmware_mod/www/js/control.js +++ b/firmware_mod/www/js/control.js @@ -14,7 +14,7 @@ function timedRefresh(timeoutPeriod) { function update(onStart) { $.ajax({ 'url': 'cgi-bin/action.cgi?cmd=show_updateProgress' - }).done(function(log) { + }).done(function(log) { if (log < 0) { if (onStart != true) { @@ -44,65 +44,103 @@ function accordionUpdate(param) { panel.style.maxHeight = null; } else { panel.style.maxHeight = panel.scrollHeight + "px"; - } + } +} + +function startCustom(el) { + var repo = $('#custom_repo').val(); + var branch = $('#custom_branch').val(); + var mode = $('#custom_full').is(":checked") ? 'full' : 'cumul'; + start(repo, branch, mode); } function showupdatepage(result) { + $('#update').html('

Seaching for updates ...

'); + $.ajax({ 'url': 'cgi-bin/action.cgi?cmd=check_update' }).done(function(result){ - + var update = result.split(":") - var update_status = parseInt(update[1],10); + var repo = update[0]; + var branch = update[1]; + var update_status = parseInt(update[2],10); + + var custom = '
\ +

Custom Firmware

\ + \ +
\ + \ +
\ + \ +

\ +
\ +
'; if (update_status == 0) { - $('#updatemsg').html("You have already the latest version from the " + update[0] + " branch") - if (update[0] == "master") { - $('#updatemsg').append(' \ + $('#updatemsg').html("You have already the latest version from the " + branch + " branch of the " + repo + " repo.") + if (branch == "master") { + $('#update').append(' \

\ -
\ -
\ -
'); - +
\ +
\ + ' + custom + ''); + + } + else if (branch == "beta") { + $('#update').append(' \ +

\ +
\ +
\ + ' + custom + '
'); } else { - $('#updatemsg').append(' \ + $('#update').append(' \

\ -
\ -
\ -
'); +
\ +
\ +
\ + ' + custom + ''); } - } + } else if (update_status == -1) { $('#updatemsg').html("No version file found.
You can update the firmware on this camera to the latest version from Github repository.
Settings will be retained after update.") - $('#updatemsg').append('\ -
\ -
'); + $('#update').append('\ +
\ +
' + custom); } else if (update_status > 0) { - $('#updatemsg').html("You are "+ update_status +" commits behind "+ update[0] + " branch"); - if (update[0] == "master") { - $('#updatemsg').append('
'); - $('#updatemsg').append(' \ + $('#updatemsg').html("You are "+ update_status +" commits behind the " + branch + " branch of the " + repo + " repo.") + if (branch == "master") { + $('#update').append('
'); + $('#update').append(' \

\ -
\ -
\ -
'); +
\ +
\ + ' + custom + ''); + } + else if (branch == "beta") { + $('#update').append('
'); + $('#update').append(' \ +

\ +
\ +
\ + ' + custom + '
'); } else { - $('#updatemsg').append('
'); - $('#updatemsg').append(' \ + $('#update').append('
'); + $('#update').append(' \

\ -
\ -
\ -
'); +
\ +
\ + ' + custom + ''); } } else { $('#updatemsg').text("There is a problem with your VERSION file. Please do a full update to create a valid VERSION file."); - $('#updatemsg').append('\ -
\ -
'); + $('#update').append('\ +
\ +
' + custom); } }); } @@ -111,12 +149,12 @@ function saveConfig() { $.get("cgi-bin/ui_control.cgi",{cmd: "save_config"},function(result) { getFiles('config'); }); - + } function deleteConfig(fileName,dir) { var del = confirm("Confirm delete file: "+fileName); - if ( del ) { + if ( del ) { $.get("cgi-bin/ui_control.cgi", {cmd: "del_config",file: fileName}); getFiles(dir); } @@ -125,7 +163,7 @@ function deleteConfig(fileName,dir) { function restoreConfig(fileName) { var restore = confirm("Are you sure to restore config file: "+fileName+"\n Camera will reboot at the end of the process"); if ( restore ) { - $.get("cgi-bin/ui_control.cgi",{cmd: "restore_config",file: fileName}); + $.get("cgi-bin/ui_control.cgi",{cmd: "restore_config",file: fileName}); } } @@ -133,8 +171,8 @@ function restoreConfig(fileName) { function getFiles(dir) { // Get files from dir $('#'+dir).html("

"); - $.get("cgi-bin/ui_control.cgi", {cmd: "getFiles", dir: dir}, function(config){ - var config_all = config.split("\n"); + $.get("cgi-bin/ui_control.cgi", {cmd: "getFiles", dir: dir}, function(config){ + var config_all = config.split("\n"); if ( config_all.length == 1) $('#'+dir).append("

No snapshot available.

"); else { @@ -151,7 +189,7 @@ function getFiles(dir) { "); for (var i = 0; i < config_all.length-1; i++) { var config_info = config_all[i].split("#:#"); - var file_info = config_info[3].split("."); + var file_info = config_info[3].split("."); var html_photo = ""; $('#result_'+dir).append(" \ "+config_info[0]+" \ @@ -177,8 +215,8 @@ function getFiles(dir) { } -function start(branch,mode) { - var login = ""; +function start(repo,branch,mode) { + var login = ""; // if ($('#login').val().length > 0) { // login = "login=" + $('#login').val() + ":" + $('#password').val(); // } @@ -188,7 +226,7 @@ function start(branch,mode) { $('#modal_content').html('

Please note: at the end of this process the camera will reboot without notice!

\
0%

'); - var url = 'cgi-bin/action.cgi?cmd=update&release='+branch+'&mode='+mode; + var url = 'cgi-bin/action.cgi?cmd=update&repo='+repo+'&release='+branch+'&mode='+mode; $.ajax({ 'url': url, 'type': 'POST', @@ -246,10 +284,10 @@ var serviceFriendlyNames = { //Function get config function getServices() { // get config and put to hmtl elements - $.get("cgi-bin/ui_control.cgi", {cmd: "get_services"}, function(config){ + $.get("cgi-bin/ui_control.cgi", {cmd: "get_services"}, function(config){ var config_all = config.split("\n"); for (var i = 0; i < config_all.length-1; i++) { - var config_info = config_all[i].split("#:#"); + var config_info = config_all[i].split("#:#"); // Select button color accrding status var control_checked = "onclick='controlService(\"start\",\""+config_info[0]+"\")')"; if (config_info[1] == "started") @@ -290,5 +328,3 @@ function onLoad() { } onLoad(); - -