More human friendly library ids

This commit is contained in:
Kovid Goyal 2015-11-26 15:34:11 +05:30
parent 1adebcc700
commit e6a98f5478

View File

@ -7,11 +7,11 @@ __license__ = 'GPL v3'
__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
import os
from binascii import hexlify
from collections import OrderedDict
from importlib import import_module
from threading import Lock
from calibre import force_unicode, filesystem_encoding
from calibre.db.cache import Cache
from calibre.db.legacy import create_backend, LibraryDatabase
from calibre.srv.auth import AuthController
@ -36,7 +36,7 @@ class LibraryBroker(object):
seen.add(path)
if not LibraryDatabase.exists_at(path):
continue
bname = library_id = hexlify(os.path.basename(path).encode('utf-8')).decode('ascii')
bname = library_id = force_unicode(os.path.basename(path), filesystem_encoding)
c = 0
while library_id in self.lmap:
c += 1