From dacd8be4c2860d34b213b7a31cbdb16fa979a946 Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 19 Nov 2024 16:37:29 +0930 Subject: [PATCH] Process TIC files even if they omit the size attribute --- app/Classes/FTN/Tic.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Classes/FTN/Tic.php b/app/Classes/FTN/Tic.php index 6d8eedd..3b110e2 100644 --- a/app/Classes/FTN/Tic.php +++ b/app/Classes/FTN/Tic.php @@ -135,7 +135,7 @@ class Tic extends FTNBase */ public function isNodelist(): bool { - Log::critical(sprintf('%s:D fo_nodelist_file_area [%d], fo_filearea_domain_filearea_id [%d], regex [%s] name [%s]', + Log::info(sprintf('%s:D fo_nodelist_file_area [%d], fo_filearea_domain_filearea_id [%d], regex [%s] name [%s]', self::LOGKEY, $this->file->nodelist_filearea_id, $this->file->filearea->domain->filearea_id, @@ -347,7 +347,7 @@ class Tic extends FTNBase // @todo Add notification back to the system if no replaces line and the file already exists // Validate Size - if ($this->file->size !== ($y=$fs->size($file))) + if ((! is_null($this->file->size)) && ($this->file->size !== ($y=$fs->size($file)))) throw new SizeMismatchException(sprintf('TIC file size [%d] doesnt match file [%s] (%d)',$this->file->size,$fs->path($rel_path_name),$y)); // Validate Password @@ -367,6 +367,10 @@ class Tic extends FTNBase if (! $this->file->datetime) $this->file->datetime = Carbon::createFromTimestamp($fs->lastModified($file)); + // If the file size was omitted, we'll use the file's size + if (is_null($this->file->size)) + $this->file->size = $fs->size($file); + $this->file->src_file = $file; $this->file->recv_tic = $filename;