Switch serialno file and group_id.txt into home dir.

SharpAI · Nov 2, 2018 · d8219df · d8219df
1 parent 2ca0211
commit d8219df
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 21 deletions.
diff --git a/src/detector/deepeye.js b/src/detector/deepeye.js
@@ -17,8 +17,8 @@ var detect_task_queues_length = 'http://'+host_ip+':'+host_port+'/api/tasks?limi
 var embedding_task_url = 'http://'+host_ip+':'+host_port+'/api/task/apply/upload_api-v2.extract'
 var IMAGE_DIR = process.env.NODE_ENV || '/opt/nvr/detector/images';
 
-var DEVICE_UUID_FILE = '/dev/ro_serialno'
-var DEVICE_GROUP_ID = '/data/usr/com.deep.workai/cache/groupid.txt'
+var DEVICE_UUID_FILE = '/data/data/com.termux/files/home/.ro_serialno'
+var DEVICE_GROUP_ID = '/data/data/com.termux/files/home/.groupid.txt'
 //client = null
 
 function connect_node_celery_to_amqp(){
@@ -313,7 +313,7 @@ function get_device_SN(cb) {
     if(device_SN)
         return cb && cb(null, device_SN)
 
-    fs.readFile('/dev/ro_serialno', 'utf8', function(err, data){
+    fs.readFile('/data/data/com.termux/files/home/.ro_serialno', 'utf8', function(err, data){
         if(err)
             return cb && cb(err, null)
 

diff --git a/src/detector/face_motions.js b/src/detector/face_motions.js
@@ -15,8 +15,8 @@ var FACE_MOTION_REPORT_SERVER_REQUEST_PREFIX = 'http://timealbumemail.tiegushi.c
 //var FACE_MOTION_REPORT_SERVER_REQUEST_PREFIX = 'http://10.5.52.253:3000/timelines/add?'
 var REPORT_FACE_MOTION_TO_EVENT_SERVER = true
 
-var DEVICE_UUID_FILE = '/dev/ro_serialno'
-var DEVICE_GROUP_ID = '/data/usr/com.deep.workai/cache/groupid.txt'
+var DEVICE_UUID_FILE = '/data/data/com.termux/files/home/.ro_serial_no'
+var DEVICE_GROUP_ID = '/data/data/com.termux/files/home/.groupid.txt'
 var ON_DEBUG = false
 
 function get_device_uuid(cb){

diff --git a/src/detector/package-lock.json b/src/detector/package-lock.json
diff --git a/src/detector/timeline.js b/src/detector/timeline.js
@@ -22,8 +22,8 @@ if (typeof db_global_timeline === 'undefined'){
   db_global_timeline = new Datastore()
   console.log('init nedb global for timeline')
 }
-var DEVICE_UUID_FILE = '/dev/ro_serialno'
-var DEVICE_GROUP_ID = '/data/usr/com.deep.workai/cache/groupid.txt'
+var DEVICE_UUID_FILE = '/data/data/com.termux/files/home/.ro_serialno'
+var DEVICE_GROUP_ID = '/data/data/com.termux/files/home/.groupid.txt'
 
 function get_device_uuid(cb){
   fs.readFile(DEVICE_UUID_FILE, function (err,data) {

diff --git a/src/detector/workai.js b/src/detector/workai.js
@@ -24,7 +24,7 @@ function get_device_SN(cb) {
     if(device_SN)
         return cb && cb(null, device_SN)
 
-    fs.readFile('/dev/ro_serialno', 'utf8', function(err, data){
+    fs.readFile('/data/data/com.termux/files/home/.ro_serialno', 'utf8', function(err, data){
         if(err)
             return cb && cb(err, null)
 

diff --git a/src/embedding/utilslib/getDeviceInfo.py b/src/embedding/utilslib/getDeviceInfo.py
@@ -4,8 +4,8 @@
 from persistentUUID import getUUID
 deviceId = None
 gourpId = None
-group_id_file_path = '/data/usr/com.deep.workai/cache/groupid.txt'
-device_id_file_path = './ro_serialno'
+group_id_file_path = '/data/data/com.termux/files/home/.groupid.txt'
+device_id_file_path = '/data/data/com.termux/files/home/.ro_serialno'
 
 def get_deviceid():         
     global deviceId         
@@ -32,8 +32,8 @@ def get_deviceid_old():
     if deviceId is not None:
         return deviceId
 
-    iSerial = '/sys/class/android_usb/android0/iSerial'
-    iSerial2 = '/dev/ro_serialno'
+    iSerial = '/data/data/com.termux/files/home/.ro_serialno'
+    iSerial2 = '/data/data/com.termux/files/home/.ro_serialno'
 
     if os.path.exists(iSerial):
         with open(iSerial) as f:

diff --git a/src/monitor/index.js b/src/monitor/index.js
@@ -21,7 +21,7 @@ var ddpClient = new DDPClient({
 });
 
 var DEVICE_UUID_FILE = process.env.UUID_FILE || '/dev/ro_serialno'
-var DEVICE_GROUP_ID = process.env.GROUP_ID || '/data/usr/com.deep.workai/cache/groupid.txt'
+var DEVICE_GROUP_ID = '/data/data/com.termux/files/home/.groupid.txt'
 var VERSION_FILE = process.env.VERSION_FILE || '../version'
 var AUTO_UPDATE_FILE = process.env.AUTO_UPDATE_FILE || '../workaipython/wtconf/enableWT'
 var DOCKER_COMPOSE_YML = process.env.DOCKER_COMPOSE_YML || '../docker-compose.yml'

diff --git a/src/monitor/monitorrun.sh b/src/monitor/monitorrun.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export FLOWER_WS="ws://127.0.0.1:5555/api/task/events/task-succeeded/"
-export UUID_FILE='/.cacheresource/workaipython/ro_serialno'
+export UUID_FILE=/data/data/com.termux/home/.ro_serialno
 export GROUP_ID='/.cacheresource/workaipython/groupid.txt'
 export VERSION_FILE='/.cacheresource/version'
 export AUTO_UPDATE_FILE='/.cacheresource/workaipython/wtconf/enableWT'