Skip to content

Commit 1092e74

Browse files
committed
improves file path upgrade; removes store method from file
1 parent d16287e commit 1092e74

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

src/Models/File.php

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,20 @@ public function upload(UploadedFile $file): self
107107
$this->processImage($file);
108108
}
109109

110-
return $this->store($file, $this->attachable->folder());
110+
DB::transaction(function () use ($file) {
111+
$folder = $this->attachable->folder();
112+
113+
$this->fill([
114+
'original_name' => $file->getClientOriginalName(),
115+
'path' => "{$folder}/{$file->hashName()}",
116+
'size' => $file->getSize(),
117+
'mime_type' => $file->getMimeType(),
118+
])->save();
119+
120+
$file->store($folder);
121+
});
122+
123+
return $this;
111124
}
112125

113126
public function delete()
@@ -154,20 +167,4 @@ public function isImage(BaseFile $file): bool
154167
['file' => "image|mimetypes:{$mimeTypes}"]
155168
)->passes();
156169
}
157-
158-
public function store(UploadedFile $file, string $folder): self
159-
{
160-
DB::transaction(function () use ($file, $folder) {
161-
$this->fill([
162-
'original_name' => $file->getClientOriginalName(),
163-
'path' => "{$folder}/{$file->hashName()}",
164-
'size' => $file->getSize(),
165-
'mime_type' => $file->getMimeType(),
166-
])->save();
167-
168-
$file->store($folder);
169-
});
170-
171-
return $this;
172-
}
173170
}

src/Upgrades/FilePath.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ private function handle(RejectedImport $rejected): void
5858
$xlsx = Str::of($path)->explode('/')->last();
5959

6060
Storage::move($path, "imports/{$xlsx}");
61-
6261
Storage::deleteDirectory($folder);
6362
}
6463

0 commit comments

Comments
 (0)