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

Improvements to Echoarea Import, area names are now uppercase and descriptions use ucfirst()

Browse Source
This commit is contained in:
Deon George 2023-08-03 22:11:59 +10:00
parent a87cf875e4
commit c59f8ee0ed
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Jobs/EchoareaImport.php
View File

@ -52,13 +52,7 @@ class EchoareaImport implements ShouldQueue
*/ */
public function handle() public function handle()
{ {
// Get the file from the host $fh = fopen($this->file,'r');
$file = $this->getFileFromHost('',self::importkey,$this->file);
Log::debug(sprintf('%s:Loading file [%s] (%s).',static::LOGKEY,$file,getcwd()));
$lines = $this->getFileLines($file);
Log::debug(sprintf('%s:Processing [%d] lines.',static::LOGKEY,$lines));
$fh = fopen($file,'r');
$p = $c = 0; $p = $c = 0;
while (! feof($fh)) { while (! feof($fh)) {
@ -73,16 +67,16 @@ class EchoareaImport implements ShouldQueue
$c++; $c++;
if (str_contains($line,' '))
list($area,$description) = preg_split('/[\s|\t]+/',$line,2); list($area,$description) = preg_split('/[\s|\t]+/',$line,2);
else {
if ($this->do->echoareas->pluck('name')->search($area) !== FALSE) { $area = $line;
Log::info(sprintf('%s: Area [%s] already exists.',self::LOGKEY,$area)); $description = '[No Description]';
continue;
} }
$o = new Echoarea; $o = Echoarea::whereRaw(sprintf("LOWER(name)='%s'",strtolower($area)))->firstOrNew();
$o->name = $area; $o->name = strtoupper($area);
$o->description = ($this->prefix ?: '').$description; $o->description = ($this->prefix.' ' ?: '').ucfirst($description);
$o->active = TRUE; $o->active = TRUE;
$o->show = TRUE; $o->show = TRUE;