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

Back out the models 'strip' change

Browse Source
This commit is contained in:
Charles Haley 2010-09-23 17:59:50 +01:00
parent b2d5f740b5
commit 232ce4748d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/metadata/book/base.py
View File

@ -36,7 +36,7 @@ field_metadata = FieldMetadata()
class SafeFormat(TemplateFormatter): class SafeFormat(TemplateFormatter):
def get_value(self, key, args, mi): def get_value(self, key, args, mi):
try: try:
ign, v = mi.format_field(key, series_with_index=False) ign, v = mi.format_field(key.lower(), series_with_index=False)
if v is None: if v is None:
return '' return ''
if v == '': if v == '':

2
src/calibre/gui2/library/models.py
View File

@ -724,7 +724,7 @@ class BooksModel(QAbstractTableModel): # {{{
elif typ == 'series': elif typ == 'series':
val, s_index = parse_series_string(self.db, label, value.toString()) val, s_index = parse_series_string(self.db, label, value.toString())
elif typ == 'composite': elif typ == 'composite':
tmpl = unicode(value.toString()).lower().strip() tmpl = unicode(value.toString()).strip()
disp = cc['display'] disp = cc['display']
disp['composite_template'] = tmpl disp['composite_template'] = tmpl
self.db.set_custom_column_metadata(cc['colnum'], display = disp) self.db.set_custom_column_metadata(cc['colnum'], display = disp)

4
src/calibre/library/save_to_disk.py
View File

@ -108,8 +108,8 @@ class SafeFormat(TemplateFormatter):
''' '''
def get_value(self, key, args, kwargs): def get_value(self, key, args, kwargs):
try: try:
if kwargs[key]: if kwargs[key.lower()]:
return kwargs[key] return kwargs[key.lower()]
return '' return ''
except: except:
return '' return ''