This commit is contained in:
Kovid Goyal 2012-01-05 09:34:16 +05:30
parent ee8de4b180
commit 50bbff2417

View File

@ -14,7 +14,7 @@ from calibre.ebooks.metadata.opf2 import OPF
from calibre.ebooks.metadata import MetaInformation from calibre.ebooks.metadata import MetaInformation
from calibre.constants import preferred_encoding, filesystem_encoding, DEBUG from calibre.constants import preferred_encoding, filesystem_encoding, DEBUG
from calibre.utils.config import prefs from calibre.utils.config import prefs
from calibre import prints from calibre import prints, force_unicode, as_unicode
single_shot = partial(QTimer.singleShot, 75) single_shot = partial(QTimer.singleShot, 75)
@ -66,7 +66,8 @@ class RecursiveFind(QThread): # {{{
if self.canceled: if self.canceled:
return return
self.update.emit( 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.books += list(self.db.find_books_in_directory(dirpath[0],
self.single_book_per_directory)) self.single_book_per_directory))
@ -82,10 +83,7 @@ class RecursiveFind(QThread): # {{{
except Exception as err: except Exception as err:
import traceback import traceback
traceback.print_exc() traceback.print_exc()
try: msg = as_unicode(err)
msg = unicode(err)
except:
msg = repr(err)
self.found.emit(msg) self.found.emit(msg)
return return