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

Use un-prefixed names for markdown extension loading

Browse Source
This commit is contained in:
Kovid Goyal 2019-02-10 16:05:55 +05:30
parent ea99a041d3
commit 0242b3d1c1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/calibre/ebooks/txt/processor.py
View File

@ -102,25 +102,26 @@ def convert_basic(txt, title='', epub_split_size_kb=0):
DEFAULT_MD_EXTENSIONS = ('footnotes', 'tables', 'toc')
def convert_markdown(txt, title='', extensions=DEFAULT_MD_EXTENSIONS):
from calibre.ebooks.conversion.plugins.txt_input import MD_EXTENSIONS
def create_markdown_object(extensions):
from calibre.ebooks.markdown import Markdown
extensions = ['calibre.ebooks.markdown.extensions.' + x.lower() for x in extensions if x.lower() in MD_EXTENSIONS]
from calibre.ebooks.conversion.plugins.txt_input import MD_EXTENSIONS
extensions = [x.lower() for x in extensions if x.lower() in MD_EXTENSIONS]
md = Markdown(extensions=extensions)
return md
def convert_markdown(txt, title='', extensions=DEFAULT_MD_EXTENSIONS):
md = create_markdown_object(extensions)
return HTML_TEMPLATE % (title, md.convert(txt))
def convert_markdown_with_metadata(txt, title='', extensions=DEFAULT_MD_EXTENSIONS):
from calibre.ebooks.conversion.plugins.txt_input import MD_EXTENSIONS
from calibre.ebooks.markdown import Markdown
from calibre.ebooks.metadata.book.base import Metadata
from calibre.utils.date import parse_only_date
from calibre.db.write import get_series_values
extensions = ['calibre.ebooks.markdown.extensions.' + x.lower() for x in extensions if x.lower() in MD_EXTENSIONS]
meta_ext = 'calibre.ebooks.markdown.extensions.meta'
if meta_ext not in extensions:
extensions.append(meta_ext)
md = Markdown(extensions=extensions)
if 'meta' not in extensions:
extensions.append('meta')
md = create_markdown_object(extensions)
html = md.convert(txt)
mi = Metadata(title or _('Unknown'))
m = md.Meta

4
src/calibre/test_build.py
View File

@ -269,9 +269,9 @@ class BuildTest(unittest.TestCase):
del readline
def test_markdown(self):
from calibre.ebooks.markdown import Markdown
from calibre.ebooks.txt.processor import create_markdown_object
from calibre.ebooks.conversion.plugins.txt_input import MD_EXTENSIONS
Markdown(extensions=MD_EXTENSIONS)
create_markdown_object(MD_EXTENSIONS)
from calibre.library.comments import sanitize_comments_html
sanitize_comments_html(b'''<script>moo</script>xxx<img src="http://moo.com/x.jpg">''')