From e611fb807d8332370e995190e836060a17146e16 Mon Sep 17 00:00:00 2001 From: "g@localhost.localdomain" Date: Sat, 30 Sep 2006 22:57:22 +0200 Subject: [PATCH] Don't use the name 'item'. Nodes are nodes, fullpaths are fullpaths. --- pysize/core/pysize_fs_node.py | 12 ++++++------ pysize/ui/gtk/pysize_widget.py | 2 +- pysize/ui/gtk/pysize_widget_draw.py | 2 +- pysize/ui/gtk/threaded_pysize_tree.py | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pysize/core/pysize_fs_node.py b/pysize/core/pysize_fs_node.py index dc22b21..6e5a582 100644 --- a/pysize/core/pysize_fs_node.py +++ b/pysize/core/pysize_fs_node.py @@ -106,7 +106,7 @@ class _pysize_node_collection(_pysize_node): if max_depth != 0: children_size = 0 remaining_size = 0 - remaining_items = [] + remaining_nodes = [] cookie = chdir_browsing.init(prefix) try: for child in children: @@ -116,13 +116,13 @@ class _pysize_node_collection(_pysize_node): children_size += node.size else: node.__name = child - remaining_items.append(node) + remaining_nodes.append(node) remaining_size += node.size _sort_nodes(self.children) if remaining_size > min_size: - _sort_nodes(remaining_items) - names = [n.__name for n in remaining_items] + _sort_nodes(remaining_nodes) + names = [n.__name for n in remaining_nodes] rem = _pysize_node_remaining(self, names) self.children.append(rem) finally: @@ -139,7 +139,7 @@ class _pysize_node_forest(_pysize_node_collection): super(_pysize_node_forest, self).__init__(parent, prefix, suffixes, max_depth, min_size) self.basename = prefix - self.forest_items = suffixes + self.forest_paths = suffixes self.forest_name = _join_prefix_suffixes(prefix, suffixes) def get_name(self): @@ -149,7 +149,7 @@ class _pysize_node_forest(_pysize_node_collection): return self.basename def get_fullpaths(self): - fullpaths = self.forest_items + fullpaths = self.forest_paths parent = self while parent: fullpaths = [parent.basename + '/' + fp for fp in fullpaths] diff --git a/pysize/ui/gtk/pysize_widget.py b/pysize/ui/gtk/pysize_widget.py index 2c3c527..3b818a9 100644 --- a/pysize/ui/gtk/pysize_widget.py +++ b/pysize/ui/gtk/pysize_widget.py @@ -91,7 +91,7 @@ class PysizeWidget(gtk.DrawingArea, PysizeWidget_Draw, def min_size_requested(self): return min_size_to_consider(self.options.min_size, - self.max_number_of_items()) + self.max_number_of_nodes()) def set_paths(self, paths): if paths: diff --git a/pysize/ui/gtk/pysize_widget_draw.py b/pysize/ui/gtk/pysize_widget_draw.py index 9867c83..9db622d 100644 --- a/pysize/ui/gtk/pysize_widget_draw.py +++ b/pysize/ui/gtk/pysize_widget_draw.py @@ -144,7 +144,7 @@ class PysizeWidget_Draw(object): self._draw(context) return False - def max_number_of_items(self): + def max_number_of_nodes(self): return max(2, self.allocation.height / self.max_text_height) def _get_actual_min_size(self): diff --git a/pysize/ui/gtk/threaded_pysize_tree.py b/pysize/ui/gtk/threaded_pysize_tree.py index 57eaf47..ada6218 100644 --- a/pysize/ui/gtk/threaded_pysize_tree.py +++ b/pysize/ui/gtk/threaded_pysize_tree.py @@ -49,11 +49,11 @@ class threaded_pysize_tree(object): def run_thread(self): while True: - item = self.queue.get() + params = self.queue.get() while not self.queue.empty(): # Get the last item - item = self.queue.get_nowait() - (args, kwargs) = item + params = self.queue.get_nowait() + (args, kwargs) = params gobject.idle_add(lambda: self.completion.fire_observers(None)) try: tree = pysize_tree(*args, **kwargs) -- 2.11.4.GIT