Skip to content

Commit 79de4d7

Browse files
committed
calendar
1 parent 56795d8 commit 79de4d7

File tree

3 files changed

+31
-5
lines changed

3 files changed

+31
-5
lines changed

app.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from werkzeug.contrib.cache import SimpleCache
44

55
from resources.dining import Dining, DiningInformation, DiningSearch, DiningToday
6-
from resources.weather import Weather
6+
#from resources.weather import Weather
77
from resources.wifi import Wifi, WifiNearMe
88
from resources.laundry import Laundry
99
from resources.main import Main
@@ -13,6 +13,7 @@
1313
from resources.buildings import Buildings
1414
from resources.directory import FacultyDirectory
1515
from resources.daily_illini import News, SubCategoryNews, SportsNews, RecentNews
16+
from resources.calendar import Calendar
1617

1718
app = Flask(__name__)
1819
api = Api(app)
@@ -21,18 +22,17 @@
2122
# Define routes
2223
api.add_resource(Main, '/')
2324

24-
#api.add_resource(Dining, '/dining/search/<query>', '/dining/<hall>/<dateFrom>/<dateTo>', '/dining/information', '/dining/balance')
2525
'''Dining'''
2626
api.add_resource(DiningToday, '/dining/<string:hall>')
2727
api.add_resource(Dining, '/dining/<string:hall>/<string:dateFrom>/<string:dateTo>')
2828
api.add_resource(DiningSearch, '/dining/search/<string:query>')
2929
api.add_resource(DiningInformation, '/dining/information')
3030

3131
'''Wifi'''
32-
#api.add_resource(Wifi, '/wifi')
32+
api.add_resource(Wifi, '/wifi')
3333
#api.add_resource(WifiNearMe, '/wifi/<string:latitude>/<string:longitude>')
3434

35-
api.add_resource(Weather, '/weather')
35+
#api.add_resource(Weather, '/weather')
3636

3737
api.add_resource(Laundry, '/laundry')
3838

@@ -54,5 +54,7 @@
5454

5555
api.add_resource(EWSStatus, '/ews-status')
5656

57+
api.add_resource(Calendar, '/calendar/<string:year>')
58+
5759
if __name__ == '__main__':
5860
app.run(debug=True)

resources/calendar.py

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
from flask_restful import Resource
2+
import urllib2
3+
from bs4 import BeautifulSoup
4+
5+
years = {'2016':'http://www.senate.illinois.edu/ep0943.html', '2017':'http://www.senate.illinois.edu/ep0944.html', '2018':'http://www.senate.illinois.edu/ep0945.html'}
6+
7+
class Calendar(Resource):
8+
def get(self, year):
9+
if year not in years.keys():
10+
return {'This year':'is not available.'}
11+
else :
12+
request_url=years[year]
13+
request = urllib2.urlopen(request_url)
14+
soup = BeautifulSoup(request, 'html.parser')
15+
retval = {}
16+
for x in soup.find_all('table'):
17+
retlist = []
18+
for y in x.find_all('tr'):
19+
if (y.td.p is None):
20+
retlist.append((y.td.string, y.td.next_sibling.string))
21+
else:
22+
retlist.append((y.td.p.string, y.td.next_sibling.string))
23+
retval[x.previous_sibling.previous_sibling.strong.string] = retlist
24+
return retval;

resources/wifi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class Wifi(Resource):
99
def get(self):
10-
request_url = "https://www.cites.illinois.edu/wireless/locations.html"
10+
request_url = "http://web.archive.org/web/20151229092233/https://www.cites.illinois.edu/wireless/locations.html"
1111
response = urllib2.urlopen(request_url)
1212
soup = BeautifulSoup(response, "html.parser")
1313
addresses = []

0 commit comments

Comments
 (0)