fix download

1 files changed, 36 insertions, 223 deletions

diff --git a/xmake/modules/private/action/require/impl/download_packages.lua b/xmake/modules/private/action/require/impl/download_packages.lua
index fa3684eb7..5005391c4 100644
--- a/xmake/modules/private/action/require/impl/download_packages.lua
+++ b/xmake/modules/private/action/require/impl/download_packages.lua
@@ -31,7 +31,6 @@ import("private.action.require.impl.package")
 import("private.action.require.impl.lock_packages")
 import("private.action.require.impl.register_packages")
 import("private.action.require.impl.actions.download", {alias = "action_download"})
-import("private.action.require.impl.actions.download", {alias = "action_download"})
 
 -- sort packages urls
 function _sort_packages_urls(packages)
@@ -47,52 +46,6 @@ function _sort_packages_urls(packages)
     end
 end
 
--- get user confirm from 3rd package sources
--- @see https://github.com/xmake-io/xmake/issues/1140
-function _get_confirm_from_3rd(packages)
-
-    -- get extpackages list
-    local extpackages_list = _g.extpackages_list
-    if not extpackages_list then
-        extpackages_list = {}
-        for _, instance in ipairs(packages) do
-            local extsources = instance:get("extsources")
-            local extsources_extra = instance:extraconf("extsources")
-            if extsources then
-                local extpackages = package.load_packages(extsources, extsources_extra)
-                for _, extinstance in ipairs(extpackages) do
-                    table.insert(extpackages_list, {instance = instance, extinstance = extinstance})
-                end
-            end
-        end
-        _g.extpackages_list = extpackages_list
-    end
-
-    -- no extpackages?
-    if #extpackages_list == 0 then
-        print("no more packages!")
-        return
-    end
-
-    -- get confirm result
-    local result = utils.confirm({description = function ()
-        cprint("${bright color.warning}note: ${clear}select the following 3rd packages")
-        for idx, extinstance in ipairs(extpackages_list) do
-            local instance = extinstance.instance
-            local extinstance = extinstance.extinstance
-            cprint("  ${yellow}%d.${clear} %s ${yellow}->${clear} %s %s ${dim}%s",
-                idx, extinstance:name(),
-                instance:displayname(),
-                instance:version_str() or "",
-                package.get_configs_str(instance))
-        end
-    end, answer = function ()
-        cprint("please input number list: ${bright}n${clear} (1,2,..)")
-        io.flush()
-        return (io.read() or "n"):trim()
-    end})
-end
-
 -- get user confirm
 function _get_confirm(packages)
 
@@ -109,7 +62,6 @@ function _get_confirm(packages)
 
             -- get packages for each repositories
             local packages_repo = {}
-            local packages_group = {}
             for _, instance in ipairs(packages) do
                 -- achive packages by repository
                 local reponame = instance:repo() and instance:repo():name() or (instance:is_system() and "system" or "")
@@ -118,17 +70,10 @@ function _get_confirm(packages)
                 end
                 packages_repo[reponame] = packages_repo[reponame] or {}
                 table.insert(packages_repo[reponame], instance)
-
-                -- achive packages by group
-                local group = instance:group()
-                if group then
-                    packages_group[group] = packages_group[group] or {}
-                    table.insert(packages_group[group], instance)
-                end
             end
 
             -- show tips
-            cprint("${bright color.warning}note: ${clear}download or modify (m) these packages (pass -y to skip confirm)?")
+            cprint("${bright color.warning}note: ${clear}download these packages (pass -y to skip confirm)?")
             for reponame, packages in pairs(packages_repo) do
                 if reponame ~= "" then
                     print("in %s:", reponame)
@@ -136,36 +81,21 @@ function _get_confirm(packages)
                 local packages_showed = {}
                 for _, instance in ipairs(packages) do
                     if not packages_showed[tostring(instance)] then
-                        local group = instance:group()
-                        if group and packages_group[group] and #packages_group[group] > 1 then
-                            for idx, package_in_group in ipairs(packages_group[group]) do
-                                cprint("  ${yellow}%s${clear} %s %s ${dim}%s", idx == 1 and "->" or "   or", package_in_group:displayname(), package_in_group:version_str() or "", package.get_configs_str(package_in_group))
-                                packages_showed[tostring(package_in_group)] = true
-                            end
-                            packages_group[group] = nil
-                        else
-                            cprint("  ${yellow}->${clear} %s %s ${dim}%s", instance:displayname(), instance:version_str() or "", package.get_configs_str(instance))
-                            packages_showed[tostring(instance)] = true
-                        end
+                        cprint("  ${yellow}->${clear} %s %s ${dim}%s", instance:displayname(), instance:version_str() or "", package.get_configs_str(instance))
+                        packages_showed[tostring(instance)] = true
                     end
                 end
             end
         end, answer = function ()
-            cprint("please input: ${bright}y${clear} (y/n/m)")
+            cprint("please input: ${bright}y${clear} (y/n)")
             io.flush()
             return (io.read() or "false"):trim()
         end})
 
-        -- modify to select 3rd packages?
-        if result == "m" then
-            packages_modified = _get_confirm_from_3rd(packages)
-            result = nil
-        else
-            -- get confirm result
-            result = option.boolean(result)
-            if type(result) ~= "boolean" then
-                result = true
-            end
+        -- get confirm result
+        result = option.boolean(result)
+        if type(result) ~= "boolean" then
+            result = true
         end
     end
     return result, packages_modified
@@ -176,14 +106,14 @@ function _should_download_package(instance)
     _g.package_status_cache = _g.package_status_cache or {}
     local result = _g.package_status_cache[tostring(instance)]
     if result == nil then
-        result = package.should_download(instance) or false
+        result = package.should_install(instance) or false
         _g.package_status_cache[tostring(instance)] = result
     end
     return result
 end
 
 -- download packages
-function _download_packages(packages_download, downloaddeps)
+function _download_packages(packages_download, packagedeps)
 
     -- we need to hide wait characters if is not a tty
     local show_wait = io.isatty()
@@ -200,12 +130,9 @@ function _download_packages(packages_download, downloaddeps)
     -- do download
     local progress_helper = show_wait and progress.new() or nil
     local packages_downloading = {}
-    local packages_downloading = {}
     local packages_pending = table.copy(packages_download)
-    local packages_in_group = {}
     local working_count = 0
     local downloading_count = 0
-    local parallelize = true
     runjobs("download_packages", function (index)
 
         -- fetch a new package
@@ -216,7 +143,7 @@ function _download_packages(packages_download, downloaddeps)
                 -- all dependences has been downloaded? we download it now
                 local ready = true
                 local dep_not_found = nil
-                for _, dep in pairs(downloaddeps[tostring(pkg)]) do
+                for _, dep in pairs(packagedeps[tostring(pkg)]) do
                     local downloaded = packages_downloaded[tostring(dep)]
                     if downloaded == false or (downloaded == nil and _should_download_package(dep) and not dep:is_optional()) then
                         ready = false
@@ -224,18 +151,6 @@ function _download_packages(packages_download, downloaddeps)
                         break
                     end
                 end
-                local group = pkg:group()
-                if ready and group then
-                    -- this group has been downloaded? skip it
-                    local group_status = packages_in_group[group]
-                    if group_status == 1 then
-                        table.remove(packages_pending, idx)
-                        break
-                    -- this group is downloading? wait it
-                    elseif group_status == 0 then
-                        ready = false
-                    end
-                end
 
                 -- get a package with the ready status
                 if ready then
@@ -255,78 +170,24 @@ function _download_packages(packages_download, downloaddeps)
             end
         end
         if instance then
-
-            -- update working count
             working_count = working_count + 1
+            downloading_count = downloading_count + 1
+            packages_downloading[index] = instance
 
-            -- only download the first package in same group
-            local group = instance:group()
-            if not group or not packages_in_group[group] then
-
-                -- disable parallelize?
-                if not instance:is_parallelize() then
-                    parallelize = false
-                end
-                if not parallelize then
-                    while downloading_count > 0 do
-                        os.sleep(100)
-                    end
-                end
-                downloading_count = downloading_count + 1
+            -- download this package
+            action_download(instance)
 
-                -- mark this group as 'downloading'
-                if group then
-                    packages_in_group[group] = 0
-                end
+            -- reset package status cache
+            _g.package_status_cache = nil
 
-                -- download this package first
-                local downloaded = true
-                if packages_download[tostring(instance)] then
-                    packages_downloading[index] = instance
-                    downloaded = action_download(instance)
-                    packages_downloading[index] = nil
-                end
-
-                -- download this package
-                packages_downloading[index] = instance
-                if downloaded then
-                    if not action_download(instance) then
-                        assert(instance:is_precompiled(), "package(%s) should be precompiled", instance:name())
-                        -- we need to disable built and re-download and re-download it
-                        instance:fallback_build()
-                        action_download(instance)
-                        action_download(instance)
-                    end
-                end
-
-                -- reset package status cache
-                _g.package_status_cache = nil
-
-                -- register it to local cache if it is root required package
-                --
-                -- @note we need to register the package in time,
-                -- because other packages may be used, e.g. toolchain/packages
-                if instance:is_toplevel() then
-                    register_packages({instance})
-                end
-
-                -- mark this group as 'downloaded' or 'failed'
-                if group then
-                    packages_in_group[group] = instance:exists() and 1 or -1
-                end
-
-                -- next
-                parallelize = true
-                downloading_count = downloading_count - 1
-                packages_downloading[index] = nil
-                packages_downloaded[tostring(instance)] = true
-            end
+            -- next
+            downloading_count = downloading_count - 1
+            packages_downloading[index] = nil
+            packages_downloaded[tostring(instance)] = true
 
             -- update working count
             working_count = working_count - 1
         end
-        packages_downloading[index] = nil
-        packages_downloading[index] = nil
 
     end, {total = #packages_download,
           comax = (option.get("verbose") or option.get("diagnosis")) and 1 or 4,
@@ -338,18 +199,13 @@ function _download_packages(packages_download, downloaddeps)
             return
         end
 
-        -- make downloading and downloading packages list
-        local downloading = {}
+        -- make downloading packages list
         local downloading = {}
         for _, index in ipairs(running_jobs_indices) do
             local instance = packages_downloading[index]
             if instance then
                 table.insert(downloading, instance:displayname())
             end
-            local instance = packages_downloading[index]
-            if instance then
-                table.insert(downloading, instance:displayname())
-            end
         end
         -- we just return it directly if no thing is waited
         -- @see https://github.com/xmake-io/xmake/issues/3535
@@ -394,9 +250,6 @@ function _download_packages(packages_download, downloaddeps)
         if #downloading > 0 then
             cprintf("downloading ${color.dump.string}%s", table.concat(downloading, ", "))
         end
-        if #downloading > 0 then
-            cprintf("%sdownloading ${color.dump.string}%s", #downloading > 0 and ", " or "", table.concat(downloading, ", "))
-        end
         cprintf(" .. %s", tips and ("${dim}" .. tips .. "${clear} ") or "")
         progress_helper:write()
     end, exit = function(errors)
@@ -407,39 +260,20 @@ function _download_packages(packages_download, downloaddeps)
     end})
 end
 
--- only enable the first package in same group and root packages
-function _disable_other_packages_in_group(packages)
-    local registered_in_group = {}
-    for _, instance in ipairs(packages) do
-        local group = instance:group()
-        if instance:is_toplevel() and group then
-            local required_package = project.required_package(instance:alias() or instance:name())
-            if required_package then
-                if not registered_in_group[group] and required_package:enabled() then
-                    registered_in_group[group] = true
-                elseif required_package:enabled() then
-                    required_package:enable(false)
-                    required_package:save()
-                end
-            end
-        end
-    end
-end
-
 -- sort packages for downloadation dependencies
-function _sort_packages_for_downloaddeps(packages, downloaddeps, order_packages)
+function _sort_packages_for_packagedeps(packages, packagedeps, order_packages)
     for _, instance in ipairs(packages) do
-        local deps = downloaddeps[tostring(instance)]
+        local deps = packagedeps[tostring(instance)]
         if deps then
-            _sort_packages_for_downloaddeps(deps, downloaddeps, order_packages)
+            _sort_packages_for_packagedeps(deps, packagedeps, order_packages)
         end
         table.insert(order_packages, instance)
     end
 end
 
--- get package downloadation dependencies
-function _get_package_downloaddeps(packages)
-    local downloaddeps = {}
+-- get package dependencies
+function _get_packagedeps(packages)
+    local packagedeps = {}
     local packagesmap = {}
     for _, instance in ipairs(packages) do
         -- we need to use alias name first for toolchain/packages
@@ -450,7 +284,7 @@ function _get_package_downloaddeps(packages)
         if instance:orderdeps() then
             deps = table.copy(instance:orderdeps())
         end
-        -- patch toolchain/packages to downloaddeps, because we need to download toolchain package first
+        -- patch toolchain/packages to packagedeps, because we need to download toolchain package first
         for _, toolchain in ipairs(instance:toolchains()) do
             for _, packagename in ipairs(toolchain:config("packages")) do
                 if packagesmap[packagename] ~= instance then -- avoid loop recursion
@@ -458,9 +292,9 @@ function _get_package_downloaddeps(packages)
                 end
             end
         end
-        downloaddeps[tostring(instance)] = deps
+        packagedeps[tostring(instance)] = deps
     end
-    return downloaddeps
+    return packagedeps
 end
 
 -- download packages
@@ -470,12 +304,12 @@ function main(requires, opt)
     -- load packages
     local packages = package.load_packages(requires, opt)
 
-    -- get package downloadation dependencies
-    local downloaddeps = _get_package_downloaddeps(packages)
+    -- get package dependencies
+    local packagedeps = _get_packagedeps(packages)
 
-    -- sort packages for downloaddeps
+    -- sort packages for packagedeps
     local order_packages = {}
-    _sort_packages_for_downloaddeps(packages, downloaddeps, order_packages)
+    _sort_packages_for_packagedeps(packages, packagedeps, order_packages)
     packages = table.unique(order_packages)
 
     -- save terminal mode for stdout
@@ -483,9 +317,7 @@ function main(requires, opt)
 
     -- filter packages
     local packages_download = {}
-    local packages_download = {}
     local packages_unsupported = {}
-    local packages_not_found = {}
     local packages_unknown = {}
     for _, instance in ipairs(packages) do
         if _should_download_package(instance) then
@@ -501,12 +333,6 @@ function main(requires, opt)
                     table.insert(packages_unsupported, instance)
                 end
             end
-        -- @see https://github.com/xmake-io/xmake/issues/2050
-        elseif not instance:exists() and not instance:is_optional() then
-            local requireinfo = instance:requireinfo()
-            if requireinfo and requireinfo.system then
-                table.insert(packages_not_found, instance)
-            end
         end
     end
 
@@ -529,19 +355,6 @@ function main(requires, opt)
         has_errors = true
     end
 
-    -- exists not found packages?
-    if #packages_not_found > 0 then
-        if packages_not_found[1]:is_cross() then
-            cprint("${bright color.warning}note: ${clear}system package is not supported for cross-compilation currently, the following system packages cannot be found:")
-        else
-            cprint("${bright color.warning}note: ${clear}the following packages were not found on your system, try again after downloading them:")
-        end
-        for _, instance in ipairs(packages_not_found) do
-            print("  -> %s %s", instance:displayname(), instance:version_str() or "")
-        end
-        has_errors = true
-    end
-
     if has_errors then
         raise()
     end
@@ -556,7 +369,7 @@ function main(requires, opt)
     _sort_packages_urls(packages_download)
 
     -- download all required packages from repositories
-    _download_packages(packages_download, downloaddeps)
+    _download_packages(packages_download, packagedeps)
     return packages
 end