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 regression that was causing metadata to not be properly restored from books that were saved to disk

Browse Source
This commit is contained in:
Kovid Goyal 2008-05-02 13:18:46 -07:00
parent 790abb0b2f
commit 4564cd4c95
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/ebooks/metadata/opf.py
View File

@ -383,11 +383,8 @@ class OPF(MetaInformation):
return ans return ans
def get_series(self): def get_series(self):
xm = self.soup.package.metadata.find('x-metadata') s = self.soup.package.metadata.find('series')
if not xm: if s is not None:
return None
s = xm.find('series')
if s:
return str(s.string).strip() return str(s.string).strip()
return None return None
@ -397,10 +394,7 @@ class OPF(MetaInformation):
self._set_metadata_element('series', val, type='x-metadata') self._set_metadata_element('series', val, type='x-metadata')
def get_series_index(self): def get_series_index(self):
xm = self.soup.package.metadata.find('x-metadata') s = self.soup.package.metadata.find('series-index')
if not xm:
return None
s = xm.find('series-index')
if s: if s:
try: try:
return int(str(s.string).strip()) return int(str(s.string).strip())
@ -623,7 +617,6 @@ def main(args=sys.argv):
mi.category = opts.category.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;') mi.category = opts.category.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
if opts.comment is not None: if opts.comment is not None:
mi.comments = opts.comment.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;') mi.comments = opts.comment.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
print mi
mo = OPFCreator(os.getcwd(), mi) mo = OPFCreator(os.getcwd(), mi)
mo.render(open(args[1], 'wb')) mo.render(open(args[1], 'wb'))
return 0 return 0

2
src/calibre/library/database.py
View File

@ -1404,7 +1404,7 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
cpath = os.path.join(base, cname) cpath = os.path.join(base, cname)
open(cpath, 'wb').write(cover) open(cpath, 'wb').write(cover)
mi.cover = cname mi.cover = cname
f = open(os.path.join(base, name+'.opf'), 'wb') f = open(os.path.join(base, sanitize_file_name(name)+'.opf'), 'wb')
mi.render(f) mi.render(f)
f.close() f.close()