creating wizard view - minor changes in src/pkgsearch.py

[findit] / src / searchfile.py

diff --git a/src/searchfile.py b/src/searchfile.py
index 26567d1..0f09f5f 100644 (file)
--- a/src/searchfile.py
+++ b/src/searchfile.py
@@ -9,6 +9,8 @@ from os.path import join, abspath, normcase, basename, \
                             isdir, getsize
 from heapq import nlargest
 
+from misc import size_hum_read
+
 class Search_File_Control(object):
     
     def __init__(self, get_start_data, ignore_dirs, show_func):
@@ -24,7 +26,7 @@ class Search_File_Control(object):
         start_path, count = self.start_data()
         for fsize, fpath in nlargest(count, \
                 self.srch_abs.filegetter(start_path, stopit, label) ):
-            self.filelist.append([fpath, self.srch_abs.size_convert(fsize), fsize])
+            self.filelist.append([fpath, size_hum_read(fsize), fsize])
         show_func(self.filelist)
 
 
@@ -32,13 +34,6 @@ class Search_File_Abstraction(object):
     
     def __init__(self, ignore_dirs):
         self.ignore_dirs = ignore_dirs
-        
-    def size_convert(self, size):
-        """Return string with file size in b or Kb or Mb or Gb or Tb."""
-        for i, unit in enumerate(['%d b', '%.1f Kb', '%.2f Mb', '%.3f Gb', '%.4f Tb']):
-            if size < 1024**(i+1):
-                return unit % (size/1024.**i)
-        return '>1024 Tb'
 
     def filegetter(self, startdir, get_stopit, label):
         """Generator of file sizes and paths based on os.walk."""
@@ -94,7 +89,7 @@ class Search_File_Presentation(object):
         
 
         self.search_hbox = gtk.HBox(False, 10)
-        self.search_hbox.pack_start(currfilefrm, False, False, 0)
+        self.search_hbox.pack_start(currfilefrm, True, True, 0)
         self.search_hbox.pack_end(self.butt_start, False, False, 0)
         self.search_hbox.pack_end(self.butt_stop, False, False, 0)