make semester selector work

Author: nik3daz

app/timetable/timetable_importer.py

@@ -45,7 +45,6 @@
 timetable_url='https://my.unsw.edu.au/active/studentTimetable/timetable.xml'
 
 def getFlow(full_path):
-  print full_path
   return OAuth2WebServerFlow(client_id='52070605511-3e5l10hi90c8t4t3foa0aptmhe5psgsr.apps.googleusercontent.com',
                              client_secret='aKejP602Oz7Axrump73Oh1_R',
                              scope='https://www.googleapis.com/auth/calendar',
@@ -54,15 +53,23 @@ def getFlow(full_path):
 def getGoogleRedirect(full_path):
   return getFlow(full_path).step1_get_authorize_url()
 
-def getTimetable(zUser, zPass):
+def getTimetable(zUser, zPass, semester):
   jar = cookielib.CookieJar()
   opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(jar))
   # CSRF Token or something. We need to steal it from SSO
   # into our cookie jar to go open the timetable page
   stupid_thing = re.findall(r'_cNoOpConversation.*?"', opener.open(login_url).read())[0].replace('"', '')
   data = {'username': zUser, 'password': zPass, '_eventId': 'submit', 'lt': stupid_thing}
   opener.open(login_url, urllib.urlencode(data))
-  return opener.open(timetable_url).read()
+  data = {}
+  if semester:
+    source = opener.open(timetable_url).read().replace('\n', '')
+    if "sectionHeading" not in source:
+      return ''
+    s = BeautifulSoup(source)
+    bsds = s.find('input', {'name': 'bsdsSequence'})['value']
+    data = {'term': semester, 'bsdsSubmit-commit': 'Get Timetable', 'bsdsSequence': bsds}
+  return opener.open(timetable_url, urllib.urlencode(data)).read()
 
 def CreateClassEvent(title, content, where, start_time, end_time):
   event = {
@@ -80,22 +87,36 @@ def CreateClassEvent(title, content, where, start_time, end_time):
     }
   return event
 
-def export(f, source, zu, zp, code, full_path):
-  if f == 'use-login' and (not zu or not zp):
-    return "No zPass details or timetable source"
+def getSemester(zu, zp):
+  source = getTimetable(zu, zp, None)
+  if "sectionHeading" not in source:
+    return ("Bad timetable source, possibly incorrect login details or myunsw daily dose of downtime (12am-2am or whatever)", {})
+
+  # parsing shit
+  s = BeautifulSoup(source.replace("\n",""))
+  select_html = s.find("select", {'name': 'term'})
+  select_html['style'] = 'width: 400px;'
+  return (None,
+          {
+            'semester_select_html': select_html.prettify(),
+            'source': source
+          })
 
-  if f == 'use-login':
-    print "getting timetable"
-    f = getTimetable(zu, zp)
-    print "got timetable!"
-  else:
-    f = source
+
+def export(source, code, full_path):
+  f = source.replace('\r', '')
 
   if "sectionHeading" not in f:
     return "Bad timetable source, possibly incorrect login details or myunsw daily dose of downtime (12am-2am or whatever)"
 
   # parsing shit
   s = BeautifulSoup(f.replace("\n",""))
+  sem = re.sub(r'.*Semester (\d+) \S\S(\d+).*', u'\\2s\\1', s.find("option", {'selected':'true'}).text)
+  title = sem + " Timetable"
+
+  if not re.match(r'\d\ds\d', sem):
+    current_time = datetime.datetime.now()
+    sem = '%ds%d' % (current_time.year % 100, 1 if current_time.month < 7 else 2)
 
   credentials = getFlow(full_path).step2_exchange(code)
   http = httplib2.Http()
@@ -108,8 +129,6 @@ def export(f, source, zu, zp, code, full_path):
   ####################################################
   zp = ''
 
-  sem = re.sub(u'.*Semester (\S+) \S\S(\S+).*', u'\\2s\\1', s.find("option", {'selected':'true'}).text)
-  title = sem + " Timetable"
 
 
   # make gcal calendar
@@ -186,3 +205,7 @@ def export(f, source, zu, zp, code, full_path):
 
   print "Probably success!"
 
+
+def exportByScraping(zu, zp, semester, code, full_path):
+  source = getTimetable(zu, zp, None)
+  return export(source, code, full_path)

app/timetable/views.py

@@ -4,26 +4,51 @@
 import timetable_importer
 import urlparse
 
+# TODO: it would be nice if somebody could figure out if we could make google
+# auth the last step in the flow.
 def show(request):
   this_url = urlparse.urlunsplit(urlparse.urlsplit(request.build_absolute_uri())[:3] + ('', ''))
   if 'code' in request.REQUEST and 'fail' not in request.REQUEST:
     code = request.REQUEST['code']
+    context = {'auth_code' : code}
     if request.method == 'POST':
-      f = request.REQUEST['input-type']
-      s = request.REQUEST['source']
-      zu = request.REQUEST['zUser']
-      zp = request.REQUEST['zPass']
-
-      result = timetable_importer.export(f, s, zu, zp, code, this_url)
-
-      if result != None:
-        messages.error(request, result)
-        return redirect(timetable_importer.getGoogleRedirect(this_url))
-      else:
-        messages.success(request, 'Success! Check <a href="http://calendar.google.com">Google Calendar</a>')
-        return render_to_response('tools/timetable-importer.html', context_instance=RequestContext(request))
+      f = request.REQUEST.get('input-type')
+      s = request.REQUEST.get('source')
+      zu = request.REQUEST.get('zUser')
+      zp = request.REQUEST.get('zPass')
+      semester = request.REQUEST.get('term')
+      print semester
+      result = None
+      if f == 'use-source' and s:
+        # source exists, parse it now.
+        result = timetable_importer.export(s, code, this_url)
+        if result == None:
+          messages.success(request, 'Success! Check <a href="http://calendar.google.com">Google Calendar</a>')
+          return render_to_response('tools/timetable-importer.html', context_instance=RequestContext(request))
+      elif f == 'use-login' and zu and zp:
+        # scrape myUNSW for available semesters
+        (result, c) = timetable_importer.getSemester(zu, zp)
+        if result == None:
+          context = dict(c.items() + context.items())
+          context['zu'] = zu
+          context['zp'] = zp
+          return render_to_response('tools/timetable-importer-select-term.html',
+                                    context,
+                                    context_instance=RequestContext(request))
+      elif zu and zp and semester:
+        # create calendar by scraping myUNSW
+        result = timetable_importer.exportByScraping(zu, zp, semester, code, this_url)
+        if result == None:
+          messages.success(request, 'Success! Check <a href="http://calendar.google.com">Google Calendar</a>')
+          return render_to_response('tools/timetable-importer.html', context_instance=RequestContext(request))
+      messages.error(request, result)
+      return render_to_response('tools/timetable-importer.html',
+                                context,
+                                context_instance=RequestContext(request))
     else:
-        return render_to_response('tools/timetable-importer.html',
-                                  {'auth_code' : code},
-                                  context_instance=RequestContext(request))
+      # get importer start page
+      return render_to_response('tools/timetable-importer.html',
+                                context,
+                                context_instance=RequestContext(request))
+  # get google auth page
   return redirect(timetable_importer.getGoogleRedirect(this_url))

app/views/tools/timetable-importer.html

@@ -117,7 +117,7 @@ <h4 id="source-help">Help</h4>
       </div>
     </div>
     <div>
-      <p>Source at ~clam/public_html/timetable/timetable.py or <a href="http://www.nik3daz.com/timetable.py">here</a><br/>
+      <p>Source at <a href="https://github.com/csesoc/csesoc-website/tree/master/app/timetable">github</a><br/>
         Original Timetable Parsing Code by Steven Fan (stevenf)<br/>
         Google Calendar integration and WebUI by Christopher Lam (clam)<br/>
         <b>Report bugs to <a href="mailto:dylank@cse.unsw.edu.au">dylank</a></b>

public/assets/js/timetable-importer.js

@@ -44,11 +44,14 @@ function validate() {
     if (active == 'use-source') {
       $('#use-login :input').each(function(i, e) { e.value="" });
     }
-    $('#importing-timetable-modal').modal({
-      keyboard: false,
-      backdrop: "static",
-    });
-    $('#importing-timetable-statusbar').animate({width:'100%'}, 60000, function() {});
   }
   return good;
 }
+
+function activateModalStatusBar() {
+  $('#importing-timetable-modal').modal({
+    keyboard: false,
+    backdrop: "static",
+  });
+  $('#importing-timetable-statusbar').animate({width:'100%'}, 60000, function() {});
+}