add addon search

5 files changed, 78 insertions, 26 deletions

diff --git a/xmake/modules/package/manager/xmake/search_package.lua b/xmake/modules/package/manager/xmake/search_package.lua
index 32991ae3e..a5ed3caf8 100644
--- a/xmake/modules/package/manager/xmake/search_package.lua
+++ b/xmake/modules/package/manager/xmake/search_package.lua
@@ -23,7 +23,7 @@ import("core.base.semver")
 import("private.xrepo.quick_search.cache")
 
 function _search_package(packages, name, opt)
-    for _, packageinfo in ipairs(cache.find(name, {description = opt.description ~= false})) do
+    for _, packageinfo in ipairs(cache.find(name, {description = opt.description ~= false, kind = opt.kind})) do
         local packagename = packageinfo.name
         local packagedata = packageinfo.data
 
@@ -59,7 +59,7 @@ end
 -- search package using the xmake package manager
 --
 -- @param name  the package name with pattern
--- @param opt   the options, e.g. {require_version = "1.x"}
+-- @param opt   the options, e.g. {require_version = "1.x", kind = "addon"}
 --
 function main(name, opt)
     opt = opt or {}
diff --git a/xmake/modules/private/action/require/search.lua b/xmake/modules/private/action/require/search.lua
index e714c6c19..a0f98e0d9 100644
--- a/xmake/modules/private/action/require/search.lua
+++ b/xmake/modules/private/action/require/search.lua
@@ -20,6 +20,7 @@
 
 -- imports
 import("core.base.task")
+import("core.base.option")
 import("private.action.require.impl.utils.filter")
 import("private.action.require.impl.repository")
 import("private.action.require.impl.environment")
@@ -41,11 +42,14 @@ function main(names)
         task.run("repo", {update = true})
     end
 
+    -- we only search the addon packages if `--addon` is enabled
+    local kind = option.get("addon") and "addon" or nil
+
     -- show title
-    print("The package names:")
+    print(kind == "addon" and "The addon names:" or "The package names:")
 
     -- search packages
-    for name, packages in pairs(search_packages(names)) do
+    for name, packages in pairs(search_packages(names, {kind = kind})) do
         if #packages > 0 then
 
             -- show name
diff --git a/xmake/modules/private/xrepo/action/remove.lua b/xmake/modules/private/xrepo/action/remove.lua
index ed92a83b8..adfec92c0 100644
--- a/xmake/modules/private/xrepo/action/remove.lua
+++ b/xmake/modules/private/xrepo/action/remove.lua
@@ -20,6 +20,7 @@
 
 -- imports
 import("core.base.option")
+import("core.package.addon")
 import("private.action.require.impl.remove_packages", {alias = "remove_all_packages"})
 
 -- get menu options
@@ -44,6 +45,9 @@ function menu_options()
         {nil, "toolchain",       "kv", nil, "Set the toolchain name."                           },
         {nil, "toolchain_host",  "kv", nil, "Set the host toolchain name."                      },
         {                                                                                       },
+        {nil, "addon",           "k", nil,  "Remove the given installed addon packages.",
+                                       "e.g.",
+                                       "    - xrepo remove --addon serial-monitor"           },
         {nil, "all",             "k", nil,  "Remove all packages and ignore extra package configs.",
                                        "If `--all` is enabled, the package name parameter will support lua pattern",
                                        "e.g.",
@@ -193,10 +197,22 @@ function _remove_packages(packages)
     os.vexecv(os.programfile(), require_argv)
 end
 
+-- remove the given installed addons
+function _remove_addons(names)
+    for _, name in ipairs(names) do
+        local ok, errors = addon.remove(name)
+        assert(ok, errors)
+        cprint("${color.success}remove ${bright}%s${clear} ok!", name)
+    end
+end
+
 -- main entry
 function main()
     local packages = option.get("packages")
-    if option.get("all") then
+    if option.get("addon") then
+        assert(packages, "please specify the addons to be removed.")
+        _remove_addons(packages)
+    elseif option.get("all") then
         remove_all_packages(packages)
     elseif packages then
         _remove_packages(packages)
diff --git a/xmake/modules/private/xrepo/action/search.lua b/xmake/modules/private/xrepo/action/search.lua
index d389e3833..c532af44e 100644
--- a/xmake/modules/private/xrepo/action/search.lua
+++ b/xmake/modules/private/xrepo/action/search.lua
@@ -30,6 +30,9 @@ function menu_options()
     -- menu options
     local options =
     {
+        {nil, "addon",      "k",  nil, "Search the addon packages from <repository>/addons/",
+                                       "e.g.",
+                                       "    - xrepo search --addon serial"},
         {nil, "packages",   "vs", nil, "The packages list (support lua pattern).",
                                        "e.g.",
                                        "    - xrepo search zlib boost",
@@ -80,6 +83,9 @@ function _search_packages(packages)
     if option.get("diagnosis") then
         table.insert(require_argv, "-D")
     end
+    if option.get("addon") then
+        table.insert(require_argv, "--addon")
+    end
     table.join2(require_argv, packages)
     os.vexecv(os.programfile(), require_argv)
 end
diff --git a/xmake/modules/private/xrepo/quick_search/cache.lua b/xmake/modules/private/xrepo/quick_search/cache.lua
index cf75a212d..43af417a8 100644
--- a/xmake/modules/private/xrepo/quick_search/cache.lua
+++ b/xmake/modules/private/xrepo/quick_search/cache.lua
@@ -25,20 +25,36 @@ import("private.action.require.impl.repository")
 
 local cache = globalcache.cache("quick_search")
 
+-- get the cache key of the given package
+--
+-- @note the addons are stored with the `addon::` prefix,
+-- because an addon and a package may have the same name
+--
+function _cachekey(packagename, kind)
+    return kind == "addon" and ("addon::" .. packagename) or packagename
+end
+
 -- search package directories from repositories
+--
+-- the packages are stored in <repodir>/packages/<first-letter>/<name>,
+-- and the addons are stored in <repodir>/addons/<first-letter>/<name>
+--
 function _list_package_dirs()
     -- find the package directories from all repositories
     local unique = {}
     local packageinfos = {}
     for _, repo in ipairs(repository.repositories()) do
-        for _, file in ipairs(os.files(path.join(repo:directory(), "packages", "*", "*", "xmake.lua"))) do
-            local dir = path.directory(file)
-            local subdirname = path.basename(path.directory(dir))
-            if #subdirname == 1 then -- ignore l/luajit/port/xmake.lua
-                local packagename = path.filename(dir)
-                if not unique[packagename] then
-                    table.insert(packageinfos, {name = packagename, repo = repo, packagedir = dir})
-                    unique[packagename] = true
+        for _, rootinfo in ipairs({{rootdir = "packages"}, {rootdir = "addons", kind = "addon"}}) do
+            for _, file in ipairs(os.files(path.join(repo:directory(), rootinfo.rootdir, "*", "*", "xmake.lua"))) do
+                local dir = path.directory(file)
+                local subdirname = path.basename(path.directory(dir))
+                if #subdirname == 1 then -- ignore l/luajit/port/xmake.lua
+                    local packagename = path.filename(dir)
+                    local cachekey = _cachekey(packagename, rootinfo.kind)
+                    if not unique[cachekey] then
+                        table.insert(packageinfos, {name = packagename, kind = rootinfo.kind, repo = repo, packagedir = dir})
+                        unique[cachekey] = true
+                    end
                 end
             end
         end
@@ -57,7 +73,9 @@ end
 function update()
     for _, packageinfo in ipairs(_list_package_dirs()) do
         local package = core_package.load_from_repository(packageinfo.name, packageinfo.packagedir, {repo = packageinfo.repo})
-        cache:set(packageinfo.name, {
+        cache:set(_cachekey(packageinfo.name, packageinfo.kind), {
+            name = packageinfo.name,
+            kind = packageinfo.kind,
             reponame = package:repo() and package:repo():name(),
             description = package:description(),
             versions = package:versions(),
@@ -79,22 +97,30 @@ function get()
 end
 
 -- find package
+--
+-- @param name  the package name (support lua pattern)
+-- @param opt   the options, e.g. {prefix = true, description = true, kind = "addon"}
+--
 function find(name, opt)
     _init()
     opt = opt or {}
     local list_result = {}
-    for packagename, packagedata in pairs(cache:data()) do
-        local found = false
-        if opt.prefix then
-            found = packagename:startswith(name)
-        else
-            found = packagename:find(path.pattern(name))
-        end
-        if not found and opt.description and packagedata.description and packagedata.description:find(name) then
-            found = true
-        end
-        if found then
-            table.insert(list_result, {name = packagename, data = packagedata})
+    for cachekey, packagedata in pairs(cache:data()) do
+        -- we only search the packages with the given kind, e.g. nil (package), "addon"
+        local packagename = packagedata.name or cachekey
+        if packagedata.kind == opt.kind then
+            local found = false
+            if opt.prefix then
+                found = packagename:startswith(name)
+            else
+                found = packagename:find(path.pattern(name))
+            end
+            if not found and opt.description and packagedata.description and packagedata.description:find(name) then
+                found = true
+            end
+            if found then
+                table.insert(list_result, {name = packagename, data = packagedata})
+            end
         end
     end
     return list_result