refactor: simplify filtering logic

Author: streamtw

resources/views/index.blade.php

@@ -86,7 +86,7 @@
         </ol>
       </nav>
 
-      <div>
+      <div style="margin-bottom: 16px;">
         <input type="text" name="keyword" id="keyword" placeholder="keyword">
         <button type="button" id="keyword-button" >Search</button>
         <button type="button" id="keyword-reset-button" >Reset</button>

src/Controllers/ItemsController.php

@@ -15,30 +15,24 @@ class ItemsController extends LfmController
      *
      * @return mixed
      */
-    public function getItems(Request $request)
+    public function getItems()
     {
         $currentPage = self::getCurrentPageFromRequest();
 
         $perPage = $this->helper->getPaginationPerPage();
         $items = array_merge($this->lfm->folders(), $this->lfm->files());
 
-        $items = array_map(function ($item) {
-            return $item->fill()->attributes;
-        }, $items);
-
-        $keyword = $request->keyword;
+        $keyword = request()->get('keyword', "");
         if (!empty($keyword)) {
-            $items = array_values(array_filter($items, function ($item) use ($keyword) {
-                if ($this->like_match("%".$keyword."%", $item['name'])) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }));
+            $items = array_filter($items, function ($item) use ($keyword) {
+                return str_contains($item->name, $keyword);
+            });
         }
 
         return [
-            'items' => array_slice($items, ($currentPage - 1) * $perPage, $perPage),
+            'items' => array_map(function ($item) {
+                return $item->fill()->attributes;
+            }, array_slice($items, ($currentPage - 1) * $perPage, $perPage)),
             'paginator' => [
                 'current_page' => $currentPage,
                 'total' => count($items),
@@ -49,12 +43,6 @@ public function getItems(Request $request)
         ];
     }
 
-    public function like_match($pattern, $subject)
-    {
-        $pattern = str_replace('%', '.*', preg_quote($pattern, '/'));
-        return (bool) preg_match("/^{$pattern}$/i", $subject);
-    }
-
     public function move()
     {
         $items = request('items');
@@ -122,10 +110,4 @@ private static function getCurrentPageFromRequest()
 
         return $currentPage;
     }
-
-    private static function getKeywordFromRequest()
-    {
-        $keyword = request()->get('keyword', "");
-        return $keyword;
-    }
 }