Compare commits

...

2 Commits

Author SHA1 Message Date
52852d11a6 Bump version to 1.1.8 2019-09-22 11:56:41 +00:00
f94629a7fa Fix exceptions with weird content types
(hopefully)
2019-09-22 11:55:47 +00:00
3 changed files with 7 additions and 26 deletions

View File

@ -23,21 +23,6 @@ logger = logging.getLogger(__name__)
class ShibbolethAuthenticator:
ILIAS_GOTO = "https://ilias.studium.kit.edu/goto.php"
ALLOWED_CONTENT_TYPES = [
"application/pdf",
"application/zip",
"application/msword",
"application/vnd.wolfram.nb",
"application/octet-stream",
"application/excel",
"text/xml",
"text/xml;charset=UTF-8",
"text/plain",
"text/plain;charset=UTF-8",
"image/jpeg",
"image/png",
]
def __init__(self, cookie_file) -> None:
# Because LWPCookieJar insists on the path being str-like instead of
# Path-like.
@ -152,11 +137,7 @@ class ShibbolethAuthenticator:
with self._session.get(url, params=params, stream=True) as r:
content_type = r.headers["content-type"]
if content_type in self.ALLOWED_CONTENT_TYPES:
# Yay, we got the file :)
stream_to_path(r, to_path)
return True
elif content_type == "text/html":
if content_type.startswith("text/html"):
# Dangit, we're probably not logged in.
soup = bs4.BeautifulSoup(r.text, "html.parser")
if self._is_logged_in(soup):
@ -164,9 +145,9 @@ class ShibbolethAuthenticator:
"Attempting to download a web page, not a file")
return False
else:
# What *did* we get?
raise ContentTypeException(
f"Unknown file of type {content_type}")
# Yay, we got the file :)
stream_to_path(r, to_path)
return True
def download_file(self, file_id, to_path):
params = {"target": file_id}

View File

@ -10,7 +10,7 @@ test it though).
To install PFERD or update your installation to the latest version, run this
wherever you want to install/have installed PFERD:
```
$ pip install git+https://github.com/Garmelon/PFERD@v1.1.7
$ pip install git+https://github.com/Garmelon/PFERD@v1.1.8
```
The use of [venv](https://docs.python.org/3/library/venv.html) is recommended.
@ -25,7 +25,7 @@ $ mkdir Vorlesungen
$ cd Vorlesungen
$ python3 -m venv .
$ . bin/activate
$ pip install git+https://github.com/Garmelon/PFERD@v1.1.7
$ pip install git+https://github.com/Garmelon/PFERD@v1.1.8
$ curl -O https://raw.githubusercontent.com/Garmelon/PFERD/master/example_config.py
$ python3 example_config.py
$ deactivate

View File

@ -2,7 +2,7 @@ from setuptools import setup
setup(
name="PFERD",
version="1.1.7",
version="1.1.8",
packages=["PFERD"],
install_requires=[
"requests>=2.21.0",