Fix for bug introduced in previous commit, where tic files where queued without the address prefix
This commit is contained in:
@@ -25,7 +25,7 @@ use Illuminate\Support\Collection;
|
||||
* + sendas (nameas) is filename only
|
||||
*
|
||||
* For receiving, we just received files, and based on its name, we determine if it is a mail/file/tic or request
|
||||
* When receiving, we receive one file at a time, and our list has the list of files we've recevied
|
||||
* When receiving, we receive one file at a time, and our list has the list of files we've received
|
||||
*
|
||||
* + name our name (including path) with the address ID prefixed of the sender
|
||||
* + size is advised to us by the remote
|
||||
|
@@ -36,8 +36,10 @@ final class Item extends Receive
|
||||
case 'exists':
|
||||
return Storage::disk(self::LOCATION)->exists($this->rel_name);
|
||||
|
||||
case 'stor_name':
|
||||
return sprintf('%04X-%s',$this->ao->id,$this->recvas);
|
||||
case 'rel_name':
|
||||
return sprintf('%s/%04X-%s',config('app.fido'),$this->ao->id,$this->recvas);
|
||||
return sprintf('%s/%s',config('app.fido'),$this->stor_name);
|
||||
case 'full_name':
|
||||
return Storage::disk(self::LOCATION)->path($this->rel_name);
|
||||
|
||||
|
@@ -63,6 +63,7 @@ class Receive extends Base
|
||||
case 'nameas':
|
||||
case 'size':
|
||||
case 'name_size_time':
|
||||
case 'stor_name':
|
||||
return $this->receiving->{$key};
|
||||
|
||||
case 'pos':
|
||||
@@ -215,7 +216,7 @@ class Receive extends Base
|
||||
Log::info(sprintf('%s:- Processing TIC file [%s]',self::LOGKEY,$this->receiving->nameas));
|
||||
|
||||
// Queue the tic to be processed later, in case the referenced file hasnt been received yet
|
||||
TicProcess::dispatch($this->receiving->nameas);
|
||||
TicProcess::dispatch($this->receiving->rel_name);
|
||||
|
||||
break;
|
||||
|
||||
|
Reference in New Issue
Block a user