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

Fix bugs in sort for series-to-collection feature. Handle sending multiple copies of book to device correctly.

Browse Source
This commit is contained in:
Kovid Goyal 2007-11-16 17:59:16 +00:00
parent c027381636
commit bf5b924058
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libprs500/devices/prs500/books.py
View File

@ -235,7 +235,7 @@ class BookList(_BookList):
Also remove book from any collections it is part of. Also remove book from any collections it is part of.
''' '''
for book in self: for book in self:
if path.endswith(book.path): if path.endswith(book.rpath):
self.remove(book) self.remove(book)
self._delete_book(book.elem) self._delete_book(book.elem)
break break
@ -255,8 +255,18 @@ class BookList(_BookList):
max = nid max = nid
return max return max
def book_by_path(self, path):
for child in self.root_element.childNodes:
if child.nodeType == child.ELEMENT_NODE and child.hasAttribute("path"):
if path == child.getAttribute('path'):
return child
return None
def add_book(self, info, name, size, ctime): def add_book(self, info, name, size, ctime):
""" Add a node into DOM tree representing a book """ """ Add a node into DOM tree representing a book """
book = self.book_by_path(name)
if book is not None:
self.remove_book(name)
node = self.document.createElement(self.prefix + "text") node = self.document.createElement(self.prefix + "text")
mime = MIME_MAP[name[name.rfind(".")+1:]] mime = MIME_MAP[name[name.rfind(".")+1:]]
cid = self.max_id()+1 cid = self.max_id()+1
@ -357,8 +367,8 @@ class BookList(_BookList):
pl = self.playlist_by_title(title) pl = self.playlist_by_title(title)
if not pl: if not pl:
continue continue
db_ids = [i.getAttribute('id') for i in pl.childNodes] db_ids = [i.getAttribute('id') for i in pl.childNodes if hasattr(i, 'getAttribute')]
pl_book_ids = [self.book_by_id(i.getAttribute('id')).db_id for i in pl.childNodes] pl_book_ids = [self.book_by_id(i.getAttribute('id')).db_id for i in pl.childNodes if hasattr(i, 'getAttribute')]
map = {} map = {}
for i, j in zip(pl_book_ids, db_ids): for i, j in zip(pl_book_ids, db_ids):
map[i] = j map[i] = j
@ -367,7 +377,7 @@ class BookList(_BookList):
if len(ordered_ids) < len(pl.childNodes): if len(ordered_ids) < len(pl.childNodes):
continue continue
children = [i for i in pl.childNodes] children = [i for i in pl.childNodes if hasattr(i, 'getAttribute')]
for child in children: for child in children:
pl.removeChild(child) pl.removeChild(child)
child.unlink() child.unlink()

20
src/libprs500/devices/prs505/books.py
View File

@ -180,8 +180,20 @@ class BookList(_BookList):
def supports_tags(self): def supports_tags(self):
return True return True
def book_by_path(self, path):
for child in self.root_element.childNodes:
if child.nodeType == child.ELEMENT_NODE and child.hasAttribute("path"):
if path == child.getAttribute('path'):
return child
return None
def add_book(self, info, name, size, ctime): def add_book(self, info, name, size, ctime):
""" Add a node into the DOM tree, representing a book """ """ Add a node into the DOM tree, representing a book """
book = self.book_by_path(name)
if book is not None:
print name
self.remove_book(name)
node = self.document.createElement(self.prefix + "text") node = self.document.createElement(self.prefix + "text")
mime = MIME_MAP[name.rpartition('.')[-1]] mime = MIME_MAP[name.rpartition('.')[-1]]
cid = self.max_id()+1 cid = self.max_id()+1
@ -242,7 +254,7 @@ class BookList(_BookList):
Also remove book from any collections it is part of. Also remove book from any collections it is part of.
''' '''
for book in self: for book in self:
if path.endswith(book.path): if path.endswith(book.rpath):
self.remove(book) self.remove(book)
self._delete_book(book.elem) self._delete_book(book.elem)
break break
@ -354,8 +366,8 @@ class BookList(_BookList):
pl = self.playlist_by_title(title) pl = self.playlist_by_title(title)
if not pl: if not pl:
continue continue
db_ids = [i.getAttribute('id') for i in pl.childNodes] db_ids = [i.getAttribute('id') for i in pl.childNodes if hasattr(i, 'getAttribute')]
pl_book_ids = [self.book_by_id(i.getAttribute('id')).db_id for i in pl.childNodes] pl_book_ids = [self.book_by_id(i.getAttribute('id')).db_id for i in pl.childNodes if hasattr(i, 'getAttribute')]
map = {} map = {}
for i, j in zip(pl_book_ids, db_ids): for i, j in zip(pl_book_ids, db_ids):
map[i] = j map[i] = j
@ -364,7 +376,7 @@ class BookList(_BookList):
if len(ordered_ids) < len(pl.childNodes): if len(ordered_ids) < len(pl.childNodes):
continue continue
children = [i for i in pl.childNodes] children = [i for i in pl.childNodes if hasattr(i, 'getAttribute')]
for child in children: for child in children:
pl.removeChild(child) pl.removeChild(child)
child.unlink() child.unlink()