kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

fix local references in upload/export disk. first step for #1727.

Browse Source
This commit is contained in:
HamuZ HamuZ
2018-10-13 09:56:26 +03:00
parent cf11dfe73b
commit f696353e2c
9 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Repositories/ExportJob/ExportJobRepository.php
View File

@@ -28,8 +28,8 @@ use FireflyIII\Models\ExportJob;
use FireflyIII\User;
use Illuminate\Contracts\Filesystem\FileNotFoundException;
use Illuminate\Support\Str;
use Illuminate\Support\Facades\Storage;
use Log;
use Storage;
/**
* Class ExportJobRepository.
@@ -74,15 +74,17 @@ class ExportJobRepository implements ExportJobRepositoryInterface
->whereIn('status', ['never_started', 'export_status_finished', 'export_downloaded'])
->get();
$disk = Storage::disk('export');
$files = $disk->files();
// loop set:
/** @var ExportJob $entry */
foreach ($set as $entry) {
$key = $entry->key;
$files = scandir(storage_path('export'), SCANDIR_SORT_NONE);
/** @var string $file */
/** @var array $file */
foreach ($files as $file) {
if (0 === strpos($file, $key)) {
unlink(storage_path('export') . DIRECTORY_SEPARATOR . $file);
if (0 === strpos($file['basename'], $key)) {
$disk->delete($file['path']);
}
}
try {