Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make library_ids stable as long as the library folder names are unique

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-16 19:24:58 +05:30
parent 794ebd0075
commit e200792884
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/srv/handler.py
View File

@ -7,6 +7,7 @@ __license__ = 'GPL v3'
__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
import os import os
from binascii import hexlify
from collections import OrderedDict from collections import OrderedDict
from importlib import import_module from importlib import import_module
from threading import Lock from threading import Lock
@ -33,7 +34,11 @@ class LibraryBroker(object):
seen.add(path) seen.add(path)
if not LibraryDatabase.exists_at(path): if not LibraryDatabase.exists_at(path):
continue continue
library_id = 'lib%d' % len(self.lmap) bname = library_id = hexlify(os.path.basename(path).encode('utf-8')).decode('ascii')
c = 0
while library_id in self.lmap:
c += 1
library_id = bname + '%d' % c
if i == 0: if i == 0:
self.default_library = library_id self.default_library = library_id
self.lmap[library_id] = path self.lmap[library_id] = path