Fix decorator order
This commit is contained in:
parent
413aafa9cb
commit
147955c8a0
11
app.py
11
app.py
|
@ -122,19 +122,18 @@ def wrap_generator(g):
|
|||
|
||||
app = DefaultToGopher()
|
||||
|
||||
@app.route("(?:/(?:index\.gmi)?)?")
|
||||
@wrap_response
|
||||
@app.route("")
|
||||
@app.route("/index.gmi")
|
||||
def index(request):
|
||||
return listing_generator(header_file="/var/cosmic/templates/geminiintro.tmpl",limit_line_count=RECENT_ENTRIES_COUNT)
|
||||
|
||||
@wrap_response
|
||||
@app.route("/log(?:/(?:index\.gmi)?)?")
|
||||
@wrap_response
|
||||
def log(request):
|
||||
return listing_generator(header_text="RS001 Log Entries (Newest First):")
|
||||
|
||||
@wrap_generator
|
||||
@app.route("/ships(?:/(?:index\.gmi)?)?")
|
||||
@wrap_generator
|
||||
def ships(request):
|
||||
yield "# Ships and Outposts\n\n"
|
||||
for ship in os.listdir("/var/gopher"):
|
||||
|
@ -145,8 +144,8 @@ def ships(request):
|
|||
urlencoded = urllib.parse.quote(ship,safe='')
|
||||
yield f"=> /ships/{urlencoded}/ {ship} ({entries!s})\n"
|
||||
|
||||
@wrap_response
|
||||
@app.route("/ships/(?P<ship>[^/]+)(?:/(?:index\.gmi)?)?")
|
||||
@wrap_response
|
||||
def ship(request,ship=None):
|
||||
if ship is None: return Response(Status.BAD_REQUEST,"Bad Request")
|
||||
ship_unquoted = urllib.parse.unquote(ship)
|
||||
|
@ -178,8 +177,8 @@ def ship(request,ship=None):
|
|||
yield "All rights reserved.\n"
|
||||
return __generator
|
||||
|
||||
@wrap_generator
|
||||
@app.route("/(?P<format>rss|atom).xml")
|
||||
@wrap_generator
|
||||
def feeds(request,format="atom"):
|
||||
with open(os.path.join("/var/gopher",format+".xml")):
|
||||
for line in f:
|
||||
|
|
Loading…
Reference in New Issue