Hello community,
here is the log from the commit of package yast2-packager for
openSUSE:Leap:15.2 checked in at 2020-01-17 11:59:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/yast2-packager (Old)
and /work/SRC/openSUSE:Leap:15.2/.yast2-packager.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager"
Fri Jan 17 11:59:01 2020 rev:135 rq:764558 version:4.2.44
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/yast2-packager/yast2-packager.changes
2020-01-15 16:32:17.500881821 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.yast2-packager.new.26092/yast2-packager.changes
2020-01-17 11:59:03.520441137 +0100
@@ -1,0 +2,17 @@
+Thu Jan 10 15:03:31 UTC 2020 - [email protected]
+
+- Do not refresh package installation overview if the medium has
+ been changed and the user has switched to the release notes tab.
+ (bsc#1129426, bsc#1159367)
+- 4.2.44
+
+-------------------------------------------------------------------
+Fri Jan 10 14:47:58 UTC 2020 - Josef Reidinger <[email protected]>
+
+- PackageSlideShow: Do not show medium if there is only one
+ (bsc#1158498)
+- PackageSlideShow: Show hourglass when computing remaining time
+- PackageSlideShow: Never exceed 2 hours for time estimation
+- 4.2.43
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-4.2.42.tar.bz2
New:
----
yast2-packager-4.2.44.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.AJF1Gs/_old 2020-01-17 11:59:04.264441465 +0100
+++ /var/tmp/diff_new_pack.AJF1Gs/_new 2020-01-17 11:59:04.264441465 +0100
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 4.2.42
+Version: 4.2.44
Release: 0
Summary: YaST2 - Package Library
License: GPL-2.0-or-later
@@ -35,8 +35,8 @@
BuildRequires: yast2-storage-ng >= 4.0.141
# break the yast2-packager -> yast2-storage-ng -> yast2-packager build cycle
#!BuildIgnore: yast2-packager
-# Y2Packager::Resolvable moved to yast2 package
-BuildRequires: yast2 >= 4.2.43
+# SlideShow.Redraw
+BuildRequires: yast2 >= 4.2.54
# Pkg::Resolvables
BuildRequires: yast2-pkg-bindings >= 4.2.0
# Augeas lenses
@@ -47,8 +47,8 @@
Requires: yast2-country-data >= 2.16.3
# Pkg::Resolvables
Requires: yast2-pkg-bindings >= 4.2.0
-# Y2Packager::Resolvable moved to yast2 package
-Requires: yast2 >= 4.2.43
+# SlideShow.Redraw
+Requires: yast2 >= 4.2.54
# unzipping license file
Requires: unzip
# HTTP, FTP, HTTPS modules (inst_productsources.ycp)
++++++ yast2-packager-4.2.42.tar.bz2 -> yast2-packager-4.2.44.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-4.2.42/package/yast2-packager.changes
new/yast2-packager-4.2.44/package/yast2-packager.changes
--- old/yast2-packager-4.2.42/package/yast2-packager.changes 2020-01-03
10:26:49.000000000 +0100
+++ new/yast2-packager-4.2.44/package/yast2-packager.changes 2020-01-13
16:35:42.000000000 +0100
@@ -1,4 +1,21 @@
-------------------------------------------------------------------
+Thu Jan 10 15:03:31 UTC 2020 - [email protected]
+
+- Do not refresh package installation overview if the medium has
+ been changed and the user has switched to the release notes tab.
+ (bsc#1129426, bsc#1159367)
+- 4.2.44
+
+-------------------------------------------------------------------
+Fri Jan 10 14:47:58 UTC 2020 - Josef Reidinger <[email protected]>
+
+- PackageSlideShow: Do not show medium if there is only one
+ (bsc#1158498)
+- PackageSlideShow: Show hourglass when computing remaining time
+- PackageSlideShow: Never exceed 2 hours for time estimation
+- 4.2.43
+
+-------------------------------------------------------------------
Thu Jan 2 16:29:45 UTC 2020 - Josef Reidinger <[email protected]>
- Improve warning when all repositories are disabled (bsc#1158512)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-4.2.42/package/yast2-packager.spec
new/yast2-packager-4.2.44/package/yast2-packager.spec
--- old/yast2-packager-4.2.42/package/yast2-packager.spec 2020-01-03
10:26:49.000000000 +0100
+++ new/yast2-packager-4.2.44/package/yast2-packager.spec 2020-01-13
16:35:42.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 4.2.42
+Version: 4.2.44
Release: 0
Summary: YaST2 - Package Library
License: GPL-2.0-or-later
@@ -35,8 +35,8 @@
BuildRequires: yast2-storage-ng >= 4.0.141
# break the yast2-packager -> yast2-storage-ng -> yast2-packager build cycle
#!BuildIgnore: yast2-packager
-# Y2Packager::Resolvable moved to yast2 package
-BuildRequires: yast2 >= 4.2.43
+# SlideShow.Redraw
+BuildRequires: yast2 >= 4.2.54
# Pkg::Resolvables
BuildRequires: yast2-pkg-bindings >= 4.2.0
# Augeas lenses
@@ -47,8 +47,8 @@
Requires: yast2-country-data >= 2.16.3
# Pkg::Resolvables
Requires: yast2-pkg-bindings >= 4.2.0
-# Y2Packager::Resolvable moved to yast2 package
-Requires: yast2 >= 4.2.43
+# SlideShow.Redraw
+Requires: yast2 >= 4.2.54
# unzipping license file
Requires: unzip
# HTTP, FTP, HTTPS modules (inst_productsources.ycp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-4.2.42/src/modules/PackageInstallation.rb
new/yast2-packager-4.2.44/src/modules/PackageInstallation.rb
--- old/yast2-packager-4.2.42/src/modules/PackageInstallation.rb
2020-01-03 10:26:49.000000000 +0100
+++ new/yast2-packager-4.2.44/src/modules/PackageInstallation.rb
2020-01-13 16:35:42.000000000 +0100
@@ -96,10 +96,6 @@
# list srcremaining, list update_messages ]
def Commit(config)
config = deep_copy(config)
- if Mode.test
- FakePackager([], "suse", false) # not deleting packages
- return []
- end
# install packages from this media
PackageSlideShow.InitPkgData(false)
@@ -214,58 +210,8 @@
Commit("medium_nr" => media_number)
end
- #
- # Fake progress bars for Mode::test ()
- #
- # NOTE: This is currently completely broken.
- # -- sh 2003-12-15
- #
- def FakePackager(packages, _inst_source, _deleting)
- packages = deep_copy(packages)
- disk_usage = 20
- ret = nil
- number = 0
-
- Builtins.y2debug(
- "FakePackager - handling %1 packages",
- Builtins.size(packages)
- )
-
- Builtins.foreach(packages) do |_pac|
- pkg_size = 42 * 1024
- bytes_installed = 0
- if Ops.less_than(pkg_size, 0)
- # pkginfo doesn't know anything about the kernel RPM, so its
- # size can't be obtained, e.g. pkg_size is -1. To make up for
- # this, let's assume a negative starting size to keep things
- # going for a while (this is test_mode only, anyway).
- bytes_installed = -857 * 1024
- end
- while Ops.less_than(bytes_installed, pkg_size) && ret != :cancel &&
- ret != :diskfull
- Builtins.sleep(300) # millisec
- bytes_installed = Ops.add(bytes_installed, 300 * 1024)
- end
- disk_usage = Ops.add(disk_usage, 1)
- number = Ops.add(number, 1)
- end
-
- ret = case ret
- when :cancel, :abort
- :cancel
- when :diskfull
- :diskfull
- else
- :ok
- end
-
- Builtins.y2debug("FakePackager returning with %1", ret)
- deep_copy(ret)
- end
-
publish function: :DownloadInAdvance, type: "boolean ()"
publish function: :SetDownloadInAdvance, type: "void (boolean)"
- publish function: :FakePackager, type: "any (list <list>, string, boolean)"
publish function: :Commit, type: "list (map <string, any>)"
publish function: :CommitPackages, type: "list (integer, integer)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-4.2.42/src/modules/PackageSlideShow.rb
new/yast2-packager-4.2.44/src/modules/PackageSlideShow.rb
--- old/yast2-packager-4.2.42/src/modules/PackageSlideShow.rb 2020-01-03
10:26:49.000000000 +0100
+++ new/yast2-packager-4.2.44/src/modules/PackageSlideShow.rb 2020-01-13
16:35:42.000000000 +0100
@@ -8,10 +8,7 @@
include Yast::Logger
# seconds to cut off predicted time
- MAX_TIME_PER_CD = 7200
-
- # minimum time displayed per CD if there is something to install
- MIN_TIME_PER_CD = 5
+ MAX_TIME = 2 * 60 * 60 # 2 hours
# Column index for refreshing statistics: remaining size
SIZE_COLUMN_POSITION = 1
@@ -19,6 +16,10 @@
PKG_COUNT_COLUMN_POSITION = 2
# Column index for refreshing statistics: remaining time
TIME_COLUMN_POSITION = 3
+ # Table padding
+ ITEM_PREFIX = " " * 4
+ # hourglass unicode char
+ HOURGLASS = "\u231B".freeze
def main
Yast.import "UI"
@@ -53,14 +54,12 @@
@next_src_no = -1
@next_cd_no = -1
@last_cd = false
- @total_cd_count = 0
@unit_is_seconds = false # begin with package sizes
@bytes_per_second = 1
@init_pkg_data_complete = false
- @debug = false # more debugging info
- @provide_name = "" # currently downlaoded package name
- @provide_size = "" # currently downlaoded package size
+ @provide_name = "" # currently downloaded package name
+ @provide_size = "" # currently downloaded package size
# package summary
# package counters
@@ -75,10 +74,8 @@
@installed_packages_list = []
@updated_packages_list = []
@removed_packages_list = []
- # integer avg_download_rate = 0;
@current_provide_size = 0
- @current_install_size = 0
@updating = false
end
@@ -95,7 +92,6 @@
# temporary values
@current_provide_size = 0
- @current_install_size = 0
@updating = false
nil
@@ -118,72 +114,46 @@
# ************** Formatting functions and helpers
**************************
#
***************************************************************************
- # Sum up all list items
+ # Sum up all list items. It flattens list and also skip all negative
values.
#
- # @param sizes [Array<Fixnum>] Sizes to sum
+ # @param sizes [Array<Fixnum|Array>] Sizes to sum
# @return [Fixnum] Sizes sum
def ListSum(sizes)
- sizes.reduce(0) { |a, e| (e == -1) ? a : a + e }
- end
-
- # Sum up all positive list items, but cut off individual items at a
maximum value.
- # Negative return values indicate overflow of any individual item at
"max_cutoff".
- # In this case, the absolute value of the return value is "max_cutoff" *
number of overflows.
- # (e.g. >2hour + >2hours + 1:13:20 => >4hours
- #
- def ListSumCutOff(sizes, max_cutoff)
- sizes = deep_copy(sizes)
- overflow = 0
- sum = 0
-
- Builtins.foreach(sizes) do |item|
- if Ops.greater_than(item, 0)
- if Ops.greater_than(item, max_cutoff)
- overflow = Ops.add(overflow, 1)
- else
- sum = Ops.add(sum, item)
- end
- end
- end
-
- sum = Ops.multiply(Ops.unary_minus(overflow), max_cutoff) if
Ops.greater_than(overflow, 0)
-
- sum
+ sizes.flatten.select(&:positive?).reduce(0, :+)
end
def TotalRemainingSize
- ListSum(Builtins.flatten(@remaining_sizes_per_cd_per_src))
+ ListSum(@remaining_sizes_per_cd_per_src)
end
def TotalRemainingTime
- ListSumCutOff(
- Builtins.flatten(@remaining_times_per_cd_per_src),
- MAX_TIME_PER_CD
- )
+ ListSum(@remaining_times_per_cd_per_src)
end
def TotalRemainingPkgCount
- ListSum(Builtins.flatten(@remaining_pkg_count_per_cd_per_src))
+ ListSum(@remaining_pkg_count_per_cd_per_src)
end
def TotalInstalledSize
- Ops.subtract(@total_size_to_install, TotalRemainingSize())
+ @total_size_to_install - TotalRemainingSize()
+ end
+
+ def show_remaining_time?
+ @unit_is_seconds
end
# Format an integer seconds value with min:sec or hours:min:sec
#
- # Negative values are interpreted as overflow - ">" is prepended and the
- # absolute value is used.
+ # Values bigger then MAX_TIME are interpreted as overflow - ">" is
prepended and the
+ # MAX_TIME is used.
#
def FormatTimeShowOverflow(seconds)
- if Ops.less_than(seconds, 0) # Overflow (indicated by negative value)
- # When data throughput goes downhill (stalled network connection etc.),
- # cut off the predicted time at a reasonable maximum.
- # "%1" is a predefined maximum time.
-
+ if seconds > MAX_TIME
+ # TRANSLATORS: "%1" is a predefined maximum time. Value used in table
+ # to indicate long time like ">2:00:00"
Builtins.sformat(
_(">%1"),
- String.FormatTime(Ops.unary_minus(seconds))
+ String.FormatTime(MAX_TIME)
)
else
String.FormatTime(seconds)
@@ -229,11 +199,10 @@
Builtins.sformat(@media_type, Ops.add(@next_cd_no, 1))
)
- text = if @unit_is_seconds
+ text = if show_remaining_time?
# Status line informing about the next CD that will be used
- # %1: Media type ("CD" / "DVD", ???)
- # %2: Media name ("SuSE Linux Professional CD 2" )
- # %3: Time remaining until this media will be needed
+ # %1: Media name ("SuSE Linux Professional CD 2" )
+ # %2: Time remaining until this media will be needed
Builtins.sformat(
_("Next: %1 -- %2"),
next_media_name,
@@ -250,8 +219,7 @@
)
else
# Status line informing about the next CD that will be used
- # %1: Media type ("CD" / "DVD", ???)
- # %2: Media name ("SuSE Linux Professional CD 2" )
+ # %1: Media name ("SuSE Linux Professional CD 2" )
Builtins.sformat(_("Next: %1"), next_media_name)
end
end
@@ -272,6 +240,7 @@
# Update internal bookkeeping: subtract size of one package from the
# global list of remaining sizes per CD
+ # @param [String] pkg_size package size in bytes
#
def SubtractPackageSize(pkg_size)
remaining = Ops.get(
@@ -279,14 +248,12 @@
[Ops.subtract(@current_src_no, 1), Ops.subtract(@current_cd_no, 1)],
1
)
- remaining = Ops.subtract(remaining, pkg_size)
- @total_size_installed = Ops.add(@total_size_installed, pkg_size)
+ remaining -= pkg_size
+ @total_size_installed += pkg_size
- if Ops.less_or_equal(remaining, 0)
- # -1 is the indicator for "done with this CD" - not to be
- # confused with 0 for "nothing to install from this CD".
- remaining = -1
- end
+ # -1 is the indicator for "done with this CD" - not to be
+ # confused with 0 for "nothing to install from this CD".
+ remaining = -1 if remaining <= 0
Ops.set(
@remaining_sizes_per_cd_per_src,
@@ -306,15 +273,11 @@
)
)
- if @unit_is_seconds
+ if show_remaining_time?
seconds = 0
- if Ops.greater_than(remaining, 0) &&
- Ops.greater_than(@bytes_per_second, 0)
- seconds = Ops.divide(remaining, @bytes_per_second)
- end
+ seconds = remaining / @bytes_per_second if remaining > 0 &&
@bytes_per_second > 0
- seconds = MIN_TIME_PER_CD if seconds < MIN_TIME_PER_CD
log.debug "Updating remaining time for source #{@current_src_no} " \
"(medium #{@current_cd_no}): #{seconds}"
Ops.set(
@@ -324,14 +287,6 @@
)
end
- if @debug
- Builtins.y2milestone(
- "SubtractPackageSize( %1 ) -> %2",
- pkg_size,
- @remaining_sizes_per_cd_per_src
- )
- end
-
nil
end
@@ -383,9 +338,8 @@
end
def packages_to_install(src_mapping)
- src_mapping = deep_copy(src_mapping)
- ret = ListSum(Builtins.flatten(src_mapping))
- Builtins.y2milestone("Total number of packages to install: %1", ret)
+ ret = ListSum(src_mapping)
+ log.info "Total number of packages to install: #{ret}"
ret
end
@@ -401,51 +355,35 @@
ResetPackageSummary()
# Reinititalize some globals (in case this is a second run)
@total_size_installed = 0
- # total_time_elapsed = 0;
- # start_time = -1;
@current_src_no = -1 # 1..n
@current_cd_no = -1 # 1..n
@next_src_no = -1
@next_cd_no = -1
@last_cd = false
- @unit_is_seconds = false # begin with package sizes
+ @unit_is_seconds = false # begin without showing time before it
stabilize a bit
@bytes_per_second = 1
src_list = Pkg.PkgMediaNames
- @inst_src_names = Builtins.maplist(src_list) do |src|
- Ops.get_string(src, 0, "CD")
- end
+ @inst_src_names = src_list.map { |src| src[0] || "CD" }
- Builtins.y2milestone("Media names: %1", @inst_src_names)
+ log.info "Media names: #{@inst_src_names}"
index = 0
@srcid_to_current_src_no = Builtins.listmap(src_list) do |src|
- index = Ops.add(index, 1)
+ index += 1
{ Ops.get_integer(src, 1, -1) => index }
end
- Builtins.y2milestone(
- "Repository mapping information: %1",
- @srcid_to_current_src_no
- )
+ log.info "Repository mapping information:
#{@srcid_to_current_src_no.inspect}"
@total_sizes_per_cd_per_src = Pkg.PkgMediaSizes
@total_pkg_count_per_cd_per_src = Pkg.PkgMediaCount
- @total_size_to_install = ListSum(
- Builtins.flatten(@total_sizes_per_cd_per_src)
- )
- Builtins.y2milestone("total_size_to_install: %1", @total_size_to_install)
- @remaining_sizes_per_cd_per_src = Builtins.eval(
- @total_sizes_per_cd_per_src
- )
- @remaining_pkg_count_per_cd_per_src = Builtins.eval(
- @total_pkg_count_per_cd_per_src
- )
- @total_cd_count = Builtins.size(
- Builtins.flatten(@total_sizes_per_cd_per_src)
- )
+ @total_size_to_install = ListSum(@total_sizes_per_cd_per_src)
+ log.info "total_size_to_install: #{@total_size_to_install}"
+ @remaining_sizes_per_cd_per_src = deep_copy(@total_sizes_per_cd_per_src)
+ @remaining_pkg_count_per_cd_per_src =
deep_copy(@total_pkg_count_per_cd_per_src)
@total_count_to_download = packages_to_download(
@total_pkg_count_per_cd_per_src
)
@@ -453,26 +391,16 @@
total_count_to_install = packages_to_install(
@total_pkg_count_per_cd_per_src
)
- total = Ops.add(total_count_to_install, @total_count_to_download)
- @downloading_pct = Ops.divide(
- Ops.multiply(total.zero? ? 0 : 100, @total_count_to_download),
- total
- )
+ total = total_count_to_install + @total_count_to_download
+ @downloading_pct = 0
+ @downloading_pct = 100 * @total_count_to_download / total if
total.nonzero?
@init_pkg_data_complete = true
# reset the history log
SlideShow.inst_log = ""
- Builtins.y2milestone(
- "PackageSlideShow::InitPkgData() done; total_sizes_per_cd_per_src: %1",
- @total_sizes_per_cd_per_src
- )
- Builtins.y2milestone(
- "PackageSlideShow::InitPkgData(): pkg: %1",
- @total_pkg_count_per_cd_per_src
- )
-
- nil
+ log.info "total_sizes_per_cd_per_src:
#{@total_sizes_per_cd_per_src.inspect}"
+ log.info "total_pkg_count_per_cd_per_src
#{@total_pkg_count_per_cd_per_src}"
end
# Try to figure out what media will be needed next
@@ -483,38 +411,22 @@
# but since this uses 1..n and we need 0..n-1
# for array subscripts anyway, use it as it is.
@next_cd_no = @current_cd_no
- @next_src_no = Ops.subtract(@current_src_no, 1)
+ @next_src_no = @current_src_no - 1
@last_cd = false
- while Ops.less_than(
- @next_src_no,
- Builtins.size(@remaining_sizes_per_cd_per_src)
- )
- remaining_sizes = Ops.get(
- @remaining_sizes_per_cd_per_src,
- @next_src_no,
- []
- )
+ while @next_src_no < @remaining_sizes_per_cd_per_src.size
+ remaining_sizes = @remaining_sizes_per_cd_per_src[@next_src_no]
- while Ops.less_than(@next_cd_no, Builtins.size(remaining_sizes))
- if Ops.greater_than(Ops.get(remaining_sizes, @next_cd_no, 0), 0)
- if @debug
- Builtins.y2milestone(
- "Next media: src: %1 CD: %2",
- @next_src_no,
- @next_cd_no
- )
- end
- return
- else
- @next_cd_no = Ops.add(@next_cd_no, 1)
- end
+ while @next_cd_no < remaining_sizes.size
+ return if remaining_sizes[@next_cd_no] > 0
+
+ @next_cd_no += 1
end
- @next_src_no = Ops.add(@next_src_no, 1)
+ @next_src_no += 1
end
- Builtins.y2milestone("No next media - all done") if @debug
+ log.info "No next media - all done"
@next_src_no = -1
@next_cd_no = -1
@@ -529,33 +441,16 @@
#
def SetCurrentCdNo(src_no, cd_no)
if cd_no.zero?
- Builtins.y2milestone("medium number 0, using medium number 1")
+ log.info("medium number 0, using medium number 1")
cd_no = 1
end
- Builtins.y2milestone("SetCurrentCdNo() - src: %1 , CD: %2", src_no,
cd_no)
- @current_src_no = Ops.get(@srcid_to_current_src_no, src_no, -1)
+ log.info("SetCurrentCdNo() - src: #{src_no} , CD: #{cd_no}")
+ @current_src_no = @srcid_to_current_src_no[src_no] || -1
@current_cd_no = cd_no
-
- SlideShow.CheckForSlides
FindNextMedia()
- if Slides.HaveSlides && Slides.HaveSlideSupport
- if !SlideShow.HaveSlideWidget
- # (true) : Showing release tab if needed
- SlideShow.RebuildDialog(true)
-
- SlideShow.SwitchToDetailsView if SlideShow.user_switched_to_details
- end
-
- # Don't override explicit user request!
- SlideShow.SwitchToSlideView if !SlideShow.user_switched_to_details
- elsif !SlideShow.ShowingDetails
- # (true) : Showing release tab if needed
- SlideShow.RebuildDialog(true)
- end
-
- nil
+ SlideShow.Redraw() # Redrawing the complete slide show if needed.
end
# Recalculate remaining times per CD based on package sizes remaining
@@ -615,25 +510,11 @@
Builtins.foreach(@remaining_sizes_per_cd_per_src) do
|remaining_sizes_list|
remaining_times_list = []
- remaining_time = -1
remaining_sizes_list.each do |remaining_size|
remaining_time = remaining_size
- if remaining_size > 0
- remaining_time = (remaining_size.to_f / @bytes_per_second).round
-
- if remaining_time < MIN_TIME_PER_CD
- # It takes at least this long for the CD drive to spin up and
- # for RPM to do _anything_. Times below this values are
- # ridiculously unrealistic.
- remaining_time = MIN_TIME_PER_CD
- elsif remaining_time > MAX_TIME_PER_CD # clip off at 2 hours
- # When data throughput goes downhill (stalled network connection
etc.),
- # cut off the predicted time at a reasonable maximum.
- remaining_time = MAX_TIME_PER_CD
- end
- end
+ remaining_time = (remaining_size.to_f / @bytes_per_second).round if
remaining_size > 0
remaining_times_list << remaining_time
end
@@ -655,11 +536,8 @@
# @return true if just switched from sizes to seconds, false otherwise
#
def SwitchToSecondsIfNecessary
- if @unit_is_seconds ||
- Ops.less_than(
- Yast2::SystemTime.uptime,
- Ops.add(SlideShow.start_time, SlideShow.initial_recalc_delay)
- )
+ if show_remaining_time? ||
+ (Yast2::SystemTime.uptime - SlideShow.start_time) <
SlideShow.initial_recalc_delay
return false # no need to switch
end
@@ -675,6 +553,7 @@
# Update progress widgets for the current CD: Label and ProgressBar.
# Use global statistics variables for that.
+ # @param [Boolean] silent_check don't complain in log file
#
def UpdateCurrentCdProgress(silent_check)
return if !SanityCheck(silent_check)
@@ -684,20 +563,17 @@
# Update table entries for current CD
#
- remaining = Ops.get(
- @remaining_sizes_per_cd_per_src,
- [Ops.subtract(@current_src_no, 1), Ops.subtract(@current_cd_no, 1)],
- 0
- )
+ # pair into array of array for time and size
+ source_pair = [@current_src_no - 1, @current_cd_no - 1]
+ remaining = @remaining_sizes_per_cd_per_src.dig(*source_pair) || 0
+
+ # collumn id for current CD
+ source_id = "cd(#{source_pair.join(",")})"
UI.ChangeWidget(
Id(:cdStatisticsTable),
term(
:Item,
- Builtins.sformat(
- "cd(%1,%2)",
- Ops.subtract(@current_src_no, 1),
- Ops.subtract(@current_cd_no, 1)
- ),
+ source_id,
SIZE_COLUMN_POSITION
),
FormatRemainingSize(remaining)
@@ -707,44 +583,22 @@
Id(:cdStatisticsTable),
term(
:Item,
- Builtins.sformat(
- "cd(%1,%2)",
- Ops.subtract(@current_src_no, 1),
- Ops.subtract(@current_cd_no, 1)
- ),
+ source_id,
PKG_COUNT_COLUMN_POSITION
),
- FormatRemainingCount(
- Ops.get(
- @remaining_pkg_count_per_cd_per_src,
- [Ops.subtract(@current_src_no, 1), Ops.subtract(@current_cd_no,
1)],
- 0
- )
- )
+
FormatRemainingCount(@remaining_pkg_count_per_cd_per_src.dig(*source_pair) || 0)
)
- if @unit_is_seconds
+ if show_remaining_time?
# Convert 'remaining' from size (bytes) to time (seconds)
- remaining = Ops.divide(remaining, @bytes_per_second)
-
- remaining = 0 if Ops.less_or_equal(remaining, 0)
-
- if Ops.greater_than(remaining, MAX_TIME_PER_CD) # clip off at 2 hours
- # When data throughput goes downhill (stalled network connection
etc.),
- # cut off the predicted time at a reasonable maximum.
- remaining = Ops.unary_minus(MAX_TIME_PER_CD)
- end
+ remaining = @bytes_per_second.nonzero? ? remaining / @bytes_per_second
: (MAX_TIME + 1)
UI.ChangeWidget(
Id(:cdStatisticsTable),
term(
:Item,
- Builtins.sformat(
- "cd(%1,%2)",
- Ops.subtract(@current_src_no, 1),
- Ops.subtract(@current_cd_no, 1)
- ),
+ source_id,
TIME_COLUMN_POSITION
),
FormatTimeShowOverflow(remaining)
@@ -767,49 +621,30 @@
FormatRemainingCount(TotalRemainingPkgCount())
)
- if @unit_is_seconds
- UI.ChangeWidget(
- Id(:cdStatisticsTable),
- term(:Item, "total", TIME_COLUMN_POSITION),
- FormatTimeShowOverflow(TotalRemainingTime())
- )
- end
+ return unless show_remaining_time?
- nil
+ UI.ChangeWidget(
+ Id(:cdStatisticsTable),
+ term(:Item, "total", TIME_COLUMN_POSITION),
+ FormatTimeShowOverflow(TotalRemainingTime())
+ )
end
# update the overall progress value (download + installation)
def UpdateTotalProgressValue
- total_progress = if @total_count_to_download.zero?
+ total_progress = if @total_size_to_install.zero?
+ 100 # nothing to install. Should not happen
+ elsif @total_count_to_download.zero?
# no package to download, just use the install size
- Ops.divide(
- Ops.multiply(TotalInstalledSize(), 100),
- @total_size_to_install
- )
+ TotalInstalledSize() * 100 / @total_size_to_install
else
# compute the total progress (use both download and installation size)
- Ops.add(
- Ops.divide(
- Ops.multiply(@total_count_downloaded, @downloading_pct),
- @total_count_to_download
- ),
- Ops.divide(
- Ops.multiply(
- TotalInstalledSize(),
- Ops.subtract(100, @downloading_pct)
- ),
- @total_size_to_install
- )
- )
+ @total_count_downloaded * @downloading_pct / @total_count_to_download +
+ TotalInstalledSize() * (100 - @downloading_pct) /
@total_size_to_install
end
- Builtins.y2debug(
- "Total package installation progress: %1%%",
- total_progress
- )
+ log.debug "Total package installation progress: #{total_progress}%"
SlideShow.StageProgress(total_progress, nil)
-
- nil
end
# Update progress widgets
@@ -836,8 +671,6 @@
# Returns a table widget item list for CD statistics
#
def CdStatisticsTableItems
- itemList = []
-
#
# Add "Total" item - at the top so it is visible by default even if
there are many items
#
@@ -847,22 +680,19 @@
remaining = TotalRemainingSize()
rem_size = FormatRemainingSize(remaining)
rem_count = FormatRemainingCount(TotalRemainingPkgCount())
- rem_time = ""
+ rem_time = HOURGLASS
- if @unit_is_seconds && Ops.greater_than(@bytes_per_second, 0)
+ if show_remaining_time? && @bytes_per_second > 0
rem_time = FormatTimeShowOverflow(TotalRemainingTime())
end
- itemList = Builtins.add(
- itemList,
- SlideShow.TableItem(
- "total",
- caption,
- Ops.add(" ", rem_size),
- Ops.add(" ", rem_count),
- Ops.add(" ", rem_time)
- )
- )
+ itemList = [SlideShow.TableItem(
+ "total",
+ caption,
+ ITEM_PREFIX + rem_size,
+ ITEM_PREFIX + rem_count,
+ ITEM_PREFIX + rem_time
+ )]
#
# Now go through all repositories
@@ -870,73 +700,46 @@
src_no = 0
- Builtins.foreach(@remaining_sizes_per_cd_per_src) do |inst_src|
- Builtins.y2milestone("src #%1: %2", src_no, inst_src)
+ @remaining_sizes_per_cd_per_src.each do |inst_src|
+ log.info "src ##{src_no}: #{inst_src}"
# Ignore repositories from where there is nothing is to install
- if Ops.greater_than(ListSum(inst_src), 0)
- # Add heading for this repository
- itemList = Builtins.add(
- itemList,
- SlideShow.TableItem(
- Builtins.sformat("src(%1)", src_no),
- Ops.get(@inst_src_names, src_no, ""),
- "",
- "",
- ""
- )
- )
+ next if ListSum(inst_src) < 1
- cd_no = 0
+ cd_no = 0
- Builtins.foreach(inst_src) do |src_remaining|
- if Ops.greater_than(src_remaining, 0) ||
- Ops.add(src_no, 1) == @current_src_no &&
- Ops.add(cd_no, 1) == @current_cd_no # suppress current CD
- caption = Builtins.sformat(@media_type, Ops.add(cd_no, 1)) #
"Medium 1" - column #0
- rem_size = FormatRemainingSize(src_remaining) # column #1
- rem_count = FormatRemainingCount(
- Ops.get(@src_remaining_pkg_count_per_cd_per_src, [src_no,
cd_no], 0)
- )
- rem_time = ""
+ inst_src.each do |src_remaining|
+ if src_remaining > 0 ||
+ (src_no + 1) == @current_src_no &&
+ (cd_no + 1) == @current_cd_no # suppress current CD
+ caption = @inst_src_names[src_no] || _("Unknown Source")
+ # add "Medium 1" only if more cds available (bsc#1158498)
+ caption += @media_type + (cd_no + 1).to_s unless @last_cd
+ rem_size = FormatRemainingSize(src_remaining) # column #1
+ rem_count = FormatRemainingCount(
+ @remaining_pkg_count_per_cd_per_src.dig(src_no, cd_no) || 0
+ )
+ rem_time = HOURGLASS
- if @unit_is_seconds && Ops.greater_than(@bytes_per_second, 0)
- src_remaining = Ops.divide(src_remaining, @bytes_per_second)
- src_remaining = MIN_TIME_PER_CD if src_remaining <
MIN_TIME_PER_CD
- rem_time = String.FormatTime(src_remaining) # column #2
-
- if Ops.greater_than(src_remaining, MAX_TIME_PER_CD) # clip off
at 2 hours
- # When data throughput goes downhill (stalled network
connection etc.),
- # cut off the predicted time at a reasonable maximum.
- # "%1" is a predefined maximum time.
- rem_time = FormatTimeShowOverflow(
- Ops.unary_minus(MAX_TIME_PER_CD)
- )
- end
- end
-
- itemList = Builtins.add(
- itemList,
- SlideShow.TableItem(
- Builtins.sformat("cd(%1,%2)", src_no, cd_no), # ID
- caption,
- Ops.add(" ", rem_size),
- Ops.add(" ", rem_count),
- Ops.add(" ", rem_time)
- )
- )
+ if show_remaining_time? && @bytes_per_second > 0
+ src_remaining /= @bytes_per_second
+ rem_time = FormatTimeShowOverflow(src_remaining) # column #2
end
- cd_no = Ops.add(cd_no, 1)
+
+ itemList <<
+ SlideShow.TableItem(
+ "cd(#{src_no},#{cd_no})", # ID
+ caption,
+ ITEM_PREFIX + rem_size,
+ ITEM_PREFIX + rem_count,
+ ITEM_PREFIX + rem_time
+ )
end
+ cd_no += 1
end
- src_no = Ops.add(src_no, 1)
+ src_no += 1
end
- if @debug
- Builtins.y2milestone("Remaining: %1", @remaining_sizes_per_cd_per_src)
- Builtins.y2milestone("CD table item list:\n%1", itemList)
- end
-
- deep_copy(itemList)
+ itemList
end
# Progress display update
@@ -946,14 +749,10 @@
#
def UpdateCurrentPackageProgress(pkg_percent)
SlideShow.SubProgress(pkg_percent, nil)
-
- nil
end
# update the download rate
def UpdateCurrentPackageRateProgress(pkg_percent, bps_avg, bps_current)
- # avg_download_rate = bps_avg;
-
return if !SlideShow.ShowingDetails
new_text = nil # no update of the label
@@ -981,7 +780,7 @@
tot_rem_t = TotalRemainingTime()
rem_string =
- if @unit_is_seconds && Ops.greater_than(@bytes_per_second, 0) &&
+ if show_remaining_time? && Ops.greater_than(@bytes_per_second, 0) &&
Ops.greater_than(tot_rem_t, 0)
Builtins.sformat(
"%1 / %2",
@@ -992,7 +791,7 @@
FormatRemainingSize(TotalRemainingSize())
end
- rem_string = Ops.add(rem_string, ", ") if rem_string != ""
+ rem_string += ", " unless rem_string.empty?
SlideShow.SetGlobalProgressLabel(
Ops.add(
@@ -1008,39 +807,35 @@
nil
end
+ # Callback when file is downloaded ( but not yet installed )
+ # @param error[Integer] error code
def DoneProvide(error, _reason, _name)
- if error.zero?
- @total_downloaded = Ops.add(@total_downloaded, @current_provide_size)
+ return if error.nonzero?
- @total_count_downloaded = Ops.add(@total_count_downloaded, 1)
- Builtins.y2milestone(
- "Downloaded %1/%2 packages",
- @total_count_downloaded,
- @total_count_to_download
- )
+ @total_downloaded += @current_provide_size
- # move the progress also for downloaded files
- UpdateTotalProgressValue()
+ @total_count_downloaded += 1
+ log.info "Downloaded #{@total_downloaded}/#{@total_count_to_download}
packages"
- d_mode = Ops.get_symbol(Pkg.CommitPolicy, "download_mode", :default)
+ # move the progress also for downloaded files
+ UpdateTotalProgressValue()
- if d_mode == :download_in_advance ||
- d_mode == :default && Mode.normal &&
- !Installation.dirinstall_installing_into_dir
- # display download progress in DownloadInAdvance mode
- # translations: progress message (part1)
- SlideShow.SetGlobalProgressLabel(
- Ops.add(
- _("Downloading Packages..."),
- # progress message (part2)
- Builtins.sformat(
- _(" (Downloaded %1 of %2 packages)"),
- @total_count_downloaded,
- @total_count_to_download
- )
- )
+ d_mode = Ops.get_symbol(Pkg.CommitPolicy, "download_mode", :default)
+
+ if d_mode == :download_in_advance ||
+ d_mode == :default && Mode.normal &&
+ !Installation.dirinstall_installing_into_dir
+ # display download progress in DownloadInAdvance mode
+ # translations: progress message (part1)
+ SlideShow.SetGlobalProgressLabel(
+ _("Downloading Packages...") +
+ # progress message (part2)
+ Builtins.sformat(
+ _(" (Downloaded %1 of %2 packages)"),
+ @total_count_downloaded,
+ @total_count_to_download
)
- end
+ )
end
nil
@@ -1048,11 +843,12 @@
# Update progress widgets for all CDs.
# Uses global statistics variables.
+ # Redraw whole table, time consuming, but called only when all times
recalculated.
#
def UpdateAllCdProgress(silent_check)
return if !SanityCheck(silent_check)
- RecalcRemainingTimes(true) if @unit_is_seconds # force
+ RecalcRemainingTimes(true) if show_remaining_time? # force
SlideShow.UpdateTable(CdStatisticsTableItems())
@@ -1071,7 +867,8 @@
# - this is called at the end of a new package
#
# @param [String] pkg_name package name
- # @param [Boolean] deleting Flag: deleting (true) or installing (false)
package?
+ # @param [String] pkg_size package size in bytes
+ # @param [Boolean] deleting Flag: deleting (true) or installing (false)
package
#
def SlideDisplayDone(pkg_name, pkg_size, deleting)
if !deleting
@@ -1109,16 +906,11 @@
end
end
- @total_installed = Ops.add(@total_installed, @current_install_size)
+ @total_installed = Ops.add(@total_installed, pkg_size)
else
- @removed_packages = Ops.add(@removed_packages, 1)
+ @removed_packages += 1
- if Mode.normal
- @removed_packages_list = Builtins.add(
- @removed_packages_list,
- pkg_name
- )
- end
+ @removed_packages_list << pkg_name if Mode.normal
end
nil
@@ -1174,8 +966,6 @@
pkg_filename,
String.FormatSize(pkg_size)
)
-
- @current_install_size = pkg_size
end
#
@@ -1269,37 +1059,10 @@
nil
end
- publish variable: :total_sizes_per_cd_per_src, type: "list <list
<integer>>"
- publish variable: :remaining_sizes_per_cd_per_src, type: "list <list
<integer>>"
- publish variable: :remaining_times_per_cd_per_src, type: "list <list
<integer>>"
- publish variable: :inst_src_names, type: "list <string>"
- publish variable: :total_pkg_count_per_cd_per_src, type: "list <list
<integer>>"
- publish variable: :remaining_pkg_count_per_cd_per_src, type: "list <list
<integer>>"
- publish variable: :srcid_to_current_src_no, type: "map <integer, integer>"
- publish variable: :media_type, type: "string"
- publish variable: :total_size_installed, type: "integer"
- publish variable: :total_size_to_install, type: "integer"
- publish variable: :total_count_to_download, type: "integer"
- publish variable: :total_count_downloaded, type: "integer"
- publish variable: :downloading_pct, type: "integer"
- publish variable: :min_time_per_cd, type: "integer"
- publish variable: :max_time_per_cd, type: "integer"
- publish variable: :size_column, type: "integer"
- publish variable: :pkg_count_column, type: "integer"
- publish variable: :time_column, type: "integer"
- publish variable: :current_src_no, type: "integer"
- publish variable: :current_cd_no, type: "integer"
- publish variable: :next_src_no, type: "integer"
- publish variable: :next_cd_no, type: "integer"
- publish variable: :last_cd, type: "boolean"
- publish variable: :total_cd_count, type: "integer"
- publish variable: :unit_is_seconds, type: "boolean"
- publish variable: :bytes_per_second, type: "integer"
- publish variable: :init_pkg_data_complete, type: "boolean"
+ publish variable: :total_size_to_install, type: "integer" # Used in
installation client
publish function: :GetPackageSummary, type: "map <string, any> ()"
publish function: :InitPkgData, type: "void (boolean)"
publish function: :SetCurrentCdNo, type: "void (integer, integer)"
- publish function: :UpdateCurrentCdProgress, type: "void (boolean)"
publish function: :UpdateCurrentPackageProgress, type: "void (integer)"
publish function: :UpdateCurrentPackageRateProgress, type: "void (integer,
integer, integer)"
publish function: :DisplayGlobalProgress, type: "void ()"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-4.2.42/src/modules/SlideShowCallbacks.rb
new/yast2-packager-4.2.44/src/modules/SlideShowCallbacks.rb
--- old/yast2-packager-4.2.42/src/modules/SlideShowCallbacks.rb 2020-01-03
10:26:49.000000000 +0100
+++ new/yast2-packager-4.2.44/src/modules/SlideShowCallbacks.rb 2020-01-13
16:35:42.000000000 +0100
@@ -40,7 +40,6 @@
# @return true if user wishes to abort
#
def HandleInput
- # any button = SlideShow::debug ? UI::PollInput() :
UI::TimeoutUserInput( 10 );
button = UI.PollInput
# in case of cancel ask user if he really wants to quit installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-4.2.42/test/package_slide_show_test.rb
new/yast2-packager-4.2.44/test/package_slide_show_test.rb
--- old/yast2-packager-4.2.42/test/package_slide_show_test.rb 2020-01-03
10:26:49.000000000 +0100
+++ new/yast2-packager-4.2.44/test/package_slide_show_test.rb 2020-01-13
16:35:42.000000000 +0100
@@ -7,20 +7,149 @@
describe Yast::PackageSlideShow do
subject(:package_slide_show) { Yast::PackageSlideShow }
- describe "#ListSum" do
- it "returns the sum skipping '-1' values" do
- expect(package_slide_show.ListSum([1, 2, 3, -1, 4])).to eq(10)
+ describe ".ListSum" do
+ it "returns the sum skipping negative values" do
+ expect(package_slide_show.ListSum([1, 2, 3, -1, -2, 4])).to eq(10)
+ end
+
+ it "flattens list" do
+ expect(package_slide_show.ListSum([[1, 2], 3, -1, -2, [4]])).to eq(10)
end
end
- describe "#ListSumCutOff" do
- it "returns sum of values if no value is over max_cutoff" do
- expect(Yast::PackageSlideShow.ListSumCutOff([60, 70, 80, 0], 100)).to eq
210
+ describe ".SwitchToSecondsIfNecessary" do
+ before do
+ # set internal variable if showing time or not
+ package_slide_show.instance_variable_set(:@unit_is_seconds, show_time)
+ end
+
+ context "remaining time is already shown" do
+ let(:show_time) { true }
+
+ it "returns false" do
+ expect(package_slide_show.SwitchToSecondsIfNecessary).to eq false
+ end
end
- it "returns -x * max_cutoff where x is number of value higher then
max_cutoff if any apear" do
- expect(Yast::PackageSlideShow.ListSumCutOff([60, 70, 80, 150], 100)).to
eq(-100)
- expect(Yast::PackageSlideShow.ListSumCutOff([160, 170, 80, 150],
100)).to eq(-300)
+ context "remaining time is not yet shown" do
+ let(:show_time) { false }
+
+ context "initial delay does not pass yet" do
+ before do
+ allow(Yast2::SystemTime).to receive(:uptime).and_return(5)
+ allow(Yast::SlideShow).to receive(:start_time).and_return(3)
+ allow(Yast::SlideShow).to
receive(:initial_recalc_delay).and_return(3)
+ end
+
+ it "returns false" do
+ expect(package_slide_show.SwitchToSecondsIfNecessary).to eq false
+ end
+ end
+
+ context "initial delay already pass" do
+ before do
+ allow(Yast2::SystemTime).to receive(:uptime).and_return(10)
+ allow(Yast::SlideShow).to receive(:start_time).and_return(3)
+ allow(Yast::SlideShow).to
receive(:initial_recalc_delay).and_return(3)
+ end
+
+ it "returns false" do
+ expect(package_slide_show.SwitchToSecondsIfNecessary).to eq true
+ end
+
+ it "sets to display remaining time" do
+ package_slide_show.SwitchToSecondsIfNecessary
+
+ expect(package_slide_show.show_remaining_time?).to eq true
+ end
+
+ it "recalculates remaining time" do
+ expect(package_slide_show).to receive(:RecalcRemainingTimes)
+
+ package_slide_show.SwitchToSecondsIfNecessary
+ end
+ end
+ end
+ end
+
+ describe ".SlideDisplayDone" do
+ context "when deleting package" do
+ it "increases removed counter in summary" do
+ package_slide_show.main # to reset counter
+ expect { package_slide_show.SlideDisplayDone("test", 1, true) }.to(
+ change { package_slide_show.GetPackageSummary["removed"]
}.from(0).to(1)
+ )
+ end
+
+ it "adds name to removed_list in summary in normal mode" do
+ allow(Yast::Mode).to receive(:normal).and_return(true)
+ package_slide_show.main # to reset counter
+ expect { package_slide_show.SlideDisplayDone("test", 1, true) }.to(
+ change { package_slide_show.GetPackageSummary["removed_list"] }
+ .from([])
+ .to(["test"])
+ )
+ end
+ end
+
+ context "when installing package" do
+ # TODO: lot of internal variables changes in size and time estimation
that is hard to test
+ # TODO: updating is also hard to test as it is set at start of package
install
+ # TODO: updating non trivial amount of table
+ it "increases installed counter in summary" do
+ package_slide_show.main # to reset counter
+ expect { package_slide_show.SlideDisplayDone("test", 1, false) }.to(
+ change { package_slide_show.GetPackageSummary["installed"]
}.from(0).to(1)
+ )
+ end
+
+ it "adds name to installed_list in summary in normal mode" do
+ allow(Yast::Mode).to receive(:normal).and_return(true)
+ package_slide_show.main # to reset counter
+ expect { package_slide_show.SlideDisplayDone("test", 1, false) }.to(
+ change { package_slide_show.GetPackageSummary["installed_list"] }
+ .from([])
+ .to(["test"])
+ )
+ end
+
+ it "adds its size to installed_bytes in summary" do
+ package_slide_show.main # to reset counter
+ expect { package_slide_show.SlideDisplayDone("test", 502, false) }.to(
+ change { package_slide_show.GetPackageSummary["installed_bytes"]
}.from(0).to(502)
+ )
+ end
+
+ it "sets global progress label in slide show" do
+ expect(Yast::SlideShow).to receive(:SetGlobalProgressLabel)
+
+ package_slide_show.SlideDisplayDone("test", 502, false)
+ end
+
+ it "updates stage progress" do
+ expect(Yast::SlideShow).to receive(:StageProgress)
+
+ package_slide_show.SlideDisplayDone("test", 502, false)
+ end
+ end
+ end
+
+ describe ".FormatTimeShowOverflow" do
+ it "formats time" do
+ time = 1 * 3600 + 14 * 60 + 30
+ expect(package_slide_show.FormatTimeShowOverflow(time)).to eq "1:14:30"
+ end
+
+ it "shows >MAX_TIME if time exceed MAX_TIME" do
+ time = 14 * 60 + 30 + Yast::PackageSlideShowClass::MAX_TIME
+ expect(package_slide_show.FormatTimeShowOverflow(time)).to eq ">2:00:00"
+ end
+ end
+
+ describe ".CdStatisticsTableItems" do
+ it "returns array of table items" do
+ package_slide_show.main # to reset counter
+ expect(package_slide_show.CdStatisticsTableItems).to be_a(::Array)
end
end
end
