Поправил сканирование и очистку кеша

visavi · Jun 18, 2021 · 612cd23 · 612cd23
1 parent b61fe90
commit 612cd23
Show file tree

Hide file tree

Showing 6 changed files with 226 additions and 3,408 deletions.
diff --git a/app/Http/Controllers/Admin/CacheController.php b/app/Http/Controllers/Admin/CacheController.php
@@ -6,6 +6,7 @@
 
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\View\View;
 
 class CacheController extends AdminController
@@ -25,10 +26,10 @@ public function index(Request $request): View
             $files = glob(public_path('uploads/thumbnails/*.{gif,png,jpg,jpeg}'), GLOB_BRACE);
             $files = paginate($files, 20, compact('type'));
         } elseif ($type === 'views') {
-            $files = glob(storage_path('views/*.php'), GLOB_BRACE);
+            $files = glob(storage_path('framework/views/*.php'), GLOB_BRACE);
             $files = paginate($files, 20, compact('type'));
         } else {
-            $files = glob(storage_path('caches/{*/*/*,*.php}'), GLOB_BRACE);
+            $files = glob(storage_path('framework/cache/data/*/*/*'));
             $files = paginate($files, 20, compact('type'));
         }
 
@@ -49,15 +50,15 @@ public function clear(Request $request): RedirectResponse
         if ($request->input('_token') === csrf_token()) {
             switch ($type) {
                 case 'images':
-                    runCommand(new ImageClear());
+                    Artisan::call('image:clear');
                     break;
                 case 'views':
-                    runCommand(new ViewClear());
+                    Artisan::call('view:clear');
                     break;
                 default:
-                    runCommand(new ConfigClear());
-                    runCommand(new RouteClear());
-                    runCommand(new CacheClear());
+                    Artisan::call('cache:clear');
+                    Artisan::call('route:clear');
+                    Artisan::call('config:clear');
             }
 
             setFlash('success', __('admin.caches.success_cleared'));

diff --git a/app/Http/Controllers/Admin/CheckerController.php b/app/Http/Controllers/Admin/CheckerController.php
@@ -21,9 +21,9 @@ public function index(): View
     {
         $diff = [];
 
-        if (file_exists(storage_path('caches/checker.php'))) {
+        if (file_exists(storage_path('framework/cache/checker.php'))) {
             $files = $this->scanFiles(base_path());
-            $filesScan = json_decode(file_get_contents(storage_path('caches/checker.php')), true);
+            $filesScan = json_decode(file_get_contents(storage_path('framework/cache/checker.php')), true);
 
             $diff['left']  = array_diff($files, $filesScan);
             $diff['right'] = array_diff($filesScan, $files);
@@ -44,7 +44,7 @@ public function scan(Request $request): RedirectResponse
         if ($request->input('_token') === csrf_token()) {
             $files = $this->scanFiles(base_path());
 
-            file_put_contents(storage_path('caches/checker.php'), json_encode($files));
+            file_put_contents(storage_path('framework/cache/checker.php'), json_encode($files));
 
             setFlash('success', __('admin.checkers.success_crawled'));
         } else {
@@ -69,6 +69,7 @@ private function scanFiles(string $dir): array
         $finder = new Finder();
         $files  = $finder->in($dir)
             ->files()
+            ->exclude(basename(storage_path()))
             ->notName($excludeFiles);
 
         if (file_exists(base_path('.gitignore'))) {

diff --git a/app/helpers.php b/app/helpers.php
@@ -599,8 +599,8 @@ function statsStickers(): int
  */
 function statsChecker()
 {
-    if (file_exists(storage_path('caches/checker.php'))) {
-        return dateFixed(filemtime(storage_path('caches/checker.php')), 'd.m.Y');
+    if (file_exists(storage_path('framework/cache/checker.php'))) {
+        return dateFixed(filemtime(storage_path('framework/cache/checker.php')), 'd.m.Y');
     }
 
     return 0;