Combine first and second pages.
This commit is contained in:
parent
1c6a83083a
commit
0768cc101c
4 changed files with 22 additions and 62 deletions
16
main.py
16
main.py
|
|
@ -1,4 +1,5 @@
|
|||
#!/usr/bin/python3
|
||||
"""Find photos on flickr for Wikipedia articls and contact the photographer."""
|
||||
|
||||
import collections
|
||||
import json
|
||||
|
|
@ -18,17 +19,14 @@ enwiki = "en.wikipedia.org/wiki/"
|
|||
@app.route("/")
|
||||
def start() -> str:
|
||||
"""Start form."""
|
||||
return flask.render_template("wikipedia_url.html")
|
||||
|
||||
|
||||
@app.route("/flickr")
|
||||
def flickr_search() -> str:
|
||||
"""Search flickr."""
|
||||
wikipedia_url = flask.request.args["wikipedia"]
|
||||
wikipedia_url = flask.request.args.get("wikipedia")
|
||||
if not wikipedia_url:
|
||||
return flask.render_template("combined.html")
|
||||
start = wikipedia_url.find(enwiki) + len(enwiki)
|
||||
name = unquote(wikipedia_url[start:]).replace("_", " ")
|
||||
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,
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue