Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use both name and mime type to decide file syntax

Browse Source
This commit is contained in:
Kovid Goyal 2013-11-22 20:39:08 +05:30
parent b02c37bf8c
commit d25a6e3c35
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/tweak_book/boss.py
View File

@ -190,7 +190,7 @@ class Boss(QObject):
if c.opf_name in editors: if c.opf_name in editors:
editors[c.opf_name].replace_data(c.raw_data(c.opf_name)) editors[c.opf_name].replace_data(c.raw_data(c.opf_name))
mt = c.mime_map[d.file_name] mt = c.mime_map[d.file_name]
syntax = syntax_from_mime(mt) syntax = syntax_from_mime(d.file_name, mt)
if syntax: if syntax:
if d.using_template: if d.using_template:
self.edit_file(d.file_name, syntax, use_template=d.file_data.decode('utf-8')) self.edit_file(d.file_name, syntax, use_template=d.file_data.decode('utf-8'))
@ -578,7 +578,7 @@ class Boss(QObject):
if name in editors: if name in editors:
self.gui.central.show_editor(editors[name]) self.gui.central.show_editor(editors[name])
return return
syntax = syntax or syntax_from_mime(mime) syntax = syntax or syntax_from_mime(name, mime)
if not syntax: if not syntax:
return error_dialog( return error_dialog(
self.gui, _('Unsupported file format'), self.gui, _('Unsupported file format'),

2
src/calibre/gui2/tweak_book/editor/__init__.py
View File

@ -11,7 +11,7 @@ from PyQt4.Qt import QTextCharFormat
from calibre.ebooks.oeb.base import OEB_DOCS, OEB_STYLES from calibre.ebooks.oeb.base import OEB_DOCS, OEB_STYLES
from calibre.ebooks.oeb.polish.container import guess_type from calibre.ebooks.oeb.polish.container import guess_type
def syntax_from_mime(mime): def syntax_from_mime(name, mime):
if mime in OEB_DOCS: if mime in OEB_DOCS:
return 'html' return 'html'
if mime in OEB_STYLES: if mime in OEB_STYLES:

4
src/calibre/gui2/tweak_book/file_list.py
View File

@ -416,11 +416,11 @@ class FileList(QTreeWidget):
name = unicode(item.data(0, NAME_ROLE).toString()) name = unicode(item.data(0, NAME_ROLE).toString())
ok = category in {'text', 'styles'} ok = category in {'text', 'styles'}
if ok: if ok:
ans[category][name] = syntax_from_mime(mime) ans[category][name] = syntax_from_mime(name, mime)
if not ok and category == 'misc': if not ok and category == 'misc':
ok = mime in {guess_type('a.'+x) for x in ('opf', 'ncx', 'txt', 'xml')} ok = mime in {guess_type('a.'+x) for x in ('opf', 'ncx', 'txt', 'xml')}
if ok and item.isSelected(): if ok and item.isSelected():
ans['selected'][name] = syntax_from_mime(mime) ans['selected'][name] = syntax_from_mime(name, mime)
return ans return ans
class NewFileDialog(QDialog): # {{{ class NewFileDialog(QDialog): # {{{