voussoir/voussoir.net
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use more accurate timestamps in rss / atom.

Browse source
This commit is contained in:
voussoir 2022-04-06 11:49:55 -07:00
parent 4fbad55d77
commit 36dde281d6
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
voussoir.net/writing/generate_site.py
View file

@ -1,4 +1,6 @@
import bs4 import bs4
import datetime
import dateutil.parser
import etiquette import etiquette
import html import html
import jinja2 import jinja2
@ -62,10 +64,10 @@ def git_repo_for_file(path):
folder = folder.parent folder = folder.parent
raise Exception('No Git repo.') raise Exception('No Git repo.')
def git_file_edited_date(path): def git_file_edited_date(path) -> str:
''' '''
Return the YYYY-MM-DD date of the most recent commit that touched this file, Return the ISO formatted date of the most recent commit that touched this
ignoring commits marked as "[minor]". file, ignoring commits marked as "[minor]".
''' '''
path = pathclass.Path(path) path = pathclass.Path(path)
repo = git_repo_for_file(path) repo = git_repo_for_file(path)
@ -76,14 +78,16 @@ def git_file_edited_date(path):
'log', 'log',
'-1', '-1',
'--pretty=format:%ad', '--pretty=format:%ad',
'--date=short', '--date=iso',
r'--grep=\[minor\]', r'--grep=\[minor\]',
'--invert-grep', '--invert-grep',
'--', '--',
path, path,
] ]
output = check_output(command) date = check_output(command)
return output date = dateutil.parser.parse(date)
date = date.astimezone(datetime.timezone.utc)
return date.isoformat()
def git_file_commit_history(path): def git_file_commit_history(path):
''' '''
@ -111,9 +115,9 @@ def git_file_commit_history(path):
lines = [line.split(' ', 1) for line in lines] lines = [line.split(' ', 1) for line in lines]
return lines return lines
def git_file_published_date(path): def git_file_published_date(path) -> str:
''' '''
Return the YYYY-MM-DD date of the commit where this file first appeared. Return the ISO formatted date of the commit where this file first appeared.
''' '''
path = pathclass.Path(path) path = pathclass.Path(path)
repo = git_repo_for_file(path) repo = git_repo_for_file(path)
@ -125,12 +129,14 @@ def git_file_published_date(path):
'--follow', '--follow',
'--diff-filter=A', '--diff-filter=A',
'--pretty=format:%ad', '--pretty=format:%ad',
'--date=short', '--date=iso',
'--', '--',
path, path,
] ]
output = check_output(command) date = check_output(command)
return output date = dateutil.parser.parse(date)
date = date.astimezone(datetime.timezone.utc)
return date.isoformat()
# SOUP # SOUP
################################################################################ ################################################################################
@ -472,7 +478,7 @@ def write_atom():
<id>{{article.publication_id}}</id> <id>{{article.publication_id}}</id>
<title>{{article.title|e}}</title> <title>{{article.title|e}}</title>
<link rel="alternate" type="text/html" href="https://voussoir.net/writing/{{article.web_path}}"/> <link rel="alternate" type="text/html" href="https://voussoir.net/writing/{{article.web_path}}"/>
<updated>{{article.date}}T00:00:00Z</updated> <updated>{{article.date}}</updated>
<content type="html"> <content type="html">
<![CDATA[ <![CDATA[
{{article.soup.article}} {{article.soup.article}}
@ -501,7 +507,7 @@ def write_rss():
<title>{{article.title|e}}</title> <title>{{article.title|e}}</title>
<guid isPermalink="false">{{article.publication_id}}</guid> <guid isPermalink="false">{{article.publication_id}}</guid>
<link>https://voussoir.net/writing/{{article.web_path}}</link> <link>https://voussoir.net/writing/{{article.web_path}}</link>
<pubDate>{{article.date}}T00:00:00Z</pubDate> <pubDate>{{article.date}}</pubDate>
<description> <description>
<![CDATA[ <![CDATA[
{{article.soup.article}} {{article.soup.article}}