minor fix

This commit is contained in:
sigvartmh
2017-05-12 15:05:29 +02:00
parent 631b88e915
commit 2d596925fd
2 changed files with 18 additions and 14 deletions

1
app.py
View File

@@ -1,3 +1,4 @@
import appJar
from appJar import gui from appJar import gui
from itl_scrape import itslearning_scraper from itl_scrape import itslearning_scraper

View File

@@ -1,7 +1,6 @@
import os import os
import sys import sys
import re import re
import argparse
import requests as rq import requests as rq
import mechanicalsoup as ms import mechanicalsoup as ms
import html2text import html2text
@@ -35,19 +34,23 @@ class itslearning_scraper():
def login(self, username, password): def login(self, username, password):
self.browser.open(self.start_url) self.browser.open(self.start_url)
self.browser.select_form("form[name=f]") try:
self.browser["feidename"]=username self.browser.select_form("form[name=f]")
self.browser["password"]=password self.browser["feidename"]=username
self.browser.submit_selected() self.browser["password"]=password
self.browser.select_form("form[action=https://sats.itea.ntnu.no/sso-wrapper/feidelogin]") self.browser.submit_selected()
self.browser.submit_selected() except:
print("Something weird happened")
self.key = self.browser.session.cookies.get_dict() try:
self.jsession={"JSESSIONID": self.key["JSESSIONID"]} self.browser.select_form("form[action=https://sats.itea.ntnu.no/sso-wrapper/feidelogin]")
resp = rq.get(self.start_url, cookies=self.jsession) self.browser.submit_selected()
self.key = self.browser.session.cookies.get_dict()
self.get_cookies(resp) self.jsession={"JSESSIONID": self.key["JSESSIONID"]}
self.find_all_courses() resp = rq.get(self.start_url, cookies=self.jsession)
self.get_cookies(resp)
self.find_all_courses()
except:
print("Didn't get login redirect")
def get_cookies(self, resp): def get_cookies(self, resp):
split_cookie = resp.request.headers["Cookie"].split(";") split_cookie = resp.request.headers["Cookie"].split(";")