Refactor update script

[phdru.name/phdru.name.git] / phd.py

diff --git a/phd.py b/phd.py
index 1e34234998a569fbe621cc7256bdd76c521044ed..3e275e6f21c8a3fe5490a032cf5208b8e1abf7e8 100644 (file)
--- a/phd.py
+++ b/phd.py
@@ -9,7 +9,7 @@ def _url2href(match):
    return '<a href="%s">%s</a>' % (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</p>\n<p>\n'.join(parts))
@@ -78,9 +82,18 @@ class phd(Template):
          subtitle = "<h2>%s</h2>" % 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):
 <a href="%(img_name)s-800x600.jpg">800x600</a>, <a href="%(img_name)s-1024x800.jpg">1024x800</a>""" % {"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")