Skip to content

lazy load some mod(actually not used feature) avoid start error when … #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lrobot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

lazy load some mod(actually not used feature) avoid start error when … #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,10 @@
from email.parser import BytesParser, Parser
from email.policy import default

from bs4 import BeautifulSoup

from markdown2 import Markdown

from datetime import datetime
from pytz import timezone

from html2txt import converters


import hashlib

Expand Down Expand Up @@ -119,6 +115,7 @@ def create_message_id(id_=None):
return ("<%s>@mail.gmail.com" % (id_,))

def text_to_markdown(data):
from markdown2 import Markdown
pattern = (
r'((([A-Za-z]{3,9}:(?:\/\/)?)' # scheme
r'(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+(:\[0-9]+)?' # user@hostname:port
Expand All @@ -135,22 +132,27 @@ def text_to_markdown(data):
return html_to_markdown(html)

def markdown_to_html(data):
from markdown2 import Markdown
markdown=Markdown()
return markdown.convert(data)

def markdown_to_text(data):
from markdown2 import Markdown
from bs4 import BeautifulSoup
markdown=Markdown()
html = markdown.convert(data)
soup = BeautifulSoup(html, "html.parser")
plain_text = soup.get_text()
return plain_text

def html_to_text(data, separator='\n'):
from bs4 import BeautifulSoup
soup = BeautifulSoup(data, "html.parser")
text = soup.get_text(separator)
return text

def html_to_markdown(data):
from html2txt import converters
markdown = converters.Html2Markdown().convert(data)
return markdown

Expand Down
6 changes: 3 additions & 3 deletions notes2html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def render_html(note,attachments):
tag = ['ul','ul','ol','ul'][pstyle - 100]
par = rval
while indent > 0:
last = par.getchildren()[-1]
last = list(par)[-1]
if last.tag != tag:
break
par = last
Expand All @@ -172,8 +172,8 @@ def render_html(note,attachments):
par = append(par,E(tag))
indent -= 1
par = append(par,E('li'))
elif pstyle == 4 and rval.getchildren()[-1].tag == 'pre':
par = rval.getchildren()[-1]
elif pstyle == 4 and list(rval)[-1].tag == 'pre':
par = list(rval)[-1]
append(par,"\n")
else:
par = append(rval,E(styles.get(pstyle,'p')))
Expand Down
4 changes: 2 additions & 2 deletions readnotes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from email.parser import BytesParser, Parser
from email.policy import default

from bs4 import BeautifulSoup


from datetime import datetime
from datetime import timedelta
Expand All @@ -27,7 +27,7 @@
import common

import urllib
from biplist import *


from notes2html import ReadAttachments, ProcessNoteBodyBlob, DefaultCss, PrintAttachments

Expand Down