X-Git-Url: https://git.phdru.name/?p=phdru.name%2Fphdru.name.git;a=blobdiff_plain;f=phd.py;h=a68db56e5cb2b4f601bdc84f398ab7ecd93c4cd3;hp=6b67c20c900567eb31d9ceb72bf6001ff5b86586;hb=HEAD;hpb=6a2b39f98da72d1cead6e4604494884ec46a3bd9 diff --git a/phd.py b/phd.py index 6b67c20..4aa206c 100644 --- a/phd.py +++ b/phd.py @@ -10,6 +10,7 @@ from blog_db import load_blog 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) @@ -17,12 +18,15 @@ def _url2href(match): full_dirs = len(os.getcwd().split('/')) + 1 + class phd(Template): def __init__(self, *args, **kw): if not hasattr(self, "_fileBaseName"): - self._fileDirName, self._fileBaseName = os.path.split(os.path.abspath(self._CHEETAH_src)) + 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" + # remove directories up to "./files" + directories = self._fileDirName.split('/')[full_dirs:] dirs_to_root = len(directories) if dirs_to_root: root = "../"*dirs_to_root @@ -42,7 +46,6 @@ class phd(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() @@ -90,18 +93,17 @@ class phd(Template): body = parts["body"] parts = [] for part in (title, subtitle, body): - if not part: - continue - if PY2 and not isinstance(part, bytes): - part = part.encode('utf-8') - parts.append(part) + if not part: + continue + if PY2 and not isinstance(part, bytes): + part = part.encode('utf-8') + parts.append(part) return "\n\n".join(parts) def mkd2html(self): from markdown import markdown return markdown(self.body_mkd(), output_format="html") - def find_near_blog_posts(self): if not self.path.startswith("/Russian/blog/"): return None, None, None, None @@ -109,18 +111,20 @@ class phd(Template): # blog post is ['', 'Russian', 'blog', year, month, day, filename] if len(dirs) != 7: # Not a blog post return None, None, None, None - ymd = tuple(dirs[3:-1]) + ymd = tuple(dirs[3:6]) filename = self._fileBaseName prev_key = prev_blog_post = current_key = current_blog_post = \ - next_key = next_blog_post = None - old_blog = load_blog() - for key in sorted(old_blog): - for blog_post in sorted(old_blog[key]): + next_key = next_blog_post = None + blog = load_blog() + for key in sorted(blog): + for blog_post in sorted(blog[key]): if current_blog_post: - prev_key, prev_blog_post = current_key, current_blog_post + prev_key = current_key + prev_blog_post = current_blog_post if next_blog_post: - current_key, current_blog_post = next_key, next_blog_post + current_key = next_key + current_blog_post = next_blog_post next_key = key next_blog_post = blog_post if current_blog_post and (current_key == ymd) and \ @@ -128,37 +132,43 @@ class phd(Template): return prev_key, prev_blog_post, next_key, next_blog_post return current_key, current_blog_post, None, None - def img_thumbnail_800_1024(self, img_name): return """\ %(img_name)s-thumbnail.jpg
800x600, 1024x800""" % {"img_name": img_name} def wikipedia(self, query): - return "https://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 "https://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) + 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) + return "http://www.nigma.ru/index.php?s=%s" % quote_string(query) def yandex(self, query): - return "http://www.yandex.ru/yandsearch?text=%s&rpt=rad" % quote_string(query, "cp1251") + return "http://www.yandex.ru/yandsearch?text=%s&rpt=rad" \ + % quote_string(query, "cp1251") def google(self, query): - return "http://www.google.com/search?hl=en&ie=utf-8&oe=utf-8&q=%s" % quote_string(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) + 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=',') + return "http://lurklurk.com/%s" % quote_string( + query.replace(' ', '_'), ext_safe=',') + def quote_string(s, to_encoding="utf-8", ext_safe=''): if isinstance(s, bytes):