[Compass-ci] Re: [PATCH v3 compass-ci] src/lib/job.cr: optimize the get_pkg_common_dir function

On Tue, Mar 09, 2021 at 07:33:09PM +0800, Li Ping wrote:

[why]

1. rpm has no much to do with os_mount.

add a judgment 2. optimize the code style

Signed-off-by: Li Ping 1477412247@qq.com

src/lib/job.cr | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/lib/job.cr b/src/lib/job.cr index 0b4bee4..f91e637 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -258,23 +258,28 @@ class Job end

def get_pkg_common_dir

• pkg_style = nil

• tmp = nil ["cci-makepkg", "cci-depends", "build-pkg", "rpmbuild-pkg"].each do |item|

•  pkg_style = @hash[item]?
  

•  break if pkg_style
  

•  tmp = @hash[item]?
  

•  break if tmp
  

  end

• return nil unless pkg_style

• return nil unless tmp
• pkg_style = Hash(String, JSON::Any).new {|h, k| h[k] = JSON::Any.new(nil)}
• pkg_style.merge!(tmp.as_h? || Hash(String, JSON::Any).new)

• pkg_style = JSON.parse("{}") if pkg_style == nil

• tmp_os = pkg_style["os"].as_s? || "#{os}"
• tmp_os_arch = pkg_style["os_arch"].as_s? || "#{os_arch}"
• tmp_os_version = pkg_style["os_version"].as_s? || "#{os_version}"

• tmp_os = pkg_style["os"]? == nil ? "#{os}" : pkg_style["os"]
• tmp_os_arch = pkg_style["os_arch"]? == nil ? "#{os_arch}" : pkg_style["os_arch"]
• tmp_os_version = pkg_style["os_version"]? == nil ? "#{os_version}" : pkg_style["os_version"]

• mount_type = pkg_style["os_mount"].as_s? || "#{os_mount}"
• # same usage for client
• mount_type = "nfs" if mount_type == "cifs"

• tmp_os_mount = pkg_style["os_mount"]? == nil ? "#{os_mount}" : pkg_style["os_mount"]
• mount_type = tmp_os_mount == "cifs" ? "nfs" : tmp_os_mount.dup
• common_dir = "#{mount_type}/#{tmp_os}/#{tmp_os_arch}/#{tmp_os_version}"

• if @hash["rpmbuild-pkg"]?

•  common_dir = "#{tmp_os}/#{tmp_os_arch}/#{tmp_os_version}"
  

• else

•  common_dir = "#{mount_type}/#{tmp_os}/#{tmp_os_arch}/#{tmp_os_version}"
  

• end

i think to optimize like this:

common_dir = "#{tmp_os}/#{tmp_os_arch}/#{tmp_os_version}" common_dir = "#{mount_type}/#{common_dir}" unless @hash["rpmbuild-pkg"]?

Thanks, Liushaofei

return common_dir

end

2.23.0