X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd.py;h=3c2e0dd038bb987cb6187748dc385fce67aeda07;hb=7a0043fac53e3ca80dbde5c299ede6ddfdd83837;hp=529f87a09fa3275d090435c72d773e7ffde2ea5a;hpb=d76c1ae5fc720b4e22057319b8d98478676f9005;p=phdru.name%2Fphdru.name.git
diff --git a/phd.py b/phd.py
index 529f87a..3c2e0dd 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))
@@ -66,22 +70,30 @@ class phd(Template):
def rst2html(self):
from docutils.core import publish_parts
- from m_lib.defenc import default_encoding as encoding
parts = publish_parts(self.body_rst(), writer_name="html")
- title = parts["title"].encode(encoding) or self.Title
+ title = parts["title"] or self.Title
if title:
title = "
%s
" % title
- subtitle = parts["subtitle"].encode(encoding)
+ subtitle = parts["subtitle"]
if subtitle:
subtitle = "%s
" % subtitle
- body = parts["body"].encode(encoding)
- parts = [part for part in (title, subtitle, body) if part]
+ body = parts["body"]
+ 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 """\
@@ -89,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")
@@ -108,5 +123,8 @@ class phd(Template):
def google_ru(self, query):
return "http://www.google.ru/search?hl=ru&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
+ def lurkmoar(self, query):
+ return "https://lurkmore.to/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+
def quote_string(s, to_encoding="utf-8", ext_safe=''):
- return urllib.quote(unicode(s, "koi8-r").encode(to_encoding), '/' + ext_safe)
+ return urllib.quote(unicode(s, "utf-8").encode(to_encoding), '/' + ext_safe)