Comment 5 for bug 1069617

Attached is a patch.

This should solve the problem in nearly all circumstances. The only one left is if the book is not in the metadata.calibre file or that file is deleted. An affect of the change is that books in metadata.calibre but not in the devices database will be listed in the device list.

Also, some performance improvements related to the book matching and shelf management at sync time.