X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=phd_pp.py;h=45b17aa766def132e9f07b3e32c0c26a7ab601b4;hb=132a0edc5a0f1bade4fc939f19ab2b464f9d376c;hp=64df5196ef3be6e232cd584853c4d927d85655f4;hpb=49891ef00be55498d99a740a7d3b992e5971625b;p=phdru.name%2Fphdru.name.git

diff --git a/phd_pp.py b/phd_pp.py
index 64df519..45b17aa 100644
--- a/phd_pp.py
+++ b/phd_pp.py
@@ -2,11 +2,11 @@ import os, re, time, urllib
 from Cheetah.Template import Template
 
 
-# Copied from ZWiki
+# Copied from ZWiki and Gajim
 
 urlchars         = r'[A-Za-z0-9/:@_%~#=&\.\-\?\+\$,]+'
 urlendchar       = r'[A-Za-z0-9/]'
-url              = r'["=]?((about|file|ftp|gopher|http|https|mailto|news|telnet):%s)' % \
+url              = r'["=]?((about|file|ftp|gopher|http|https|mailto|news|telnet|ed2k|irc|sip|magnet):%s)' % \
                    (urlchars+urlendchar)
 
 def _url2href(match):
@@ -92,6 +92,9 @@ class phd_pp(Template):
 <img src="%(img_name)s-thumbnail.jpg" alt="%(img_name)s-thumbnail.jpg" /><br />
 <a href="%(img_name)s-800x600.jpg">800x600</a>, <a href="%(img_name)s-1024x800.jpg">1024x800</a>""" % {"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 +102,11 @@ 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)
+      return "http://en.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'))
 
    def wikipedia_ru(self, query):
-      return "http://ru.wikipedia.org/wiki/%s" % quote_string(query)
+      return "http://ru.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'))
 
 
 def quote_string(s, to_encoding="utf-8"):
-   return urllib.quote_plus(unicode(s, "koi8-r").encode(to_encoding))
+   return urllib.quote(unicode(s, "koi8-r").encode(to_encoding))