X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd.py;h=3e275e6f21c8a3fe5490a032cf5208b8e1abf7e8;hb=d25d749d6c737395c9076c2061c8088fedeb80bf;hp=1e34234998a569fbe621cc7256bdd76c521044ed;hpb=f4b02d689691b72b8078187f69b199f226298a9a;p=phdru.name%2Fphdru.name.git
diff --git a/phd.py b/phd.py
index 1e34234..3e275e6 100644
--- a/phd.py
+++ b/phd.py
@@ -9,7 +9,7 @@ def _url2href(match):
return '%s' % (url, url)
-full_dirs = len(os.getcwd().split('/')) + 2
+full_dirs = len(os.getcwd().split('/')) + 1
class phd(Template):
def __init__(self, *args, **kw):
@@ -39,11 +39,13 @@ class phd(Template):
def body(self):
if hasattr(self, "body_html"):
- return self.body_html()
+ return self.body_html().encode('utf-8')
if hasattr(self, "body_text"):
return self.text2html()
if hasattr(self, "body_rst"):
return self.rst2html()
+ if hasattr(self, "body_mkd"):
+ return self.mkd2html()
def text2html(self):
body = re.sub(url_re, _url2href, self.body_text())
@@ -52,6 +54,8 @@ class phd(Template):
new_paras = []
for p in paragraphs:
+ if isinstance(p, unicode):
+ p = p.encode('utf-8')
parts = p.split("\n ")
parts[0] = parts[0].strip()
new_paras.append('\n
\n\n'.join(parts))
@@ -78,9 +82,18 @@ class phd(Template):
subtitle = "
%s
" % subtitle
body = parts["body"]
- parts = [part for part in (title, subtitle, body) if part]
+ parts = []
+ for part in (title, subtitle, body):
+ if not part:
+ continue
+ if isinstance(part, unicode):
+ part = part.encode('utf-8')
+ parts.append(part)
return "\n\n".join(parts)
+ def mkd2html(self):
+ from markdown import markdown
+ return markdown(self.body_mkd(), output_format="html")
def img_thumbnail_800_1024(self, img_name):
return """\
@@ -88,16 +101,19 @@ class phd(Template):
800x600, 1024x800""" % {"img_name": img_name}
def wikipedia(self, query):
- return "http://en.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+ return "https://en.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
def wikipedia_ru(self, query):
- return "http://ru.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+ return "https://ru.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+
+ def startpage(self, query):
+ return "https://startpage.com/do/search?q=%s" % quote_string(query)
+
+ search = startpage
def nigma(self, query):
return "http://www.nigma.ru/index.php?s=%s" % quote_string(query)
- search = nigma
-
def yandex(self, query):
return "http://www.yandex.ru/yandsearch?text=%s&rpt=rad" % quote_string(query, "cp1251")