readme updates, extra functions around photo inserts
Peter Molnar hello@petermolnar.eu
Wed, 21 Mar 2018 15:42:36 +0000
M
README.md
→
README.md
@@ -16,7 +16,7 @@ ## Install
### External dependencies -PHP is in order to use [XRay](https://github.com/aaronpk/XRay/) +PHP is in order to use [XRay](https://github.com/aaronpk/XRay/). Besides that, the rest is for `pandoc` and `exiftool`. ``` apt-get install pandoc exiftool php7.0-bcmath php7.0-bz2 php7.0-cli php7.0-common php7.0-curl php7.0-gd php7.0-imap php7.0-intl php7.0-json php7.0-mbstring php7.0-mcrypt php7.0-mysql php7.0-odbc php7.0-opcache php7.0-readline php7.0-sqlite3 php7.0-xml php7.0-zip python3 python3-pip python3-dev
M
nasg.py
→
nasg.py
@@ -40,6 +40,7 @@ from urllib.parse import urlparse
import asyncio from math import ceil import csv +import html import frontmatter import requests import arrow@@ -366,6 +367,7 @@ )
tmplfile = "%s.html" % (self.__class__.__name__) r = shared.j2.get_template(tmplfile).render(tmplvars) self.write_html(o, r) + # render feed if page == 1: self.write_feed(posttmpls)@@ -437,12 +439,13 @@ return list(set(r))
@property def is_uptodate(self): - if not os.path.isfile(self.htmlfile): - return False - mtime = os.path.getmtime(self.htmlfile) - if mtime >= self.stime: - return True - return False + for f in [self.htmlfile]: + if not os.path.isfile(f): + return False + mtime = os.path.getmtime(f) + if mtime < self.stime: + return False + return True @property def htmlfile(self):@@ -562,7 +565,7 @@ "%s" % self.content,
]) if self.photo: - corpus = corpus + "\n".join(self.meta.get('tags', [])) + corpus = corpus + "\n".join(self.tags) return corpus@@ -630,9 +633,9 @@ @property
def html(self): html = "%s" % (self.body) - # add photo - if self.photo: - html = "%s\n%s" % (str(self.photo), html) + ## add photo + #if self.photo: + #html = "%s\n%s" % (str(self.photo), html) return shared.Pandoc().convert(html)@@ -650,7 +653,9 @@ def summary(self):
s = self.meta.get('summary', '') if not s: return s - return shared.Pandoc().convert(s) + if not hasattr(self, '_summary'): + self._summary = shared.Pandoc().convert(s) + return self._summary @property def shortslug(self):@@ -664,6 +669,14 @@ urls.append("https://brid.gy/publish/flickr")
return urls @property + def tags(self): + return self.meta.get('tags', []) + + @property + def description(self): + return html.escape(self.meta.get('summary', '')) + + @property def tmplvars(self): # very simple caching because we might use this 4 times: # post HTML, category, front posts and atom feed@@ -688,10 +701,17 @@ 'licence': self.licence,
'is_reply': self.is_reply, 'age': int(self.published.format('YYYY')) - int(arrow.utcnow().format('YYYY')), 'summary': self.summary, + 'description': self.description, 'replies': self.replies, 'reactions': self.reactions, - 'syndicate': self.syndicate + 'syndicate': self.syndicate, + 'tags': self.tags, + 'photo': False } + if self.photo: + self._tmplvars.update({ + 'photo': str(self.photo) + }) return self._tmplvars async def render(self):@@ -1063,9 +1083,28 @@ downsized['crop']
) @property + def src_size(self): + width = int(self.meta.get('ImageWidth')) + height = int(self.meta.get('ImageHeight')) + + if not self.is_downsizeable: + return width, height + + return self._intermediate_dimension( + shared.config.getint('photo', 'default'), + width, + height + ) + + + @property def tmplvars(self): + src_width, src_height = self.src_size + return { 'src': self.src, + 'width': src_width, + 'height': src_height, 'target': self.href, 'css': self.cssclass, 'title': self.title,@@ -1116,13 +1155,22 @@ return self.meta.get('source')
@property def author(self): - url = self.meta.get('author').get('url', self.source) - name = self.meta.get('author').get('name', urlparse(url).hostname) + r = { + 'name': urlparse(self.source).hostname, + 'url': self.source + } + + author = self.meta.get('author') + if not author: + return r + + if 'name' in author: + r.update({ 'name': self.meta.get('author').get('name')}) - return { - 'name': name, - 'url': url - } + if 'url' in author: + r.update({ 'name': self.meta.get('author').get('url')}) + + return r @property def type(self):@@ -1341,10 +1389,15 @@ magic = MagicPHP()
collector_front = Category() collector_categories = NoDupeContainer() + sitemap = {} + for f, post in content: logging.info("PARSING %s", f) post.init_extras() + + # add to sitemap + sitemap.update({ post.url: post.mtime }) # extend redirects for r in post.redirects:@@ -1419,9 +1472,26 @@ src = shared.config.get('dirs', 'static')
for item in os.listdir(src): s = os.path.join(src, item) d = os.path.join(shared.config.get('common', 'build'), item) - if not os.path.exists(d): + if not os.path.exists(d) or shared.config.getboolean('params', 'force'): logging.debug("copying static file %s to %s", s, d) shutil.copy2(s, d) + if '.html' in item: + url = "%s/%s" % (shared.config.get('site', 'url'), item) + sitemap.update({ + url: os.path.getmtime(s) + }) + + # dump sitemap, if needed + sitemapf = os.path.join(shared.config.get('common', 'build'), 'sitemap.txt') + sitemap_update = True + if os.path.exists(sitemapf): + if int(max(sitemap.values())) <= int(os.path.getmtime(sitemapf)): + sitemap_update = False + + if sitemap_update: + logging.info('writing updated sitemap') + with open(sitemapf, 'wt') as smap: + smap.write("\n".join(sorted(sitemap.keys()))) if __name__ == '__main__':
M
router.py
→
router.py
@@ -30,7 +30,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
""" from sanic import Sanic import sanic.response -from sanic.log import log as logging +#from sanic.log import log as logging +import logging import validators import urllib.parse import shared@@ -48,7 +49,8 @@ #log = logging.getLogger()
# log_config=None prevents creation of access_log and error_log files # since I'm running this from systemctl it already goes into syslog - app = Sanic('router', log_config=None) + app = Sanic('router') + #app = Sanic('router', log_config=None) # this is ok to be read-only sdb = shared.SearchDB()@@ -100,7 +102,7 @@ # it is unfortunate that I need to init this every time, but
# otherwise it'll become read-only for reasons I'm yet to grasp # the actual parsing will be done at site generation time wdb = shared.WebmentionQueue() - wdb.queue(source, target) + wdb.maybe_queue(source, target) # telegram notification, if set shared.notify(@@ -112,4 +114,5 @@ )
response = sanic.response.text("Accepted", status=202) return response - app.run(host="127.0.0.1", port=8008, log_config=None) + #app.run(host="127.0.0.1", port=9002, log_config=None) + app.run(host="127.0.0.1", port=9002)