edward/flickr-mail
1
0
Fork 0
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Combine first and second pages.

Browse source
This commit is contained in:
Edward Betts 2023-09-08 12:11:42 +01:00
parent 1c6a83083a
commit 0768cc101c
4 changed files with 22 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
main.py
View file

@ -1,4 +1,5 @@
#!/usr/bin/python3 #!/usr/bin/python3
"""Find photos on flickr for Wikipedia articls and contact the photographer."""
import collections import collections
import json import json
@ -18,17 +19,14 @@ enwiki = "en.wikipedia.org/wiki/"
@app.route("/") @app.route("/")
def start() -> str: def start() -> str:
"""Start form.""" """Start form."""
return flask.render_template("wikipedia_url.html") wikipedia_url = flask.request.args.get("wikipedia")
if not wikipedia_url:
return flask.render_template("combined.html")
@app.route("/flickr")
def flickr_search() -> str:
"""Search flickr."""
wikipedia_url = flask.request.args["wikipedia"]
start = wikipedia_url.find(enwiki) + len(enwiki) start = wikipedia_url.find(enwiki) + len(enwiki)
name = unquote(wikipedia_url[start:]).replace("_", " ")
return flask.render_template( return flask.render_template(
"flickr_search.html", name=name, wikipedia_url=wikipedia_url "combined.html",
name=unquote(wikipedia_url[start:]).replace("_", " "),
wikipedia_url=wikipedia_url,
) )

16
templates/flickr_search.html → templates/combined.html
View file

@ -4,7 +4,19 @@
{% block content %} {% block content %}
<div class="container"> <div class="container">
<h1>Flickr mail</h1> <div class="row">
<h1>Enter URLs</h1>
<form action="{{ url_for(request.endpoint) }}">
<div class="mb-3">
<label for="wikipedia" class="form-label">Wikipedia URL:</label>
<input type="text" class="form-control" id="wikipedia" name="wikipedia" value="{{ wikipedia_url }}" required>
</div>
<input type="submit" value="Submit">
</form>
{% if name %}
<p>Wikipedia article: {{ name }}</p> <p>Wikipedia article: {{ name }}</p>
<p><a href="https://flickr.com/search/?view_all=1&safe_search=3&text={{ '"' + name + '"' | urlencode }}">Search flickr</a></p> <p><a href="https://flickr.com/search/?view_all=1&safe_search=3&text={{ '"' + name + '"' | urlencode }}">Search flickr</a></p>
@ -18,6 +30,8 @@
<input type="submit" value="Submit"> <input type="submit" value="Submit">
</form> </form>
{% endif %}
</div> </div>
</div>
{% endblock %} {% endblock %}

32
templates/start_form.html
View file

@ -1,32 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Flickr Mail</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
</head>
<body>
<div class="container">
<div class="row">
<h1>Enter URLs</h1>
<form action="{{ url_for("show_message") }}">
<div class="mb-3">
<label for="flickr" class="form-label">Flickr URL:</label>
<input type="text" class="form-control" id="flickr" name="flickr" required>
</div>
<div class="mb-3">
<label for="wikipedia" class="form-label">Wikipedia URL:</label>
<input type="text" class="form-control" id="wikipedia" name="wikipedia" required>
</div>
<input type="submit" value="Submit">
</form>
</div>
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>
</body>
</html>

20
templates/wikipedia_url.html
View file

@ -1,20 +0,0 @@
{% extends "base.html" %}
{% block title %}Flickr mail{% endblock %}
{% block content %}
<div class="container">
<div class="row">
<h1>Enter URLs</h1>
<form action="{{ url_for("flickr_search") }}">
<div class="mb-3">
<label for="wikipedia" class="form-label">Wikipedia URL:</label>
<input type="text" class="form-control" id="wikipedia" name="wikipedia" required>
</div>
<input type="submit" value="Submit">
</form>
</div>
</div>
{% endblock %}