end
if c[:job] and c[:job][:uuid] and job[c[:job][:uuid]]
pj[:job] = job[c[:job][:uuid]]
+ elsif c[:job].is_a?(Hash)
+ pj[:job] = c[:job]
+ if pj[:job][:started_at].is_a? String
+ pj[:job][:started_at] = Time.parse(pj[:job][:started_at])
+ end
+ if pj[:job][:finished_at].is_a? String
+ pj[:job][:finished_at] = Time.parse(pj[:job][:finished_at])
+ end
else
- pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}
+ pj[:job] = {}
end
pj[:percent_done] = 0
pj[:percent_running] = 0
pj[:nondeterministic] = pj[:job][:nondeterministic] || c[:nondeterministic]
pj[:output] = pj[:job][:output]
pj[:output_uuid] = c[:output_uuid]
- pj[:finished_at] = (Time.parse(pj[:job][:finished_at]) rescue nil)
+ pj[:finished_at] = pj[:job][:finished_at]
ret << pj
end
ret
end
if use_words
- s = ""
+ s = []
if days > 0 then
- s += "#{days} day#{'s' if days != 1}"
+ s << "#{days} day#{'s' if days != 1}"
end
if hours > 0 then
- s += " #{hours} hour#{'s' if hours != 1}"
+ s << "#{hours} hour#{'s' if hours != 1}"
end
if minutes > 0 then
- s += " #{minutes} minute#{'s' if minutes != 1}"
+ s << "#{minutes} minute#{'s' if minutes != 1}"
end
- if seconds > 0 and not round_to_min
- s += " #{seconds} second#{'s' if seconds != 1}"
+ if not round_to_min or s.size == 0
+ s << "#{seconds} second#{'s' if seconds != 1}"
end
+ s = s * " "
else
s = ""
if days > 0