feat: different url for amd64 arch

url_of support arch opt
from_sha256sum improve pref by break loop
files_of return hash

Author: initdc

lib/rootfs/data.rb

@@ -27,7 +27,10 @@ def from_sha256sum(str, keywords, ignores = [])
         next unless all_matched
 
         keywords.each do |keyword|
-          all_matched = false unless file.include?(keyword)
+          unless file.include?(keyword)
+            all_matched = false
+            break
+          end
         end
         results.push(file) if all_matched
       end

lib/rootfs/distro/ubuntu/file.rb

@@ -2,7 +2,6 @@
 
 require_relative "../../http"
 require_relative "../../data"
-require_relative "arch"
 
 module RootFS
   module Distro
@@ -47,11 +46,6 @@ def files_of(*argv, daily: false, **opts)
         arch = argv[2] || opts[:arch] || "amd64"
         devkit = argv[3] || opts[:devkit]
 
-        hash = RootFS::Distro::Ubuntu.parse_arch(arch)
-        return unless hash
-
-        arch = hash[:arch]
-
         keywords = [edition, arch]
         ignores = []
 
@@ -63,10 +57,13 @@ def files_of(*argv, daily: false, **opts)
           ignores = %w[wsl lxd squashfs]
         end
 
-        url = RootFS::Distro::Ubuntu.url_of(edition, release, daily)
+        url = RootFS::Distro::Ubuntu.url_of(edition, release, daily, arch: arch)
+        return if url.nil?
+
         resp = RootFS::HTTP.get(url)
         body = resp.body
-        RootFS::Data.from_sha256sum(body, keywords, ignores)
+        files = RootFS::Data.from_sha256sum(body, keywords, ignores)
+        { sha256sum: url, files: files }
       end
     end
   end

lib/rootfs/distro/ubuntu/file_test.rb

@@ -12,6 +12,7 @@ class MyClass
 p u.files_of
 p u.files_of("desktop", 20.04)
 p u.files_of("desktop", 23.04)
+p u.files_of("desktop", "lunar")
 p u.files_of("server", 20.04)
 p u.files_of("base", 20.04)
 p u.files_of("base", "focal")

lib/rootfs/distro/ubuntu/url.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "edition"
+require_relative "arch"
 
 module RootFS
   module Distro
@@ -13,12 +14,24 @@ module Ubuntu
 
       EDITION_URL = {
         desktop: {
-          release: "http://cdimage.ubuntu.com/releases/{version}/release/SHA256SUMS",
-          daily: "http://cdimage.ubuntu.com/{codename}/daily-preinstalled/current/SHA256SUMS"
+          release: {
+            amd64: "http://releases.ubuntu.com/{version}/SHA256SUMS",
+            others: "http://cdimage.ubuntu.com/releases/{version}/release/SHA256SUMS"
+          },
+          daily: {
+            amd64: "http://cdimage.ubuntu.com/{codename}/daily-live/current/SHA256SUMS",
+            others: "http://cdimage.ubuntu.com/{codename}/daily-preinstalled/current/SHA256SUMS"
+          }
         },
         server: {
-          release: "http://cdimage.ubuntu.com/releases/{version}/release/SHA256SUMS",
-          daily: "http://cdimage.ubuntu.com/ubuntu-server/{codename}/daily-preinstalled/current/SHA256SUMS"
+          release: {
+            amd64: "http://releases.ubuntu.com/{version}/SHA256SUMS",
+            others: "http://cdimage.ubuntu.com/releases/{version}/release/SHA256SUMS"
+          },
+          daily: {
+            amd64: "http://cdimage.ubuntu.com/ubuntu-server/{codename}/daily-live/current/SHA256SUMS",
+            others: "http://cdimage.ubuntu.com/ubuntu-server/{codename}/daily-preinstalled/current/SHA256SUMS"
+          }
         },
         base: {
           release: "http://cdimage.ubuntu.com/ubuntu-base/releases/{version}/release/SHA256SUMS",
@@ -34,7 +47,7 @@ module Ubuntu
         }
       }.freeze
 
-      def url_of(edi, rel, daily = false)
+      def url_of(edi, rel, daily = false, arch: "amd64")
         hash = RootFS::Distro::Ubuntu.parse_edition(edi)
         return unless hash
 
@@ -49,8 +62,22 @@ def url_of(edi, rel, daily = false)
         dev = hash[:dev]
         daily ||= type == "codename"
 
-        url_tmpl = !daily ? EDITION_URL[edition.to_sym][:release] : EDITION_URL[edition.to_sym][:daily]
-        top_dir = url_tmpl.start_with?("http://cdimage.ubuntu.com") && dev && daily
+        hash = RootFS::Distro::Ubuntu.parse_arch(arch)
+        return unless hash
+
+        arch = hash[:arch]
+
+        url_tmpl = if %w[desktop server].include?(edition)
+                     if arch == "amd64"
+                       !daily ? EDITION_URL[edition.to_sym][:release][:amd64] : EDITION_URL[edition.to_sym][:daily][:amd64]
+                     else
+                       !daily ? EDITION_URL[edition.to_sym][:release][:others] : EDITION_URL[edition.to_sym][:daily][:others]
+                     end
+                   else
+                     !daily ? EDITION_URL[edition.to_sym][:release] : EDITION_URL[edition.to_sym][:daily]
+                   end
+
+        top_dir = url_tmpl.include?("cdimage.ubuntu.com") && dev && daily
         codename = "" if top_dir
 
         url_tmpl.gsub("{version}", version).gsub("{codename}", codename.to_s)

lib/rootfs/distro/ubuntu/url_test.rb

@@ -10,8 +10,15 @@ class MyClass
 u = MyClass.new
 
 p u.url_of("desktop", 20.04)
+p u.url_of("desktop", 20.04, arch: "arm64")
+p u.url_of("desktop", 20.04, true, arch: "arm64")
+p u.url_of("desktop", "lunar", true, arch: "arm64")
 p u.url_of("desktop", 23.04, true)
+p u.url_of("desktop", 22.04, true)
 p u.url_of("server", 20.04)
+p u.url_of("server", 20.04, true)
+p u.url_of("server", 20.04, arch: "arm64")
+p u.url_of("server", 20.04, true, arch: "arm64")
 p u.url_of("base", 20.04)
 p u.url_of("base", "focal")
 p u.url_of("cloud", "focal")