X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd_pp.py;h=80331b05c91025397253bc5cb3e8467592931deb;hb=6169f6bcf24d833bd561a17494d77c30b3c58739;hp=b3ad03aec704cbc5f27fc3f0cf9b108debc736b6;hpb=f95ee475c554f22998041186e5daf26872fa8b69;p=phdru.name%2Fphdru.name.git
diff --git a/phd_pp.py b/phd_pp.py
index b3ad03a..80331b0 100644
--- a/phd_pp.py
+++ b/phd_pp.py
@@ -1,19 +1,12 @@
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)
return '%s' % (url, url)
-
full_dirs = len(os.getcwd().split('/')) + 1
class phd_pp(Template):
@@ -50,7 +43,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")
@@ -92,6 +85,9 @@ class phd_pp(Template):
![%(img_name)s-thumbnail.jpg](%(img_name)s-thumbnail.jpg)
800x600, 1024x800""" % {"img_name": img_name}
+ 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)
@@ -99,11 +95,10 @@ class phd_pp(Template):
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.replace(' ', '_'))
+ 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(' ', '_'))
-
+ return "http://ru.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
-def quote_string(s, to_encoding="utf-8"):
- return urllib.quote(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)