From 5cad18b188cf51e31b9ae1ab5a1fd35eacf22d43 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Mon, 2 Apr 2012 16:29:17 +0800 Subject: Hob: unify _size_to_string() and _string_to_size() We call intsize_to_string (and string_to_intsize) in 3 different places. We unify the implementations into one place. (Bitbake rev: 578ce86a9ac2110f5b128aae582c6e0b3e739cec) Signed-off-by: Shane Wang Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 18 ++++------- bitbake/lib/bb/ui/crumbs/hobpages.py | 39 ++++++++++++++++++++++++ bitbake/lib/bb/ui/crumbs/imagedetailspage.py | 11 +------ bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 21 +++---------- 4 files changed, 51 insertions(+), 38 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py index 5dddffa327..4934ba8ed8 100644 --- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py +++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py @@ -22,6 +22,7 @@ import gtk import gobject +from bb.ui.crumbs.hobpages import HobPage # # PackageListModel @@ -175,10 +176,8 @@ class PackageListModel(gtk.TreeStore): if pkgsize == "0" and not allow_empty: continue - if len(pkgsize) > 3: - size = '%.1f' % (int(pkgsize)*1.0/1024) + ' MB' - else: - size = pkgsize + ' KB' + # pkgsize is in KB + size = HobPage._size_to_string(HobPage._string_to_size(pkgsize + ' KB')) it = self.append(pniter) self.pkg_path[pkg] = self.get_path(it) @@ -391,7 +390,7 @@ class PackageListModel(gtk.TreeStore): return packagelist """ - Return the selected package size, unit is KB. + Return the selected package size, unit is B. """ def get_packages_size(self): packages_size = 0 @@ -404,16 +403,11 @@ class PackageListModel(gtk.TreeStore): if not str_size: continue - unit = str_size.split() - if unit[1] == 'MB': - size = float(unit[0])*1024 - else: - size = float(unit[0]) - packages_size += size + packages_size += HobPage._string_to_size(str_size) child_it = self.iter_next(child_it) it = self.iter_next(it) - return "%f" % packages_size + return packages_size """ Empty self.contents by setting the include of each entry to None diff --git a/bitbake/lib/bb/ui/crumbs/hobpages.py b/bitbake/lib/bb/ui/crumbs/hobpages.py index d8e59c44dc..5045ea2019 100755 --- a/bitbake/lib/bb/ui/crumbs/hobpages.py +++ b/bitbake/lib/bb/ui/crumbs/hobpages.py @@ -83,3 +83,42 @@ class HobPage (gtk.VBox): tip_text = tip button = toolbar.append_item(buttonname, tip, None, icon, cb) return button + + @staticmethod + def _size_to_string(size): + try: + if not size: + size_str = "0 B" + else: + if len(str(int(size))) > 6: + size_str = '%.1f' % (size*1.0/(1024*1024)) + ' MB' + elif len(str(int(size))) > 3: + size_str = '%.1f' % (size*1.0/1024) + ' KB' + else: + size_str = str(size) + ' B' + except: + size_str = "0 B" + return size_str + + @staticmethod + def _string_to_size(str_size): + try: + if not str_size: + size = 0 + else: + unit = str_size.split() + if len(unit) > 1: + if unit[1] == 'MB': + size = float(unit[0])*1024*1024 + elif unit[1] == 'KB': + size = float(unit[0])*1024 + elif unit[1] == 'B': + size = float(unit[0]) + else: + size = 0 + else: + size = float(unit[0]) + except: + size = 0 + return size + diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py index 5a6324d2a4..b685d11e69 100755 --- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py +++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py @@ -151,15 +151,6 @@ class ImageDetailsPage (HobPage): for child in children: self.box_group_area.remove(child) - def _size_to_string(self, size): - if len(str(int(size))) > 6: - size_str = '%.1f' % (size*1.0/(1024*1024)) + ' MB' - elif len(str(int(size))) > 3: - size_str = '%.1f' % (size*1.0/1024) + ' KB' - else: - size_str = str(size) + ' B' - return size_str - def show_page(self, step): build_succeeded = (step == self.builder.IMAGE_GENERATED) image_addr = self.builder.parameters.image_addr @@ -200,7 +191,7 @@ class ImageDetailsPage (HobPage): default_toggled = False default_image_size = 0 for image_name in image_names: - image_size = self._size_to_string(os.stat(os.path.join(image_addr, image_name)).st_size) + image_size = HobPage._size_to_string(os.stat(os.path.join(image_addr, image_name)).st_size) if not default_toggled: default_toggled = (self.test_type_runnable(image_name) and self.test_mach_runnable(image_name)) \ or self.test_deployable(image_name) diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py index 9a847c0f83..7926636e07 100755 --- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py +++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py @@ -162,31 +162,20 @@ class PackageSelectionPage (HobPage): self.builder.configuration.selected_packages = self.package_model.get_selected_packages() self.builder.configuration.user_selected_packages = self.package_model.get_user_selected_packages() selected_packages_num = len(self.builder.configuration.selected_packages) - selected_packages_size = float(self.package_model.get_packages_size()) - selected_packages_size_str = self._size_to_string(selected_packages_size) + selected_packages_size = self.package_model.get_packages_size() + selected_packages_size_str = HobPage._size_to_string(selected_packages_size) image_overhead_factor = self.builder.configuration.image_overhead_factor - image_rootfs_size = self.builder.configuration.image_rootfs_size - image_extra_size = self.builder.configuration.image_extra_size + image_rootfs_size = self.builder.configuration.image_rootfs_size * 1024 # image_rootfs_size is KB + image_extra_size = self.builder.configuration.image_extra_size * 1024 # image_extra_size is KB base_size = image_overhead_factor * selected_packages_size image_total_size = max(base_size, image_rootfs_size) + image_extra_size - image_total_size_str = self._size_to_string(image_total_size) + image_total_size_str = HobPage._size_to_string(image_total_size) self.label.set_text("Packages included: %s\nSelected packages size: %s\nTotal image size: %s" % (selected_packages_num, selected_packages_size_str, image_total_size_str)) self.ins.show_indicator_icon("Included", selected_packages_num) - """ - Helper function to convert the package size to string format. - The unit of size is KB - """ - def _size_to_string(self, size): - if len(str(int(size))) > 3: - size_str = '%.1f' % (size*1.0/1024) + ' MB' - else: - size_str = str(size) + ' KB' - return size_str - def toggle_item_idle_cb(self, path): if not self.package_model.path_included(path): self.package_model.include_item(item_path=path, binb="User Selected") -- cgit v1.2.3-54-g00ecf