Link to images in RSS output
This commit is contained in:
parent
5044b2b0e9
commit
07fdf16686
@ -21,7 +21,8 @@ settings:
|
|||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
rm ./pages/*.html
|
- rm -f ./pages/*.html
|
||||||
rm ./tags/*/*.html
|
- rm -f ./tags/*/*.html
|
||||||
rm ./webring/*.html
|
- rm -f ./webring/*.html
|
||||||
rmdir ./pages ./tags/* ./tags ./webring
|
- rm -f ./feeds/*.xml
|
||||||
|
- rmdir ./pages ./tags/* ./tags ./webring ./feeds
|
||||||
|
@ -85,3 +85,4 @@ title="Your Microblog Title Here"
|
|||||||
title_tagged = "#{__tagname__} on {__title__}"
|
title_tagged = "#{__tagname__} on {__title__}"
|
||||||
url = "https://yourdomain.tld/microblog/"
|
url = "https://yourdomain.tld/microblog/"
|
||||||
description = "Your description here."
|
description = "Your description here."
|
||||||
|
trailing_punctuation = ".,)!?>];:"
|
||||||
|
@ -549,6 +549,7 @@ if __name__ == "__main__":
|
|||||||
updated = []
|
updated = []
|
||||||
updated += writepage(tpl, tl, tc, cfg["page"],
|
updated += writepage(tpl, tl, tc, cfg["page"],
|
||||||
paginate=True if new_posts is None else False)
|
paginate=True if new_posts is None else False)
|
||||||
|
cfg["rss"]["accepted_images"] = cfg["post"]["accepted_images"]
|
||||||
if cfg["rss"]["enabled"]:
|
if cfg["rss"]["enabled"]:
|
||||||
# ensure output directory for feeds exists
|
# ensure output directory for feeds exists
|
||||||
if not os.path.exists("feeds"):
|
if not os.path.exists("feeds"):
|
||||||
|
47
src/rss.py
47
src/rss.py
@ -11,7 +11,7 @@ except ImportError:
|
|||||||
print("\trss disabled - missing dependency", file=sys.stderr)
|
print("\trss disabled - missing dependency", file=sys.stderr)
|
||||||
print("\tYour microblog still may have been generated.", file=sys.stderr)
|
print("\tYour microblog still may have been generated.", file=sys.stderr)
|
||||||
|
|
||||||
def line2words(lines, limit):
|
def line2words(lines, limit, trailing_punctuation):
|
||||||
output = []
|
output = []
|
||||||
char_count = 0
|
char_count = 0
|
||||||
break_outer_loop = False
|
break_outer_loop = False
|
||||||
@ -29,15 +29,37 @@ def line2words(lines, limit):
|
|||||||
# last char of last word
|
# last char of last word
|
||||||
last_char = output[-1].strip()[-1]
|
last_char = output[-1].strip()[-1]
|
||||||
# print(output[-1], file=sys.stderr)
|
# print(output[-1], file=sys.stderr)
|
||||||
punctuation = [".", ")", ",", "!", "?", ">", ']']
|
if last_char not in trailing_punctuation:
|
||||||
if last_char not in punctuation:
|
|
||||||
output.append("...")
|
output.append("...")
|
||||||
return output
|
return output
|
||||||
|
|
||||||
|
def _is_image_token(token: str, extensions):
|
||||||
|
parts = token.rsplit('.', 1)
|
||||||
|
return len(parts) == 2 and parts[1] in extensions
|
||||||
|
|
||||||
# this is similar to the markup function in microblog
|
# this is similar to the markup function in microblog
|
||||||
def enrich_msg(lines, is_atom=True):
|
def enrich_msg(
|
||||||
|
lines,
|
||||||
|
is_atom=True,
|
||||||
|
accepted_images=[],
|
||||||
|
base_url="",
|
||||||
|
trailing_punctuation="",
|
||||||
|
desc_len_limit=-1,
|
||||||
|
):
|
||||||
if not is_atom:
|
if not is_atom:
|
||||||
return lines
|
from urllib.parse import urljoin
|
||||||
|
words = line2words(lines, desc_len_limit, trailing_punctuation)
|
||||||
|
for i in range(len(words)):
|
||||||
|
token = words[i]
|
||||||
|
core = token.rstrip(trailing_punctuation)
|
||||||
|
suffix = token[len(core):]
|
||||||
|
if len(core) == 0 or "<" in core or ">" in core:
|
||||||
|
continue
|
||||||
|
if _is_image_token(core, accepted_images):
|
||||||
|
abs_url = urljoin(base_url, core)
|
||||||
|
anchor = f"<a href=\"{escape(abs_url)}\">{escape(abs_url)}</a>"
|
||||||
|
words[i] = anchor + suffix
|
||||||
|
return words
|
||||||
content = []
|
content = []
|
||||||
parser = My_Html_Parser([])
|
parser = My_Html_Parser([])
|
||||||
for line in lines:
|
for line in lines:
|
||||||
@ -95,12 +117,17 @@ def write_feed(posts, filename, params, tagname=None):
|
|||||||
# len of post.message is number of lines
|
# len of post.message is number of lines
|
||||||
msg = post.message
|
msg = post.message
|
||||||
ti = " ".join(
|
ti = " ".join(
|
||||||
line2words(msg,TITLE_LEN_LIMIT))
|
line2words(msg, TITLE_LEN_LIMIT, params["trailing_punctuation"]))
|
||||||
if params["use_atom"]:
|
|
||||||
de = " ".join(enrich_msg(msg))
|
|
||||||
else:
|
|
||||||
de = " ".join(
|
de = " ".join(
|
||||||
line2words(msg,DESC_LEN_LIMIT))
|
enrich_msg(
|
||||||
|
msg,
|
||||||
|
is_atom=params["use_atom"],
|
||||||
|
base_url=params["url"],
|
||||||
|
accepted_images=params["accepted_images"],
|
||||||
|
trailing_punctuation=params["trailing_punctuation"],
|
||||||
|
desc_len_limit=DESC_LEN_LIMIT,
|
||||||
|
)
|
||||||
|
)
|
||||||
li = base_url + ("#%i" % post.num)
|
li = base_url + ("#%i" % post.num)
|
||||||
p = dateutil.parser.parse(post.timestamp)
|
p = dateutil.parser.parse(post.timestamp)
|
||||||
if params["use_atom"]:
|
if params["use_atom"]:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user