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

2
app/Classes/FTN/Packet.php
View File

@@ -25,6 +25,8 @@ class Packet extends FTNBase implements \Iterator, \Countable
private const BLOCKSIZE = 1024;
protected const PACKED_MSG_LEAD = "\02\00";
public const regex = '([[:xdigit:]]{4})(?:-(\d{4,10}))?-(.+)';
public const PACKET_TYPES = [
'2.2' => FTNBase\Packet\FSC45::class,
'2+' => FTNBase\Packet\FSC48::class,

8
app/Classes/FTN/Tic.php
View File

@@ -182,10 +182,10 @@ class Tic extends FTNBase
$this->file->recv_tic = preg_replace('/\.[Tt][Ii][Cc]$/','',$filename);
$m = [];
if (preg_match('/^(([0-9A-F]{4})-)?(([0-9]{4,10})-)?(.*).[Tt][Ii][Cc]$/',$filename,$m)) {
$aid = $m[2];
$mtime = $m[4];
$this->file->recv_tic = $m[5];
if (preg_match(sprintf('/^%s\.[Tt][Ii][Cc]$/',Packet::regex),$filename,$m)) {
$aid = $m[1];
$mtime = $m[2];
$this->file->recv_tic = $m[3];
}
$ldesc = '';