From 21e90e35e618782b61d464e6ea7fca9fefa6ad4a Mon Sep 17 00:00:00 2001 From: asajedi Date: Thu, 2 Dec 2021 04:35:02 +0100 Subject: [PATCH 1/2] Remove unnecessary code --- src/Import/Importer.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/Import/Importer.php b/src/Import/Importer.php index 1968e0d..1f7c542 100644 --- a/src/Import/Importer.php +++ b/src/Import/Importer.php @@ -147,19 +147,6 @@ class Importer implements ImporterInterface if (!empty($sampleTeiDocument)) { $filesystem->dumpFile($this->teiSampleDir.'sample.xml', $sampleTeiDocument); } - -// $sampleTEIDocumentUrl = $this->sampleTEIDocumentUrl.'&access_token='.$this->gitlabRepoToken; -// $file_headers = @get_headers($sampleTEIDocumentUrl); -// if($file_headers[0] === 'HTTP/1.1 200 OK') { -// $sampleDocumentData = json_decode(file_get_contents($sampleTEIDocumentUrl), true); -// $sampleTEIDocument = base64_decode($sampleDocumentData['content']); -// $filesystem = new Filesystem(); -// if (!$filesystem->exists($this->teiSampleDir)) { -// $filesystem->mkdir($this->teiSampleDir); -// } -// -// $filesystem->dumpFile($this->teiSampleDir.$sampleDocumentData['file_name'], $sampleTEIDocument); -// } } private function getSampleTeiDocument(): ?string -- GitLab From c0407f080849bcce4dabb41c42ff996ceaa6f373 Mon Sep 17 00:00:00 2001 From: asajedi Date: Thu, 2 Dec 2021 04:36:48 +0100 Subject: [PATCH 2/2] Move confis up --- src/Import/Importer.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Import/Importer.php b/src/Import/Importer.php index 1f7c542..15740b3 100644 --- a/src/Import/Importer.php +++ b/src/Import/Importer.php @@ -25,6 +25,17 @@ class Importer implements ImporterInterface $this->fileService = $fileService; } + public function setConfigs(string $teiDir, string $teiSampleDir, string $gitlabRepoToken, string $gitlabRepoTreeUrl, string $gitlabProcessedTeiRepoUrl, string $invalidTeiListFile, string $sampleTeiDocumentUrl): void + { + $this->teiDir = $teiDir; + $this->teiSampleDir = $teiSampleDir; + $this->gitlabRepoToken = $gitlabRepoToken; + $this->gitlabRepoTreeUrl = $gitlabRepoTreeUrl; + $this->gitlabProcessedTeiRepoUrl = $gitlabProcessedTeiRepoUrl; + $this->invalidTeiListFile = $invalidTeiListFile; + $this->sampleTeiDocumentUrl = $sampleTeiDocumentUrl; + } + public function importTeiToS3Storage(): void { $mainFileSystem = $this->fileService->getMainFilesystem(); @@ -118,17 +129,6 @@ class Importer implements ImporterInterface } } - public function setConfigs(string $teiDir, string $teiSampleDir, string $gitlabRepoToken, string $gitlabRepoTreeUrl, string $gitlabProcessedTeiRepoUrl, string $invalidTeiListFile, string $sampleTeiDocumentUrl): void - { - $this->teiDir = $teiDir; - $this->teiSampleDir = $teiSampleDir; - $this->gitlabRepoToken = $gitlabRepoToken; - $this->gitlabRepoTreeUrl = $gitlabRepoTreeUrl; - $this->gitlabProcessedTeiRepoUrl = $gitlabProcessedTeiRepoUrl; - $this->invalidTeiListFile = $invalidTeiListFile; - $this->sampleTeiDocumentUrl = $sampleTeiDocumentUrl; - } - private function getInvalidTeiList(): array { $invalidTeiList = []; -- GitLab