wip

Extract Game dataclass
Add dataclasses for clips
2024-08-30 18:32:25 +00:00 · 2022-08-27 15:26:54 +02:00 · 2022-08-27 12:51:28 +02:00 · 2022-08-27 12:01:23 +02:00 · 2022-08-27 11:59:50 +02:00 · 2022-08-27 11:58:19 +02:00
46 changed files with 1511 additions and 2248 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -1,27 +0,0 @@
-name: Run tests
-
-on: [push, pull_request]
-
-jobs:
-  test:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -e ".[test]"
-      - name: Run tests
-        run: |
-          pytest
-      - name: Validate minimum required version
-        run: |
-          vermin --no-tips twitchdl
--- a/.vermin
+++ b/.vermin
@ -1,4 +0,0 @@
-[vermin]
-only_show_violations = yes
-show_tips = no
-targets = 3.8
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,76 +3,6 @@ twitch-dl changelog

 <!-- Do not edit. This file is automatically generated from changelog.yaml.-->

-### [2.3.1 (2024-05-19)](https://github.com/ihabunek/twitch-dl/releases/tag/2.3.1)
-
-* Fix fetching access token (#155, thanks @KryptonicDragon)
-
-### [2.3.0 (2024-04-27)](https://github.com/ihabunek/twitch-dl/releases/tag/2.3.0)
-
-* Show more playlist data when choosing quality
-* Improve detection of 'source' quality for Twitch Enhanced Broadcast Streams
-  (#154)
-
-### [2.2.4 (2024-04-25)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.4)
-
-* Add m dot url support to video and clip regexes (thanks @localnerve)
-
-### [2.2.3 (2024-04-24)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.3)
-
-* Respect --dry-run option when downloading videos
-* Add automated tests on github actions
-
-### [2.2.2 (2024-04-23)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.2)
-
-* Fix more compat issues Python < 3.10 (#152)
-
-### [2.2.1 (2024-04-23)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.1)
-
-* Fix compat with Python < 3.10 (#152)
-* Fix division by zero in progress calculation when video duration is reported
-  as 0
-
-### [2.2.0 (2024-04-10)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.0)
-
-* **Requires Python 3.8+**
-* Migrated to Click library for generating the commandline interface
-* Add shell auto completion, see 'Shell completion' in docs.
-* Add setting defaults via environment variables, see 'Environment variables' in
-  docs
-* Add `download --concat` option to avoid using ffmeg for joinig vods and concat
-  them instead. This will produce a `.ts` file by default.
-* Add `download --dry-run` option to skip actual download (thanks @metacoma)
-* Add video description to metadata (#129)
-* Add `clips --compact` option for listing clips in one-per-line mode
-
-### [2.1.4 (2024-01-06)](https://github.com/ihabunek/twitch-dl/releases/tag/2.1.4)
-
-* Fix error caused by twitch requiring https for the usher api (thanks
-  @deanpcmad)
-
-### [2.1.3 (2023-05-07)](https://github.com/ihabunek/twitch-dl/releases/tag/2.1.3)
-
-* Replace client ID with one that works for now (thanks @mwhite34)
-
-### [2.1.2 (2023-04-18)](https://github.com/ihabunek/twitch-dl/releases/tag/2.1.2)
-
-* Fix error caused by twitch changing the Usher domain (thanks @adsa95)
-
-### [2.1.1 (2022-11-20)](https://github.com/ihabunek/twitch-dl/releases/tag/2.1.1)
-
-* Fix Python 3.7 compatibility (#117, thanks @eliduvid)
-* Fix default value for game_ids (#102, thanks @FunnyPocketBook)
-
-### [2.1.0 (2022-11-20)](https://github.com/ihabunek/twitch-dl/releases/tag/2.1.0)
-
-* Add chapter list to `info` command
-* Add `download --chapter` option for downloading a single chapter
-
-### [2.0.1 (2022-09-09)](https://github.com/ihabunek/twitch-dl/releases/tag/2.0.1)
-
-* Fix an issue where a temp vod file would be renamed while still being open,
-  which caused an exception on Windows (#111)
-
 ### [2.0.0 (2022-08-18)](https://github.com/ihabunek/twitch-dl/releases/tag/2.0.0)

 This release switches from using `requests` to `httpx` for making http requests,
--- a/9
+++ b/9
@ -2,12 +2,13 @@

 default : clean dist

-dist:
-	python -m build
+dist :
+	python setup.py sdist --formats=gztar,zip
+	python setup.py bdist_wheel --python-tag=py3

 clean :
 	find . -name "*pyc" | xargs rm -rf $1
-	rm -rf build dist book bundle MANIFEST htmlcov deb_dist twitch-dl.*.pyz twitch-dl.1.man twitch_dl.egg-info
+	rm -rf build dist bundle MANIFEST htmlcov deb_dist twitch-dl.*.pyz twitch-dl.1.man twitch_dl.egg-info

 bundle:
 	mkdir bundle
@ -24,7 +25,7 @@ publish :
 	twine upload dist/*.tar.gz dist/*.whl

 coverage:
-	pytest --cov=twitchdl --cov-report html tests/
+	py.test --cov=toot --cov-report html tests/

 man:
 	scdoc < twitch-dl.1.scd > twitch-dl.1.man
--- a/README.md
+++ b/README.md
@ -17,7 +17,7 @@ Resources
 Requirements
 ------------

-* Python 3.8 or later
+* Python 3.7 or later
 * [ffmpeg](https://ffmpeg.org/download.html), installed and on the system path

 Quick start
--- a/changelog.yaml
+++ b/changelog.yaml
@ -1,80 +1,3 @@
-2.3.1:
-  date: 2024-05-19
-  changes:
-    - "Fix fetching access token (#155, thanks @KryptonicDragon)"
-
-2.3.0:
-  date: 2024-04-27
-  changes:
-    - "Show more playlist data when choosing quality"
-    - "Improve detection of 'source' quality for Twitch Enhanced Broadcast Streams (#154)"
-
-2.2.4:
-  date: 2024-04-25
-  changes:
-    - "Add m dot url support to video and clip regexes (thanks @localnerve)"
-
-2.2.3:
-  date: 2024-04-24
-  changes:
-    - "Respect --dry-run option when downloading videos"
-    - "Add automated tests on github actions"
-
-2.2.2:
-  date: 2024-04-23
-  changes:
-    - "Fix more compat issues Python < 3.10 (#152)"
-
-2.2.1:
-  date: 2024-04-23
-  changes:
-    - "Fix compat with Python < 3.10 (#152)"
-    - "Fix division by zero in progress calculation when video duration is reported as 0"
-
-2.2.0:
-  date: 2024-04-10
-  changes:
-    - "**Requires Python 3.8+**"
-    - "Migrated to Click library for generating the commandline interface"
-    - "Add shell auto completion, see 'Shell completion' in docs."
-    - "Add setting defaults via environment variables, see 'Environment variables' in docs"
-    - "Add `download --concat` option to avoid using ffmeg for joinig vods and concat them instead. This will produce a `.ts` file by default."
-    - "Add `download --dry-run` option to skip actual download (thanks @metacoma)"
-    - "Add video description to metadata (#129)"
-    - "Add `clips --compact` option for listing clips in one-per-line mode"
-
-2.1.4:
-  date: 2024-01-06
-  changes:
-    - "Fix error caused by twitch requiring https for the usher api (thanks @deanpcmad)"
-
-2.1.3:
-  date: 2023-05-07
-  changes:
-    - "Replace client ID with one that works for now (thanks @mwhite34)"
-
-2.1.2:
-  date: 2023-04-18
-  changes:
-    - "Fix error caused by twitch changing the Usher domain (thanks @adsa95)"
-
-2.1.1:
-  date: 2022-11-20
-  changes:
-    - "Fix Python 3.7 compatibility (#117, thanks @eliduvid)"
-    - "Fix default value for game_ids (#102, thanks @FunnyPocketBook)"
-
-2.1.0:
-  date: 2022-11-20
-  changes:
-    - "Add chapter list to `info` command"
-    - "Add `download --chapter` option for downloading a single chapter"
-
-2.0.1:
-  date: 2022-09-09
-  changes:
-    - "Fix an issue where a temp vod file would be renamed while still being open, which caused an exception on Windows (#111)"
-
 2.0.0:
  date: 2022-08-18
  description: |
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@ -9,8 +9,6 @@
    - [twitch-dl clips](commands/clips.md)
    - [twitch-dl info](commands/info.md)
    - [twitch-dl env](commands/env.md)
- [Environemnt variables](environment_variables.md)
- [Shell completion](shell_completion.md)
 - [Advanced](advanced.md)

 [License](license.md)
--- a/docs/changelog.md
+++ b/docs/changelog.md
@ -3,76 +3,6 @@ twitch-dl changelog

 <!-- Do not edit. This file is automatically generated from changelog.yaml.-->

-### [2.3.1 (2024-05-19)](https://github.com/ihabunek/twitch-dl/releases/tag/2.3.1)
-
-* Fix fetching access token (#155, thanks @KryptonicDragon)
-
-### [2.3.0 (2024-04-27)](https://github.com/ihabunek/twitch-dl/releases/tag/2.3.0)
-
-* Show more playlist data when choosing quality
-* Improve detection of 'source' quality for Twitch Enhanced Broadcast Streams
-  (#154)
-
-### [2.2.4 (2024-04-25)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.4)
-
-* Add m dot url support to video and clip regexes (thanks @localnerve)
-
-### [2.2.3 (2024-04-24)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.3)
-
-* Respect --dry-run option when downloading videos
-* Add automated tests on github actions
-
-### [2.2.2 (2024-04-23)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.2)
-
-* Fix more compat issues Python < 3.10 (#152)
-
-### [2.2.1 (2024-04-23)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.1)
-
-* Fix compat with Python < 3.10 (#152)
-* Fix division by zero in progress calculation when video duration is reported
-  as 0
-
-### [2.2.0 (2024-04-10)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.0)
-
-* **Requires Python 3.8+**
-* Migrated to Click library for generating the commandline interface
-* Add shell auto completion, see 'Shell completion' in docs.
-* Add setting defaults via environment variables, see 'Environment variables' in
-  docs
-* Add `download --concat` option to avoid using ffmeg for joinig vods and concat
-  them instead. This will produce a `.ts` file by default.
-* Add `download --dry-run` option to skip actual download (thanks @metacoma)
-* Add video description to metadata (#129)
-* Add `clips --compact` option for listing clips in one-per-line mode
-
-### [2.1.4 (2024-01-06)](https://github.com/ihabunek/twitch-dl/releases/tag/2.1.4)
-
-* Fix error caused by twitch requiring https for the usher api (thanks
-  @deanpcmad)
-
-### [2.1.3 (2023-05-07)](https://github.com/ihabunek/twitch-dl/releases/tag/2.1.3)
-
-* Replace client ID with one that works for now (thanks @mwhite34)
-
-### [2.1.2 (2023-04-18)](https://github.com/ihabunek/twitch-dl/releases/tag/2.1.2)
-
-* Fix error caused by twitch changing the Usher domain (thanks @adsa95)
-
-### [2.1.1 (2022-11-20)](https://github.com/ihabunek/twitch-dl/releases/tag/2.1.1)
-
-* Fix Python 3.7 compatibility (#117, thanks @eliduvid)
-* Fix default value for game_ids (#102, thanks @FunnyPocketBook)
-
-### [2.1.0 (2022-11-20)](https://github.com/ihabunek/twitch-dl/releases/tag/2.1.0)
-
-* Add chapter list to `info` command
-* Add `download --chapter` option for downloading a single chapter
-
-### [2.0.1 (2022-09-09)](https://github.com/ihabunek/twitch-dl/releases/tag/2.0.1)
-
-* Fix an issue where a temp vod file would be renamed while still being open,
-  which caused an exception on Windows (#111)
-
 ### [2.0.0 (2022-08-18)](https://github.com/ihabunek/twitch-dl/releases/tag/2.0.0)

 This release switches from using `requests` to `httpx` for making http requests,
--- a/docs/commands/clips.md
+++ b/docs/commands/clips.md
@ -1,52 +1,64 @@
 <!-- ------------------- generated docs start ------------------- -->
 # twitch-dl clips

-List or download clips for given CHANNEL_NAME.
+List or download clips for a channel.

 ### USAGE

 ```
-twitch-dl clips [OPTIONS] CHANNEL_NAME
+twitch-dl clips <channel_name> [FLAGS] [OPTIONS]
 ```

+### ARGUMENTS
+
+<table>
+<tbody>
+<tr>
+    <td class="code">&lt;channel_name&gt;</td>
+    <td>Name of the channel to list clips for.</td>
+</tr>
+</tbody>
+</table>
+
+### FLAGS
+
+<table>
+<tbody>
+<tr>
+    <td class="code">-a, --all</td>
+    <td>Fetch all videos, overrides --limit</td>
+</tr>
+
+<tr>
+    <td class="code">-j, --json</td>
+    <td>Show results as JSON. Ignores <code>--pager</code>.</td>
+</tr>
+
+<tr>
+    <td class="code">-d, --download</td>
+    <td>Download all videos in given period (in source quality)</td>
+</tr>
+</tbody>
+</table>
+
 ### OPTIONS

 <table>
 <tbody>
 <tr>
-    <td class="code">-a, --all</td>
-    <td>Fetch all clips, overrides --limit</td>
+    <td class="code">-l, --limit</td>
+    <td>Number of videos to fetch (default 10, max 100)</td>
 </tr>

 <tr>
-    <td class="code">-c, --compact</td>
-    <td>Show clips in compact mode, one line per video</td>
+    <td class="code">-P, --period</td>
+    <td>Period from which to return clips. Defaults to <code>all_time</code>. Possible values: <code>last_day</code>, <code>last_week</code>, <code>last_month</code>, <code>all_time</code>.</td>
 </tr>

 <tr>
-    <td class="code">-d, --download</td>
-    <td>Download clips in given period (in source quality)</td>
-</tr>
-
-<tr>
-    <td class="code">-l, --limit INTEGER</td>
-    <td>Number of clips to fetch. Defaults to 40 in compact mode, 10 otherwise.</td>
-</tr>
-
-<tr>
-    <td class="code">-p, --pager INTEGER</td>
+    <td class="code">-p, --pager</td>
    <td>Number of clips to show per page. Disabled by default.</td>
 </tr>
-
-<tr>
-    <td class="code">-P, --period TEXT</td>
-    <td>Period from which to return clips Possible values: <code>last_day</code>, <code>last_week</code>, <code>last_month</code>, <code>all_time</code>. [default: <code>all_time</code>]</td>
-</tr>
-
-<tr>
-    <td class="code">--json</td>
-    <td>Print data as JSON rather than human readable text</td>
-</tr>
 </tbody>
 </table>

--- a/docs/commands/download.md
+++ b/docs/commands/download.md
@ -3,49 +3,27 @@

 Download videos or clips.

-    Pass one or more video ID, clip slug or Twitch URL to download.
-    
-
 ### USAGE

 ```
-twitch-dl download [OPTIONS] [IDS]...
+twitch-dl download <videos> [FLAGS] [OPTIONS]
 ```

-### OPTIONS
+### ARGUMENTS

 <table>
 <tbody>
 <tr>
-    <td class="code">-a, --auth-token TEXT</td>
-    <td>Authentication token, passed to Twitch to access subscriber only VODs. Can be copied from the <code>auth_token</code> cookie in any browser logged in on Twitch.</td>
+    <td class="code">&lt;videos&gt;</td>
+    <td>One or more video ID, clip slug or twitch URL to download.</td>
 </tr>
+</tbody>
+</table>

-<tr>
-    <td class="code">-c, --chapter INTEGER</td>
-    <td>Download a single chapter of the video. Specify the chapter number or use the flag without a number to display a chapter select prompt.</td>
-</tr>
-
-<tr>
-    <td class="code">--concat</td>
-    <td>Do not use ffmpeg to join files, concat them instead. This will produce a .ts file by default.</td>
-</tr>
-
-<tr>
-    <td class="code">-d, --dry-run</td>
-    <td>Simulate the download provcess without actually downloading any files.</td>
-</tr>
-
-<tr>
-    <td class="code">-e, --end TEXT</td>
-    <td>Download video up to this time (hh:mm or hh:mm:ss)</td>
-</tr>
-
-<tr>
-    <td class="code">-f, --format TEXT</td>
-    <td>Video format to convert into, passed to ffmpeg as the target file extension. Defaults to <code>mkv</code>. If <code>--concat</code> is passed, defaults to <code>ts</code>.</td>
-</tr>
+### FLAGS

+<table>
+<tbody>
 <tr>
    <td class="code">-k, --keep</td>
    <td>Don&#x27;t delete downloaded VODs and playlists after merging.</td>
@ -60,30 +38,51 @@ twitch-dl download [OPTIONS] [IDS]...
    <td class="code">--overwrite</td>
    <td>Overwrite the target file if it already exists without prompting.</td>
 </tr>
+</tbody>
+</table>

+### OPTIONS
+
+<table>
+<tbody>
 <tr>
-    <td class="code">-o, --output TEXT</td>
-    <td>Output file name template. See docs for details. [default: <code>{date}_{id}_{channel_login}_{title_slug}.{format}</code>]</td>
+    <td class="code">-w, --max-workers</td>
+    <td>Number of workers for downloading vods concurrently (default 5)</td>
 </tr>

 <tr>
-    <td class="code">-q, --quality TEXT</td>
-    <td>Video quality, e.g. <code>720p</code>. Set to <code>source</code> to get best quality.</td>
-</tr>
-
-<tr>
-    <td class="code">-r, --rate-limit TEXT</td>
-    <td>Limit the maximum download speed in bytes per second. Use &#x27;k&#x27; and &#x27;m&#x27; suffixes for kbps and mbps.</td>
-</tr>
-
-<tr>
-    <td class="code">-s, --start TEXT</td>
+    <td class="code">-s, --start</td>
    <td>Download video from this time (hh:mm or hh:mm:ss)</td>
 </tr>

 <tr>
-    <td class="code">-w, --max-workers INTEGER</td>
-    <td>Number of workers for downloading vods concurrently [default: <code>5</code>]</td>
+    <td class="code">-e, --end</td>
+    <td>Download video up to this time (hh:mm or hh:mm:ss)</td>
+</tr>
+
+<tr>
+    <td class="code">-f, --format</td>
+    <td>Video format to convert into, passed to ffmpeg as the target file extension. Defaults to <code>mkv</code>.</td>
+</tr>
+
+<tr>
+    <td class="code">-q, --quality</td>
+    <td>Video quality, e.g. 720p. Set to &#x27;source&#x27; to get best quality.</td>
+</tr>
+
+<tr>
+    <td class="code">-a, --auth-token</td>
+    <td>Authentication token, passed to Twitch to access subscriber only VODs. Can be copied from the &#x27;auth_token&#x27; cookie in any browser logged in on Twitch.</td>
+</tr>
+
+<tr>
+    <td class="code">-o, --output</td>
+    <td>Output file name template. See docs for details.</td>
+</tr>
+
+<tr>
+    <td class="code">-r, --rate-limit</td>
+    <td>Limit the maximum download speed in bytes per second. Use &#x27;k&#x27; and &#x27;m&#x27; suffixes for kbps and mbps.</td>
 </tr>
 </tbody>
 </table>
--- a/docs/commands/env.md
+++ b/docs/commands/env.md
@ -6,7 +6,7 @@ Print environment information for inclusion in bug reports.
 ### USAGE

 ```
-twitch-dl env [OPTIONS]
+twitch-dl env 
 ```

 <!-- ------------------- generated docs end ------------------- -->
--- a/docs/commands/info.md
+++ b/docs/commands/info.md
@ -6,16 +6,27 @@ Print information for a given Twitch URL, video ID or clip slug.
 ### USAGE

 ```
-twitch-dl info [OPTIONS] ID
+twitch-dl info <video> [FLAGS]
 ```

-### OPTIONS
+### ARGUMENTS

 <table>
 <tbody>
 <tr>
-    <td class="code">--json</td>
-    <td>Print data as JSON rather than human readable text</td>
+    <td class="code">&lt;video&gt;</td>
+    <td>Video ID, clip slug, or URL</td>
+</tr>
+</tbody>
+</table>
+
+### FLAGS
+
+<table>
+<tbody>
+<tr>
+    <td class="code">-j, --json</td>
+    <td>Show results as JSON</td>
 </tr>
 </tbody>
 </table>
--- a/docs/commands/videos.md
+++ b/docs/commands/videos.md
@ -1,56 +1,73 @@
 <!-- ------------------- generated docs start ------------------- -->
 # twitch-dl videos

-List or download clips for given CHANNEL_NAME.
+List videos for a channel.

 ### USAGE

 ```
-twitch-dl videos [OPTIONS] CHANNEL_NAME
+twitch-dl videos <channel_name> [FLAGS] [OPTIONS]
 ```

-### OPTIONS
+### ARGUMENTS
+
+<table>
+<tbody>
+<tr>
+    <td class="code">&lt;channel_name&gt;</td>
+    <td>Name of the channel to list videos for.</td>
+</tr>
+</tbody>
+</table>
+
+### FLAGS

 <table>
 <tbody>
 <tr>
    <td class="code">-a, --all</td>
-    <td>Fetch all clips, overrides --limit</td>
+    <td>Fetch all videos, overrides --limit</td>
+</tr>
+
+<tr>
+    <td class="code">-j, --json</td>
+    <td>Show results as JSON. Ignores <code>--pager</code>.</td>
 </tr>

 <tr>
    <td class="code">-c, --compact</td>
    <td>Show videos in compact mode, one line per video</td>
 </tr>
+</tbody>
+</table>

-<tr>
-    <td class="code">-l, --limit INTEGER</td>
-    <td>Number of videos to fetch. Defaults to 40 in compact mode, 10 otherwise.</td>
-</tr>
+### OPTIONS

+<table>
+<tbody>
 <tr>
-    <td class="code">-p, --pager INTEGER</td>
-    <td>Number of videos to show per page. Disabled by default.</td>
-</tr>
-
-<tr>
-    <td class="code">-g, --game TEXT</td>
+    <td class="code">-g, --game</td>
    <td>Show videos of given game (can be given multiple times)</td>
 </tr>

 <tr>
-    <td class="code">-s, --sort TEXT</td>
-    <td>Sorting order of videos Possible values: <code>views</code>, <code>time</code>. [default: <code>time</code>]</td>
+    <td class="code">-l, --limit</td>
+    <td>Number of videos to fetch. Defaults to 40 in copmpact mode, 10 otherwise.</td>
 </tr>

 <tr>
-    <td class="code">-t, --type TEXT</td>
-    <td>Broadcast type Possible values: <code>archive</code>, <code>highlight</code>, <code>upload</code>. [default: <code>archive</code>]</td>
+    <td class="code">-s, --sort</td>
+    <td>Sorting order of videos. Defaults to <code>time</code>. Possible values: <code>views</code>, <code>time</code>.</td>
 </tr>

 <tr>
-    <td class="code">--json</td>
-    <td>Print data as JSON rather than human readable text</td>
+    <td class="code">-t, --type</td>
+    <td>Broadcast type. Defaults to <code>archive</code>. Possible values: <code>archive</code>, <code>highlight</code>, <code>upload</code>.</td>
+</tr>
+
+<tr>
+    <td class="code">-p, --pager</td>
+    <td>Print videos in pages. Ignores <code>--limit</code>. Defaults to 10.</td>
 </tr>
 </tbody>
 </table>
--- a/docs/environment_variables.md
+++ b/docs/environment_variables.md
@ -1,15 +0,0 @@
-# Environment variables
-
-> Introduced in twitch-dl 2.2.0
-
-twitch-dl allows setting defaults for parameters via environment variables.
-
-Environment variables should be named `TWITCH_DL_<COMMAND_NAME>_<OPTION_NAME>`.
-
-For example, when invoking `twitch-dl download`, if you always set `--quality
-source` you can set the following environment variable to make this the
-default:
-
-```
-TWITCH_DL_DOWNLOAD_QUALITY="source"
-```
--- a/docs/installation.md
+++ b/docs/installation.md
@ -1,6 +1,6 @@
 # Installation

-twitch-dl requires **Python 3.8** or later.
+twitch-dl requires **Python 3.7** or later.

 ## Prerequisite: FFmpeg

--- a/docs/shell_completion.md
+++ b/docs/shell_completion.md
@ -1,31 +0,0 @@
-# Shell completion
-
-> Introduced in twitch-dl 2.2.0
-
-twitch-dl uses [Click shell completion](https://click.palletsprojects.com/en/8.1.x/shell-completion/) which works on Bash, Fish and Zsh.
-
-To enable completion, twitch-dl must be [installed](./installation.html) as a command and available by ivoking `twitch-dl`. Then follow the instructions for your shell.
-
-**Bash**
-
-Add to `~/.bashrc`:
-
-```
-eval "$(_TWITCH_DL_COMPLETE=bash_source twitch-dl)"
-```
-
-**Fish**
-
-Add to `~/.config/fish/completions/twitch-dl.fish`:
-
-```
-_TWITCH_DL_COMPLETE=fish_source twitch-dl | source
-```
-
-**Zsh**
-
-Add to `~/.zshrc`:
-
-```
-eval "$(_TWITCH_DL_COMPLETE=zsh_source twitch-dl)"
-```
--- a/pyproject.toml
+++ b/pyproject.toml
@ -1,64 +0,0 @@
-[build-system]
-requires = ["setuptools>=64", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "twitch-dl"
-authors = [{ name="Ivan Habunek", email="ivan@habunek.com" }]
-description = "Quickly download videos from twitch.tv from the comort of your terminal emulator"
-keywords=["twitch", "vod", "video", "download"]
-readme = "README.md"
-license = { file="LICENSE" }
-requires-python = ">=3.8"
-dynamic = ["version"]
-
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Environment :: Console",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-    "Operating System :: OS Independent",
-]
-
-dependencies = [
-    "click>=8.0.0,<9.0.0",
-    "httpx>=0.17.0,<1.0.0",
-    "m3u8>=3.0.0,<5.0.0",
-]
-
-[tool.setuptools]
-packages = [
-    "twitchdl",
-    "twitchdl.commands",
-]
-
-[tool.setuptools_scm]
-
-[project.optional-dependencies]
-dev = [
-    "build",
-    "pytest",
-    "pyyaml",
-    "setuptools",
-    "twine",
-    "vermin",
-]
-
-test = [
-    "pytest",
-    "vermin",
-]
-
-[project.urls]
-"Homepage" = "https://twitch-dl.bezdomni.net/"
-"Source" = "https://github.com/ihabunek/twitch-dl"
-
-[project.scripts]
-twitch-dl = "twitchdl.cli:cli"
-
-[tool.pyright]
-typeCheckingMode = "strict"
-pythonVersion = "3.8"
-
-[tool.ruff]
-line-length = 100
-target-version = "py38"
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@ -0,0 +1,5 @@
+pytest
+pytest-cov
+twine
+wheel
+pyyaml
--- a/scripts/generate_docs
+++ b/scripts/generate_docs
@ -4,16 +4,13 @@
 Auto-generates documentation from command defs in console.py.
 """

-import click
 import html
 import os
 import re
 import shutil
 import textwrap

-from click import Command
-
-from twitchdl.cli import cli
+from twitchdl.console import COMMANDS


 START_MARKER = "<!-- ------------------- generated docs start ------------------- -->"
@ -22,11 +19,8 @@ END_MARKER = "<!-- ------------------- generated docs end ------------------- --

 def main():
    update_changelog()
-
-    parent_ctx = click.Context(cli, info_name="twitch-dl")
-    for name, command in cli.commands.items():
-        ctx = click.Context(cli, info_name=name, parent=parent_ctx)
-        update_docs(command, ctx)
+    for command in COMMANDS:
+        update_docs(command)


 def update_changelog():
@ -37,9 +31,9 @@ def update_changelog():
    shutil.copy(source, target)


-def update_docs(command: Command, ctx: click.Context):
+def update_docs(command):
    path = os.path.join("docs", "commands", f"{command.name}.md")
-    content = render_command(command, ctx)
+    content = render_command(command)

    if not os.path.exists(path):
        print(f"Creating: {path}")
@ -51,42 +45,53 @@ def update_docs(command: Command, ctx: click.Context):
        write(path, content)


-def render_command(command: Command, ctx: click.Context):
+def render_command(command):
    content = START_MARKER
    content += f"\n# twitch-dl {command.name}\n\n"
-
-    if command.help:
-        content += command.help + "\n\n"
-
-    content += render_usage(ctx, command)
-    content += render_options(ctx, command)
+    content += command.description + "\n\n"
+    content += render_usage(command)
+    content += render_arguments(command)
+    content += render_flags(command)
+    content += render_options(command)
    return content


-def render_usage(ctx: click.Context, command: Command):
+def render_usage(command):
+    arguments = get_arguments(command)
+    arguments = " ".join(f"<{name}>" for [name, _] in arguments)
+    flags = get_flags(command)
+    options = get_options(command)
+
    content = "### USAGE\n\n"
    content += "```\n"
-    content += command.get_usage(ctx).replace("Usage: ", "")
+    content += f"twitch-dl {command.name} {arguments}"
+
+    if flags:
+        content += " [FLAGS]"
+
+    if options:
+        content += " [OPTIONS]"

    content += "\n```\n\n"
+
    return content


-def render_options(ctx, command: Command):
-    options = list(get_options(command))
+def render_arguments(command):
+    arguments = get_arguments(command)

-    if not options:
+    if not arguments:
        return ""

-    content = "### OPTIONS\n\n"
+    content = "### ARGUMENTS\n\n"

    content += "<table>\n"
    content += "<tbody>"
-    for opts, help in options:
+    for [name, params] in arguments:
        content += textwrap.dedent(f"""
        <tr>
-            <td class="code">{escape(opts)}</td>
-            <td>{escape(help)}</td>
+            <td class="code">&lt;{escape(name)}&gt;</td>
+            <td>{escape(params['help'])}</td>
        </tr>
        """)
    content += "</tbody>\n"
@ -95,39 +100,85 @@ def render_options(ctx, command: Command):
    return content


-def get_options(command: Command):
-    for option in command.params:
-        if isinstance(option, click.Option):
-            opts = ", ".join(option.opts)
-            opts += option_type(option)
+def render_flags(command):
+    flags = get_flags(command)

-            help = option.help or ""
-            help = re.sub(r"\s+", " ", help)
-            help += choices(option)
-            if option.default:
-                help += f" [default: `{option.default}`]"
+    if not flags:
+        return ""

-            yield opts, help
+    content = "### FLAGS\n\n"
+
+    content += "<table>\n"
+    content += "<tbody>"
+    for [names, params] in flags:
+        names = ", ".join(f"{name}" for name in names)
+        content += textwrap.dedent(f"""
+        <tr>
+            <td class="code">{escape(names)}</td>
+            <td>{escape(params['help'])}</td>
+        </tr>
+        """)
+    content += "</tbody>\n"
+    content += "</table>\n\n"
+
+    return content


-def option_type(option: click.Option):
-    match option.type:
-        case click.types.StringParamType():
-            return " TEXT"
-        case click.types.Choice():
-            return " TEXT"
-        case click.types.IntParamType():
-            return " INTEGER"
-        case _:
-            return ""
+def render_options(command):
+    options = get_options(command)

-def choices(option: click.Option):
-    if isinstance(option.type, click.Choice):
-        choices = ", ".join(f"`{c}`" for c in option.type.choices)
+    if not options:
+        return ""
+
+    content = "### OPTIONS\n\n"
+
+    content += "<table>\n"
+    content += "<tbody>"
+    for [names, params] in options:
+        names = ", ".join(f"{name}" for name in names)
+        content += textwrap.dedent(f"""
+        <tr>
+            <td class="code">{escape(names)}</td>
+            <td>{escape(params['help'])}{choices(params)}</td>
+        </tr>
+        """)
+    content += "</tbody>\n"
+    content += "</table>\n\n"
+
+    return content
+
+
+def choices(params):
+    if "choices" in params:
+        choices = ", ".join(code(c) for c in params["choices"])
        return f" Possible values: {choices}."
    return ""


+def get_arguments(command):
+    return [
+        [names[0], options]
+        for names, options in command.arguments
+        if len(names) == 1 and not names[0].startswith("-")
+    ]
+
+
+def get_flags(command):
+    return [
+        [names, options]
+        for names, options in command.arguments
+        if names[0].startswith("-") and "type" not in options
+    ]
+
+
+def get_options(command):
+    return [
+        [names, options]
+        for names, options in command.arguments
+        if names[0].startswith("-") and "type" in options
+    ]
+
+
 def read(path):
    with open(path, "r") as f:
        return f.read()
@ -138,6 +189,10 @@ def write(path, content):
        return f.write(content)


+def code(string):
+    return f"<code>{string}</code>"
+
+
 def escape(text: str):
    text = html.escape(text)
    text = re.sub(r"`([\S]+)`", "<code>\\1</code>", text)
--- a/scripts/tag_version
+++ b/scripts/tag_version
@ -11,10 +11,12 @@ Usage: tag_version [version]
 import subprocess
 import sys
 import textwrap
+import yaml
+import twitchdl
+
 from datetime import date
 from os import path
-
-import yaml
+from pkg_resources import get_distribution

 path = path.join(path.dirname(path.dirname(path.abspath(__file__))), "changelog.yaml")
 with open(path, "r") as f:
@ -31,6 +33,15 @@ if not changelog_item:
    print(f"Version `{version}` not found in changelog.", file=sys.stderr)
    sys.exit(1)

+if twitchdl.__version__ != version:
+    print(f"twitchdl.__version__ is `{twitchdl.__version__}`, expected {version}.", file=sys.stderr)
+    sys.exit(1)
+
+dist_version = get_distribution('twitch-dl').version
+if dist_version != version:
+    print(f"Version in setup.py is `{dist_version}`, expected {version}.", file=sys.stderr)
+    sys.exit(1)
+
 release_date = changelog_item["date"]
 changes = changelog_item["changes"]
 description = changelog_item["description"] if "description" in changelog_item else None
--- a/setup.py
+++ b/setup.py
@ -0,0 +1,42 @@
+#!/usr/bin/env python
+
+from setuptools import setup, find_packages
+
+long_description = """
+Quickly download videos from twitch.tv.
+
+Works simliarly to youtube-dl but downloads multiple VODs in parallel which
+makes it faster.
+"""
+
+setup(
+    name="twitch-dl",
+    version="2.0.0",
+    description="Twitch downloader",
+    long_description=long_description.strip(),
+    author="Ivan Habunek",
+    author_email="ivan@habunek.com",
+    url="https://github.com/ihabunek/twitch-dl/",
+    project_urls={
+        "Documentation": "https://twitch-dl.bezdomni.net/"
+    },
+    keywords="twitch vod video download",
+    license="GPLv3",
+    classifiers=[
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Console",
+        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "Programming Language :: Python :: 3",
+    ],
+    packages=find_packages(),
+    python_requires=">=3.7",
+    install_requires=[
+        "m3u8>=1.0.0,<4.0.0",
+        "httpx>=0.17.0,<1.0.0",
+    ],
+    entry_points={
+        "console_scripts": [
+            "twitch-dl=twitchdl.console:main",
+        ],
+    }
+)
--- a/tests/test_api.py
+++ b/tests/test_api.py
@ -3,68 +3,56 @@ These tests depend on the channel having some videos and clips published.
 """

 import httpx
-import pytest
-
+import m3u8
 from twitchdl import twitch
-from twitchdl.commands.download import get_clip_authenticated_url
-from twitchdl.commands.videos import get_game_ids
-from twitchdl.exceptions import ConsoleError
-from twitchdl.playlists import enumerate_vods, load_m3u8, parse_playlists
+from twitchdl.commands.download import _parse_playlists, get_clip_authenticated_url
+from twitchdl.models import Game, VideosPage

 TEST_CHANNEL = "bananasaurus_rex"


 def test_get_videos():
-    videos = twitch.get_channel_videos(TEST_CHANNEL, 3, "time")
-    assert videos["pageInfo"]
-    assert len(videos["edges"]) > 0
+    page = twitch.get_channel_videos(TEST_CHANNEL, 3, "time")
+    assert isinstance(page, VideosPage)
+    assert len(page.videos) > 0

-    video_id = videos["edges"][0]["node"]["id"]
+    video_id = page.videos[0].id
    video = twitch.get_video(video_id)
-    assert video is not None
-    assert video["id"] == video_id
+    assert video and video.id == video_id

    access_token = twitch.get_access_token(video_id)
    assert "signature" in access_token
    assert "value" in access_token

-    playlists_txt = twitch.get_playlists(video_id, access_token)
-    assert playlists_txt.startswith("#EXTM3U")
+    playlists = twitch.get_playlists(video_id, access_token)
+    assert playlists.startswith("#EXTM3U")

-    playlists = parse_playlists(playlists_txt)
-    playlist_url = playlists[0].url
+    _, _, url = next(_parse_playlists(playlists))
+    playlist = httpx.get(url).text
+    assert playlist.startswith("#EXTM3U")

-    playlist_txt = httpx.get(playlist_url).text
-    assert playlist_txt.startswith("#EXTM3U")
-
-    playlist_m3u8 = load_m3u8(playlist_txt)
-    vods = enumerate_vods(playlist_m3u8)
-    assert vods[0].path == "0.ts"
+    playlist = m3u8.loads(playlist)
+    vod_path = playlist.segments[0].uri
+    assert vod_path == "0.ts"


 def test_get_clips():
-    """
-    This test depends on the channel having some videos published.
-    """
-    clips = twitch.get_channel_clips(TEST_CHANNEL, "all_time", 3)
-    assert clips["pageInfo"]
-    assert len(clips["edges"]) > 0
+    page = twitch.get_channel_clips(TEST_CHANNEL, "all_time", 3)
+    assert len(page.clips) > 0

-    slug = clips["edges"][0]["node"]["slug"]
+    slug = page.clips[0].slug
    clip = twitch.get_clip(slug)
-    assert clip is not None
-    assert clip["slug"] == slug
+    assert clip.slug == slug

-    assert get_clip_authenticated_url(slug, "source")
+    assert get_clip_authenticated_url(slug, "source").startswith("https")


-def test_get_games():
-    assert get_game_ids([]) == []
-    assert get_game_ids(["Bioshock"]) == ["15866"]
-    assert get_game_ids(["Bioshock", "Portal"]) == ["15866", "6187"]
+def test_get_game():
+    game = twitch.find_game("The Witness")
+    assert isinstance(game, Game)
+    assert game.id == "17324"
+    assert game.name == "The Witness"
+    assert game.description

-
-def test_get_games_not_found():
-    with pytest.raises(ConsoleError) as ex:
-        get_game_ids(["the game which does not exist"])
-    assert str(ex.value) == "Game 'the game which does not exist' not found"
+    game = twitch.find_game("Does Not Exist Hopefully")
+    assert game is None
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@ -1,156 +0,0 @@
-import json
-
-import pytest
-from click.testing import CliRunner, Result
-
-from twitchdl import cli
-
-
-@pytest.fixture(scope="session")
-def runner():
-    return CliRunner(mix_stderr=False)
-
-
-def assert_ok(result: Result):
-    if result.exit_code != 0:
-        raise AssertionError(
-            f"Command failed with exit code {result.exit_code}\nStderr: {result.stderr}"
-        )
-
-
-def test_info_video(runner: CliRunner):
-    result = runner.invoke(cli.info, ["2090131595"])
-    assert_ok(result)
-
-    assert "Frost Fatales 2024 Day 1" in result.stdout
-    assert "frozenflygone playing Tomb Raider" in result.stdout
-
-
-def test_info_video_json(runner: CliRunner):
-    result = runner.invoke(cli.info, ["2090131595", "--json"])
-    assert_ok(result)
-
-    video = json.loads(result.stdout)
-    assert video["title"] == "Frost Fatales 2024 Day 1"
-    assert video["game"] == {"id": "2770", "name": "Tomb Raider"}
-    assert video["creator"] == {"login": "frozenflygone", "displayName": "frozenflygone"}
-
-
-def test_info_clip(runner: CliRunner):
-    result = runner.invoke(cli.info, ["PoisedTalentedPuddingChefFrank"])
-    assert_ok(result)
-
-    assert "AGDQ Crashes during Bioshock run" in result.stdout
-    assert "GamesDoneQuick playing BioShock" in result.stdout
-
-
-def test_info_clip_json(runner: CliRunner):
-    result = runner.invoke(cli.info, ["PoisedTalentedPuddingChefFrank", "--json"])
-    assert_ok(result)
-
-    clip = json.loads(result.stdout)
-    assert clip["slug"] == "PoisedTalentedPuddingChefFrank"
-    assert clip["title"] == "AGDQ Crashes during Bioshock run"
-    assert clip["game"] == {"id": "15866", "name": "BioShock"}
-    assert clip["broadcaster"] == {"displayName": "GamesDoneQuick", "login": "gamesdonequick"}
-
-
-def test_info_not_found(runner: CliRunner):
-    result = runner.invoke(cli.info, ["banana"])
-    assert result.exit_code == 1
-    assert "Clip banana not found" in result.stderr
-
-    result = runner.invoke(cli.info, ["12345"])
-    assert result.exit_code == 1
-    assert "Video 12345 not found" in result.stderr
-
-    result = runner.invoke(cli.info, [""])
-    assert result.exit_code == 1
-    assert "Invalid input" in result.stderr
-
-
-def test_download_clip(runner: CliRunner):
-    result = runner.invoke(
-        cli.download,
-        [
-            "PoisedTalentedPuddingChefFrank",
-            "-q",
-            "source",
-            "--dry-run",
-        ],
-    )
-    assert_ok(result)
-    assert (
-        "Found: AGDQ Crashes during Bioshock run by GamesDoneQuick, playing BioShock (30 sec)"
-        in result.stdout
-    )
-    assert (
-        "Target: 2020-01-10_3099545841_gamesdonequick_agdq_crashes_during_bioshock_run.mp4"
-        in result.stdout
-    )
-    assert "Dry run, clip not downloaded." in result.stdout
-
-
-def test_download_video(runner: CliRunner):
-    result = runner.invoke(
-        cli.download,
-        [
-            "2090131595",
-            "-q",
-            "source",
-            "--dry-run",
-        ],
-    )
-    assert_ok(result)
-    assert "Found: Frost Fatales 2024 Day 1 by frozenflygone" in result.stdout
-    assert (
-        "Output: 2024-03-14_2090131595_frozenflygone_frost_fatales_2024_day_1.mkv" in result.stdout
-    )
-    assert "Dry run, video not downloaded." in result.stdout
-
-
-def test_videos(runner: CliRunner):
-    result = runner.invoke(cli.videos, ["gamesdonequick", "--json"])
-    assert_ok(result)
-    videos = json.loads(result.stdout)
-
-    assert videos["count"] == 10
-    assert videos["totalCount"] > 0
-    video = videos["videos"][0]
-
-    result = runner.invoke(cli.videos, "gamesdonequick")
-    assert_ok(result)
-
-    assert f"Video {video['id']}" in result.stdout
-    assert video["title"] in result.stdout
-
-    result = runner.invoke(cli.videos, ["gamesdonequick", "--compact"])
-    assert_ok(result)
-
-    assert video["id"] in result.stdout
-    assert video["title"][:60] in result.stdout
-
-
-def test_videos_channel_not_found(runner: CliRunner):
-    result = runner.invoke(cli.videos, ["doesnotexisthopefully"])
-    assert result.exit_code == 1
-    assert result.stderr.strip() == "Error: Channel doesnotexisthopefully not found"
-
-
-def test_clips(runner: CliRunner):
-    result = runner.invoke(cli.clips, ["gamesdonequick", "--json"])
-    assert_ok(result)
-    clips = json.loads(result.stdout)
-    clip = clips[0]
-
-    result = runner.invoke(cli.clips, "gamesdonequick")
-    assert_ok(result)
-
-    assert f"Clip {clip['slug']}" in result.stdout
-    assert clip["title"] in result.stdout
-
-    result = runner.invoke(cli.clips, ["gamesdonequick", "--compact"])
-    assert_ok(result)
-
-    assert clip["slug"] in result.stdout
-    assert clip["title"][:60] in result.stdout
--- a/tests/test_patterns.py
+++ b/tests/test_patterns.py
@ -1,38 +1,35 @@
 import pytest

-from twitchdl.utils import parse_clip_identifier, parse_video_identifier
+from twitchdl.utils import parse_video_identifier, parse_clip_identifier
+

 TEST_VIDEO_PATTERNS = [
    ("702689313", "702689313"),
    ("702689313", "https://twitch.tv/videos/702689313"),
    ("702689313", "https://www.twitch.tv/videos/702689313"),
-    ("702689313", "https://m.twitch.tv/videos/702689313"),
 ]

 TEST_CLIP_PATTERNS = {
    ("AbrasivePlayfulMangoMau5", "AbrasivePlayfulMangoMau5"),
    ("AbrasivePlayfulMangoMau5", "https://clips.twitch.tv/AbrasivePlayfulMangoMau5"),
    ("AbrasivePlayfulMangoMau5", "https://www.twitch.tv/dracul1nx/clip/AbrasivePlayfulMangoMau5"),
-    ("AbrasivePlayfulMangoMau5", "https://m.twitch.tv/dracul1nx/clip/AbrasivePlayfulMangoMau5"),
    ("AbrasivePlayfulMangoMau5", "https://twitch.tv/dracul1nx/clip/AbrasivePlayfulMangoMau5"),
    ("HungryProudRadicchioDoggo", "HungryProudRadicchioDoggo"),
    ("HungryProudRadicchioDoggo", "https://clips.twitch.tv/HungryProudRadicchioDoggo"),
    ("HungryProudRadicchioDoggo", "https://www.twitch.tv/bananasaurus_rex/clip/HungryProudRadicchioDoggo?filter=clips&range=7d&sort=time"),
-    ("HungryProudRadicchioDoggo", "https://m.twitch.tv/bananasaurus_rex/clip/HungryProudRadicchioDoggo?filter=clips&range=7d&sort=time"),
    ("HungryProudRadicchioDoggo", "https://twitch.tv/bananasaurus_rex/clip/HungryProudRadicchioDoggo?filter=clips&range=7d&sort=time"),
    ("GloriousColdbloodedTortoiseRuleFive-E017utJ4DZmHVpfQ", "GloriousColdbloodedTortoiseRuleFive-E017utJ4DZmHVpfQ"),
    ("GloriousColdbloodedTortoiseRuleFive-E017utJ4DZmHVpfQ", "https://twitch.tv/dracul1nx/clip/GloriousColdbloodedTortoiseRuleFive-E017utJ4DZmHVpfQ"),
    ("GloriousColdbloodedTortoiseRuleFive-E017utJ4DZmHVpfQ", "https://twitch.tv/dracul1nx/clip/GloriousColdbloodedTortoiseRuleFive-E017utJ4DZmHVpfQ?filter=clips&range=7d&sort=time"),
    ("GloriousColdbloodedTortoiseRuleFive-E017utJ4DZmHVpfQ", "https://www.twitch.tv/dracul1nx/clip/GloriousColdbloodedTortoiseRuleFive-E017utJ4DZmHVpfQ?filter=clips&range=7d&sort=time"),
-    ("GloriousColdbloodedTortoiseRuleFive-E017utJ4DZmHVpfQ", "https://m.twitch.tv/dracul1nx/clip/GloriousColdbloodedTortoiseRuleFive-E017utJ4DZmHVpfQ?filter=clips&range=7d&sort=time"),
 }


@pytest.mark.parametrize("expected,input", TEST_VIDEO_PATTERNS)
-def test_video_patterns(expected: str, input: str):
+def test_video_patterns(expected, input):
    assert parse_video_identifier(input) == expected


@pytest.mark.parametrize("expected,input", TEST_CLIP_PATTERNS)
-def test_clip_patterns(expected: str, input: str):
+def test_clip_patterns(expected, input):
    assert parse_clip_identifier(input) == expected
--- a/tests/test_progress.py
+++ b/tests/test_progress.py
@ -23,31 +23,26 @@ def test_downloaded():
    assert progress.progress_perc == 0

    progress.advance(1, 100)
-    progress._recalculate()
    assert progress.downloaded == 100
    assert progress.progress_bytes == 100
    assert progress.progress_perc == 11

    progress.advance(2, 200)
-    progress._recalculate()
    assert progress.downloaded == 300
    assert progress.progress_bytes == 300
    assert progress.progress_perc == 33

    progress.advance(3, 150)
-    progress._recalculate()
    assert progress.downloaded == 450
    assert progress.progress_bytes == 450
    assert progress.progress_perc == 50

    progress.advance(1, 50)
-    progress._recalculate()
    assert progress.downloaded == 500
    assert progress.progress_bytes == 500
    assert progress.progress_perc == 55

    progress.abort(2)
-    progress._recalculate()
    assert progress.downloaded == 500
    assert progress.progress_bytes == 300
    assert progress.progress_perc == 33
@ -57,7 +52,6 @@ def test_downloaded():
    progress.advance(1, 150)
    progress.advance(2, 300)
    progress.advance(3, 150)
-    progress._recalculate()

    assert progress.downloaded == 1100
    assert progress.progress_bytes == 900
@ -77,15 +71,12 @@ def test_estimated_total():
    assert progress.estimated_total is None

    progress.start(1, 12000)
-    progress._recalculate()
    assert progress.estimated_total == 12000 * 3

    progress.start(2, 11000)
-    progress._recalculate()
    assert progress.estimated_total == 11500 * 3

    progress.start(3, 10000)
-    progress._recalculate()
    assert progress.estimated_total == 11000 * 3


--- a/tests/test_twitch.py
+++ b/tests/test_twitch.py
@ -0,0 +1,5 @@
+from twitchdl.twitch import channel_clips_generator
+
+
+# def test_clips_generator():
+#     channel_clips_generator("foo", "bar", 100)
--- a/twitchdl/init.py
+++ b/twitchdl/init.py
@ -1,8 +1,3 @@
-from importlib import metadata
+__version__ = "2.0.0"

-try:
-    __version__ = metadata.version("twitch-dl")
-except metadata.PackageNotFoundError:
-    __version__ = "0.0.0"
-
-CLIENT_ID = "kd1unb4b3q4t58fwlpcbzcbnm76a8fp"
+CLIENT_ID = "kimne78kx3ncx6brgo4mv6wki5h1ko"
--- a/twitchdl/main.py
+++ b/twitchdl/main.py
@ -1,3 +1,3 @@
-from twitchdl.cli import cli
+from twitchdl.console import main

-cli()
+main()
--- a/twitchdl/cli.py
+++ b/twitchdl/cli.py
@ -1,402 +0,0 @@
-import logging
-import platform
-import re
-import sys
-from typing import Optional, Tuple
-
-import click
-
-from twitchdl import __version__
-from twitchdl.entities import DownloadOptions
-from twitchdl.twitch import ClipsPeriod, VideosSort, VideosType
-
-# Tweak the Click context
-# https://click.palletsprojects.com/en/8.1.x/api/#context
-CONTEXT = dict(
-    # Enable using environment variables to set options
-    auto_envvar_prefix="TWITCH_DL",
-    # Add shorthand -h for invoking help
-    help_option_names=["-h", "--help"],
-    # Always show default values for options
-    show_default=True,
-    # Make help a bit wider
-    max_content_width=100,
-)
-
-json_option = click.option(
-    "--json",
-    is_flag=True,
-    default=False,
-    help="Print data as JSON rather than human readable text",
-)
-
-
-def validate_positive(_ctx: click.Context, _param: click.Parameter, value: Optional[int]):
-    if value is not None and value <= 0:
-        raise click.BadParameter("must be greater than 0")
-    return value
-
-
-def validate_time(_ctx: click.Context, _param: click.Parameter, value: str) -> Optional[int]:
-    """Parse a time string (hh:mm or hh:mm:ss) to number of seconds."""
-    if not value:
-        return None
-
-    parts = [int(p) for p in value.split(":")]
-
-    if not 2 <= len(parts) <= 3:
-        raise click.BadParameter("invalid time")
-
-    hours = parts[0]
-    minutes = parts[1]
-    seconds = parts[2] if len(parts) > 2 else 0
-
-    if hours < 0 or not (0 <= minutes <= 59) or not (0 <= seconds <= 59):
-        raise click.BadParameter("invalid time")
-
-    return hours * 3600 + minutes * 60 + seconds
-
-
-def validate_rate(_ctx: click.Context, _param: click.Parameter, value: str) -> Optional[int]:
-    if not value:
-        return None
-
-    match = re.search(r"^([0-9]+)(k|m|)$", value, flags=re.IGNORECASE)
-
-    if not match:
-        raise click.BadParameter("must be an integer, followed by an optional 'k' or 'm'")
-
-    amount = int(match.group(1))
-    unit = match.group(2)
-
-    if unit == "k":
-        return amount * 1024
-
-    if unit == "m":
-        return amount * 1024 * 1024
-
-    return amount
-
-
-@click.group(context_settings=CONTEXT)
-@click.option("--debug/--no-debug", default=False, help="Log debug info to stderr")
-@click.option("--color/--no-color", default=sys.stdout.isatty(), help="Use ANSI color in output")
-@click.version_option(package_name="twitch-dl")
-@click.pass_context
-def cli(ctx: click.Context, color: bool, debug: bool):
-    """twitch-dl - twitch.tv downloader
-
-    https://twitch-dl.bezdomni.net/
-    """
-    ctx.color = color
-
-    if debug:
-        logging.basicConfig(level=logging.DEBUG)
-        logging.getLogger("httpx").setLevel(logging.WARN)
-        logging.getLogger("httpcore").setLevel(logging.WARN)
-
-
-@cli.command()
-@click.argument("channel_name")
-@click.option(
-    "-a",
-    "--all",
-    help="Fetch all clips, overrides --limit",
-    is_flag=True,
-)
-@click.option(
-    "-c",
-    "--compact",
-    help="Show clips in compact mode, one line per video",
-    is_flag=True,
-)
-@click.option(
-    "-d",
-    "--download",
-    help="Download clips in given period (in source quality)",
-    is_flag=True,
-)
-@click.option(
-    "-l",
-    "--limit",
-    help="Number of clips to fetch. Defaults to 40 in compact mode, 10 otherwise.",
-    type=int,
-    callback=validate_positive,
-)
-@click.option(
-    "-p",
-    "--pager",
-    help="Number of clips to show per page. Disabled by default.",
-    type=int,
-    callback=validate_positive,
-    is_flag=False,
-    flag_value=10,
-)
-@click.option(
-    "-P",
-    "--period",
-    help="Period from which to return clips",
-    default="all_time",
-    type=click.Choice(["last_day", "last_week", "last_month", "all_time"]),
-)
-@json_option
-def clips(
-    channel_name: str,
-    all: bool,
-    compact: bool,
-    download: bool,
-    json: bool,
-    limit: Optional[int],
-    pager: Optional[int],
-    period: ClipsPeriod,
-):
-    """List or download clips for given CHANNEL_NAME."""
-    from twitchdl.commands.clips import clips
-
-    clips(
-        channel_name,
-        all=all,
-        compact=compact,
-        download=download,
-        json=json,
-        limit=limit,
-        pager=pager,
-        period=period,
-    )
-
-
-@cli.command()
-@click.argument("ids", nargs=-1)
-@click.option(
-    "-a",
-    "--auth-token",
-    help="""Authentication token, passed to Twitch to access subscriber only
-         VODs. Can be copied from the `auth_token` cookie in any browser logged
-         in on Twitch.""",
-)
-@click.option(
-    "-c",
-    "--chapter",
-    help="""Download a single chapter of the video. Specify the chapter number
-         or use the flag without a number to display a chapter select prompt.
-         """,
-    type=int,
-    is_flag=False,
-    flag_value=0,
-)
-@click.option(
-    "--concat",
-    is_flag=True,
-    help="""Do not use ffmpeg to join files, concat them instead. This will
-         produce a .ts file by default.""",
-)
-@click.option(
-    "-d",
-    "--dry-run",
-    help="Simulate the download provcess without actually downloading any files.",
-    is_flag=True,
-)
-@click.option(
-    "-e",
-    "--end",
-    help="Download video up to this time (hh:mm or hh:mm:ss)",
-    callback=validate_time,
-)
-@click.option(
-    "-f",
-    "--format",
-    help="""Video format to convert into, passed to ffmpeg as the target file
-         extension. Defaults to `mkv`. If `--concat` is passed, defaults to
-         `ts`.""",
-)
-@click.option(
-    "-k",
-    "--keep",
-    help="Don't delete downloaded VODs and playlists after merging.",
-    is_flag=True,
-)
-@click.option(
-    "--no-join",
-    help="Don't run ffmpeg to join the downloaded vods, implies --keep.",
-    is_flag=True,
-)
-@click.option(
-    "--overwrite",
-    help="Overwrite the target file if it already exists without prompting.",
-    is_flag=True,
-)
-@click.option(
-    "-o",
-    "--output",
-    help="Output file name template. See docs for details.",
-    default="{date}_{id}_{channel_login}_{title_slug}.{format}",
-)
-@click.option(
-    "-q",
-    "--quality",
-    help="Video quality, e.g. `720p`. Set to `source` to get best quality.",
-)
-@click.option(
-    "-r",
-    "--rate-limit",
-    help="""Limit the maximum download speed in bytes per second. Use 'k' and
-         'm' suffixes for kbps and mbps.""",
-    callback=validate_rate,
-)
-@click.option(
-    "-s",
-    "--start",
-    help="Download video from this time (hh:mm or hh:mm:ss)",
-    callback=validate_time,
-)
-@click.option(
-    "-w",
-    "--max-workers",
-    help="Number of workers for downloading vods concurrently",
-    type=int,
-    default=5,
-)
-def download(
-    ids: Tuple[str, ...],
-    auth_token: Optional[str],
-    chapter: Optional[int],
-    concat: bool,
-    dry_run: bool,
-    end: Optional[int],
-    format: str,
-    keep: bool,
-    no_join: bool,
-    overwrite: bool,
-    output: str,
-    quality: Optional[str],
-    rate_limit: Optional[int],
-    start: Optional[int],
-    max_workers: int,
-):
-    """Download videos or clips.
-
-    Pass one or more video ID, clip slug or Twitch URL to download.
-    """
-    from twitchdl.commands.download import download
-
-    if not format:
-        format = "ts" if concat else "mkv"
-
-    options = DownloadOptions(
-        auth_token=auth_token,
-        chapter=chapter,
-        concat=concat,
-        dry_run=dry_run,
-        end=end,
-        format=format,
-        keep=keep,
-        no_join=no_join,
-        overwrite=overwrite,
-        output=output,
-        quality=quality,
-        rate_limit=rate_limit,
-        start=start,
-        max_workers=max_workers,
-    )
-
-    download(list(ids), options)
-
-
-@cli.command()
-def env():
-    """Print environment information for inclusion in bug reports."""
-    click.echo(f"twitch-dl {__version__}")
-    click.echo(f"Python {sys.version}")
-    click.echo(f"Platform: {platform.platform()}")
-
-
-@cli.command()
-@click.argument("id")
-@json_option
-def info(id: str, json: bool):
-    """Print information for a given Twitch URL, video ID or clip slug."""
-    from twitchdl.commands.info import info
-
-    info(id, json=json)
-
-
-@cli.command()
-@click.argument("channel_name")
-@click.option(
-    "-a",
-    "--all",
-    help="Fetch all clips, overrides --limit",
-    is_flag=True,
-)
-@click.option(
-    "-c",
-    "--compact",
-    help="Show videos in compact mode, one line per video",
-    is_flag=True,
-)
-@click.option(
-    "-l",
-    "--limit",
-    help="Number of videos to fetch. Defaults to 40 in compact mode, 10 otherwise.",
-    type=int,
-    callback=validate_positive,
-)
-@click.option(
-    "-p",
-    "--pager",
-    help="Number of videos to show per page. Disabled by default.",
-    type=int,
-    callback=validate_positive,
-    is_flag=False,
-    flag_value=10,
-)
-@click.option(
-    "-g",
-    "--game",
-    "games_tuple",
-    help="Show videos of given game (can be given multiple times)",
-    multiple=True,
-)
-@click.option(
-    "-s",
-    "--sort",
-    help="Sorting order of videos",
-    default="time",
-    type=click.Choice(["views", "time"]),
-)
-@click.option(
-    "-t",
-    "--type",
-    help="Broadcast type",
-    default="archive",
-    type=click.Choice(["archive", "highlight", "upload"]),
-)
-@json_option
-def videos(
-    channel_name: str,
-    all: bool,
-    compact: bool,
-    games_tuple: Tuple[str, ...],
-    json: bool,
-    limit: Optional[int],
-    pager: Optional[int],
-    sort: VideosSort,
-    type: VideosType,
-):
-    """List or download clips for given CHANNEL_NAME."""
-    from twitchdl.commands.videos import videos
-
-    # Click provides a tuple, make it a list instead
-    games = list(games_tuple)
-
-    videos(
-        channel_name,
-        all=all,
-        compact=compact,
-        games=games,
-        json=json,
-        limit=limit,
-        pager=pager,
-        sort=sort,
-        type=type,
-    )
--- a/twitchdl/commands/init.py
+++ b/twitchdl/commands/init.py
@ -0,0 +1,13 @@
+from .clips import clips
+from .download import download
+from .env import env
+from .info import info
+from .videos import videos
+
+__all__ = [
+    clips,
+    download,
+    env,
+    info,
+    videos,
+]
--- a/twitchdl/commands/clips.py
+++ b/twitchdl/commands/clips.py
@ -1,95 +1,113 @@
 import re
 import sys
-from os import path
-from typing import Callable, Generator, Optional

-import click
+from itertools import islice
+from os import path

 from twitchdl import twitch, utils
 from twitchdl.commands.download import get_clip_authenticated_url
 from twitchdl.download import download_file
-from twitchdl.output import green, print_clip, print_clip_compact, print_json, print_paged, yellow
-from twitchdl.twitch import Clip, ClipsPeriod
+from twitchdl.models import Clip, ClipGenerator
+from twitchdl.output import print_out, print_clip, print_json


-def clips(
-    channel_name: str,
-    *,
-    all: bool = False,
-    compact: bool = False,
-    download: bool = False,
-    json: bool = False,
-    limit: Optional[int] = None,
-    pager: Optional[int] = None,
-    period: ClipsPeriod = "all_time",
-):
-    # Set different defaults for limit for compact display
-    default_limit = 40 if compact else 10
-
+def clips(args):
    # Ignore --limit if --pager or --all are given
-    limit = sys.maxsize if all or pager else (limit or default_limit)
+    limit = sys.maxsize if args.all or args.pager else args.limit

-    generator = twitch.channel_clips_generator(channel_name, period, limit)
+    generator = twitch.channel_clips_generator(args.channel_name, args.period, limit)

-    if json:
-        return print_json(list(generator))
+    if args.json:
+        return print_json([c.raw for c in generator])

-    if download:
+    if args.download:
        return _download_clips(generator)

-    print_fn = print_clip_compact if compact else print_clip
+    if args.pager:
+        return _print_paged(generator, args.pager)

-    if pager:
-        return print_paged("Clips", generator, print_fn, pager)
+    return _print_all(generator, args)

-    return _print_all(generator, print_fn, all)
+
+def _continue():
+    print_out("Press <green><b>Enter</green> to continue, <yellow><b>Ctrl+C</yellow> to break.")
+
+    try:
+        input()
+    except KeyboardInterrupt:
+        return False
+
+    return True


 def _target_filename(clip: Clip):
-    url = clip["videoQualities"][0]["sourceURL"]
+    url = clip.video_qualities[0].source_url
    _, ext = path.splitext(url)
    ext = ext.lstrip(".")

-    match = re.search(r"^(\d{4})-(\d{2})-(\d{2})T", clip["createdAt"])
+    match = re.search(r"^(\d{4})-(\d{2})-(\d{2})T", clip.created_at)
    if not match:
-        raise ValueError(f"Failed parsing date from: {clip['createdAt']}")
+        raise ValueError(f"Invalid date: {clip.created_at}")
+
    date = "".join(match.groups())

-    name = "_".join(
-        [
-            date,
-            clip["id"],
-            clip["broadcaster"]["login"],
-            utils.slugify(clip["title"]),
-        ]
-    )
+    name = "_".join([
+        date,
+        clip.id,
+        clip.broadcaster.login,
+        utils.slugify(clip.title),
+    ])

-    return f"{name}.{ext}"
+    return "{}.{}".format(name, ext)


-def _download_clips(generator: Generator[Clip, None, None]):
-    for clip in generator:
+def _download_clips(clips: ClipGenerator):
+    for clip in clips:
        target = _target_filename(clip)

        if path.exists(target):
-            click.echo(f"Already downloaded: {green(target)}")
+            print_out("Already downloaded: <green>{}</green>".format(target))
        else:
-            url = get_clip_authenticated_url(clip["slug"], "source")
-            click.echo(f"Downloading: {yellow(target)}")
+            url = get_clip_authenticated_url(clip.slug, "source")
+            print_out("Downloading: <yellow>{}</yellow>".format(target))
            download_file(url, target)


-def _print_all(
-    generator: Generator[Clip, None, None],
-    print_fn: Callable[[Clip], None],
-    all: bool,
-):
-    for clip in generator:
-        print_fn(clip)
+def _print_all(clips: ClipGenerator, args):
+    for clip in clips:
+        print_out()
+        print_clip(clip)

-    if not all:
-        click.secho(
-            "\nThere may be more clips. "
-            + "Increase the --limit, use --all or --pager to see the rest.",
-            dim=True,
+    if not args.all:
+        print_out(
+            "\n<dim>There may be more clips. " +
+            "Increase the --limit, use --all or --pager to see the rest.</dim>"
        )
+
+
+def _print_paged(clips: ClipGenerator, page_size: int):
+    iterator = iter(clips)
+    page = list(islice(iterator, page_size))
+
+    first = 1
+    last = first + len(page) - 1
+
+    while True:
+        print_out("-" * 80)
+
+        print_out()
+        for clip in page:
+            print_clip(clip)
+            print_out()
+
+        last = first + len(page) - 1
+
+        print_out("-" * 80)
+        print_out("<yellow>Clips {}-{}</yellow>".format(first, last))
+
+        first = first + len(page)
+        last = first + 1
+
+        page = list(islice(iterator, page_size))
+        if not page or not _continue():
+            break
--- a/twitchdl/commands/download.py
+++ b/twitchdl/commands/download.py
@ -1,155 +1,161 @@
 import asyncio
+import httpx
+import m3u8
 import os
-import platform
 import re
 import shutil
 import subprocess
 import tempfile
+
 from os import path
 from pathlib import Path
-from typing import Dict, List, Optional
-from urllib.parse import urlencode, urlparse
-
-import click
-import httpx
+from typing import List, Optional, OrderedDict
+from urllib.parse import urlparse, urlencode

 from twitchdl import twitch, utils
 from twitchdl.download import download_file
-from twitchdl.entities import DownloadOptions
 from twitchdl.exceptions import ConsoleError
 from twitchdl.http import download_all
-from twitchdl.output import blue, bold, green, print_log, yellow
-from twitchdl.playlists import (
-    enumerate_vods,
-    load_m3u8,
-    make_join_playlist,
-    parse_playlists,
-    select_playlist,
-)
-from twitchdl.twitch import Chapter, Clip, ClipAccessToken, Video
+from twitchdl.models import Clip, Video
+from twitchdl.output import print_out


-def download(ids: List[str], args: DownloadOptions):
-    if not ids:
-        print_log("No IDs to downlad given")
-        return
+def _parse_playlists(playlists_m3u8):
+    playlists = m3u8.loads(playlists_m3u8)

-    for video_id in ids:
-        download_one(video_id, args)
+    for p in sorted(playlists.playlists, key=lambda p: p.stream_info.resolution is None):
+        if p.stream_info.resolution:
+            name = p.media[0].name
+            description = "x".join(str(r) for r in p.stream_info.resolution)
+        else:
+            name = p.media[0].group_id
+            description = None
+
+        yield name, description, p.uri


-def download_one(video: str, args: DownloadOptions):
-    video_id = utils.parse_video_identifier(video)
-    if video_id:
-        return _download_video(video_id, args)
+def _get_playlist_by_name(playlists, quality):
+    if quality == "source":
+        _, _, uri = playlists[0]
+        return uri

-    clip_slug = utils.parse_clip_identifier(video)
-    if clip_slug:
-        return _download_clip(clip_slug, args)
+    for name, _, uri in playlists:
+        if name == quality:
+            return uri

-    raise ConsoleError(f"Invalid input: {video}")
+    available = ", ".join([name for (name, _, _) in playlists])
+    msg = "Quality '{}' not found. Available qualities are: {}".format(quality, available)
+    raise ConsoleError(msg)
+
+
+def _select_playlist_interactive(playlists):
+    print_out("\nAvailable qualities:")
+    for n, (name, resolution, uri) in enumerate(playlists):
+        if resolution:
+            print_out("{}) {} [{}]".format(n + 1, name, resolution))
+        else:
+            print_out("{}) {}".format(n + 1, name))
+
+    no = utils.read_int("Choose quality", min=1, max=len(playlists) + 1, default=1)
+    _, _, uri = playlists[no - 1]
+    return uri


 def _join_vods(playlist_path: str, target: str, overwrite: bool, video: Video):
-    description = video["description"] or ""
-    description = description.strip()
-
    command = [
        "ffmpeg",
-        "-i",
-        playlist_path,
-        "-c",
-        "copy",
-        "-metadata",
-        f"artist={video['creator']['displayName']}",
-        "-metadata",
-        f"title={video['title']}",
-        "-metadata",
-        f"description={description}",
-        "-metadata",
-        "encoded_by=twitch-dl",
+        "-i", playlist_path,
+        "-c", "copy",
+        "-metadata", f"artist={video.creator.display_name}",
+        "-metadata", f"title={video.title}",
+        "-metadata", "encoded_by=twitch-dl",
        "-stats",
-        "-loglevel",
-        "warning",
-        f"file:{target}",
+        "-loglevel", "warning",
+        "file:{}".format(target),
    ]

    if overwrite:
        command.append("-y")

-    click.secho(f"{' '.join(command)}", dim=True)
+    print_out("<dim>{}</dim>".format(" ".join(command)))
    result = subprocess.run(command)
    if result.returncode != 0:
        raise ConsoleError("Joining files failed")


-def _concat_vods(vod_paths: List[str], target: str):
-    tool = "type" if platform.system() == "Windows" else "cat"
-    command = [tool] + vod_paths
+def _video_target_filename(video: Video, args) -> str:
+    date, time = video.published_at.split("T")
+    game = video.game.name if video.game else "Unknown"

-    with open(target, "wb") as target_file:
-        result = subprocess.run(command, stdout=target_file)
-        if result.returncode != 0:
-            raise ConsoleError(f"Joining files failed: {result.stderr}")
-
-
-def get_video_placeholders(video: Video, format: str) -> Dict[str, str]:
-    date, time = video["publishedAt"].split("T")
-    game = video["game"]["name"] if video["game"] else "Unknown"
-
-    return {
-        "channel": video["creator"]["displayName"],
-        "channel_login": video["creator"]["login"],
+    subs = {
+        "channel": video.creator.display_name,
+        "channel_login": video.creator.login,
        "date": date,
-        "datetime": video["publishedAt"],
-        "format": format,
+        "datetime": video.published_at,
+        "format": args.format,
        "game": game,
        "game_slug": utils.slugify(game),
-        "id": video["id"],
+        "id": video.id,
        "time": time,
-        "title": utils.titlify(video["title"]),
-        "title_slug": utils.slugify(video["title"]),
+        "title": utils.titlify(video.title),
+        "title_slug": utils.slugify(video.title),
    }

-
-def _video_target_filename(video: Video, args: DownloadOptions):
-    subs = get_video_placeholders(video, args.format)
-
    try:
        return args.output.format(**subs)
    except KeyError as e:
        supported = ", ".join(subs.keys())
-        raise ConsoleError(f"Invalid key {e} used in --output. Supported keys are: {supported}")
+        raise ConsoleError("Invalid key {} used in --output. Supported keys are: {}".format(e, supported))


-def _clip_target_filename(clip: Clip, args: DownloadOptions):
-    date, time = clip["createdAt"].split("T")
-    game = clip["game"]["name"] if clip["game"] else "Unknown"
+def _clip_target_filename(clip: Clip, args) -> str:
+    date, time = clip.created_at.split("T")
+    game = clip.game.name if clip.game else "Unknown"

-    url = clip["videoQualities"][0]["sourceURL"]
+    url = clip.video_qualities[0].source_url
    _, ext = path.splitext(url)
    ext = ext.lstrip(".")

    subs = {
-        "channel": clip["broadcaster"]["displayName"],
-        "channel_login": clip["broadcaster"]["login"],
+        "channel": clip.broadcaster.display_name,
+        "channel_login": clip.broadcaster.login,
        "date": date,
-        "datetime": clip["createdAt"],
+        "datetime": clip.created_at,
        "format": ext,
        "game": game,
        "game_slug": utils.slugify(game),
-        "id": clip["id"],
-        "slug": clip["slug"],
+        "id": clip.id,
+        "slug": clip.slug,
        "time": time,
-        "title": utils.titlify(clip["title"]),
-        "title_slug": utils.slugify(clip["title"]),
+        "title": utils.titlify(clip.title),
+        "title_slug": utils.slugify(clip.title),
    }

    try:
        return args.output.format(**subs)
    except KeyError as e:
        supported = ", ".join(subs.keys())
-        raise ConsoleError(f"Invalid key {e} used in --output. Supported keys are: {supported}")
+        raise ConsoleError("Invalid key {} used in --output. Supported keys are: {}".format(e, supported))
+
+
+def _get_vod_paths(playlist, start: Optional[int], end: Optional[int]) -> List[str]:
+    """Extract unique VOD paths for download from playlist."""
+    files = []
+    vod_start = 0
+    for segment in playlist.segments:
+        vod_end = vod_start + segment.duration
+
+        # `vod_end > start` is used here becuase it's better to download a bit
+        # more than a bit less, similar for the end condition
+        start_condition = not start or vod_end > start
+        end_condition = not end or vod_start < end
+
+        if start_condition and end_condition and segment.uri not in files:
+            files.append(segment.uri)
+
+        vod_start = vod_end
+
+    return files


 def _crete_temp_dir(base_uri: str) -> str:
@ -160,8 +166,25 @@ def _crete_temp_dir(base_uri: str) -> str:
    return str(temp_dir)


-def _get_clip_url(access_token: ClipAccessToken, quality: Optional[str]) -> str:
-    qualities = access_token["videoQualities"]
+def download(args):
+    for video_id in args.videos:
+        download_one(video_id, args)
+
+
+def download_one(video: str, args):
+    video_id = utils.parse_video_identifier(video)
+    if video_id:
+        return _download_video(video_id, args)
+
+    clip_slug = utils.parse_clip_identifier(video)
+    if clip_slug:
+        return _download_clip(clip_slug, args)
+
+    raise ConsoleError("Invalid input: {}".format(video))
+
+
+def _get_clip_url(clip, quality) -> str:
+    qualities = clip["videoQualities"]

    # Quality given as an argument
    if quality:
@ -174,196 +197,148 @@ def _get_clip_url(access_token: ClipAccessToken, quality: Optional[str]) -> str:
                return q["sourceURL"]

        available = ", ".join([str(q["quality"]) for q in qualities])
-        msg = f"Quality '{quality}' not found. Available qualities are: {available}"
+        msg = "Quality '{}' not found. Available qualities are: {}".format(quality, available)
        raise ConsoleError(msg)

    # Ask user to select quality
-    click.echo("\nAvailable qualities:")
+    print_out("\nAvailable qualities:")
    for n, q in enumerate(qualities):
-        click.echo(f"{n + 1}) {bold(q['quality'])} [{q['frameRate']} fps]")
-    click.echo()
+        print_out("{}) {} [{} fps]".format(n + 1, q["quality"], q["frameRate"]))
+    print_out()

    no = utils.read_int("Choose quality", min=1, max=len(qualities), default=1)
    selected_quality = qualities[no - 1]
    return selected_quality["sourceURL"]


-def get_clip_authenticated_url(slug: str, quality: Optional[str]):
-    print_log("Fetching access token...")
+def get_clip_authenticated_url(slug: str, quality: str) -> str:
+    print_out("<dim>Fetching access token...</dim>")
    access_token = twitch.get_clip_access_token(slug)

    if not access_token:
-        raise ConsoleError(f"Access token not found for slug '{slug}'")
+        raise ConsoleError("Access token not found for slug '{}'".format(slug))

    url = _get_clip_url(access_token, quality)

-    query = urlencode(
-        {
-            "sig": access_token["playbackAccessToken"]["signature"],
-            "token": access_token["playbackAccessToken"]["value"],
-        }
-    )
+    query = urlencode({
+        "sig": access_token["playbackAccessToken"]["signature"],
+        "token": access_token["playbackAccessToken"]["value"],
+    })

-    return f"{url}?{query}"
+    return "{}?{}".format(url, query)


-def _download_clip(slug: str, args: DownloadOptions) -> None:
-    print_log("Looking up clip...")
+def _download_clip(slug: str, args):
+    print_out("<dim>Looking up clip...</dim>")
    clip = twitch.get_clip(slug)
+    game = clip.game.name if clip.game else "Unknown"

    if not clip:
-        raise ConsoleError(f"Clip '{slug}' not found")
+        raise ConsoleError("Clip '{}' not found".format(slug))

-    title = clip["title"]
-    user = clip["broadcaster"]["displayName"]
-    game = clip["game"]["name"] if clip["game"] else "Unknown"
-    duration = utils.format_duration(clip["durationSeconds"])
-    click.echo(f"Found: {green(title)} by {yellow(user)}, playing {blue(game)} ({duration})")
+    print_out("Found: <green>{}</green> by <yellow>{}</yellow>, playing <blue>{}</blue> ({})".format(
+        clip.title,
+        clip.broadcaster.display_name,
+        game,
+        utils.format_duration(clip.duration_seconds)
+    ))

    target = _clip_target_filename(clip, args)
-    click.echo(f"Target: {blue(target)}")
+    print_out("Target: <blue>{}</blue>".format(target))

    if not args.overwrite and path.exists(target):
-        response = click.prompt("File exists. Overwrite? [Y/n]", default="Y", show_default=False)
-        if response.lower().strip() != "y":
-            raise click.Abort()
+        response = input("File exists. Overwrite? [Y/n]: ")
+        if response.lower().strip() not in ["", "y"]:
+            raise ConsoleError("Aborted")
        args.overwrite = True

    url = get_clip_authenticated_url(slug, args.quality)
-    print_log(f"Selected URL: {url}")
+    print_out("<dim>Selected URL: {}</dim>".format(url))

-    if args.dry_run:
-        click.echo("Dry run, clip not downloaded.")
-    else:
-        print_log("Downloading clip...")
-        download_file(url, target)
-        click.echo(f"Downloaded: {blue(target)}")
+    print_out("<dim>Downloading clip...</dim>")
+    download_file(url, target)
+
+    print_out("Downloaded: <blue>{}</blue>".format(target))


-def _download_video(video_id: str, args: DownloadOptions) -> None:
+def _download_video(video_id, args) -> None:
    if args.start and args.end and args.end <= args.start:
        raise ConsoleError("End time must be greater than start time")

-    print_log("Looking up video...")
+    print_out("<dim>Looking up video...</dim>")
    video = twitch.get_video(video_id)

    if not video:
-        raise ConsoleError(f"Video {video_id} not found")
+        raise ConsoleError("Video {} not found".format(video_id))

-    click.echo(f"Found: {blue(video['title'])} by {yellow(video['creator']['displayName'])}")
+    creator = f" by <yellow>{video.creator.display_name}" if video.creator else ""
+    print_out(f"Found: <blue>{video.title}</blue>{creator}")

    target = _video_target_filename(video, args)
-    click.echo(f"Output: {blue(target)}")
+    print_out("Output: <blue>{}</blue>".format(target))

    if not args.overwrite and path.exists(target):
-        response = click.prompt("File exists. Overwrite? [Y/n]", default="Y", show_default=False)
-        if response.lower().strip() != "y":
-            raise click.Abort()
+        response = input("File exists. Overwrite? [Y/n]: ")
+        if response.lower().strip() not in ["", "y"]:
+            raise ConsoleError("Aborted")
        args.overwrite = True

-    # Chapter select or manual offset
-    start, end = _determine_time_range(video_id, args)
-
-    print_log("Fetching access token...")
+    print_out("<dim>Fetching access token...</dim>")
    access_token = twitch.get_access_token(video_id, auth_token=args.auth_token)

-    print_log("Fetching playlists...")
-    playlists_text = twitch.get_playlists(video_id, access_token)
-    playlists = parse_playlists(playlists_text)
-    playlist = select_playlist(playlists, args.quality)
+    print_out("<dim>Fetching playlists...</dim>")
+    playlists_m3u8 = twitch.get_playlists(video_id, access_token)
+    playlists = list(_parse_playlists(playlists_m3u8))
+    playlist_uri = (_get_playlist_by_name(playlists, args.quality) if args.quality
+            else _select_playlist_interactive(playlists))

-    print_log("Fetching playlist...")
-    vods_text = http_get(playlist.url)
-    vods_m3u8 = load_m3u8(vods_text)
-    vods = enumerate_vods(vods_m3u8, start, end)
+    print_out("<dim>Fetching playlist...</dim>")
+    response = httpx.get(playlist_uri)
+    response.raise_for_status()
+    playlist = m3u8.loads(response.text)

-    if args.dry_run:
-        click.echo("Dry run, video not downloaded.")
-        return
-
-    base_uri = re.sub("/[^/]+$", "/", playlist.url)
+    base_uri = re.sub("/[^/]+$", "/", playlist_uri)
    target_dir = _crete_temp_dir(base_uri)
+    vod_paths = _get_vod_paths(playlist, args.start, args.end)

    # Save playlists for debugging purposes
    with open(path.join(target_dir, "playlists.m3u8"), "w") as f:
-        f.write(playlists_text)
+        f.write(playlists_m3u8)
    with open(path.join(target_dir, "playlist.m3u8"), "w") as f:
-        f.write(vods_text)
+        f.write(response.text)

-    click.echo(f"\nDownloading {len(vods)} VODs using {args.max_workers} workers to {target_dir}")
-
-    sources = [base_uri + vod.path for vod in vods]
-    targets = [os.path.join(target_dir, f"{vod.index:05d}.ts") for vod in vods]
+    print_out("\nDownloading {} VODs using {} workers to {}".format(
+        len(vod_paths), args.max_workers, target_dir))
+    sources = [base_uri + path for path in vod_paths]
+    targets = [os.path.join(target_dir, "{:05d}.ts".format(k)) for k, _ in enumerate(vod_paths)]
    asyncio.run(download_all(sources, targets, args.max_workers, rate_limit=args.rate_limit))

-    join_playlist = make_join_playlist(vods_m3u8, vods, targets)
-    join_playlist_path = path.join(target_dir, "playlist_downloaded.m3u8")
-    join_playlist.dump(join_playlist_path)  # type: ignore
-    click.echo()
+    # Make a modified playlist which references downloaded VODs
+    # Keep only the downloaded segments and skip the rest
+    org_segments = playlist.segments.copy()
+
+    path_map = OrderedDict(zip(vod_paths, targets))
+    playlist.segments.clear()
+    for segment in org_segments:
+        if segment.uri in path_map:
+            segment.uri = path_map[segment.uri]
+            playlist.segments.append(segment)
+
+    playlist_path = path.join(target_dir, "playlist_downloaded.m3u8")
+    playlist.dump(playlist_path)

    if args.no_join:
-        print_log("Skipping joining files...")
-        click.echo(f"VODs downloaded to:\n{blue(target_dir)}")
+        print_out("\n\n<dim>Skipping joining files...</dim>")
+        print_out("VODs downloaded to:\n<blue>{}</blue>".format(target_dir))
        return

-    if args.concat:
-        print_log("Concating files...")
-        _concat_vods(targets, target)
-    else:
-        print_log("Joining files...")
-        _join_vods(join_playlist_path, target, args.overwrite, video)
-
-    click.echo()
+    print_out("\n\nJoining files...")
+    _join_vods(playlist_path, target, args.overwrite, video)

    if args.keep:
-        click.echo(f"Temporary files not deleted: {target_dir}")
+        print_out("\n<dim>Temporary files not deleted: {}</dim>".format(target_dir))
    else:
-        print_log("Deleting temporary files...")
+        print_out("\n<dim>Deleting temporary files...</dim>")
        shutil.rmtree(target_dir)

-    click.echo(f"\nDownloaded: {green(target)}")
-
-
-def http_get(url: str) -> str:
-    response = httpx.get(url)
-    response.raise_for_status()
-    return response.text
-
-
-def _determine_time_range(video_id: str, args: DownloadOptions):
-    if args.start or args.end:
-        return args.start, args.end
-
-    if args.chapter is not None:
-        print_log("Fetching chapters...")
-        chapters = twitch.get_video_chapters(video_id)
-
-        if not chapters:
-            raise ConsoleError("This video has no chapters")
-
-        if args.chapter == 0:
-            chapter = _choose_chapter_interactive(chapters)
-        else:
-            try:
-                chapter = chapters[args.chapter - 1]
-            except IndexError:
-                raise ConsoleError(
-                    f"Chapter {args.chapter} does not exist. This video has {len(chapters)} chapters."
-                )
-
-        click.echo(f'Chapter selected: {blue(chapter["description"])}\n')
-        start = chapter["positionMilliseconds"] // 1000
-        duration = chapter["durationMilliseconds"] // 1000
-        return start, start + duration
-
-    return None, None
-
-
-def _choose_chapter_interactive(chapters: List[Chapter]):
-    click.echo("\nChapters:")
-    for index, chapter in enumerate(chapters):
-        duration = utils.format_time(chapter["durationMilliseconds"] // 1000)
-        click.echo(f'{index + 1}) {bold(chapter["description"])} ({duration})')
-    index = utils.read_int("Select a chapter", 1, len(chapters))
-    chapter = chapters[index - 1]
-    return chapter
+    print_out("\nDownloaded: <green>{}</green>".format(target))
--- a/twitchdl/commands/env.py
+++ b/twitchdl/commands/env.py
@ -0,0 +1,9 @@
+import platform
+import sys
+import twitchdl
+
+
+def env(args):
+    print("twitch-dl", twitchdl.__version__)
+    print("Platform:", platform.platform())
+    print("Python", sys.version)
--- a/twitchdl/commands/info.py
+++ b/twitchdl/commands/info.py
@ -1,24 +1,19 @@
-from typing import List
-
-import click
 import m3u8

-from twitchdl import twitch, utils
-from twitchdl.commands.download import get_video_placeholders
+from twitchdl import utils, twitch
 from twitchdl.exceptions import ConsoleError
-from twitchdl.output import bold, print_clip, print_json, print_log, print_table, print_video
-from twitchdl.playlists import parse_playlists
-from twitchdl.twitch import Chapter, Clip, Video
+from twitchdl.models import Clip, Video
+from twitchdl.output import print_video, print_clip, print_json, print_out, print_log


-def info(id: str, *, json: bool = False):
-    video_id = utils.parse_video_identifier(id)
+def info(args):
+    video_id = utils.parse_video_identifier(args.video)
    if video_id:
        print_log("Fetching video...")
        video = twitch.get_video(video_id)

        if not video:
-            raise ConsoleError(f"Video {video_id} not found")
+            raise ConsoleError("Video {} not found".format(video_id))

        print_log("Fetching access token...")
        access_token = twitch.get_access_token(video_id)
@ -26,77 +21,61 @@ def info(id: str, *, json: bool = False):
        print_log("Fetching playlists...")
        playlists = twitch.get_playlists(video_id, access_token)

-        print_log("Fetching chapters...")
-        chapters = twitch.get_video_chapters(video_id)
+        if video:
+            if args.json:
+                video_json(video, playlists)
+            else:
+                video_info(video, playlists)
+            return

-        if json:
-            video_json(video, playlists, chapters)
-        else:
-            video_info(video, playlists, chapters)
-        return
-
-    clip_slug = utils.parse_clip_identifier(id)
+    clip_slug = utils.parse_clip_identifier(args.video)
    if clip_slug:
        print_log("Fetching clip...")
        clip = twitch.get_clip(clip_slug)
        if not clip:
-            raise ConsoleError(f"Clip {clip_slug} not found")
+            raise ConsoleError("Clip {} not found".format(clip_slug))

-        if json:
-            print_json(clip)
+        if args.json:
+            print_json(clip.raw)
        else:
            clip_info(clip)
        return

-    raise ConsoleError(f"Invalid input: {id}")
+    raise ConsoleError("Invalid input: {}".format(args.video))


-def video_info(video: Video, playlists: str, chapters: List[Chapter]):
-    click.echo()
+def video_info(video: Video, playlists):
+    print_out()
    print_video(video)

-    click.echo("Playlists:")
-    for p in parse_playlists(playlists):
-        click.echo(f"{bold(p.name)} {p.url}")
-
-    if chapters:
-        click.echo()
-        click.echo("Chapters:")
-        for chapter in chapters:
-            start = utils.format_time(chapter["positionMilliseconds"] // 1000, force_hours=True)
-            duration = utils.format_time(chapter["durationMilliseconds"] // 1000)
-            click.echo(f'{start} {bold(chapter["description"])} ({duration})')
-
-    placeholders = get_video_placeholders(video, format="mkv")
-    placeholders = [[f"{{{k}}}", v] for k, v in placeholders.items()]
-    click.echo("")
-    print_table(["Placeholder", "Value"], placeholders)
+    print_out()
+    print_out("Playlists:")
+    for p in m3u8.loads(playlists).playlists:
+        print_out("<b>{}</b> {}".format(p.stream_info.video, p.uri))


-def video_json(video: Video, playlists: str, chapters: List[Chapter]):
+def video_json(video: Video, playlists):
    playlists = m3u8.loads(playlists).playlists
+    json = video.raw

-    video["playlists"] = [
+    json["playlists"] = [
        {
            "bandwidth": p.stream_info.bandwidth,
            "resolution": p.stream_info.resolution,
            "codecs": p.stream_info.codecs,
            "video": p.stream_info.video,
-            "uri": p.uri,
-        }
-        for p in playlists
+            "uri": p.uri
+        } for p in playlists
    ]

-    video["chapters"] = chapters
-
-    print_json(video)
+    print_json(json)


 def clip_info(clip: Clip):
-    click.echo()
+    print_out()
    print_clip(clip)
-    click.echo()
-    click.echo("Download links:")
+    print_out()
+    print_out("Download links:")

-    for q in clip["videoQualities"]:
-        click.echo(f"{bold(q['quality'])} [{q['frameRate']} fps] {q['sourceURL']}")
+    for q in clip.video_qualities:
+        print_out(f"<b>{q.quality}p{q.frame_rate}</b> {q.source_url}")
--- a/twitchdl/commands/videos.py
+++ b/twitchdl/commands/videos.py
@ -1,79 +1,69 @@
 import sys
-from typing import List, Optional
-
-import click

 from twitchdl import twitch
 from twitchdl.exceptions import ConsoleError
-from twitchdl.output import print_json, print_log, print_paged, print_video, print_video_compact
+from twitchdl.output import print_out, print_paged_videos, print_video, print_json, print_video_compact


-def videos(
-    channel_name: str,
-    *,
-    all: bool,
-    compact: bool,
-    games: List[str],
-    json: bool,
-    limit: Optional[int],
-    pager: Optional[int],
-    sort: twitch.VideosSort,
-    type: twitch.VideosType,
-):
-    game_ids = get_game_ids(games)
+def videos(args):
+    game_ids = _get_game_ids(args.game)

    # Set different defaults for limit for compact display
-    limit = limit or (40 if compact else 10)
+    limit = args.limit or (40 if args.compact else 10)

    # Ignore --limit if --pager or --all are given
-    max_videos = sys.maxsize if all or pager else limit
+    max_videos = sys.maxsize if args.all or args.pager else limit

    total_count, generator = twitch.channel_videos_generator(
-        channel_name, max_videos, sort, type, game_ids=game_ids
-    )
+        args.channel_name, max_videos, args.sort, args.type, game_ids=game_ids)

-    if json:
+    if args.json:
        videos = list(generator)
-        print_json({"count": len(videos), "totalCount": total_count, "videos": videos})
+        print_json({
+            "count": len(videos),
+            "totalCount": total_count,
+            "videos": [v.raw for v in videos]
+        })
        return

    if total_count == 0:
-        click.echo("No videos found")
+        print_out("<yellow>No videos found</yellow>")
        return

-    if pager:
-        print_fn = print_video_compact if compact else print_video
-        print_paged("Videos", generator, print_fn, pager, total_count)
+    if args.pager:
+        print_paged_videos(generator, args.pager, total_count)
        return

    count = 0
    for video in generator:
-        if compact:
+        if args.compact:
            print_video_compact(video)
        else:
-            click.echo()
+            print_out()
            print_video(video)
        count += 1

-    click.echo()
-    click.echo("-" * 80)
-    click.echo(f"Videos 1-{count} of {total_count}")
+    print_out()
+    print_out("-" * 80)
+    print_out("<yellow>Videos {}-{} of {}</yellow>".format(1, count, total_count))

    if total_count > count:
-        click.secho(
-            "\nThere are more videos. "
-            + "Increase the --limit, use --all or --pager to see the rest.",
-            dim=True,
+        print_out()
+        print_out(
+            "<dim>There are more videos. Increase the --limit, use --all or --pager to see the rest.</dim>"
        )


-def get_game_ids(names: List[str]) -> List[str]:
-    return [get_game_id(name) for name in names]
+def _get_game_ids(names):
+    if not names:
+        return []

+    game_ids = []
+    for name in names:
+        print_out(f"<dim>Looking up game '{name}'...</dim>")
+        game = twitch.find_game(name)
+        if not game:
+            raise ConsoleError(f"Game '{name}' not found")
+        game_ids.append(int(game.id))

-def get_game_id(name: str) -> str:
-    print_log(f"Looking up game '{name}'...")
-    game_id = twitch.get_game_id(name)
-    if not game_id:
-        raise ConsoleError(f"Game '{name}' not found")
-    return game_id
+    return game_ids
--- a/twitchdl/console.py
+++ b/twitchdl/console.py
@ -0,0 +1,325 @@
+# -*- coding: utf-8 -*-
+
+import logging
+import sys
+import re
+
+from argparse import ArgumentParser, ArgumentTypeError
+from typing import NamedTuple, List, Tuple, Any, Dict
+
+from twitchdl.exceptions import ConsoleError
+from twitchdl.output import print_err
+from twitchdl.twitch import GQLError
+from . import commands, __version__
+
+
+Argument = Tuple[List[str], Dict[str, Any]]
+
+
+class Command(NamedTuple):
+    name: str
+    description: str
+    arguments: List[Argument]
+
+
+CLIENT_WEBSITE = 'https://github.com/ihabunek/twitch-dl'
+
+
+def time(value: str) -> int:
+    """Parse a time string (hh:mm or hh:mm:ss) to number of seconds."""
+    parts = [int(p) for p in value.split(":")]
+
+    if not 2 <= len(parts) <= 3:
+        raise ArgumentTypeError()
+
+    hours = parts[0]
+    minutes = parts[1]
+    seconds = parts[2] if len(parts) > 2 else 0
+
+    if hours < 0 or not (0 <= minutes <= 59) or not (0 <= seconds <= 59):
+        raise ArgumentTypeError()
+
+    return hours * 3600 + minutes * 60 + seconds
+
+
+def pos_integer(value: str) -> int:
+    try:
+        parsed = int(value)
+    except ValueError:
+        raise ArgumentTypeError("must be an integer")
+
+    if parsed < 1:
+        raise ArgumentTypeError("must be positive")
+
+    return parsed
+
+
+def rate(value: str) -> int:
+    match = re.search(r"^([0-9]+)(k|m|)$", value, flags=re.IGNORECASE)
+
+    if not match:
+        raise ArgumentTypeError("must be an integer, followed by an optional 'k' or 'm'")
+
+    amount = int(match.group(1))
+    unit = match.group(2)
+
+    if unit == "k":
+        return amount * 1024
+
+    if unit == "m":
+        return amount * 1024 * 1024
+
+    return amount
+
+
+COMMANDS = [
+    Command(
+        name="videos",
+        description="List videos for a channel.",
+        arguments=[
+            (["channel_name"], {
+                "help": "Name of the channel to list videos for.",
+                "type": str,
+            }),
+            (["-g", "--game"], {
+                "help": "Show videos of given game (can be given multiple times)",
+                "action": "append",
+                "type": str,
+            }),
+            (["-l", "--limit"], {
+                "help": "Number of videos to fetch. Defaults to 40 in copmpact mode, 10 otherwise.",
+                "type": pos_integer,
+            }),
+            (["-a", "--all"], {
+                "help": "Fetch all videos, overrides --limit",
+                "action": "store_true",
+                "default": False,
+            }),
+            (["-s", "--sort"], {
+                "help": "Sorting order of videos. Defaults to `time`.",
+                "type": str,
+                "choices": ["views", "time"],
+                "default": "time",
+            }),
+            (["-t", "--type"], {
+                "help": "Broadcast type. Defaults to `archive`.",
+                "type": str,
+                "choices": ["archive", "highlight", "upload"],
+                "default": "archive",
+            }),
+            (["-j", "--json"], {
+                "help": "Show results as JSON. Ignores `--pager`.",
+                "action": "store_true",
+                "default": False,
+            }),
+            (["-p", "--pager"], {
+                "help": "Print videos in pages. Ignores `--limit`. Defaults to 10.",
+                "type": pos_integer,
+                "nargs": "?",
+                "const": 10,
+            }),
+            (["-c", "--compact"], {
+                "help": "Show videos in compact mode, one line per video",
+                "action": "store_true",
+                "default": False,
+            }),
+        ],
+    ),
+    Command(
+        name="clips",
+        description="List or download clips for a channel.",
+        arguments=[
+            (["channel_name"], {
+                "help": "Name of the channel to list clips for.",
+                "type": str,
+            }),
+            (["-l", "--limit"], {
+                "help": "Number of videos to fetch (default 10, max 100)",
+                "type": pos_integer,
+                "default": 10,
+            }),
+            (["-a", "--all"], {
+                "help": "Fetch all videos, overrides --limit",
+                "action": "store_true",
+                "default": False,
+            }),
+            (["-P", "--period"], {
+                "help": "Period from which to return clips. Defaults to `all_time`.",
+                "type": str,
+                "choices": ["last_day", "last_week", "last_month", "all_time"],
+                "default": "all_time",
+            }),
+            (["-j", "--json"], {
+                "help": "Show results as JSON. Ignores `--pager`.",
+                "action": "store_true",
+                "default": False,
+            }),
+            (["-p", "--pager"], {
+                "help": "Number of clips to show per page. Disabled by default.",
+                "type": pos_integer,
+                "nargs": "?",
+                "const": 10,
+            }),
+            (["-d", "--download"], {
+                "help": "Download all videos in given period (in source quality)",
+                "action": "store_true",
+                "default": False,
+            }),
+        ],
+    ),
+    Command(
+        name="download",
+        description="Download videos or clips.",
+        arguments=[
+            (["videos"], {
+                "help": "One or more video ID, clip slug or twitch URL to download.",
+                "type": str,
+                "nargs": "+",
+            }),
+            (["-w", "--max-workers"], {
+                "help": "Number of workers for downloading vods concurrently (default 5)",
+                "type": int,
+                "default": 5,
+            }),
+            (["-s", "--start"], {
+                "help": "Download video from this time (hh:mm or hh:mm:ss)",
+                "type": time,
+                "default": None,
+            }),
+            (["-e", "--end"], {
+                "help": "Download video up to this time (hh:mm or hh:mm:ss)",
+                "type": time,
+                "default": None,
+            }),
+            (["-f", "--format"], {
+                "help": "Video format to convert into, passed to ffmpeg as the "
+                        "target file extension. Defaults to `mkv`.",
+                "type": str,
+                "default": "mkv",
+            }),
+            (["-k", "--keep"], {
+                "help": "Don't delete downloaded VODs and playlists after merging.",
+                "action": "store_true",
+                "default": False,
+            }),
+            (["-q", "--quality"], {
+                "help": "Video quality, e.g. 720p. Set to 'source' to get best quality.",
+                "type": str,
+            }),
+            (["-a", "--auth-token"], {
+                "help": "Authentication token, passed to Twitch to access subscriber only "
+                        "VODs. Can be copied from the 'auth_token' cookie in any browser "
+                        "logged in on Twitch.",
+                "type": str,
+                "default": None,
+            }),
+            (["--no-join"], {
+                "help": "Don't run ffmpeg to join the downloaded vods, implies --keep.",
+                "action": "store_true",
+                "default": False,
+            }),
+            (["--overwrite"], {
+                "help": "Overwrite the target file if it already exists without prompting.",
+                "action": "store_true",
+                "default": False,
+            }),
+            (["-o", "--output"], {
+                "help": "Output file name template. See docs for details.",
+                "type": str,
+                "default": "{date}_{id}_{channel_login}_{title_slug}.{format}"
+            }),
+            (["-r", "--rate-limit"], {
+                "help": "Limit the maximum download speed in bytes per second. "
+                        "Use 'k' and 'm' suffixes for kbps and mbps.",
+                "type": rate,
+            }),
+        ],
+    ),
+    Command(
+        name="info",
+        description="Print information for a given Twitch URL, video ID or clip slug.",
+        arguments=[
+            (["video"], {
+                "help": "Video ID, clip slug, or URL",
+                "type": str,
+            }),
+            (["-j", "--json"], {
+                "help": "Show results as JSON",
+                "action": "store_true",
+                "default": False,
+            }),
+        ],
+    ),
+    Command(
+        name="env",
+        description="Print environment information for inclusion in bug reports.",
+        arguments=[],
+    )
+]
+
+COMMON_ARGUMENTS = [
+    (["--debug"], {
+        "help": "show debug log in console",
+        "action": 'store_true',
+        "default": False,
+    }),
+    (["--no-color"], {
+        "help": "disable ANSI colors in output",
+        "action": 'store_true',
+        "default": False,
+    })
+]
+
+
+def get_parser():
+    description = "A script for downloading videos from Twitch"
+
+    parser = ArgumentParser(prog='twitch-dl', description=description, epilog=CLIENT_WEBSITE)
+    parser.add_argument("--version", help="show version number", action='store_true')
+
+    subparsers = parser.add_subparsers(title="commands")
+
+    for command in COMMANDS:
+        sub = subparsers.add_parser(
+            command.name,
+            description=command.description,
+            epilog=CLIENT_WEBSITE
+        )
+
+        # Set the function to call to the function of same name in the "commands" package
+        sub.set_defaults(func=commands.__dict__.get(command.name))
+
+        for args, kwargs in command.arguments + COMMON_ARGUMENTS:
+            sub.add_argument(*args, **kwargs)
+
+    return parser
+
+
+def main():
+    parser = get_parser()
+    args = parser.parse_args()
+
+    if "--debug" in sys.argv:
+        logging.basicConfig(level=logging.DEBUG)
+
+    if args.version:
+        print("twitch-dl v{}".format(__version__))
+        return
+
+    if "func" not in args:
+        parser.print_help()
+        return
+
+    try:
+        args.func(args)
+    except ConsoleError as e:
+        print_err(e)
+        sys.exit(1)
+    except KeyboardInterrupt:
+        print_err("\nOperation canceled")
+        sys.exit(1)
+    except GQLError as e:
+        print_err(e)
+        for err in e.errors:
+            print_err("*", err["message"])
+        sys.exit(1)
--- a/twitchdl/download.py
+++ b/twitchdl/download.py
@ -1,14 +1,15 @@
 import os
-
 import httpx

-from twitchdl.exceptions import ConsoleError
-
 CHUNK_SIZE = 1024
 CONNECT_TIMEOUT = 5
 RETRY_COUNT = 5


+class DownloadFailed(Exception):
+    pass
+
+
 def _download(url: str, path: str):
    tmp_path = path + ".tmp"
    size = 0
@ -34,4 +35,4 @@ def download_file(url: str, path: str, retries: int = RETRY_COUNT):
        except httpx.RequestError:
            pass

-    raise ConsoleError(f"Failed downloading after {retries} attempts: {url}")
+    raise DownloadFailed(":(")
--- a/twitchdl/entities.py
+++ b/twitchdl/entities.py
@ -1,25 +0,0 @@
-from dataclasses import dataclass
-from typing import Any, Mapping, Optional
-
-
-@dataclass
-class DownloadOptions:
-    auth_token: Optional[str]
-    chapter: Optional[int]
-    concat: bool
-    dry_run: bool
-    end: Optional[int]
-    format: str
-    keep: bool
-    no_join: bool
-    overwrite: bool
-    output: str
-    quality: Optional[str]
-    rate_limit: Optional[int]
-    start: Optional[int]
-    max_workers: int
-
-
-# Type for annotating decoded JSON
-# TODO: make data classes for common structs
-Data = Mapping[str, Any]
--- a/twitchdl/exceptions.py
+++ b/twitchdl/exceptions.py
@ -1,7 +1,4 @@
-import click

-
-class ConsoleError(click.ClickException):
+class ConsoleError(Exception):
    """Raised when an error occurs and script exectuion should halt."""
-
    pass
--- a/twitchdl/http.py
+++ b/twitchdl/http.py
@ -1,11 +1,10 @@
 import asyncio
+import httpx
 import logging
 import os
 import time
-from abc import ABC, abstractmethod
-from typing import List, Optional

-import httpx
+from typing import List, Optional, Union

 from twitchdl.progress import Progress

@ -26,13 +25,7 @@ https://www.python-httpx.org/advanced/#timeout-configuration
 """


-class TokenBucket(ABC):
-    @abstractmethod
-    def advance(self, size: int):
-        pass
-
-
-class LimitingTokenBucket(TokenBucket):
+class TokenBucket:
    """Limit the download speed by strategically inserting sleeps."""

    def __init__(self, rate: int, capacity: Optional[int] = None):
@ -60,20 +53,22 @@ class LimitingTokenBucket(TokenBucket):
        self.last_refilled = now


-class EndlessTokenBucket(TokenBucket):
+class EndlessTokenBucket:
    """Used when download speed is not limited."""
-
    def advance(self, size: int):
        pass


+AnyTokenBucket = Union[TokenBucket, EndlessTokenBucket]
+
+
 async def download(
    client: httpx.AsyncClient,
    task_id: int,
    source: str,
    target: str,
    progress: Progress,
-    token_bucket: TokenBucket,
+    token_bucket: AnyTokenBucket,
 ):
    # Download to a temp file first, then copy to target when over to avoid
    # getting saving chunks which may persist if canceled or --keep is used
@ -88,7 +83,7 @@ async def download(
                token_bucket.advance(size)
                progress.advance(task_id, size)
            progress.end(task_id)
-    os.rename(tmp_target, target)
+        os.rename(tmp_target, target)


 async def download_with_retries(
@ -98,7 +93,7 @@ async def download_with_retries(
    source: str,
    target: str,
    progress: Progress,
-    token_bucket: TokenBucket,
+    token_bucket: AnyTokenBucket,
 ):
    async with semaphore:
        if os.path.exists(target):
@ -122,23 +117,13 @@ async def download_all(
    sources: List[str],
    targets: List[str],
    workers: int,
-    *,
-    rate_limit: Optional[int] = None,
+    /, *,
+    rate_limit: Optional[int] = None
 ):
    progress = Progress(len(sources))
-    token_bucket = LimitingTokenBucket(rate_limit) if rate_limit else EndlessTokenBucket()
+    token_bucket = TokenBucket(rate_limit) if rate_limit else EndlessTokenBucket()
    async with httpx.AsyncClient(timeout=TIMEOUT) as client:
        semaphore = asyncio.Semaphore(workers)
-        tasks = [
-            download_with_retries(
-                client,
-                semaphore,
-                task_id,
-                source,
-                target,
-                progress,
-                token_bucket,
-            )
-            for task_id, (source, target) in enumerate(zip(sources, targets))
-        ]
+        tasks = [download_with_retries(client, semaphore, task_id, source, target, progress, token_bucket)
+                 for task_id, (source, target) in enumerate(zip(sources, targets))]
        await asyncio.gather(*tasks)
--- a/twitchdl/models.py
+++ b/twitchdl/models.py
@ -0,0 +1,141 @@
+from typing import Any, Dict, List, Optional, Generator
+from dataclasses import dataclass
+
+
+Json = Dict[str, Any]
+GameID = str
+
+
+@dataclass(frozen=True)
+class Broadcaster():
+    login: str
+    display_name: str
+
+    @staticmethod
+    def from_json(data: Json) -> "Broadcaster":
+        return Broadcaster(data["login"], data["displayName"])
+
+
+@dataclass(frozen=True)
+class VideoQuality():
+    frame_rate: int
+    quality: str
+    source_url: str
+
+    @staticmethod
+    def from_json(data: Json) -> "VideoQuality":
+        return VideoQuality(data["frameRate"], data["quality"], data["sourceURL"])
+
+
+@dataclass(frozen=True)
+class Game():
+    id: str
+    name: str
+    description: str
+
+    @staticmethod
+    def from_json(data: Json) -> "Game":
+        return Game(data["id"], data["name"], data["description"])
+
+
+@dataclass(frozen=True)
+class Clip():
+    id: str
+    slug: str
+    title: str
+    created_at: str
+    view_count: int
+    duration_seconds: int
+    url: str
+    game: Optional[Game]
+    broadcaster: Broadcaster
+    video_qualities: List[VideoQuality]
+    raw: Json
+
+    @staticmethod
+    def from_json(data: Json) -> "Clip":
+        game = Game.from_json(data["game"]) if data["game"] else None
+        broadcaster = Broadcaster.from_json(data["broadcaster"])
+        video_qualities = [VideoQuality.from_json(q) for q in data["videoQualities"]]
+
+        return Clip(
+            data["id"],
+            data["slug"],
+            data["title"],
+            data["createdAt"],
+            data["viewCount"],
+            data["durationSeconds"],
+            data["url"],
+            game,
+            broadcaster,
+            video_qualities,
+            data
+        )
+
+
+@dataclass(frozen=True)
+class ClipsPage():
+    cursor: str
+    has_next_page: bool
+    has_previous_page: bool
+    clips: List[Clip]
+
+    @staticmethod
+    def from_json(data: Json) -> "ClipsPage":
+        return ClipsPage(
+            data["edges"][-1]["cursor"],
+            data["pageInfo"]["hasNextPage"],
+            data["pageInfo"]["hasPreviousPage"],
+            [Clip.from_json(c["node"]) for c in data["edges"]]
+        )
+
+
+@dataclass(frozen=True)
+class Video():
+    id: str
+    title: str
+    published_at: str
+    broadcast_type: str
+    length_seconds: int
+    game: Optional[Game]
+    creator: Broadcaster
+    raw: Json
+
+    @staticmethod
+    def from_json(data: Json) -> "Video":
+        game = Game.from_json(data["game"]) if data["game"] else None
+        creator = Broadcaster.from_json(data["creator"])
+
+        return Video(
+            data["id"],
+            data["title"],
+            data["publishedAt"],
+            data["broadcastType"],
+            data["lengthSeconds"],
+            game,
+            creator,
+            data
+        )
+
+
+@dataclass(frozen=True)
+class VideosPage():
+    cursor: str
+    has_next_page: bool
+    has_previous_page: bool
+    total_count: int
+    videos: List[Video]
+
+    @staticmethod
+    def from_json(data: Json) -> "VideosPage":
+        return VideosPage(
+            data["edges"][-1]["cursor"],
+            data["pageInfo"]["hasNextPage"],
+            data["pageInfo"].get("hasPreviousPage"),
+            data["totalCount"],
+            [Video.from_json(c["node"]) for c in data["edges"]]
+        )
+
+
+ClipGenerator = Generator[Clip, None, None]
+VideoGenerator = Generator[Video, None, None]
--- a/twitchdl/output.py
+++ b/twitchdl/output.py
@ -1,65 +1,111 @@
+# -*- coding: utf-8 -*-
+
 import json
+import sys
+import re
+
 from itertools import islice
-from typing import Any, Callable, Generator, List, Optional, TypeVar
-
-import click
-
 from twitchdl import utils
-from twitchdl.twitch import Clip, Video
+from twitchdl.models import Clip, Video
+from typing import Any, Match

-T = TypeVar("T")
+
+START_CODES = {
+    'b': '\033[1m',
+    'dim': '\033[2m',
+    'i': '\033[3m',
+    'u': '\033[4m',
+    'red': '\033[91m',
+    'green': '\033[92m',
+    'yellow': '\033[93m',
+    'blue': '\033[94m',
+    'magenta': '\033[95m',
+    'cyan': '\033[96m',
+}
+
+END_CODE = '\033[0m'
+
+START_PATTERN = "<(" + "|".join(START_CODES.keys()) + ")>"
+END_PATTERN = "</(" + "|".join(START_CODES.keys()) + ")>"
+
+USE_ANSI_COLOR = "--no-color" not in sys.argv
+
+
+def start_code(match: Match[str]) -> str:
+    name = match.group(1)
+    return START_CODES[name]
+
+
+def colorize(text: str) -> str:
+    text = re.sub(START_PATTERN, start_code, text)
+    text = re.sub(END_PATTERN, END_CODE, text)
+
+    return text
+
+
+def strip_tags(text: str) -> str:
+    text = re.sub(START_PATTERN, '', text)
+    text = re.sub(END_PATTERN, '', text)
+
+    return text


 def truncate(string: str, length: int) -> str:
    if len(string) > length:
-        return string[: length - 1] + "…"
+        return string[:length - 1] + "…"

    return string


+def print_out(*args, **kwargs):
+    args = [colorize(a) if USE_ANSI_COLOR else strip_tags(a) for a in args]
+    print(*args, **kwargs)
+
+
 def print_json(data: Any):
-    click.echo(json.dumps(data))
+    print(json.dumps(data))


-def print_log(message: Any):
-    click.secho(message, err=True, dim=True)
+def print_err(*args, **kwargs):
+    args = ["<red>{}</red>".format(a) for a in args]
+    args = [colorize(a) if USE_ANSI_COLOR else strip_tags(a) for a in args]
+    print(*args, file=sys.stderr, **kwargs)


-def visual_len(text: str):
-    return len(click.unstyle(text))
+def print_log(*args, **kwargs):
+    args = ["<dim>{}</dim>".format(a) for a in args]
+    args = [colorize(a) if USE_ANSI_COLOR else strip_tags(a) for a in args]
+    print(*args, file=sys.stderr, **kwargs)


-def ljust(text: str, width: int):
-    diff = width - visual_len(text)
-    return text + (" " * diff) if diff > 0 else text
+def print_video(video: Video):
+    published_at = video.published_at.replace("T", " @ ").replace("Z", "")
+    length = utils.format_duration(video.length_seconds)
+
+    channel = f"<blue>{video.creator.display_name}</blue>" if video.creator else ""
+    playing = f"playing <blue>{video.game.name}</blue>" if video.game else ""
+
+    # Can't find URL in video object, strange
+    url = f"https://www.twitch.tv/videos/{video.id}"
+
+    print_out(f"<b>Video {video.id}</b>")
+    print_out(f"<green>{video.title}</green>")
+
+    if channel or playing:
+        print_out(" ".join([channel, playing]))
+
+    print_out(f"Published <blue>{published_at}</blue>  Length: <blue>{length}</blue>")
+    print_out(f"<i>{url}</i>")


-def print_table(headers: List[str], data: List[List[str]]):
-    widths = [[visual_len(cell) for cell in row] for row in data + [headers]]
-    widths = [max(width) for width in zip(*widths)]
-    underlines = ["-" * width for width in widths]
-
-    def print_row(row: List[str]):
-        for idx, cell in enumerate(row):
-            width = widths[idx]
-            click.echo(ljust(cell, width), nl=False)
-            click.echo("  ", nl=False)
-        click.echo()
-
-    print_row(headers)
-    print_row(underlines)
-
-    for row in data:
-        print_row(row)
+def print_video_compact(video):
+    date = video.published_at[:10]
+    game = video.game.name if video.game else ""
+    title = truncate(video.title, 80).ljust(80)
+    print_out(f"<b>{video.id}</b> {date} <green>{title}</green> <blue>{game}</blue>")


-def print_paged(
-    label: str,
-    generator: Generator[T, Any, Any],
-    print_fn: Callable[[T], None],
-    page_size: int,
-    total_count: Optional[int] = None,
-):
+def print_paged_videos(generator, page_size, total_count):
    iterator = iter(generator)
    page = list(islice(iterator, page_size))

@ -67,89 +113,47 @@ def print_paged(
    last = first + len(page) - 1

    while True:
-        click.echo("-" * 80)
+        print_out("-" * 80)

-        click.echo()
-        for item in page:
-            print_fn(item)
+        print_out()
+        for video in page:
+            print_video(video)
+            print_out()

        last = first + len(page) - 1

-        click.echo("-" * 80)
-        click.echo(f"{label} {first}-{last} of {total_count or '???'}")
+        print_out("-" * 80)
+        print_out("<yellow>Videos {}-{} of {}</yellow>".format(first, last, total_count))

        first = first + len(page)
        last = first + 1

        page = list(islice(iterator, page_size))
-        if not page or not prompt_continue():
+        if not page or not _continue():
            break


-def print_video(video: Video):
-    published_at = video["publishedAt"].replace("T", " @ ").replace("Z", "")
-    length = utils.format_duration(video["lengthSeconds"])
-
-    channel = blue(video["creator"]["displayName"]) if video["creator"] else ""
-    playing = f"playing {blue(video['game']['name'])}" if video["game"] else ""
-
-    # Can't find URL in video object, strange
-    url = f"https://www.twitch.tv/videos/{video['id']}"
-
-    click.secho(f"Video {video['id']}", bold=True)
-    click.secho(video["title"], fg="green")
-
-    if channel or playing:
-        click.echo(" ".join([channel, playing]))
-
-    if video["description"]:
-        click.echo(f"Description: {video['description']}")
-
-    click.echo(f"Published {blue(published_at)}  Length: {blue(length)} ")
-    click.secho(url, italic=True)
-    click.echo()
-
-
-def print_video_compact(video: Video):
-    id = video["id"]
-    date = video["publishedAt"][:10]
-    game = video["game"]["name"] if video["game"] else ""
-    title = truncate(video["title"], 80).ljust(80)
-    click.echo(f"{bold(id)} {date} {green(title)} {blue(game)}")
-
-
 def print_clip(clip: Clip):
-    published_at = clip["createdAt"].replace("T", " @ ").replace("Z", "")
-    length = utils.format_duration(clip["durationSeconds"])
-    channel = clip["broadcaster"]["displayName"]
-    playing = f"playing {blue(clip['game']['name'])}" if clip["game"] else ""
-
-    click.echo(f"Clip {bold(clip['slug'])}")
-    click.secho(clip["title"], fg="green")
-    click.echo(f"{blue(channel)} {playing}")
-    click.echo(
-        f"Published {blue(published_at)}"
-        + f"  Length: {blue(length)}"
-        + f"  Views: {blue(clip['viewCount'])}"
+    published_at = clip.created_at.replace("T", " @ ").replace("Z", "")
+    length = utils.format_time(clip.duration_seconds)
+    channel = clip.broadcaster.display_name
+    playing = (
+        "playing <blue>{}</blue>".format(clip.game.name)
+        if clip.game else ""
    )
-    click.secho(clip["url"], italic=True)
-    click.echo()
+
+    print_out("Clip <b>{}</b>".format(clip.slug))
+    print_out("<green>{}</green>".format(clip.title))
+    print_out("<blue>{}</blue> {}".format(channel, playing))
+    print_out(
+        f"Published: <blue>{published_at}</blue>"
+        f"  Length: <blue>{length}</blue>"
+        f"  Views: <blue>{clip.view_count}</blue>")
+    print_out(f"<i>{clip.url}</i>")


-def print_clip_compact(clip: Clip):
-    slug = clip["slug"]
-    date = clip["createdAt"][:10]
-    title = truncate(clip["title"], 50).ljust(50)
-    game = clip["game"]["name"] if clip["game"] else ""
-    game = truncate(game, 30).ljust(30)
-
-    click.echo(f"{date} {green(title)} {blue(game)} {bold(slug)}")
-
-
-def prompt_continue():
-    enter = click.style("Enter", bold=True, fg="green")
-    ctrl_c = click.style("Ctrl+C", bold=True, fg="yellow")
-    click.echo(f"Press {enter} to continue, {ctrl_c} to break.")
+def _continue():
+    print_out("Press <green><b>Enter</green> to continue, <yellow><b>Ctrl+C</yellow> to break.")

    try:
        input()
@ -157,30 +161,3 @@ def prompt_continue():
        return False

    return True
-
-
-# Shorthand functions for coloring output
-
-
-def blue(text: Any) -> str:
-    return click.style(text, fg="blue")
-
-
-def cyan(text: Any) -> str:
-    return click.style(text, fg="cyan")
-
-
-def green(text: Any) -> str:
-    return click.style(text, fg="green")
-
-
-def yellow(text: Any) -> str:
-    return click.style(text, fg="yellow")
-
-
-def bold(text: Any) -> str:
-    return click.style(text, bold=True)
-
-
-def dim(text: Any) -> str:
-    return click.style(text, dim=True)
--- a/twitchdl/playlists.py
+++ b/twitchdl/playlists.py
@ -1,170 +0,0 @@
-"""
-Parse and manipulate m3u8 playlists.
-"""
-
-from dataclasses import dataclass
-from typing import Generator, List, Optional, OrderedDict
-
-import click
-import m3u8
-
-from twitchdl import utils
-from twitchdl.output import bold, dim, print_table
-
-
-@dataclass
-class Playlist:
-    name: str
-    group_id: str
-    resolution: Optional[str]
-    url: str
-    is_source: bool
-
-
-@dataclass
-class Vod:
-    index: int
-    """Ordinal number of the VOD in the playlist"""
-    path: str
-    """Path part of the VOD URL"""
-    duration: int
-    """Segment duration in seconds"""
-
-
-def parse_playlists(playlists_m3u8: str) -> List[Playlist]:
-    def _parse(source: str) -> Generator[Playlist, None, None]:
-        document = load_m3u8(source)
-
-        for p in document.playlists:
-            resolution = (
-                "x".join(str(r) for r in p.stream_info.resolution)
-                if p.stream_info.resolution
-                else None
-            )
-
-            media = p.media[0]
-            is_source = media.group_id == "chunked"
-            yield Playlist(media.name, media.group_id, resolution, p.uri, is_source)
-
-    return list(_parse(playlists_m3u8))
-
-
-def load_m3u8(playlist_m3u8: str) -> m3u8.M3U8:
-    return m3u8.loads(playlist_m3u8)
-
-
-def enumerate_vods(
-    document: m3u8.M3U8,
-    start: Optional[int] = None,
-    end: Optional[int] = None,
-) -> List[Vod]:
-    """Extract VODs for download from document."""
-    vods = []
-    vod_start = 0
-
-    for index, segment in enumerate(document.segments):
-        vod_end = vod_start + segment.duration
-
-        # `vod_end > start` is used here becuase it's better to download a bit
-        # more than a bit less, similar for the end condition
-        start_condition = not start or vod_end > start
-        end_condition = not end or vod_start < end
-
-        if start_condition and end_condition:
-            vods.append(Vod(index, segment.uri, segment.duration))
-
-        vod_start = vod_end
-
-    return vods
-
-
-def make_join_playlist(
-    playlist: m3u8.M3U8,
-    vods: List[Vod],
-    targets: List[str],
-) -> m3u8.Playlist:
-    """
-    Make a modified playlist which references downloaded VODs
-    Keep only the downloaded segments and skip the rest
-    """
-    org_segments = playlist.segments.copy()
-
-    path_map = OrderedDict(zip([v.path for v in vods], targets))
-    playlist.segments.clear()
-    for segment in org_segments:
-        if segment.uri in path_map:
-            segment.uri = path_map[segment.uri]
-            playlist.segments.append(segment)
-
-    return playlist
-
-
-def select_playlist(playlists: List[Playlist], quality: Optional[str]) -> Playlist:
-    return (
-        select_playlist_by_name(playlists, quality)
-        if quality is not None
-        else select_playlist_interactive(playlists)
-    )
-
-
-def select_playlist_by_name(playlists: List[Playlist], quality: str) -> Playlist:
-    if quality == "source":
-        for playlist in playlists:
-            if playlist.is_source:
-                return playlist
-        raise click.ClickException("Source quality not found, please report an issue on github.")
-
-    for playlist in playlists:
-        if playlist.name == quality or playlist.group_id == quality:
-            return playlist
-
-    available = ", ".join([p.name for p in playlists])
-    msg = f"Quality '{quality}' not found. Available qualities are: {available}"
-    raise click.ClickException(msg)
-
-
-def select_playlist_interactive(playlists: List[Playlist]) -> Playlist:
-    playlists = sorted(playlists, key=_playlist_key)
-    headers = ["#", "Name", "Group ID", "Resolution"]
-
-    rows = [
-        [
-            f"{n + 1})",
-            bold(playlist.name),
-            dim(playlist.group_id),
-            dim(playlist.resolution or ""),
-        ]
-        for n, playlist in enumerate(playlists)
-    ]
-
-    click.echo()
-    print_table(headers, rows)
-
-    default = 1
-    for index, playlist in enumerate(playlists):
-        if playlist.is_source:
-            default = index + 1
-
-    no = utils.read_int("\nChoose quality", min=1, max=len(playlists) + 1, default=default)
-    playlist = playlists[no - 1]
-    return playlist
-
-
-MAX = 1_000_000
-
-
-def _playlist_key(playlist: Playlist) -> int:
-    """Attempt to sort playlists so that source quality is on top, audio only
-    is on bottom and others are sorted descending by resolution."""
-    if playlist.is_source:
-        return 0
-
-    if playlist.group_id == "audio_only":
-        return MAX
-
-    try:
-        return MAX - int(playlist.name.split("p")[0])
-    except Exception:
-        pass
-
-    return MAX
--- a/twitchdl/progress.py
+++ b/twitchdl/progress.py
@ -1,13 +1,12 @@
 import logging
 import time
+
 from collections import deque
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from statistics import mean
-from typing import Deque, Dict, NamedTuple, Optional
+from typing import Dict, NamedTuple, Optional, Deque

-import click
-
-from twitchdl.output import blue
+from twitchdl.output import print_out
 from twitchdl.utils import format_size, format_time

 logger = logging.getLogger(__name__)
@ -22,7 +21,7 @@ class Task:
    size: int
    downloaded: int = 0

-    def advance(self, size: int):
+    def advance(self, size):
        self.downloaded += size


@ -31,25 +30,28 @@ class Sample(NamedTuple):
    timestamp: float


+@dataclass
 class Progress:
-    def __init__(self, vod_count: int):
-        self.downloaded: int = 0
-        self.estimated_total: Optional[int] = None
-        self.last_printed: Optional[float] = None
-        self.progress_bytes: int = 0
-        self.progress_perc: int = 0
-        self.remaining_time: Optional[int] = None
-        self.samples: Deque[Sample] = deque(maxlen=1000)
-        self.speed: Optional[float] = None
-        self.tasks: Dict[TaskId, Task] = {}
-        self.vod_count = vod_count
-        self.vod_downloaded_count: int = 0
+    vod_count: int
+    downloaded: int = 0
+    estimated_total: Optional[int] = None
+    last_printed: float = field(default_factory=time.time)
+    progress_bytes: int = 0
+    progress_perc: int = 0
+    remaining_time: Optional[int] = None
+    speed: Optional[float] = None
+    start_time: float = field(default_factory=time.time)
+    tasks: Dict[TaskId, Task] = field(default_factory=dict)
+    vod_downloaded_count: int = 0
+    samples: Deque[Sample] = field(default_factory=lambda: deque(maxlen=100))

    def start(self, task_id: int, size: int):
        if task_id in self.tasks:
            raise ValueError(f"Task {task_id}: cannot start, already started")

        self.tasks[task_id] = Task(task_id, size)
+        self._calculate_total()
+        self._calculate_progress()
        self.print()

    def advance(self, task_id: int, size: int):
@ -60,6 +62,7 @@ class Progress:
        self.progress_bytes += size
        self.tasks[task_id].advance(size)
        self.samples.append(Sample(self.downloaded, time.time()))
+        self._calculate_progress()
        self.print()

    def already_downloaded(self, task_id: int, size: int):
@ -69,6 +72,8 @@ class Progress:
        self.tasks[task_id] = Task(task_id, size)
        self.progress_bytes += size
        self.vod_downloaded_count += 1
+        self._calculate_total()
+        self._calculate_progress()
        self.print()

    def abort(self, task_id: int):
@ -77,6 +82,9 @@ class Progress:

        del self.tasks[task_id]
        self.progress_bytes = sum(t.downloaded for t in self.tasks.values())
+
+        self._calculate_total()
+        self._calculate_progress()
        self.print()

    def end(self, task_id: int):
@ -85,26 +93,18 @@ class Progress:

        task = self.tasks[task_id]
        if task.size != task.downloaded:
-            logger.warn(
-                f"Taks {task_id} ended with {task.downloaded}b downloaded, expected {task.size}b."
-            )
+            logger.warn(f"Taks {task_id} ended with {task.downloaded}b downloaded, expected {task.size}b.")

        self.vod_downloaded_count += 1
        self.print()

-    def _recalculate(self):
-        self.estimated_total = (
-            int(mean(t.size for t in self.tasks.values()) * self.vod_count) if self.tasks else None
-        )
+    def _calculate_total(self):
+        self.estimated_total = int(mean(t.size for t in self.tasks.values()) * self.vod_count) if self.tasks else None
+
+    def _calculate_progress(self):
        self.speed = self._calculate_speed()
-        self.progress_perc = (
-            int(100 * self.progress_bytes / self.estimated_total) if self.estimated_total else 0
-        )
-        self.remaining_time = (
-            int((self.estimated_total - self.progress_bytes) / self.speed)
-            if self.estimated_total and self.speed
-            else None
-        )
+        self.progress_perc = int(100 * self.progress_bytes / self.estimated_total) if self.estimated_total else 0
+        self.remaining_time = int((self.estimated_total - self.progress_bytes) / self.speed) if self.estimated_total and self.speed else None

    def _calculate_speed(self):
        if len(self.samples) < 2:
@ -116,31 +116,22 @@ class Progress:
        size = last_sample.downloaded - first_sample.downloaded
        duration = last_sample.timestamp - first_sample.timestamp

-        return size / duration if duration > 0 else None
+        return size / duration

    def print(self):
        now = time.time()

        # Don't print more often than 10 times per second
-        if self.last_printed and now - self.last_printed < 0.1:
+        if now - self.last_printed < 0.1:
            return

-        self._recalculate()
-
-        click.echo(f"\rDownloaded {self.vod_downloaded_count}/{self.vod_count} VODs", nl=False)
-        click.secho(f" {self.progress_perc}%", fg="blue", nl=False)
-
-        if self.estimated_total is not None:
-            total = f"~{format_size(self.estimated_total)}"
-            click.echo(f" of {blue(total)}", nl=False)
-
-        if self.speed is not None:
-            speed = f"{format_size(self.speed)}/s"
-            click.echo(f" at {blue(speed)}", nl=False)
-
-        if self.remaining_time is not None:
-            click.echo(f" ETA {blue(format_time(self.remaining_time))}", nl=False)
-
-        click.echo("    ", nl=False)
+        progress = " ".join([
+            f"Downloaded {self.vod_downloaded_count}/{self.vod_count} VODs",
+            f"<blue>{self.progress_perc}%</blue>",
+            f"of <blue>~{format_size(self.estimated_total)}</blue>" if self.estimated_total else "",
+            f"at <blue>{format_size(self.speed)}/s</blue>" if self.speed else "",
+            f"ETA <blue>{format_time(self.remaining_time)}</blue>" if self.remaining_time is not None else "",
+        ])

+        print_out(f"\r{progress}     ", end="")
        self.last_printed = now
--- a/twitchdl/twitch.py
+++ b/twitchdl/twitch.py
@ -2,109 +2,24 @@
 Twitch API access.
 """

-import json
-import logging
-import time
-from typing import Any, Dict, Generator, List, Literal, Mapping, Optional, Tuple, TypedDict, Union
-
-import click
 import httpx

 from twitchdl import CLIENT_ID
-from twitchdl.entities import Data
 from twitchdl.exceptions import ConsoleError
-
-ClipsPeriod = Literal["last_day", "last_week", "last_month", "all_time"]
-VideosSort = Literal["views", "time"]
-VideosType = Literal["archive", "highlight", "upload"]
+from twitchdl.models import Clip, ClipsPage, ClipGenerator, Game, Video, VideoGenerator, VideosPage
+from typing import Dict, Optional, Tuple


-class AccessToken(TypedDict):
-    signature: str
-    value: str
+class GQLError(Exception):
+    def __init__(self, errors):
+        super().__init__("GraphQL query failed")
+        self.errors = errors


-class User(TypedDict):
-    login: str
-    displayName: str
+def authenticated_post(url, data=None, json=None, headers={}):
+    headers['Client-ID'] = CLIENT_ID

-
-class Game(TypedDict):
-    id: str
-    name: str
-
-
-class VideoQuality(TypedDict):
-    frameRate: str
-    quality: str
-    sourceURL: str
-
-
-class ClipAccessToken(TypedDict):
-    id: str
-    playbackAccessToken: AccessToken
-    videoQualities: List[VideoQuality]
-
-
-class Clip(TypedDict):
-    id: str
-    slug: str
-    title: str
-    createdAt: str
-    viewCount: int
-    durationSeconds: int
-    url: str
-    videoQualities: List[VideoQuality]
-    game: Game
-    broadcaster: User
-
-
-class Video(TypedDict):
-    id: str
-    title: str
-    description: str
-    publishedAt: str
-    broadcastType: str
-    lengthSeconds: int
-    game: Game
-    creator: User
-
-
-class Chapter(TypedDict):
-    id: str
-    durationMilliseconds: int
-    positionMilliseconds: int
-    type: str
-    description: str
-    subDescription: str
-    thumbnailURL: str
-    game: Game
-
-
-class GQLError(click.ClickException):
-    def __init__(self, errors: List[str]):
-        message = "GraphQL query failed."
-        for error in errors:
-            message += f"\n* {error}"
-        super().__init__(message)
-
-
-Content = Union[str, bytes]
-Headers = Dict[str, str]
-
-
-def authenticated_post(
-    url: str,
-    *,
-    json: Any = None,
-    content: Optional[Content] = None,
-    auth_token: Optional[str] = None,
-):
-    headers = {"Client-ID": CLIENT_ID}
-    if auth_token is not None:
-        headers["authorization"] = f"OAuth {auth_token}"
-
-    response = request("POST", url, content=content, json=json, headers=headers)
+    response = httpx.post(url, data=data, json=json, headers=headers)
    if response.status_code == 400:
        data = response.json()
        raise ConsoleError(data["message"])
@ -114,80 +29,49 @@ def authenticated_post(
    return response


-def request(
-    method: str,
-    url: str,
-    json: Any = None,
-    content: Optional[Content] = None,
-    headers: Optional[Mapping[str, str]] = None,
-):
-    with httpx.Client() as client:
-        request = client.build_request(method, url, json=json, content=content, headers=headers)
-        log_request(request)
-        start = time.time()
-        response = client.send(request)
-        duration = time.time() - start
-        log_response(response, duration)
-        return response
-
-
-logger = logging.getLogger(__name__)
-
-
-def log_request(request: httpx.Request):
-    logger.debug(f"--> {request.method} {request.url}")
-    if request.content:
-        logger.debug(f"--> {request.content}")
-
-
-def log_response(response: httpx.Response, duration: float):
-    request = response.request
-    duration_ms = int(1000 * duration)
-    logger.debug(f"<-- {request.method} {request.url} HTTP {response.status_code} {duration_ms}ms")
-    if response.content:
-        logger.debug(f"<-- {response.content}")
-
-
-def gql_post(query: str):
+def gql_post(query):
    url = "https://gql.twitch.tv/gql"
-    response = authenticated_post(url, content=query)
-    gql_raise_on_error(response)
-    return response.json()
+    response = authenticated_post(url, data=query).json()
+
+    if "errors" in response:
+        raise GQLError(response["errors"])
+
+    return response


-def gql_query(query: str, auth_token: Optional[str] = None):
+def gql_query(query: str, headers: Dict[str, str] = {}):
    url = "https://gql.twitch.tv/gql"
-    response = authenticated_post(url, json={"query": query}, auth_token=auth_token)
-    gql_raise_on_error(response)
-    return response.json()
+    response = authenticated_post(url, json={"query": query}, headers=headers).json()
+
+    if "errors" in response:
+        raise GQLError(response["errors"])
+
+    return response


-def gql_raise_on_error(response: httpx.Response):
-    data = response.json()
-    if "errors" in data:
-        errors = [e["message"] for e in data["errors"]]
-        raise GQLError(errors)
+GAME_FIELDS = """
+    id
+    name
+    description
+"""

-
-VIDEO_FIELDS = """
+VIDEO_FIELDS = f"""
    id
    title
-    description
    publishedAt
    broadcastType
    lengthSeconds
-    game {
-        id
-        name
-    }
-    creator {
+    game {{
+        {GAME_FIELDS}
+    }}
+    creator {{
        login
        displayName
-    }
+    }}
 """


-CLIP_FIELDS = """
+CLIP_FIELDS = f"""
    id
    slug
    title
@ -195,50 +79,52 @@ CLIP_FIELDS = """
    viewCount
    durationSeconds
    url
-    videoQualities {
+    videoQualities {{
        frameRate
        quality
        sourceURL
-    }
-    game {
-        id
-        name
-    }
-    broadcaster {
-        displayName
+    }}
+    game {{
+        {GAME_FIELDS}
+    }}
+    broadcaster {{
        login
-    }
+        displayName
+    }}
 """


 def get_video(video_id: str) -> Optional[Video]:
-    query = f"""
+    query = """
    {{
        video(id: "{video_id}") {{
-            {VIDEO_FIELDS}
+            {fields}
        }}
    }}
    """

+    query = query.format(video_id=video_id, fields=VIDEO_FIELDS)
+
    response = gql_query(query)
-    return response["data"]["video"]
+    if response["data"]["video"]:
+        return Video.from_json(response["data"]["video"])


-def get_clip(slug: str) -> Optional[Clip]:
-    query = f"""
+def get_clip(slug: str) -> Clip:
+    query = """
    {{
-        clip(slug: "{slug}") {{
-            {CLIP_FIELDS}
+        clip(slug: "{}") {{
+            {fields}
        }}
    }}
    """

-    response = gql_query(query)
-    return response["data"]["clip"]
+    response = gql_query(query.format(slug, fields=CLIP_FIELDS))
+    return Clip.from_json(response["data"]["clip"])


-def get_clip_access_token(slug: str) -> ClipAccessToken:
-    query = f"""
+def get_clip_access_token(slug):
+    query = """
    {{
        "operationName": "VideoAccessToken_Clip",
        "variables": {{
@ -253,16 +139,11 @@ def get_clip_access_token(slug: str) -> ClipAccessToken:
    }}
    """

-    response = gql_post(query.strip())
+    response = gql_post(query.format(slug=slug).strip())
    return response["data"]["clip"]


-def get_channel_clips(
-    channel_id: str,
-    period: ClipsPeriod,
-    limit: int,
-    after: Optional[str] = None,
-):
+def get_channel_clips(channel_id, period, limit, after=None) -> ClipsPage:
    """
    List channel clips.

@ -272,10 +153,10 @@ def get_channel_clips(
    * sorting by VIEWS_DESC and TRENDING returns the same results
    * there is no totalCount
    """
-    query = f"""
+    query = """
    {{
      user(login: "{channel_id}") {{
-        clips(first: {limit}, after: "{after or ''}", criteria: {{ period: {period.upper()}, sort: VIEWS_DESC }}) {{
+        clips(first: {limit}, after: "{after}", criteria: {{ period: {period}, sort: VIEWS_DESC }}) {{
          pageInfo {{
            hasNextPage
            hasPreviousPage
@ -283,7 +164,7 @@ def get_channel_clips(
          edges {{
            cursor
            node {{
-              {CLIP_FIELDS}
+              {fields}
            }}
          }}
        }}
@ -291,78 +172,70 @@ def get_channel_clips(
    }}
    """

+    query = query.format(
+        channel_id=channel_id,
+        after=after if after else "",
+        limit=limit,
+        period=period.upper(),
+        fields=CLIP_FIELDS
+    )
+
    response = gql_query(query)
    user = response["data"]["user"]
    if not user:
-        raise ConsoleError(f"Channel {channel_id} not found")
+        raise ConsoleError("Channel {} not found".format(channel_id))

-    return response["data"]["user"]["clips"]
+    return ClipsPage.from_json(response["data"]["user"]["clips"])


-def channel_clips_generator(
-    channel_id: str,
-    period: ClipsPeriod,
-    limit: int,
-) -> Generator[Clip, None, None]:
-    def _generator(clips: Data, limit: int) -> Generator[Clip, None, None]:
-        for clip in clips["edges"]:
+def channel_clips_generator(channel_id: str, period, limit: int) -> ClipGenerator:
+    def _generator(page: ClipsPage, limit: int):
+        for clip in page.clips:
            if limit < 1:
                return
-            yield clip["node"]
+            yield clip
            limit -= 1

-        has_next = clips["pageInfo"]["hasNextPage"]
-        if limit < 1 or not has_next:
+        if limit < 1 or not page.has_next_page:
            return

        req_limit = min(limit, 100)
-        cursor = clips["edges"][-1]["cursor"]
-        clips = get_channel_clips(channel_id, period, req_limit, cursor)
-        yield from _generator(clips, limit)
+        next_page = get_channel_clips(channel_id, period, req_limit, page.cursor)
+        yield from _generator(next_page, limit)

    req_limit = min(limit, 100)
-    clips = get_channel_clips(channel_id, period, req_limit)
-    return _generator(clips, limit)
+    page = get_channel_clips(channel_id, period, req_limit)
+    return _generator(page, limit)


-def channel_clips_generator_old(channel_id: str, period: ClipsPeriod, limit: int):
+def channel_clips_generator_old(channel_id, period, limit):
    cursor = ""
    while True:
-        clips = get_channel_clips(channel_id, period, limit, after=cursor)
+        page = get_channel_clips(channel_id, period, limit, after=cursor)

-        if not clips["edges"]:
+        if not page.clips:
            break

-        has_next = clips["pageInfo"]["hasNextPage"]
-        cursor = clips["edges"][-1]["cursor"] if has_next else None
+        has_next = page.has_next_page
+        cursor = page.cursor if has_next else None

-        yield clips, has_next
+        yield page.clips, has_next

        if not cursor:
            break


-def get_channel_videos(
-    channel_id: str,
-    limit: int,
-    sort: str,
-    type: str = "archive",
-    game_ids: Optional[List[str]] = None,
-    after: Optional[str] = None,
-):
-    game_ids = game_ids or []
-    game_ids_str = f"[{','.join(game_ids)}]"
-
-    query = f"""
+def get_channel_videos(channel_id, limit, sort, type="archive", game_ids=[], after=None) -> VideosPage:
+    query = """
    {{
        user(login: "{channel_id}") {{
            videos(
                first: {limit},
-                type: {type.upper()},
-                sort: {sort.upper()},
-                after: "{after or ''}",
+                type: {type},
+                sort: {sort},
+                after: "{after}",
                options: {{
-                    gameIDs: {game_ids_str}
+                    gameIDs: {game_ids}
                }}
            ) {{
                totalCount
@ -372,7 +245,7 @@ def get_channel_videos(
                edges {{
                    cursor
                    node {{
-                        {VIDEO_FIELDS}
+                        {fields}
                    }}
                }}
            }}
@ -380,49 +253,49 @@ def get_channel_videos(
    }}
    """

+    query = query.format(
+        channel_id=channel_id,
+        game_ids=game_ids,
+        after=after if after else "",
+        limit=limit,
+        sort=sort.upper(),
+        type=type.upper(),
+        fields=VIDEO_FIELDS
+    )
+
    response = gql_query(query)

    if not response["data"]["user"]:
-        raise ConsoleError(f"Channel {channel_id} not found")
+        raise ConsoleError("Channel {} not found".format(channel_id))

-    return response["data"]["user"]["videos"]
+    return VideosPage.from_json(response["data"]["user"]["videos"])


-def channel_videos_generator(
-    channel_id: str,
-    max_videos: int,
-    sort: VideosSort,
-    type: VideosType,
-    game_ids: Optional[List[str]] = None,
-) -> Tuple[int, Generator[Video, None, None]]:
-    game_ids = game_ids or []
-
-    def _generator(videos: Data, max_videos: int) -> Generator[Video, None, None]:
-        for video in videos["edges"]:
+def channel_videos_generator(channel_id, max_videos, sort, type, game_ids=None) -> Tuple[int, VideoGenerator]:
+    def _generator(page, max_videos):
+        for video in page.videos:
            if max_videos < 1:
                return
-            yield video["node"]
+            yield video
            max_videos -= 1

-        has_next = videos["pageInfo"]["hasNextPage"]
-        if max_videos < 1 or not has_next:
+        if max_videos < 1 or not page.has_next_page:
            return

        limit = min(max_videos, 100)
-        cursor = videos["edges"][-1]["cursor"]
-        videos = get_channel_videos(channel_id, limit, sort, type, game_ids, cursor)
+        videos = get_channel_videos(channel_id, limit, sort, type, game_ids, page.cursor)
        yield from _generator(videos, max_videos)

    limit = min(max_videos, 100)
-    videos = get_channel_videos(channel_id, limit, sort, type, game_ids)
-    return videos["totalCount"], _generator(videos, max_videos)
+    page = get_channel_videos(channel_id, limit, sort, type, game_ids)
+    return page.total_count, _generator(page, max_videos)


-def get_access_token(video_id: str, auth_token: Optional[str] = None) -> AccessToken:
-    query = f"""
+def get_access_token(video_id, auth_token=None):
+    query = """
    {{
        videoPlaybackAccessToken(
-            id: "{video_id}",
+            id: {video_id},
            params: {{
                platform: "web",
                playerBackend: "mediaplayer",
@ -435,8 +308,14 @@ def get_access_token(video_id: str, auth_token: Optional[str] = None) -> AccessT
    }}
    """

+    query = query.format(video_id=video_id)
+
+    headers = {}
+    if auth_token is not None:
+        headers['authorization'] = f'OAuth {auth_token}'
+
    try:
-        response = gql_query(query, auth_token=auth_token)
+        response = gql_query(query, headers=headers)
        return response["data"]["videoPlaybackAccessToken"]
    except httpx.HTTPStatusError as error:
        # Provide a more useful error message when server returns HTTP 401
@ -453,64 +332,32 @@ def get_access_token(video_id: str, auth_token: Optional[str] = None) -> AccessT
        raise


-def get_playlists(video_id: str, access_token: AccessToken) -> str:
+def get_playlists(video_id, access_token):
    """
    For a given video return a playlist which contains possible video qualities.
    """
-    url = f"https://usher.ttvnw.net/vod/{video_id}"
+    url = "http://usher.twitch.tv/vod/{}".format(video_id)

-    response = httpx.get(
-        url,
-        params={
-            "nauth": access_token["value"],
-            "nauthsig": access_token["signature"],
-            "allow_audio_only": "true",
-            "allow_source": "true",
-            "player": "twitchweb",
-        },
-    )
+    response = httpx.get(url, params={
+        "nauth": access_token['value'],
+        "nauthsig": access_token['signature'],
+        "allow_audio_only": "true",
+        "allow_source": "true",
+        "player": "twitchweb",
+    })
    response.raise_for_status()
-    return response.content.decode("utf-8")
+    return response.content.decode('utf-8')


-def get_game_id(name: str):
+def find_game(name: str) -> Optional[Game]:
    query = f"""
    {{
        game(name: "{name.strip()}") {{
-            id
+            {GAME_FIELDS}
        }}
    }}
    """

    response = gql_query(query)
-    game = response["data"]["game"]
-    if game:
-        return game["id"]
-
-
-def get_video_chapters(video_id: str) -> List[Chapter]:
-    query = {
-        "operationName": "VideoPlayer_ChapterSelectButtonVideo",
-        "variables": {
-            "includePrivate": False,
-            "videoID": video_id,
-        },
-        "extensions": {
-            "persistedQuery": {
-                "version": 1,
-                "sha256Hash": "8d2793384aac3773beab5e59bd5d6f585aedb923d292800119e03d40cd0f9b41",
-            }
-        },
-    }
-
-    response = gql_post(json.dumps(query))
-    return list(_chapter_nodes(response["data"]["video"]["moments"]))
-
-
-def _chapter_nodes(moments: Data) -> Generator[Chapter, None, None]:
-    for edge in moments["edges"]:
-        node = edge["node"]
-        node["game"] = node["details"]["game"]
-        del node["details"]
-        del node["moments"]
-        yield node
+    if response["data"]["game"]:
+        return Game.from_json(response["data"]["game"])
--- a/twitchdl/utils.py
+++ b/twitchdl/utils.py
@ -1,18 +1,15 @@
 import re
 import unicodedata
-from typing import Optional, Union
-
-import click


-def _format_size(value: float, digits: int, unit: str):
+def _format_size(value, digits, unit):
    if digits > 0:
-        return f"{{:.{digits}f}}{unit}".format(value)
+        return "{{:.{}f}}{}".format(digits, unit).format(value)
    else:
-        return f"{int(value)}{unit}"
+        return "{{:d}}{}".format(unit).format(value)


-def format_size(bytes_: Union[int, float], digits: int = 1):
+def format_size(bytes_, digits=1):
    if bytes_ < 1024:
        return _format_size(bytes_, digits, "B")

@ -27,7 +24,7 @@ def format_size(bytes_: Union[int, float], digits: int = 1):
    return _format_size(mega / 1024, digits, "GB")


-def format_duration(total_seconds: Union[int, float]) -> str:
+def format_duration(total_seconds: int) -> str:
    total_seconds = int(total_seconds)
    hours = total_seconds // 3600
    remainder = total_seconds % 3600
@ -35,32 +32,34 @@ def format_duration(total_seconds: Union[int, float]) -> str:
    seconds = total_seconds % 60

    if hours:
-        return f"{hours} h {minutes} min"
+        return "{} h {} min".format(hours, minutes)

    if minutes:
-        return f"{minutes} min {seconds} sec"
+        return "{} min {} sec".format(minutes, seconds)

-    return f"{seconds} sec"
+    return "{} sec".format(seconds)


-def format_time(total_seconds: Union[int, float], force_hours: bool = False) -> str:
+def format_time(total_seconds: int) -> str:
    total_seconds = int(total_seconds)
    hours = total_seconds // 3600
    remainder = total_seconds % 3600
    minutes = remainder // 60
    seconds = total_seconds % 60

-    if hours or force_hours:
+    if hours:
        return f"{hours:02}:{minutes:02}:{seconds:02}"

    return f"{minutes:02}:{seconds:02}"


-def read_int(msg: str, min: int, max: int, default: Optional[int] = None) -> int:
+def read_int(msg, min, max, default):
+    msg = msg + " [default {}]: ".format(default)
+
    while True:
        try:
-            val = click.prompt(msg, default=default, type=int)
-            if default and not val:
+            val = input(msg)
+            if not val:
                return default
            if min <= int(val) <= max:
                return int(val)
@ -69,32 +68,32 @@ def read_int(msg: str, min: int, max: int, default: Optional[int] = None) -> int


 def slugify(value: str) -> str:
-    value = unicodedata.normalize("NFKC", str(value))
-    value = re.sub(r"[^\w\s_-]", "", value)
-    value = re.sub(r"[\s_-]+", "_", value)
+    value = unicodedata.normalize('NFKC', str(value))
+    value = re.sub(r'[^\w\s_-]', '', value)
+    value = re.sub(r'[\s_-]+', '_', value)
    return value.strip("_").lower()


 def titlify(value: str) -> str:
-    value = unicodedata.normalize("NFKC", str(value))
-    value = re.sub(r"[^\w\s\[\]().-]", "", value)
-    value = re.sub(r"\s+", " ", value)
+    value = unicodedata.normalize('NFKC', str(value))
+    value = re.sub(r'[^\w\s\[\]().-]', '', value)
+    value = re.sub(r'\s+', ' ', value)
    return value.strip()


 VIDEO_PATTERNS = [
    r"^(?P<id>\d+)?$",
-    r"^https://(www\.|m\.)?twitch\.tv/videos/(?P<id>\d+)(\?.+)?$",
+    r"^https://(www.)?twitch.tv/videos/(?P<id>\d+)(\?.+)?$",
 ]

 CLIP_PATTERNS = [
    r"^(?P<slug>[A-Za-z0-9]+(?:-[A-Za-z0-9_-]{16})?)$",
-    r"^https://(www\.|m\.)?twitch\.tv/\w+/clip/(?P<slug>[A-Za-z0-9]+(?:-[A-Za-z0-9_-]{16})?)(\?.+)?$",
-    r"^https://clips\.twitch\.tv/(?P<slug>[A-Za-z0-9]+(?:-[A-Za-z0-9_-]{16})?)(\?.+)?$",
+    r"^https://(www.)?twitch.tv/\w+/clip/(?P<slug>[A-Za-z0-9]+(?:-[A-Za-z0-9_-]{16})?)(\?.+)?$",
+    r"^https://clips.twitch.tv/(?P<slug>[A-Za-z0-9]+(?:-[A-Za-z0-9_-]{16})?)(\?.+)?$",
 ]


-def parse_video_identifier(identifier: str) -> Optional[str]:
+def parse_video_identifier(identifier: str) -> str:
    """Given a video ID or URL returns the video ID, or null if not matched"""
    for pattern in VIDEO_PATTERNS:
        match = re.match(pattern, identifier)
@ -102,7 +101,7 @@ def parse_video_identifier(identifier: str) -> Optional[str]:
            return match.group("id")


-def parse_clip_identifier(identifier: str) -> Optional[str]:
+def parse_clip_identifier(identifier: str) -> str:
    """Given a clip slug or URL returns the clip slug, or null if not matched"""
    for pattern in CLIP_PATTERNS:
        match = re.match(pattern, identifier)
Author	SHA1	Message	Date
Ivan Habunek	c0a7ea1f27	wip	2022-08-27 15:26:54 +02:00
Ivan Habunek	afe38b84cd	Extract Game dataclass	2022-08-27 12:51:28 +02:00
Ivan Habunek	aed0b993a7	Add dataclasses for clips	2022-08-27 12:01:23 +02:00
Ivan Habunek	599b7783d0	Some more types	2022-08-27 11:59:50 +02:00
Ivan Habunek	9cc7c05d8a	Expand tests	2022-08-27 11:58:19 +02:00
Ivan Habunek	98d2ce0bc7	Add dependency on pytest-cov	2022-08-27 11:57:57 +02:00