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

TIC processing fixes, was unable to find TIC file

Browse Source
This commit is contained in:
Deon George 2023-10-06 14:59:14 +11:00
parent 4616feacda
commit df5cc8c2d4
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,6 @@ class Tic extends FTNBase
/**
* Load a TIC file from an existing filename
*
* @param string $sp
* @param string $filename Relative to filesystem
* @return void
* @throws FileNotFoundException
@ -164,7 +163,7 @@ class Tic extends FTNBase
}
if (! $fs->exists($filename))
throw new FileNotFoundException(sprintf('File [%s] doesnt exist',$filename));
throw new FileNotFoundException(sprintf('File [%s] doesnt exist',$fs->path($filename)));
if (! is_readable($fs->path($filename)))
throw new UnableToReadFile(sprintf('File [%s] is not readable',realpath($filename)));

6
app/Jobs/TicProcess.php
View File

@ -62,10 +62,10 @@ class TicProcess implements ShouldQueue
$to = new Tic;
try {
$to->load($fs->path($rel_name));
$to->load($rel_name);
} catch (\Exception $e) {
Log::error(sprintf('%s:! Error loading TIC file [%s]',self::LOGKEY,$rel_name));
Log::error(sprintf('%s:! Error loading TIC file [%s] (%s)',self::LOGKEY,$rel_name,$e->getMessage()));
return;
}
@ -77,7 +77,7 @@ class TicProcess implements ShouldQueue
try {
if ($fs->makeDirectory($dir)) {
$fs->move($rel_name,$x=sprintf('%s/%s/%s',config('fido.dir'),$dir,$this->file));
$fs->move($rel_name,$x=sprintf('%s/%s',$dir,$this->file));
Log::info(sprintf('%s:- Moved processed TIC [%s] to [%s]',self::LOGKEY,$rel_name,$x));
} else