[PATCH 1/7] oe-pkgdata-browser: Rename from pkgdataui.py

[PATCH 1/7] oe-pkgdata-browser: Rename from pkgdataui.py

[Peter Kjellerstedt]

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 scripts/{pkgdataui.py => oe-pkgdata-browser}          | 2 +-
 scripts/{pkgdataui.glade => oe-pkgdata-browser.glade} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename scripts/{pkgdataui.py => oe-pkgdata-browser} (99%)
 rename scripts/{pkgdataui.glade => oe-pkgdata-browser.glade} (100%)

diff --git a/scripts/pkgdataui.py b/scripts/oe-pkgdata-browser
similarity index 99%
rename from scripts/pkgdataui.py
rename to scripts/oe-pkgdata-browser
index f6b23fc0be..09544fff82 100755
--- a/scripts/pkgdataui.py
+++ b/scripts/oe-pkgdata-browser
@@ -99,7 +99,7 @@ class PkgUi():
         self.package_iters = {}
 
         builder = Gtk.Builder()
-        builder.add_from_file(os.path.join(os.path.dirname(__file__), "pkgdataui.glade"))
+        builder.add_from_file(os.path.join(os.path.dirname(__file__), "oe-pkgdata-browser.glade"))
 
         self.window = builder.get_object("window")
         self.window.connect("delete-event", Gtk.main_quit)
diff --git a/scripts/pkgdataui.glade b/scripts/oe-pkgdata-browser.glade
similarity index 100%
rename from scripts/pkgdataui.glade
rename to scripts/oe-pkgdata-browser.glade
-- 
2.21.1

[PATCH 2/7] oe-pkgdata-browser: Clean the package view properly

[Peter Kjellerstedt]

Not all widgets were hidden when no package was selected.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 scripts/oe-pkgdata-browser | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/oe-pkgdata-browser b/scripts/oe-pkgdata-browser
index 09544fff82..21e319481e 100755
--- a/scripts/oe-pkgdata-browser
+++ b/scripts/oe-pkgdata-browser
@@ -186,6 +186,9 @@ class PkgUi():
         self.depends_label.hide()
         self.recommends_label.hide()
         self.suggests_label.hide()
+        self.provides_label.hide()
+        self.files_view.hide()
+        self.files_label.hide()
 
         (model, it) = selection.get_selected()
         if it is None:
@@ -205,6 +208,7 @@ class PkgUi():
         else:
             self.files_view.hide()
             self.files_label.set_text("This package has no files.")
+        self.files_label.show()
 
         def update_deps(field, prefix, label, clickable=True):
             if field in data:
-- 
2.21.1

[PATCH 3/7] oe-pkgdata-browser: Correct the prefix for kilo to "k"

[Peter Kjellerstedt]

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 scripts/oe-pkgdata-browser | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/oe-pkgdata-browser b/scripts/oe-pkgdata-browser
index 21e319481e..36b5e798fa 100755
--- a/scripts/oe-pkgdata-browser
+++ b/scripts/oe-pkgdata-browser
@@ -35,7 +35,7 @@ def timeit(f):
 
 def human_size(nbytes):
     import math
-    suffixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB']
+    suffixes = ['B', 'kB', 'MB', 'GB', 'TB', 'PB']
     human = nbytes
     rank = 0
     if nbytes != 0:
-- 
2.21.1

[PATCH 4/7] oe-pkgdata-browser: Show file sizes in a human readable format

[Peter Kjellerstedt]

Just like the package sizes already are shown.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 scripts/oe-pkgdata-browser       | 2 ++
 scripts/oe-pkgdata-browser.glade | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/oe-pkgdata-browser b/scripts/oe-pkgdata-browser
index 36b5e798fa..57e56f66ee 100755
--- a/scripts/oe-pkgdata-browser
+++ b/scripts/oe-pkgdata-browser
@@ -133,6 +133,8 @@ class PkgUi():
 
         self.file_store = builder.get_object("file_store")
         self.file_store.set_sort_column_id(FileColumns.Filename, Gtk.SortType.ASCENDING)
+        builder.get_object("file_size_column").set_cell_data_func(builder.get_object("file_size_cell"), lambda column, cell, model, iter, data: cell.set_property("text", human_size(model[iter][FileColumns.Size])))
+
         self.files_view = builder.get_object("files_scrollview")
         self.files_label = builder.get_object("files_label")
 
diff --git a/scripts/oe-pkgdata-browser.glade b/scripts/oe-pkgdata-browser.glade
index 04e987b975..a6aae60bdd 100644
--- a/scripts/oe-pkgdata-browser.glade
+++ b/scripts/oe-pkgdata-browser.glade
@@ -289,12 +289,12 @@
                               </object>
                             </child>
                             <child>
-                              <object class="GtkTreeViewColumn" id="treeviewcolumn4">
+                              <object class="GtkTreeViewColumn" id="file_size_column">
                                 <property name="title" translatable="yes">Size</property>
                                 <property name="sort_indicator">True</property>
                                 <property name="sort_column_id">1</property>
                                 <child>
-                                  <object class="GtkCellRendererText" id="cellrenderertext4"/>
+                                  <object class="GtkCellRendererText" id="file_size_cell"/>
                                   <attributes>
                                     <attribute name="text">1</attribute>
                                   </attributes>
-- 
2.21.1

[PATCH 5/7] oe-pkgdata-browser: Avoid an extra space for dependencies without version

[Peter Kjellerstedt]

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 scripts/oe-pkgdata-browser | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/oe-pkgdata-browser b/scripts/oe-pkgdata-browser
index 57e56f66ee..75d889271b 100755
--- a/scripts/oe-pkgdata-browser
+++ b/scripts/oe-pkgdata-browser
@@ -217,9 +217,9 @@ class PkgUi():
                 l = []
                 for name, version in bb.utils.explode_dep_versions2(data[field]).items():
                     if clickable:
-                        l.append("<a href='package:{0}'>{0}</a> {1}".format(name, " ".join(version)))
+                        l.append("<a href='package:{0}'>{0}</a> {1}".format(name, " ".join(version)).strip())
                     else:
-                        l.append("{0} {1}".format(name, " ".join(version)))
+                        l.append("{0} {1}".format(name, " ".join(version)).strip())
                 label.set_markup(prefix + ", ".join(l))
                 label.show()
             else:
-- 
2.21.1

[PATCH 6/7] oe-pkgdata-browser: Select a matching package when a recipe is selected

[Peter Kjellerstedt]

When a recipe is selected, automatically select the package that
matches the recipe name (if it exists), otherwise select the first
package.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 scripts/oe-pkgdata-browser | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/oe-pkgdata-browser b/scripts/oe-pkgdata-browser
index 75d889271b..8d223185a4 100755
--- a/scripts/oe-pkgdata-browser
+++ b/scripts/oe-pkgdata-browser
@@ -176,12 +176,18 @@ class PkgUi():
             return
 
         recipe = model[it][RecipeColumns.Recipe]
-        for package in packages_in_recipe(self.pkgdata, recipe):
+        packages = packages_in_recipe(self.pkgdata, recipe)
+        for package in packages:
             # TODO also show PKG after debian-renaming?
             data = load_runtime_package(self.pkgdata, package)
             # TODO stash data to avoid reading in on_package_changed
             self.package_iters[package] = self.package_store.append([package, int(data["PKGSIZE"])])
 
+        package = recipe if recipe in packages else sorted(packages)[0]
+        path = self.package_store.get_path(self.package_iters[package])
+        self.package_view.set_cursor(path)
+        self.package_view.scroll_to_cell(path)
+
     def on_package_changed(self, selection):
         self.label.set_text("")
         self.file_store.clear()
-- 
2.21.1

[PATCH 7/7] oe-pkgdata-browser: Make the window 1200x900 by default

[Peter Kjellerstedt]

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 scripts/oe-pkgdata-browser.glade | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/oe-pkgdata-browser.glade b/scripts/oe-pkgdata-browser.glade
index a6aae60bdd..0d06c825ff 100644
--- a/scripts/oe-pkgdata-browser.glade
+++ b/scripts/oe-pkgdata-browser.glade
@@ -35,6 +35,8 @@
   <object class="GtkWindow" id="window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Package Data Browser</property>
+    <property name="default_width">1200</property>
+    <property name="default_height">900</property>
     <property name="icon_name">accessories-dictionary</property>
     <property name="has_resize_grip">True</property>
     <child>
@@ -69,7 +71,7 @@
           <object class="GtkPaned" id="paned1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="position">200</property>
+            <property name="position">400</property>
             <property name="position_set">True</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow1">
@@ -112,7 +114,7 @@
               <object class="GtkPaned" id="paned2">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="position">200</property>
+                <property name="position">400</property>
                 <property name="position_set">True</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow2">
-- 
2.21.1

Re: [PATCH 1/7] oe-pkgdata-browser: Rename from pkgdataui.py

[Ross Burton]

On 08/01/2020 03:44, Peter Kjellerstedt wrote:
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>

Thanks for this series, a good slew of small improvements!

Ross