Slightly improve performance in python2

Author: j4321

tkfilebrowser/constants.py

@@ -164,26 +164,6 @@ def get_modification_date(file):
     return date
 
 
-def get_size(file):
-    """Return the size of file."""
-    try:
-        size_o = os.path.getsize(file)
-    except OSError:
-        size_o = 0
-    if size_o > 0:
-        m = int(floor(log(size_o) / log(1024)))
-        if m < len(SIZES):
-            unit = SIZES[m]
-            s = size_o / (1024 ** m)
-        else:
-            unit = SIZES[-1]
-            s = size_o / (1024**(len(SIZES) - 1))
-        size = "%s %s" % (locale_number("%.1f" % s), unit)
-    else:
-        size = "0 " + _("B")
-    return size
-
-
 def display_modification_date(mtime):
     """Return the modDification date of file."""
     tps = fromtimestamp(mtime)

tkfilebrowser/filebrowser.py

@@ -22,7 +22,7 @@
 
 
 import psutil
-from os import walk, mkdir
+from os import walk, mkdir, stat
 from os.path import exists, join, getmtime, realpath, split, expanduser, \
     abspath, isabs, splitext, dirname, getsize, isdir, isfile, islink
 try:
@@ -33,7 +33,7 @@
 import traceback
 import tkfilebrowser.constants as cst
 from tkfilebrowser.constants import unquote, tk, ttk, key_sort_files, \
-    get_modification_date, get_size
+    get_modification_date, display_modification_date, display_size
 from tkfilebrowser.autoscrollbar import AutoScrollbar
 from tkfilebrowser.path_button import PathButton
 from tkfilebrowser.tooltip import TooltipTreeWrapper
@@ -74,9 +74,9 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
 
         # python version compatibility
         if SCANDIR:
-            self.display_folder = self.display_folder_scandir
+            self.display_folder = self._display_folder_scandir
         else:
-            self.display_folder = self.display_folder_walk
+            self.display_folder = self._display_folder_walk
 
         # keep track of folders to be able to move backward/foreward in history
         if initialdir:
@@ -699,15 +699,19 @@ def _display_recents(self):
                         ext = splitext(f)[-1]
                         if extension == [""] or ext in extension:
                             tags.append("file_link")
-                            vals = (p, get_size(p), get_modification_date(p))
+                            stats = stat(p)
+                            vals = (p, display_size(stats.st_size),
+                                    display_modification_date(stats.st_mtime))
                     elif isdir(p):
                         tags.append("folder_link")
                         vals = (p, "", get_modification_date(p))
                 elif isfile(p):
                     ext = splitext(f)[-1]
                     if extension == [""] or ext in extension:
                         tags.append("file")
-                        vals = (p, get_size(p), get_modification_date(p))
+                        stats = stat(p)
+                        vals = (p, display_size(stats.st_size),
+                                display_modification_date(stats.st_mtime))
                 elif isdir(p):
                     tags.append("folder")
                     vals = (p, "", get_modification_date(p))
@@ -898,7 +902,7 @@ def _update_path_bar(self, path):
             self.path_bar_buttons.append(b)
             b.grid(row=0, column=i + 2, sticky="ns")
 
-    def display_folder_walk(self, folder, reset=True, update_bar=True):
+    def _display_folder_walk(self, folder, reset=True, update_bar=True):
         """
         Display the content of folder in self.right_tree.
         Arguments:
@@ -969,9 +973,18 @@ def display_folder_walk(self, folder, reset=True, update_bar=True):
                         tags = tags + (str(i % 2),)
                         i += 1
 
-                    self.right_tree.insert("", "end", p, text=f, tags=tags,
-                                           values=("", get_size(p),
-                                                   get_modification_date(p)))
+                    try:
+                        stats = stat(p)
+                    except OSError:
+                        self.right_tree.insert("", "end", p, text=f, tags=tags,
+                                               values=("",
+                                                       display_size(0),
+                                                       display_modification_date(cst.TODAY)))
+                    else:
+                        self.right_tree.insert("", "end", p, text=f, tags=tags,
+                                               values=("",
+                                                       display_size(stats.st_size),
+                                                       display_modification_date(stats.st_mtime)))
             else:
                 for f in files:
                     ext = splitext(f)[-1]
@@ -990,9 +1003,18 @@ def display_folder_walk(self, folder, reset=True, update_bar=True):
                             tags = tags + (str(i % 2),)
                             i += 1
 
-                        self.right_tree.insert("", "end", p, text=f, tags=tags,
-                                               values=("", get_size(p),
-                                                       get_modification_date(p)))
+                        try:
+                            stats = stat(p)
+                        except OSError:
+                            self.right_tree.insert("", "end", p, text=f, tags=tags,
+                                                   values=("",
+                                                           display_size(0),
+                                                           display_modification_date(cst.TODAY)))
+                        else:
+                            self.right_tree.insert("", "end", p, text=f, tags=tags,
+                                                   values=("",
+                                                           display_size(stats.st_size),
+                                                           display_modification_date(stats.st_mtime)))
             items = self.right_tree.get_children("")
             if items:
                 self.right_tree.focus_set()
@@ -1003,7 +1025,7 @@ def display_folder_walk(self, folder, reset=True, update_bar=True):
         except StopIteration:
             print("err")
 
-    def display_folder_scandir(self, folder, reset=True, update_bar=True):
+    def _display_folder_scandir(self, folder, reset=True, update_bar=True):
         """
         Display the content of folder in self.right_tree.
 
@@ -1052,17 +1074,17 @@ def display_folder_scandir(self, folder, reset=True, update_bar=True):
                 else:
                     tags = tags + (str(i % 2),)
                     i += 1
-                stat = f.stat()
+                stats = f.stat()
                 if b_file:
                     if (extension == [""] or splitext(name)[-1] in extension):
                         self.right_tree.insert("", "end", f.path, text=name, tags=tags,
                                                values=("",
-                                                       cst.display_size(stat.st_size),
-                                                       cst.display_modification_date(stat.st_mtime)))
+                                                       display_size(stats.st_size),
+                                                       display_modification_date(stats.st_mtime)))
                 else:
                     self.right_tree.insert("", "end", f.path, text=name, tags=tags,
                                            values=("", "",
-                                                   cst.display_modification_date(stat.st_mtime)))
+                                                   display_modification_date(stats.st_mtime)))
             items = self.right_tree.get_children("")
             if items:
                 self.right_tree.focus_set()