diff --git a/main.py b/main.py index e47275e..9a39761 100755 --- a/main.py +++ b/main.py @@ -22,11 +22,62 @@ def start() -> str: wikipedia_url = flask.request.args.get("wikipedia") if not wikipedia_url: return flask.render_template("combined.html") + start = wikipedia_url.find(enwiki) + len(enwiki) + wiki_part2 = unquote(wikipedia_url[start:]) + + name = wiki_part2 + + if "_(" in name: + name = name[: name.find("_(")] + name = name.replace("_", " ") + + flickr_url = flask.request.args.get("flickr") + if not flickr_url: + return flask.render_template( + "combined.html", + name=name, + wikipedia_url=wikipedia_url, + ) + + wiki_part1 = wikipedia_url[:start] + + if "/in/" in flickr_url: + flickr_url = flickr_url[: flickr_url.find("/in/")] + + flickr_start = "https://flickr.com/photos/" + + assert flickr_url.startswith(flickr_start) + flickr_username = flickr_url[ + len(flickr_start) : flickr_url.find("/", len(flickr_start)) + ] + + # nsid = flickr_usrename_to_nsid(flickr_username) + nsid = "disabled" + assert nsid + print(nsid) + + msg = flask.render_template( + "message.jinja", + flickr_url=flickr_url, + wikipedia_url=wikipedia_url, + name=name, + wiki_part1=wiki_part1, + wiki_part2=wiki_part2, + ) + + subject = f"Request to use your photo of {name} on Wikipedia" + + lines = msg.split("\n\n") + return flask.render_template( "combined.html", - name=unquote(wikipedia_url[start:]).replace("_", " "), + name=name, wikipedia_url=wikipedia_url, + flickr_url=flickr_url, + subject=subject, + lines=lines, + nsid=nsid, ) diff --git a/templates/combined.html b/templates/combined.html index f0c1306..3c846d1 100644 --- a/templates/combined.html +++ b/templates/combined.html @@ -20,11 +20,11 @@

Wikipedia article: {{ name }}

Search flickr

-
+
- +
@@ -32,6 +32,39 @@ {% endif %} + {% if flickr_url %} +

send message +

Subject: {{ subject }} +
+

message + +

+ {% for p in lines %} +

{{ p }}

+ {% endfor %} +
+ + + {% endif %} +
{% endblock %} + +{% block scripts %} + +{% endblock %}