From 1ad43aa0afcd306e17972a68277adf671b486798 Mon Sep 17 00:00:00 2001
From: Anton Sarukhanov <code@ant.sr>
Date: Sun, 25 Mar 2018 14:45:54 -0400
Subject: [PATCH] Fix refresh, autosubmit select, handle errors.
---
scrape.py | 13 ++++++++-----
templates/index.html | 2 +-
templates/live.html | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/scrape.py b/scrape.py
index 10c519d..1b14577 100644
--- a/scrape.py
+++ b/scrape.py
@@ -15,11 +15,14 @@ def scrape(results_url):
event_urls = results_tree.xpath(
'//div[@id="schedule"]/table/tr/td/a[text()="View"]/@href')
except IndexError:
- return "No event schedule found"
- tournament_name = results_tree.xpath(
- '//span[@class="tournName"]/text()')[0]
- tournament_details = results_tree.xpath(
- '//span[@class="tournDetails"]/text()')[0]
+ return "No event schedule found."
+ try:
+ tournament_name = results_tree.xpath(
+ '//span[@class="tournName"]/text()')[0]
+ tournament_details = results_tree.xpath(
+ '//span[@class="tournDetails"]/text()')[0]
+ except IndexError:
+ return "Tournament info not found."
events = []
for event_url in event_urls:
if not urlparse(event_url).netloc:
diff --git a/templates/index.html b/templates/index.html
index 5e8386c..4853d48 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,7 +10,7 @@
<p>
<form action="{{ url_for('live') }}" method="get">
<label>Live Results URL:
- <select name="results_url">
+ <select name="results_url" onchange="this.form.submit()">
<option value="" selected disabled>-- Select One --</option>
<optgroup label="Escrime Management">
<option value="http://escrimeresults.com/tournaments/NCAA.html">NCAA</option>
diff --git a/templates/live.html b/templates/live.html
index f124ee6..e04a1d0 100644
--- a/templates/live.html
+++ b/templates/live.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% block extra_head %}
- <meta http-equiv="refresh" content="60; URL={{ url_for('live') }}">
+ <meta http-equiv="refresh" content="60; URL={{ request.url }}">
{% endblock extra_head %}
{% block content %}
<header>
--
GitLab