diff --git a/PFERD/progress.py b/PFERD/progress.py index 92f23d7..6ad098f 100644 --- a/PFERD/progress.py +++ b/PFERD/progress.py @@ -7,8 +7,7 @@ from types import TracebackType from typing import Optional, Type import requests -from rich.console import Console, ConsoleOptions, Control, RenderResult -from rich.live_render import LiveRender +from rich.console import Console from rich.progress import (BarColumn, DownloadColumn, Progress, TaskID, TextColumn, TimeRemainingColumn, TransferSpeedColumn) @@ -23,7 +22,8 @@ _progress: Progress = Progress( TransferSpeedColumn(), "•", TimeRemainingColumn(), - console=Console(file=sys.stdout) + console=Console(file=sys.stdout), + transient=True ) @@ -61,18 +61,6 @@ def progress_for(settings: Optional[ProgressSettings]) -> 'ProgressContextManage return ProgressContextManager(settings) -class _OneLineUp(LiveRender): - """ - Render a control code for moving one line upwards. - """ - - def __init__(self) -> None: - super().__init__("not rendered") - - def __console__(self, console: Console, options: ConsoleOptions) -> RenderResult: - yield Control(f"\r\x1b[1A") - - class ProgressContextManager: """ A context manager used for displaying progress. @@ -113,9 +101,6 @@ class ProgressContextManager: _progress.stop() _progress.refresh() - # And we existed, so remove the line above (remove_task leaves one behind) - Console().print(_OneLineUp()) - return None def advance(self, amount: float) -> None: diff --git a/README.md b/README.md index 3dfb7d3..e95eb14 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,19 @@ Ensure that you have at least Python 3.8 installed. 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@v2.0.0 +$ pip install git+https://github.com/Garmelon/PFERD@v2.1.1 ``` The use of [venv](https://docs.python.org/3/library/venv.html) is recommended. +### Upgrading from 2.0.0 to 2.1.0+ + +The `IliasDirectoryType` type was renamed to `IliasElementType` and is now far +more detailed. +The new values are: REGULAR_FOLDER, VIDEO_FOLDER, +EXERCISE_FOLDER, REGULAR_FILE, VIDEO_FILE, FORUM, EXTERNAL_LINK. +Forums and external links are skipped automatically if you use the `kit_ilias` helper. + ## Example setup In this example, `python3` refers to at least Python 3.8. @@ -29,8 +37,8 @@ $ mkdir Vorlesungen $ cd Vorlesungen $ python3 -m venv .venv $ .venv/bin/activate -$ pip install git+https://github.com/Garmelon/PFERD@v2.0.0 -$ curl -O https://raw.githubusercontent.com/Garmelon/PFERD/v2.0.0/example_config.py +$ pip install git+https://github.com/Garmelon/PFERD@v2.1.1 +$ curl -O https://raw.githubusercontent.com/Garmelon/PFERD/v2.1.1/example_config.py $ python3 example_config.py $ deactivate ``` diff --git a/setup.py b/setup.py index 49d20eb..b734b84 100644 --- a/setup.py +++ b/setup.py @@ -2,12 +2,12 @@ from setuptools import find_packages, setup setup( name="PFERD", - version="2.1.0", + version="2.1.1", packages=find_packages(), install_requires=[ "requests>=2.21.0", "beautifulsoup4>=4.7.1", - "rich>=1.0.0" + "rich>=2.1.0" ], )