Bump version to 1.1.8

(hopefully)

.gitignore

@@ -10,3 +10,4 @@ pyvenv.cfg
 
 .tmp/
 pip-selfcheck.json
+.mypy_cache/

PFERD/ilias_authenticators.py

@@ -23,16 +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",
-        "text/xml",
-        "text/plain",
-        "image/jpeg",
-        "image/png",
-    ]
-
     def __init__(self, cookie_file) -> None:
         # Because LWPCookieJar insists on the path being str-like instead of
         # Path-like.
@@ -147,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:
+            if content_type.startswith("text/html"):
-                # Yay, we got the file :)
-                stream_to_path(r, to_path)
-                return True
-            elif content_type == "text/html":
                 # Dangit, we're probably not logged in.
                 soup = bs4.BeautifulSoup(r.text, "html.parser")
                 if self._is_logged_in(soup):
@@ -159,9 +145,9 @@ class ShibbolethAuthenticator:
                             "Attempting to download a web page, not a file")
                 return False
             else:
-                # What *did* we get?
+                # Yay, we got the file :)
-                raise ContentTypeException(
+                stream_to_path(r, to_path)
-                        f"Unknown file of type {content_type}")
+                return True
 
     def download_file(self, file_id, to_path):
         params = {"target": file_id}

PFERD/ti.py

@@ -4,6 +4,7 @@ import getpass
 import logging
 import pathlib
 import re
+from urllib.parse import urljoin
 
 import bs4
 import requests
@@ -43,7 +44,7 @@ class Ti:
             if filter(path):
                 self._crawl(urlpart + address, path, orga, transform)
             else:
-                loggwe.info(f"Skipping {name}/")
+                logger.info(f"Skipping {name}/")
 
         orga.clean_sync_dir()
         orga.clean_temp_dir()
@@ -76,7 +77,7 @@ class Ti:
 
         for filelink in soup.find_all("a", href=self.FILE_RE):
             filepath = path / filelink["href"]
-            fileurl = url + "/" + filelink["href"]
+            fileurl = urljoin(url, filelink["href"])
 
             new_path = transform(filepath)
             if new_path is None:

README.md

@@ -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.3
+$ 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.3
+$ 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

setup.py

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