updating fork from source

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,5 @@
 This is an issue tracking system only.
-If you have general questions or are a newbie, please ask for help in our [chat channel](https://gitter.im/Xiaomi-Dafang-Hacks).
+If you have general questions or are a newbie, please ask for help in our [chat channel](https://gitter.im/Xiaomi-Dafang-Hacks/Lobby).
 
 To make sure your issue can be resolved as quickly as possible please state your
 

.gitignore

@@ -57,5 +57,11 @@ firmware_mod/config/rtspserver.conf
 firmware_mod/config/ntp_srv.conf
 firmware_mod/config/lighttpd.user
 firmware_mod/config/lighttpd.pem
-firmware_mod/config/userscripts/*/*
+firmware_mod/config/userscripts/motiondetection/*
+!firmware_mod/config/userscripts/motiondetection/*.dist
+firmware_mod/config/userscripts/startup/*
+!firmware_mod/config/userscripts/startup/*.dist
 firmware_mod/root/.ssh/*
+
+# avoid committing OSX .DS_Store files
+.DS_Store

README.md

@@ -2,21 +2,23 @@
 
 [![Join the chat at https://gitter.im/Xiaomi-Dafang-Hacks/Lobby](https://badges.gitter.im/Xiaomi-Dafang-Hacks/Lobby.svg)](https://gitter.im/Xiaomi-Dafang-Hacks/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-This repository contains custom firmwares for the following devices:
+This repository contains custom firmware for the following devices:
 
 Name | Picture
 --- | ---
 Xiaomi Dafang | ![Dafang](/dafang.png)
-Xiaomi Xiaofang 1S (only old Version with T20, newer Version with T20L not supported yet!) | ![XiaoFang](/xiaofang.png)
+Xiaomi Xiaofang 1S (old Version with T20 is supported, newer Version with T20L is in beta) | ![XiaoFang](/xiaofang.png)
 Wyzecam Pan | ![Dafang](/dafang.png)
 Wyzecam V2 | ![XiaoFang](/xiaofang.png)
-Neos SmartCam (NB The original firmware is not yet available, proceed with caution!) | ![XiaoFang](/xiaofang.png)
+Neos SmartCam | ![XiaoFang](/xiaofang.png)
 Sannce I21AG, MixSight HX-I2110T2, WanScam HW0036, Digoo BB-M2 | ![XiaoFang](/sannce.jpg)
 Any other Device with Ingenic T10/T20 Device https://github.com/EliasKotlyar/Xiaomi-Dafang-Hacks/issues/980 | ![T20](/t20.png)
 
+If you want to test the Xiaofang T20L (newer version) please check out the [additional instructions](https://github.com/EliasKotlyar/Xiaomi-Dafang-Hacks/blob/master/hacks/install_cfw_t20l.md).
+
 If you have a classic XiaoFang with a ARM-Processor, consider using https://github.com/samtap/fang-hacks
 
-### Attentention: Do not install the latest Firmware on your Device. It will disable the support of this hack. 
+### Attention: Do not install the latest Firmware on your Device. It will disable the support of this hack. 
 
 Further information about this topic can be found here: https://github.com/EliasKotlyar/Xiaomi-Dafang-Hacks/issues/669
 
@@ -32,7 +34,7 @@ After that, continue to the
 ### Support
 
 If you encounter a problem, please see first if you find similiar open/closed issues. 
-Or ask in our [Gitter channel](https://gitter.im/Xiaomi-Dafang-Hacks) for help.
+Or ask in our [Gitter channel](https://gitter.im/Xiaomi-Dafang-Hacks/Lobby) for help.
 
 If you don't find anything related, feel free to open a new issue.
 If you/we solve your issue, please condense your gained insights into a pull request for continuous self-improvement.
@@ -78,4 +80,4 @@ It is possible to run your own scripts on motion detection. See [here](/integrat
 
 ## Contributions:
 
-Any contribution to the development is highly welcome. Simply open a pull request on GitHub.
+Any contribution to the development is highly welcome. Simply open a pull request against our beta branch on GitHub.

firmware_mod/autoupdate.sh

@@ -18,11 +18,15 @@ DESTOVERRIDE="/tmp/Update"
 EXCLUDEFILTER="*.conf|*.user|passwd|shadow"
 GITHUBURL="https://api.github.com/repos"
 GITHUBURLRAW="https://raw.githubusercontent.com"
-CURL="/system/sdcard/bin/curl -k"
+CURL="/system/sdcard/bin/curl -k -L"
 JQ="/system/sdcard/bin/jq"
 SHA="/system/sdcard/bin/openssl dgst -sha256"
 BASENAME="/system/sdcard/bin/busybox basename"
 FIND="/system/sdcard/bin/busybox find"
+VERSION_FILE='/system/sdcard/VERSION'
+COMMITS_FILE='/tmp/.lastcommit'
+
+
 
 TMPFILE=/tmp/update.tmp
 BACKUPEXT=.backup
@@ -41,16 +45,19 @@ usage()
 {
     echo "Usage: $1 [OPTIONS]"
     echo "$1 will update a local folder with the ${REPO} github repo (first copy all the files in ${DESTOVERRIDE}, stop services and reboot"
-    echo "Usage this script to update the ${REPO} github repo from ${BRANCH} branch"
+    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})"
     echo "-p (--print) print action only, do nothing"
     echo "-s (--steps) add progress in file /tmp/progress"
 
     echo "-v (--verbose) for verbose"
     echo "-u (--user) githup login/password (not mandatory, but sometime anonymous account get banned)"
+    echo "-t (--token) github API token"
     echo "-h (--help) for this help"
     echo
     echo "Note that ${EXCLUDEFILTER} will be excluded"
@@ -124,13 +131,6 @@ ismatch()
 
     echo notmatch
 }
-##########################################################################
-# Return the current (last) commit from the specified repo and branch
-getCurrentCommitDateFromRemote()
-{
-    LASTCOMMITDATE=$(${CURL} -s ${GITHUBURL}/${REPO}/commits/${BRANCH} | grep date | head -1 | cut -d'"' -f 4)
-    echo ${LASTCOMMITDATE}
-}
 
 ##########################################################################
 # Print the files from repo of the folder $1
@@ -148,7 +148,7 @@ getfiles()
 
         for row in $(echo "${1}" | ${JQ} '.[]| select(.type == "dir") | .path' ); do
             flder=$(echo "${row}" | tr -d '"')
-            next=$(${CURL} -s https://api.github.com/repos/${REPO}/contents/${flder}?ref=${BRANCH})
+            next=$(curl -s https://api.github.com/repos/${REPO}/contents/${flder}?ref=${BRANCH})
             getfiles "${next}"
         done
     fi
@@ -167,6 +167,24 @@ countdownreboot()
     action reboot
 }
 ##########################################################################
+# Generate VERSION file
+generateVersionFile ()
+{
+    echo "{\"date\":\"${REMOTECOMMITDATE}\",\"repo\":\"${REPO}\",\"branch\":\"${BRANCH}\",\"commit\":\"${REMOTECOMMITID}\"}" > $VERSION_FILE
+}
+##########################################################################
+# Curl with optional authentication
+curl ()
+{
+    if [ -n "$_TOKEN" ]; then
+      $CURL -H "Authorization: token $_TOKEN" "$@"
+    elif [ -n "$_USER" ]; then
+      $CURL -u "$_USER" "$@"
+    else
+      $CURL "$@"
+    fi
+}
+##########################################################################
 # Script real start
 
 while [ $# -gt 0 ]
@@ -198,22 +216,43 @@ do
             shift
             ;;
         -u | --user)
-            CURL="${CURL} -u $2"
+            _USER="$2"
+            shift
+            shift
+            ;;
+        -t | --token)
+            _TOKEN="$2"
             shift
             shift
             ;;
         -s | --steps)
             _PROGRESS=1;
            shift
            ;;
+        -x | --repo)
+            REPO=$2;
+            shift
+            shift
+            ;;
+        -r | --branch)
+	    BRANCH=$2
+	    shift
+            shift
+           ;;
         *|-h |\? | --help)
             usage $0
             exit 1
             ;;
     esac
 done
 
-log "Starting AutoUpdate"
+log "Starting AutoUpdate on branch ${BRANCH}"
+
+######################################################""
+# Get date and last commit ID from Github
+curl -s ${GITHUBURL}/${REPO}/commits/${BRANCH} --output $COMMITS_FILE
+REMOTECOMMITDATE=$(${JQ} -r '.commit .author .date' ${COMMITS_FILE})
+REMOTECOMMITID=$(${JQ} -r '.sha[0:7]' ${COMMITS_FILE} )
 
 if [ ${_FORCE} = 1 ]; then
     log "Forcing update."
@@ -229,11 +268,30 @@ fi
 
 action "rm -rf ${DESTOVERRIDE} 2>/dev/null"
 
-
-
-log "Getting list of remote files."
-FIRST=$(${CURL} -s ${GITHUBURL}/${REPO}/contents/${REMOTEFOLDER}?ref=${BRANCH})
-FILES=$(getfiles "${FIRST}")
+if [ -f "$VERSION_FILE" ]; 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
+    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}"
+    log "Getting list of remote files."
+    FIRST=$(curl -s ${GITHUBURL}/${REPO}/contents/${REMOTEFOLDER}?ref=${BRANCH})
+    FILES=$(getfiles "${FIRST}")
+fi
 
 if [ $_PROGRESS = 1 ]; then
    _NBTOTALFILES=$(echo $FILES | wc -w)
@@ -246,26 +304,25 @@ for i in ${FILES}
 do
     progress
     # String to remove to get the local path
-    REMOVE="${GITHUBURLRAW}/${REPO}/${BRANCH}/${REMOTEFOLDER}/"
-    LOCALFILE="${i#$REMOVE}"
+    LOCALFILE=$(echo ${i} | awk -F ${REMOTEFOLDER}/ '{print $2}')
     # Remove files that match the filter
     res=$(ismatch ${LOCALFILE})
     if [ "$res" == "match" ]; then
         echo "${LOCALFILE} is excluded due to filter."
         continue
     fi
     # Get the file temporally to calculate SHA
-    ${CURL} -s ${i} -o ${TMPFILE} 2>/dev/null
+    curl -s ${i} -o ${TMPFILE} 2>/dev/null
     if [ ! -f ${TMPFILE} ]; then
         echo "Can not get remote file $i, exiting."
         exit 1
     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)
@@ -345,7 +402,7 @@ if [ -d ${DESTOVERRIDE} ] && [ $(ls -l ${DESTOVERRIDE}/* | wc -l 2>/dev/null) >
     action "rm -Rf ${DESTOVERRIDE}/* 2>/dev/null"
 
     # Everythings was OK, save the date
-    echo $(getCurrentCommitDateFromRemote) > /system/sdcard/.lastCommitDate
+    generateVersionFile
     echo "---------------    Reboot    ------------"
     if [ ${_FORCEREBOOT} = 1 ]; then
         countdownreboot
@@ -358,6 +415,6 @@ if [ -d ${DESTOVERRIDE} ] && [ $(ls -l ${DESTOVERRIDE}/* | wc -l 2>/dev/null) >
         fi
     fi
 else
-    echo $(getCurrentCommitDateFromRemote) > /system/sdcard/.lastCommitDate
+    generateVersionFile
     echo "No files to update."
 fi

firmware_mod/bin/matrix

@@ -1,18 +1,54 @@
 #!/bin/sh
 
+CURL="/system/sdcard/bin/curl --silent"
+JQ="/system/sdcard/bin/jq"
+
 what="$1"
-shift
-data="$@"
-CURL="/system/sdcard/bin/curl"
+
+if [ "$what" = "m" ]; then
+  shift
+  sendtext="${@//\"/\\\"}"
+else
+  filename="$2"
+  datafile="$3"
+fi
 
 . /system/sdcard/config/matrix.conf
 
+uploadData() {
+  mimetype="$1"
+  msgtype="$2"
+
+  mxcuri="$($CURL -XPOST -H "Content-Type: $mimetype" --data-binary @"$datafile" "https://$host:$port/_matrix/media/r0/upload?filename=$filename&access_token=$access_token" | $JQ -cMr ".content_uri")"
+  if [ -n "$mxcuri" ] && [ "$mxcuri" != "null" ]; then
+    $CURL -XPOST -d '{"msgtype":"'"$msgtype"'", "body":"'"$filename"'", "url":"'"$mxcuri"'"}' "https://$host:$port/_matrix/client/r0/rooms/$room_id/send/m.room.message?access_token=$access_token"
+  fi
+}
+
+sendFile() {
+  echo "Sending file: $datafile"
+  uploadData "application/octet-stream" "m.file"
+}
+
 sendMessage() {
-  text="$(echo "${@}" | sed 's:\\n:\n:g')"
-  echo "Sending message: $text"
+  echo "Sending message: $sendtext"
+  $CURL -XPOST -d '{"msgtype":"m.notice", "body":"'"$sendtext"'"}' "https://$host:$port/_matrix/client/r0/rooms/$room_id/send/m.room.message?access_token=$access_token"
+}
+
+sendPicture() {
+  echo "Sending picture: $datafile"
+  filename="$filename.jpg"
+  uploadData "image/jpeg" "m.image"
+}
 
-  $CURL -XPOST -d '{"msgtype":"m.text", "body":"'$text'"}' "https://$host:$port/_matrix/client/r0/rooms/$room_id/send/m.room.message?access_token=$access_token"
+sendVideo() {
+  echo "Sending video: $datafile"
+  filename="$filename.mp4"
+  uploadData "video/mp4" "m.video"
 }
 
-[ "$what" = "m" ] && sendMessage $data
-[ -z "$what" ] && echo -e "$0 <m|f|p> <data>\n m: message\n f: file\n p: picture"
+[ "$what" = "f" ] && sendFile
+[ "$what" = "m" ] && sendMessage
+[ "$what" = "p" ] && sendPicture
+[ "$what" = "v" ] && sendVideo
+[ -z "$what" ] && echo -e "$0 <m|f|p|v> <data|filename>\n m: message\n f: file\n p: picture\n v: video"