Skip to content

A self-hosted media server and file management system

fix first folder name that matches query sometimes does not get selected if another similarly named folder exists

aminnausine0f40c2e8479
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index cec90262..3ec262e4 100755
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -63,13 +63,13 @@ class DirectoryController extends Controller {
$folderRaw = isset($request->folderName)
? (
// $folderList->firstWhere('name', $folderName)
- $folderList->firstWhere('name', 'ilike', '%' . $folderName . '%')
- // $folderList->first(function ($folder) use ($folderName) {
- // return Str::lower($folder->name) === Str::lower($folderName);
- // })
- // ?: $folderList->filter(function ($folder) use ($folderName) {
- // return Str::contains(Str::lower($folder->name), Str::lower($folderName));
- // })->first()
+ // $folderList->firstWhere('name', 'ilike', '%' . $folderName . '%')
+ $data['dir']['folders']->first(function ($folder) use ($folderName) {
+ return Str::lower($folder->name) === Str::lower($folderName);
+ })
+ ?: $data['dir']['folders']->first(function ($folder) use ($folderName) {
+ return Str::contains(Str::lower($folder->name), Str::lower($folderName));
+ })
)
: (
isset($dirRaw->default_folder_id)