...

src/calibre/gui2/add.py

@@ -14,7 +14,7 @@
 from calibre.ebooks.metadata import MetaInformation
 from calibre.constants import preferred_encoding, filesystem_encoding, DEBUG
 from calibre.utils.config import prefs
-from calibre import prints
+from calibre import prints, force_unicode, as_unicode
 
 single_shot = partial(QTimer.singleShot, 75)
 
@@ -66,7 +66,8 @@ def walk(self, root):
             if self.canceled:
                 return
             self.update.emit(
-                    _('Searching in')+' '+dirpath[0])
+                    _('Searching in')+' '+force_unicode(dirpath[0],
+                        filesystem_encoding))
             self.books += list(self.db.find_books_in_directory(dirpath[0],
                                             self.single_book_per_directory))
 
@@ -82,10 +83,7 @@ def run(self):
             except Exception as err:
                 import traceback
                 traceback.print_exc()
-                try:
-                    msg = unicode(err)
-                except:
-                    msg = repr(err)
+                msg = as_unicode(err)
                 self.found.emit(msg)
                 return