Revert "update filewatch"

This reverts commit 7075ca1.

Author: koppchen

script/filewatch.lua

@@ -32,21 +32,16 @@ local m = {}
 m._eventList = {}
 m._watchings = {}
 
----@param path string
----@param recursive boolean
-function m.watch(path, recursive)
+function m.watch(path)
     if path == '' then
         return function () end
     end
     if m._watchings[path] then
         m._watchings[path].count = m._watchings[path].count + 1
     else
-        local watch = fw.create()
-        watch:add(path)
-        watch:recursive(recursive)
         m._watchings[path] = {
             count = 1,
-            watch = watch,
+            id    = fw.add(path),
         }
         log.debug('fw.add', path)
     end
@@ -58,6 +53,7 @@ function m.watch(path, recursive)
         removed = true
         m._watchings[path].count = m._watchings[path].count - 1
         if m._watchings[path].count == 0 then
+            fw.remove(m._watchings[path].id)
             m._watchings[path] = nil
             log.debug('fw.remove', path)
         end
@@ -79,22 +75,19 @@ end
 
 function m.update()
     local collect
-    for _, watching in pairs(m._watchings) do
-        local watch = watching.watch
-        for _ = 1, 10000 do
-            local ev, path = watch:select()
-            if not ev then
-                break
-            end
-            log.debug('filewatch:', ev, path)
-            if not collect then
-                collect = {}
-            end
-            if ev == 'modify' then
-                collect[path] = (collect[path] or 0) | MODIFY
-            elseif ev == 'rename' then
-                collect[path] = (collect[path] or 0) | RENAME
-            end
+    for _ = 1, 10000 do
+        local ev, path = fw.select()
+        if not ev then
+            break
+        end
+        log.debug('filewatch:', ev, path)
+        if not collect then
+            collect = {}
+        end
+        if ev == 'modify' then
+            collect[path] = (collect[path] or 0) | MODIFY
+        elseif ev == 'rename' then
+            collect[path] = (collect[path] or 0) | RENAME
         end
     end
 

script/provider/provider.lua

@@ -36,7 +36,7 @@ function m.updateConfig(uri)
         log.info('Load config from specified', CONFIGPATH)
         log.info(inspect(specified))
         -- watch directory
-        filewatch.watch(workspace.getAbsolutePath(uri, CONFIGPATH):gsub('[^/\\]+$', ''), false)
+        filewatch.watch(workspace.getAbsolutePath(uri, CONFIGPATH):gsub('[^/\\]+$', ''))
         config.update(scope.override, specified)
     end
 

script/workspace/workspace.lua

@@ -308,7 +308,7 @@ function m.awaitPreload(scp)
 
     if scp.uri and not scp:get('bad root') then
         log.info('Scan files at:', scp:getName())
-        scp:gc(fw.watch(m.normalize(furi.decode(scp.uri)), true))
+        scp:gc(fw.watch(m.normalize(furi.decode(scp.uri))))
         local count = 0
         ---@async
         native:scan(furi.decode(scp.uri), function (path)
@@ -326,7 +326,7 @@ function m.awaitPreload(scp)
     for _, libMatcher in ipairs(librarys) do
         log.info('Scan library at:', libMatcher.uri)
         local count = 0
-        scp:gc(fw.watch(furi.decode(libMatcher.uri), true))
+        scp:gc(fw.watch(furi.decode(libMatcher.uri)))
         scp:addLink(libMatcher.uri)
         ---@async
         libMatcher.matcher:scan(furi.decode(libMatcher.uri), function (path)

test/other/filewatch.lua

@@ -9,7 +9,7 @@ fs.create_directories(path)
 
 os.remove((path / 'test.txt'):string())
 
-local _ <close> = fw.watch(path:string(), true)
+local _ <close> = fw.watch(path:string())
 fsu.saveFile(path / 'test.txt', 'test')
 
 local events