X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd.py;h=3c2e0dd038bb987cb6187748dc385fce67aeda07;hb=5bfe6ea88d9f0579f7d4ed471c63c342c7b6fc1b;hp=7d9cf13d7c895dd6c1e628ecadaaa355f7b7d587;hpb=4e1b23994ee310c40da786faedf49c8fa4b44d31;p=phdru.name%2Fphdru.name.git diff --git a/phd.py b/phd.py index 7d9cf13..3c2e0dd 100644 --- a/phd.py +++ b/phd.py @@ -101,16 +101,19 @@ class phd(Template): 800x600, 1024x800""" % {"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") @@ -120,5 +123,8 @@ class phd(Template): 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 lurkmoar(self, query): + return "https://lurkmore.to/%s" % quote_string(query.replace(' ', '_'), ext_safe=',') + def quote_string(s, to_encoding="utf-8", ext_safe=''): return urllib.quote(unicode(s, "utf-8").encode(to_encoding), '/' + ext_safe)