IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-27 11:20:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up upload collector.

Browse Source
This commit is contained in:
James Cole 2016-02-23 07:05:08 +01:00
parent 0c9c0f2032
commit aeaebd082f
1 changed files with 70 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
app/Export/Collector/UploadCollector.php
View File

@ -15,6 +15,7 @@ use Crypt;
use FireflyIII\Models\ExportJob; use FireflyIII\Models\ExportJob;
use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Contracts\Encryption\DecryptException;
use Log; use Log;
use Storage;
/** /**
* Class UploadCollector * Class UploadCollector
@ -23,6 +24,12 @@ use Log;
*/ */
class UploadCollector extends BasicCollector implements CollectorInterface class UploadCollector extends BasicCollector implements CollectorInterface
{ {
/** @var string */
private $expected;
/** @var \Illuminate\Contracts\Filesystem\Filesystem */
private $exportDisk;
/** @var \Illuminate\Contracts\Filesystem\Filesystem */
private $uploadDisk;
/** /**
* AttachmentCollector constructor. * AttachmentCollector constructor.
@ -32,6 +39,11 @@ class UploadCollector extends BasicCollector implements CollectorInterface
public function __construct(ExportJob $job) public function __construct(ExportJob $job)
{ {
parent::__construct($job); parent::__construct($job);
// make storage:
$this->uploadDisk = Storage::disk('upload');
$this->exportDisk = Storage::disk('export');
$this->expected = 'csv-upload-' . Auth::user()->id . '-';
} }
/** /**
@ -40,37 +52,68 @@ class UploadCollector extends BasicCollector implements CollectorInterface
public function run() public function run()
{ {
// grab upload directory. // grab upload directory.
$path = storage_path('upload'); $files = $this->uploadDisk->files();
$files = scandir($path); Log::debug('Found ' . count($files) . ' files in the upload directory.');
Log::debug('Found ' . count($files) . ' in the upload directory.');
// only allow old uploads for this user:
$expected = 'csv-upload-' . Auth::user()->id . '-';
Log::debug('Searching for files that start with: "' . $expected . '".');
$len = strlen($expected);
foreach ($files as $entry) { foreach ($files as $entry) {
if (substr($entry, 0, $len) === $expected) { $this->processOldUpload($entry);
Log::debug($entry . ' is part of this users original uploads.'); }
try { }
/**
* @param string $entry
*
* @return string
*/
private function getOriginalUploadDate(string $entry): string
{
// this is an original upload. // this is an original upload.
$parts = explode('-', str_replace(['.csv.encrypted', $expected], '', $entry)); $parts = explode('-', str_replace(['.csv.encrypted', $this->expected], '', $entry));
$originalUpload = intval($parts[1]); $originalUpload = intval($parts[1]);
$date = date('Y-m-d \a\t H-i-s', $originalUpload); $date = date('Y-m-d \a\t H-i-s', $originalUpload);
$newFileName = 'Old CSV import dated ' . $date . '.csv';
$content = Crypt::decrypt(file_get_contents($path . DIRECTORY_SEPARATOR . $entry));
$fullPath = storage_path('export') . DIRECTORY_SEPARATOR . $this->job->key . '-' . $newFileName;
Log::debug('Will put "' . $fullPath . '" in the zip file.'); return $date;
// write to file: }
file_put_contents($fullPath, $content);
// add entry to set: /**
$this->getFiles()->push($fullPath); * @param string $entry
*
* @return bool
*/
private function isValidFile(string $entry): bool
{
$len = strlen($this->expected);
if (substr($entry, 0, $len) === $this->expected) {
Log::debug($entry . ' is part of this users original uploads.');
return true;
}
Log::debug($entry . ' is not part of this users original uploads.');
return false;
}
/**
* @param $entry
*/
private function processOldUpload(string $entry)
{
$content = '';
if ($this->isValidFile($entry)) {
try {
$content = Crypt::decrypt($this->uploadDisk->get($entry));
} catch (DecryptException $e) { } catch (DecryptException $e) {
Log::error('Could not decrypt old CSV import file ' . $entry . '. Skipped because ' . $e->getMessage()); Log::error('Could not decrypt old CSV import file ' . $entry . '. Skipped because ' . $e->getMessage());
} }
} else {
Log::debug($entry . ' is not part of this users original uploads.');
} }
if (strlen($content) > 0) {
// continue with file:
$date = $this->getOriginalUploadDate($entry);
$file = $this->job->key . '-Old CSV import dated ' . $date . '.csv';
Log::debug('Will put "' . $file . '" in the zip file.');
$this->exportDisk->put($file, $content);
$this->getFiles()->push($file);
} }
} }
} }