Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-08 20:35:18 +02:00
Code Issues Projects Releases Wiki Activity

GwR fix RecentlyRead bug in Windows

Browse source
This commit is contained in:
GRiker 2010-02-26 06:08:27 -07:00
parent 4c2480cbb0
commit 7f101fb8a9
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/calibre/library/catalog.py
View file

@ -586,6 +586,10 @@ def __init__(self, db, opts, plugin,
self.__generateForKindle = True if (self.opts.fmt == 'mobi' and \
self.opts.output_profile and \
self.opts.output_profile.startswith("kindle")) else False
self.__generateRecentlyRead = True if self.opts.generate_recently_added \
and self.opts.connected_kindle \
and self.generateForKindle \
else False
self.__genres = None
self.__genre_tags_dict = None
self.__htmlFileList = []
@ -610,7 +614,7 @@ def __init__(self, db, opts, plugin,
self.__totalSteps += 2
if self.opts.generate_recently_added:
self.__totalSteps += 2
if self.opts.connected_kindle:
if self.generateRecentlyRead:
self.__totalSteps += 2
# Accessors
@ -733,6 +737,13 @@ def fset(self, val):
self.__generateForKindle = val
return property(fget=fget, fset=fset)
@dynamic_property
def generateRecentlyRead(self):
def fget(self):
return self.__generateRecentlyRead
def fset(self, val):
self.__generateRecentlyRead = val
return property(fget=fget, fset=fset)
@dynamic_property
def genres(self):
def fget(self):
return self.__genres
@ -917,7 +928,8 @@ def buildSources(self):
self.generateHTMLByTitle()
if self.opts.generate_recently_added:
self.generateHTMLByDateAdded()
self.generateHTMLByDateRead()
if self.generateRecentlyRead:
self.generateHTMLByDateRead()
self.generateHTMLByTags()
from calibre.utils.PythonMagickWand import ImageMagick
@ -932,7 +944,8 @@ def buildSources(self):
self.generateNCXByTitle("Titles")
if self.opts.generate_recently_added:
self.generateNCXByDateAdded("Recently Added")
self.generateNCXByDateRead("Recently Read")
if self.generateRecentlyRead:
self.generateNCXByDateRead("Recently Read")
self.generateNCXByGenre("Genres")
self.writeNCX()
return True
@ -1196,7 +1209,7 @@ def __init__(self,path, formats, id):
def get_bookmark_data(self, path):
''' Return the timestamp and last_read_location '''
with open(path) as f:
with open(path,'rb') as f:
stream = StringIO(f.read())
data = StreamSlicer(stream)
self.timestamp, = unpack('>I', data[0x24:0x28])
@ -1253,7 +1266,7 @@ def get_book_length(self, path, formats):
self.book_length = 0
return
# Read the book len from the header
with open(book_fs) as f:
with open(book_fs,'rb') as f:
self.stream = StringIO(f.read())
self.data = StreamSlicer(self.stream)
self.nrecs, = unpack('>H', self.data[76:78])
@ -1283,7 +1296,7 @@ def hexdump(self, src, length=16):
N+=length
print result
if self.opts.connected_kindle:
if self.generateRecentlyRead:
self.opts.log.info(" Collecting Kindle bookmarks matching catalog entries")
d = BookmarkDevice(None)