X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd_pp.py;h=80331b05c91025397253bc5cb3e8467592931deb;hb=d450aeda27440cadb2fcd1504cdc4acf23187860;hp=08b6bf6573a8f8ef29042196809480d7fac226d6;hpb=6aa7ab00b5dc30b6221d0d55fecc1b0b957cdd79;p=phdru.name%2Fphdru.name.git

diff --git a/phd_pp.py b/phd_pp.py
index 08b6bf6..80331b0 100644
--- a/phd_pp.py
+++ b/phd_pp.py
@@ -1,23 +1,18 @@
-import os, re, time
+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|gopher|http|https|ftp|mailto|file):%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 '<a href="%s">%s</a>' % (url, url)
 
-
 full_dirs = len(os.getcwd().split('/')) + 1
 
 class phd_pp(Template):
    def __init__(self, *args, **kw):
+      if not hasattr(self, "_fileBaseName"):
+         self._fileDirName, self._fileBaseName = os.path.split(os.path.abspath(self._CHEETAH_src))
       Template.__init__(self, *args, **kw)
       directories = self._fileDirName.split('/')[full_dirs:] # remove directories up to "./files"
       dirs_to_root = len(directories)
@@ -48,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")
 
@@ -84,3 +79,26 @@ class phd_pp(Template):
       body = parts["body"].encode(encoding)
       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 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)
+
+   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.replace(' ', '_'), ext_safe=',')
+
+   def wikipedia_ru(self, query):
+      return "http://ru.wikipedia.org/wiki/%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)