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

Content server: Fix for home screen being empty if the path to the calibre library has a trailing slash.

Browse Source 
Should hopefully Fix #1698489 [content server stuck on 'choose library'](https://bugs.launchpad.net/calibre/+bug/1698489)
This commit is contained in:
Kovid Goyal 2017-06-17 10:42:31 +05:30
parent 2174d7d8aa
commit fdbe5ae812
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/srv/library_broker.py
View File

@ -29,6 +29,12 @@ def samefile(a, b):
return _samefile(a, b) return _samefile(a, b)
def basename(path):
while path and path[-1] in ('/' + os.sep):
path = path[:-1]
return os.path.basename(path)
def init_library(library_path, is_default_library): def init_library(library_path, is_default_library):
db = Cache( db = Cache(
create_backend( create_backend(
@ -47,7 +53,7 @@ def make_library_id_unique(library_id, existing):
def library_id_from_path(path, existing): def library_id_from_path(path, existing):
library_id = os.path.basename(path).replace(' ', '_') library_id = basename(path).replace(' ', '_')
return make_library_id_unique(library_id, existing) return make_library_id_unique(library_id, existing)
@ -73,7 +79,7 @@ class LibraryBroker(object):
continue continue
library_id = library_id_from_path(original_path, self.lmap) library_id = library_id_from_path(original_path, self.lmap)
self.lmap[library_id] = path self.lmap[library_id] = path
self.library_name_map[library_id] = os.path.basename(original_path) self.library_name_map[library_id] = basename(original_path)
self.original_path_map[path] = original_path self.original_path_map[path] = original_path
self.loaded_dbs = {} self.loaded_dbs = {}
self.category_caches, self.search_caches, self.tag_browser_caches = ( self.category_caches, self.search_caches, self.tag_browser_caches = (
@ -114,15 +120,15 @@ class LibraryBroker(object):
@property @property
def library_map(self): def library_map(self):
with self: with self:
return {k: v for k, v in self.library_name_map.iteritems()} return self.library_name_map.copy()
def allowed_libraries(self, filter_func): def allowed_libraries(self, filter_func):
with self: with self:
allowed_names = filter_func( allowed_names = filter_func(
os.path.basename(l) for l in self.lmap.itervalues()) basename(l) for l in self.lmap.itervalues())
return OrderedDict(((lid, self.library_map[lid]) return OrderedDict(((lid, self.library_map[lid])
for lid, path in self.lmap.iteritems() for lid, path in self.lmap.iteritems()
if os.path.basename(path) in allowed_names)) if basename(path) in allowed_names))
def __enter__(self): def __enter__(self):
self.lock.acquire() self.lock.acquire()
@ -183,7 +189,7 @@ class GuiLibraryBroker(LibraryBroker):
library_id = library_id_from_path(library_path, self.lmap) library_id = library_id_from_path(library_path, self.lmap)
db.new_api.server_library_id = library_id db.new_api.server_library_id = library_id
self.lmap[library_id] = library_path self.lmap[library_id] = library_path
self.library_name_map[library_id] = os.path.basename( self.library_name_map[library_id] = basename(
original_library_path) original_library_path)
self.loaded_dbs[library_id] = db self.loaded_dbs[library_id] = db
return db return db
@ -214,7 +220,7 @@ class GuiLibraryBroker(LibraryBroker):
library_id = self.gui_library_id = library_id_from_path( library_id = self.gui_library_id = library_id_from_path(
newloc, self.lmap) newloc, self.lmap)
self.lmap[library_id] = newloc self.lmap[library_id] = newloc
self.library_name_map[library_id] = os.path.basename(original_path) self.library_name_map[library_id] = basename(original_path)
self.original_path_map[newloc] = original_path self.original_path_map[newloc] = original_path
self.loaded_dbs[library_id] = db self.loaded_dbs[library_id] = db
db.new_api.server_library_id = library_id db.new_api.server_library_id = library_id