From d8219df53d4a68ebdb8db5007e3982c1bda56a9f Mon Sep 17 00:00:00 2001 From: Simba Zhang Date: Fri, 2 Nov 2018 00:24:04 +0000 Subject: [PATCH] Switch serialno file and group_id.txt into home dir. --- src/detector/deepeye.js | 6 +++--- src/detector/face_motions.js | 4 ++-- src/detector/package-lock.json | 28 ++++++++++++++++++------- src/detector/timeline.js | 4 ++-- src/detector/workai.js | 2 +- src/embedding/utilslib/getDeviceInfo.py | 8 +++---- src/monitor/index.js | 2 +- src/monitor/monitorrun.sh | 2 +- 8 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/detector/deepeye.js b/src/detector/deepeye.js index 2d32e9d1..47ebd31b 100644 --- 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 index eec77d17..2faaf1b3 100644 --- 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 index 0170d0ba..f3768d07 100644 --- a/src/detector/package-lock.json +++ b/src/detector/package-lock.json @@ -2143,12 +2143,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2163,17 +2165,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2290,7 +2295,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2302,6 +2308,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2316,6 +2323,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2323,12 +2331,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2347,6 +2357,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2427,7 +2438,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2439,6 +2451,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2560,6 +2573,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/src/detector/timeline.js b/src/detector/timeline.js index 351d82a4..2908eb8f 100644 --- 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 index 551f4055..37a4a0ae 100644 --- 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 index 3d9ccc71..e76e986b 100644 --- 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 index 58bdcd22..b07baf21 100644 --- 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 index add73612..8755b247 100755 --- 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'