diff --git a/app/Jobs/XArcadiaFlux.php b/app/Jobs/XArcadiaFlux.php
index 89dabef..56818a0 100644
--- a/app/Jobs/XArcadiaFlux.php
+++ b/app/Jobs/XArcadiaFlux.php
@@ -77,21 +77,37 @@ abstract class XArcadiaFlux implements ShouldQueue
*/
protected function moveToArchives(string $filename): void
{
- $archiveFile = sprintf('%s/%s', $this->archiveFolderName, $filename);
- if ($this->getDisk()->exists($archiveFile)) {
+ $newFileName = $filename;
+ if (!$this->getDisk()->exists($filename)) {
$this->log(
sprintf(
- 'File %s exists, and therefore must be delete before archive',
- $archiveFile
+ 'File %s could not be moved to archives (not found)',
+ $filename
),
- LogType::info()
+ LogType::warning()
);
- if (!$this->getDisk()->delete($archiveFile)) {
- Log::critical(sprintf('%s : Could not delete file %s', get_class($this), $archiveFile));
- };
+ return;
}
-
- if (!$this->getDisk()->move($filename, sprintf('%s/%s', $this->archiveFolderName, $filename))) {
+ if ($this->getDisk()->exists(sprintf('%s/%s', $this->archiveFolderName, $filename))) {
+ $ext = \pathinfo($filename, \PATHINFO_EXTENSION);
+ $newFileName = \sprintf(
+ '%s_%d.%s',
+ \substr($filename, 0, 0 - (strlen($ext) + 1)),
+ \time(),
+ $ext
+ );
+ }
+ try {
+ if (!$this->getDisk()->move($filename, sprintf('%s/%s', $this->archiveFolderName, $newFileName))) {
+ $this->log(
+ sprintf(
+ 'File %s could not be moved to archives',
+ $filename
+ ),
+ LogType::warning()
+ );
+ }
+ } catch (Exception $e) {
$this->log(
sprintf(
'File %s could not be moved to archives',
@@ -104,13 +120,13 @@ abstract class XArcadiaFlux implements ShouldQueue
/**
* Suppression des fichiers dans
- * archives qui ont plus de 30j
+ * archives qui ont plus de 2j
*
* @return void
*/
protected function clearOldArchives(): void
{
- $disk = $this->getDisk();
+ $disk = $this->getDisk();
$archives = $disk->files($this->archiveFolderName);
// /** @var File */
@@ -120,7 +136,7 @@ abstract class XArcadiaFlux implements ShouldQueue
continue;
}
- if ($disk->lastModified($archive) < strtotime(Carbon::now()->subDays(30))) {
+ if ($disk->lastModified($archive) < strtotime(Carbon::now()->subDays(2))) {
if (!$disk->delete($archive)) {
Log::critical(sprintf('%s : Could not delete file %s', get_class($this), $archive));
};
@@ -141,7 +157,7 @@ abstract class XArcadiaFlux implements ShouldQueue
/**
* Logs data
*
- * @param string $message
+ * @param string $message
* @param LogType $logtype
* @return void
*/
@@ -172,14 +188,14 @@ abstract class XArcadiaFlux implements ShouldQueue
break;
default:
throw new Exception(sprintf('%s : unhandled log type %s', get_class($this), $logtype->label));
- }
+ }//end switch
$this->consolePrint($message, $logtype);
}
/**
* Prints to the console
*
- * @param string $message
+ * @param string $message
* @param LogType $logtype
* @return void
*/
diff --git a/app/Jobs/XmlIncoReader.php b/app/Jobs/XmlIncoReader.php
index 3a2998e..b85d311 100644
--- a/app/Jobs/XmlIncoReader.php
+++ b/app/Jobs/XmlIncoReader.php
@@ -13,6 +13,8 @@ class XmlIncoReader extends XmlJobs
protected $imagesPath = 'images';
+ protected $xsdFile = 'xsd/incollector.xsd';
+
/**
* éléments à la racine : nom du noeud
* sous éléments d'un noeud PARENT :
@@ -61,6 +63,7 @@ class XmlIncoReader extends XmlJobs
'INCO_COMPO' => 'inco_compo', // Consider this sub array
+ 'INCO_COMPO.NOM' => 'nom',
'INCO_COMPO.TAILLE_REF' => 'taille_ref',
'INCO_COMPO.VAL_ENERG_KJ_NUT' => 'val_energ_kj_nut',
'INCO_COMPO.VAL_ENERG_KJ_R' => 'val_energ_kj_r', //_R apports de la taille_ref
@@ -168,7 +171,7 @@ class XmlIncoReader extends XmlJobs
'allegations',
'astuces', 'arg_vente',
'pds_moy_theo',
- 'lib_conso', 'lst_ing',
+ 'lib_conso', 'lst_ing', 'lst_allergene',
'allegat_sante', 'allegat_nutrit', 'allegat_autre',
'inco_compo',
'inco_compo.nom',
@@ -432,32 +435,89 @@ class XmlIncoReader extends XmlJobs
$disk = $this->getDisk();
$info = getimagesizefromstring($imageData);
- $mime = $info['mime'];
- switch ($mime) {
- case 'image/jpeg':
- $imgExtension = 'jpg';
- break;
- case 'image/png':
- $imgExtension = 'png';
- break;
- case 'image/gif':
- $imgExtension = 'gif';
- break;
- default:
- throw new AbortXmlImportException(sprintf('Unknown image type %s', $imgName));
+ if($info !== false) {
+ $mime = $info['mime'];
+ switch ($mime) {
+ case 'image/jpeg':
+ $imgExtension = 'jpg';
+ break;
+ case 'image/png':
+ $imgExtension = 'png';
+ break;
+ case 'image/gif':
+ $imgExtension = 'gif';
+ break;
+ default:
+ throw new AbortXmlImportException(sprintf('Unknown image type %s', $imgName));
+ }
+
+ $imgNamePath = sprintf('%s.%s', $imgNamePath, $imgExtension);
+
+ if (!$disk->put($imgNamePath, $imageData)) {
+ throw new AbortXmlImportException(sprintf('The image %s could not be saved', $imgNamePath));
+ }
+
+ $arImgPaths[$index] = sprintf('%s/%s', $this->disk, $imgNamePath);
+ $index++;
+ } else {
+ //probably not an image could be a PDF, PPT, AI anything is possible
}
-
- $imgNamePath = sprintf('%s.%s', $imgNamePath, $imgExtension);
-
- if (!$disk->put($imgNamePath, $imageData)) {
- throw new AbortXmlImportException(sprintf('The image %s could not be saved', $imgNamePath));
- }
-
- $arImgPaths[$index] = sprintf('%s/%s', $this->disk, $imgNamePath);
- $index++;
}
}
return $arImgPaths;
}
+
+ /**
+ * Recursive extract to array
+ * introduce sort of Hook to transform
+ *
+ *