From c7dd16b4c92196f8545e06f46bcf36db6aaa71ad Mon Sep 17 00:00:00 2001
From: xl <as2252258@163.com>
Date: Thu, 6 Jul 2023 16:53:53 +0800
Subject: [PATCH] qqq

---
 HotReload.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/HotReload.php b/HotReload.php
index 6d70d7d..afdeba7 100644
--- a/HotReload.php
+++ b/HotReload.php
@@ -21,10 +21,13 @@ class HotReload extends BaseProcess
      */
     private array $watchFiles = [];
 
+
+    private array $md5Map = [];
+
     /**
      * @var array|string[]
      */
-    private array $dirs = [APP_PATH . 'app/', APP_PATH . 'config/', APP_PATH . 'routes/'];
+    private array $dirs = [APP_PATH . 'app', APP_PATH . 'routes'];
 
 
     /**
@@ -89,7 +92,7 @@ class HotReload extends BaseProcess
             if (!is_dir($dir)) {
                 continue;
             }
-            $this->watch($init, $dir);
+            $this->watch($init, rtrim($dir,'/'));
         }
         Event::add($init, fn() => $this->check($init));
         Event::cycle(function () use ($init) {
@@ -203,8 +206,7 @@ class HotReload extends BaseProcess
         if (!($events = inotify_read($inotify))) {
             return;
         }
-        $isReloading = Context::get('isReloading', false);
-        if ($isReloading) {
+        if (Context::exists('isReloading')) {
             return;
         }
 
@@ -224,7 +226,7 @@ class HotReload extends BaseProcess
             if ($fileType !== '.php') {
                 continue;
             }
-            if (Context::get('swoole_timer_after') !== -1) {
+            if (Context::exists('swoole_timer_after')) {
                 return;
             }
             $int = @swoole_timer_after(2000, fn() => $this->reload($inotify));
@@ -238,15 +240,14 @@ class HotReload extends BaseProcess
      */
     public function reload($inotify): void
     {
-        Context::set('isReloading', true);
         $this->trigger_reload();
 
         $this->clearWatch($inotify);
         foreach ($this->dirs as $root) {
             $this->watch($inotify, $root);
         }
-        Context::set('swoole_timer_after', -1);
-        Context::set('isReloading', false);
+        Context::remove('swoole_timer_after');
+        Context::remove('isReloading');
         $this->md5Map = [];
     }
 
@@ -328,6 +329,7 @@ class HotReload extends BaseProcess
             //递归目录
             if (is_dir($path)) {
                 $this->watch($inotify, $path);
+                continue;
             }
 
             //检测文件类型