X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd_pp.py;h=d4b2e3211747d7ba54f11aecfa50c7cfc4e9ce52;hb=8dba3199ebeac8260f5a0e90f68b6adcc91d579b;hp=64df5196ef3be6e232cd584853c4d927d85655f4;hpb=49891ef00be55498d99a740a7d3b992e5971625b;p=phdru.name%2Fphdru.name.git
diff --git a/phd_pp.py b/phd_pp.py
index 64df519..d4b2e32 100644
--- a/phd_pp.py
+++ b/phd_pp.py
@@ -2,12 +2,7 @@ import os, re, time, urllib
from Cheetah.Template import Template
-# Copied from ZWiki
-
-urlchars = r'[A-Za-z0-9/:@_%~#=&\.\-\?\+\$,]+'
-urlendchar = r'[A-Za-z0-9/]'
-url = r'["=]?((about|file|ftp|gopher|http|https|mailto|news|telnet):%s)' % \
- (urlchars+urlendchar)
+url_re = r"(((https?|ftp|gopher|telnet)://|(mailto|file|news|about|ed2k|irc|sip|magnet):)[^' \t<>\"]+|(www|web|w3)[A-Za-z0-9_-]*\.[A-Za-z0-9._-]+\.[^' \t<>\"]+)[A-Za-z0-9/]"
def _url2href(match):
url = match.group(0)
@@ -41,6 +36,7 @@ class phd_pp(Template):
return "%s, %s" % (start_year, this_year)
return "%s-%s" % (start_year, this_year)
+
def body(self):
if hasattr(self, "body_html"):
return self.body_html()
@@ -50,7 +46,7 @@ class phd_pp(Template):
return self.rst2html()
def text2html(self):
- body = re.sub(url, _url2href, self.body_text())
+ body = re.sub(url_re, _url2href, self.body_text())
paragraphs = body.split("\n\n")
@@ -70,8 +66,7 @@ class phd_pp(Template):
def rst2html(self):
from docutils.core import publish_parts
- from locale import getpreferredencoding
- encoding = getpreferredencoding()
+ from m_lib.defenc import default_encoding as encoding
parts = publish_parts(self.body_rst(), writer_name="html")
@@ -87,23 +82,31 @@ class phd_pp(Template):
parts = [part for part in (title, subtitle, body) if part]
return "\n\n".join(parts)
+
def img_thumbnail_800_1024(self, img_name):
return """\
![%(img_name)s-thumbnail.jpg](%(img_name)s-thumbnail.jpg)
800x600, 1024x800""" % {"img_name": img_name}
- 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 wikipedia(self, query):
+ return "http://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=',')
+
+ 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")
- def wikipedia(self, query):
- return "http://en.wikipedia.org/wiki/%s" % quote_string(query)
-
- def wikipedia_ru(self, query):
- return "http://ru.wikipedia.org/wiki/%s" % quote_string(query)
+ def google(self, query):
+ return "http://www.google.com/search?hl=en&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
+ 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 quote_string(s, to_encoding="utf-8"):
- return urllib.quote_plus(unicode(s, "koi8-r").encode(to_encoding))
+def quote_string(s, to_encoding="utf-8", ext_safe=''):
+ return urllib.quote(unicode(s, "koi8-r").encode(to_encoding), '/' + ext_safe)