relikd/appchk-web
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Separate long term background recordings

Browse Source
This commit is contained in:
relikd
2020-09-06 11:05:22 +02:00
parent 724d7ab319
commit 3fbde2091e
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api/v1/contribute/index.php
View File

@@ -9,23 +9,18 @@ function is_valid_bundle($bundle_id) {
return preg_match('/^[A-Za-z0-9\.\-]{1,155}$/', $bundle_id); return preg_match('/^[A-Za-z0-9\.\-]{1,155}$/', $bundle_id);
} }
function normalize_bundle($bundle_id) {
$valid = is_valid_bundle($bundle_id);
return [$valid ? $bundle_id : '_manually', $valid];
}
function path_for($parts) { return implode(DIRECTORY_SEPARATOR, $parts); } function path_for($parts) { return implode(DIRECTORY_SEPARATOR, $parts); }
function mark_needs_update($norm_bundle) { function mark_needs_update($valid_bundle) {
global $proj_root; global $proj_root;
$pth = path_for([$proj_root, 'data', '_in']); $pth = path_for([$proj_root, 'data', '_in']);
@mkdir($pth, 0755, true); @mkdir($pth, 0755, true);
file_put_contents(path_for([$pth, 'in_'.$norm_bundle]), '.'); file_put_contents(path_for([$pth, 'in_'.$valid_bundle]), '.');
} }
function random_filename($norm_bundle) { function random_filename($valid_bundle) {
global $proj_root; global $proj_root;
$dir = path_for(array_merge([$proj_root, 'data'], explode('.', $norm_bundle))); $dir = path_for(array_merge([$proj_root, 'data'], explode('.', $valid_bundle)));
@mkdir($dir, 0755, true); @mkdir($dir, 0755, true);
do { do {
$key = ''; $key = '';
@@ -74,7 +69,11 @@ if ($json->v == 1
&& !is_null($json->{'app-bundle'}) && !is_null($json->{'app-bundle'})
&& !is_null($json->logs)) && !is_null($json->logs))
{ {
[$bundle_id, $valid] = normalize_bundle($json->{'app-bundle'}); $bundle_id = $json->{'app-bundle'};
$valid = is_valid_bundle($bundle_id);
if (!$valid) {
$bundle_id = ($json->duration > 3600) ? '_longterm' : '_manually';
}
[$filename, $key] = random_filename($bundle_id); [$filename, $key] = random_filename($bundle_id);
$fp = @fopen($filename, 'w'); $fp = @fopen($filename, 'w');
if ($fp) { if ($fp) {

2
src/main.py
View File

@@ -61,6 +61,8 @@ def import_update():
if bid == '_manually': if bid == '_manually':
# TODO: notify admin that manual action is required # TODO: notify admin that manual action is required
mylib.err('import', 'manual action required!') mylib.err('import', 'manual action required!')
elif bid == '_longterm':
mylib.err('import', 'manual action required! (background)')
else: else:
print(' ' + bid) print(' ' + bid)
needs_update.add(bid) needs_update.add(bid)