bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Use regex for received file evaluation. Fixes recording received packet names

Browse Source
This commit is contained in:
Deon George
2023-11-23 23:17:13 +11:00
parent 455fed52ee
commit 0800c48928
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/PacketInfo.php
View File

@@ -45,8 +45,8 @@ class PacketInfo extends Command
if ($this->argument('ftn')) {
$a = Address::findFTN($this->argument('ftn'));
} elseif (preg_match('/^(([0-9A-F]+)-)+/',$this->argument('file'),$m)) {
$a = Address::findOrFail(hexdec($m[2]));
} elseif (preg_match(sprintf('/^%s\.pkt$/',Packet::regex),$this->argument('file'),$m)) {
$a = Address::findOrFail(hexdec($m[1]));
}
foreach ($f as $packet) {

4
app/Console/Commands/PacketProcess.php
View File

@@ -48,8 +48,8 @@ class PacketProcess extends Command
if ($this->argument('ftn')) {
$a = Address::findFTN($this->argument('ftn'));
} elseif (preg_match('/^(([0-9A-F]+)-([0-9]+))+/',$this->argument('file'),$m)) {
$a = Address::findOrFail(hexdec($m[2]));
} elseif (preg_match(sprintf('/^%s\.pkt$/',Packet::regex),$this->argument('file'),$m)) {
$a = Address::findOrFail(hexdec($m[1]));
} else {
$this->error('Unable to determine sender FTN address');