From 9c119fc238d2ae517cf9512b4ee07696949f7fe9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 1 Jun 2008 10:41:37 -0700 Subject: [PATCH] Fix #728 and make size->string conversion more robust. --- src/calibre/gui2/__init__.py | 11 +++++------ src/calibre/gui2/status.py | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 7e37c65555..06fb7b4632 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -57,16 +57,15 @@ def qstring_to_unicode(q): def human_readable(size): """ Convert a size in bytes into a human readable form """ - if size < 1024: - divisor, suffix = 1, "B" - elif size < 1024*1024: + divisor, suffix = 1, "B" + if size < 1024*1024: divisor, suffix = 1024., "KB" - elif size < 1024*1024*1024: + elif size < 1024*1024*1024: divisor, suffix = 1024*1024, "MB" - elif size < 1024*1024*1024*1024: + elif size < 1024*1024*1024*1024: divisor, suffix = 1024*1024*1024, "GB" size = str(float(size)/divisor) - if size.find(".") > -1: + if size.find(".") > -1: size = size[:size.find(".")+2] if size.endswith('.0'): size = size[:-2] diff --git a/src/calibre/gui2/status.py b/src/calibre/gui2/status.py index 901dad5a3f..4564834b8c 100644 --- a/src/calibre/gui2/status.py +++ b/src/calibre/gui2/status.py @@ -1,6 +1,6 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' -import textwrap +import textwrap, re from PyQt4.QtGui import QStatusBar, QMovie, QLabel, QFrame, QHBoxLayout, QPixmap, \ QVBoxLayout, QSizePolicy, QToolButton, QIcon @@ -153,7 +153,7 @@ class StatusBar(QStatusBar): def jobs(self): src = qstring_to_unicode(self.movie_button.jobs.text()) - return int(src.rpartition(':')[2].lstrip()) + return int(re.search(r'\d+', src).group()) def show_book_info(self): self.emit(SIGNAL('show_book_info()'))