Skip to content

Commit

Permalink
Version 3.1.0 (#26)
Browse files Browse the repository at this point in the history
* Update README

* Update dependencies

* Enable episode selection

* Add more tests

* Pytest config

* Bump version

* Update documentation
  • Loading branch information
marhoy committed May 1, 2022
1 parent 190ddbc commit 59050a7
Show file tree
Hide file tree
Showing 12 changed files with 360 additions and 157 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Expand Up @@ -10,7 +10,7 @@ repos:
- id: flake8

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.942
rev: v0.950
hooks:
- id: mypy
additional_dependencies:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -6,7 +6,7 @@

This is a commandline tool to download programs and series from NRK (Norwegian public
broadcaster). It supports both TV, Radio and Podcast content. The tool is written in
Python, and is compatible with Python 3.7 or newer. It has been tested under Linux, Mac
Python, and is compatible with Python 3.8 or newer. It has been tested under Linux, Mac
OS X and Windows.

# Documentation
Expand Down
2 changes: 1 addition & 1 deletion docs/40_usage.rst
Expand Up @@ -17,7 +17,7 @@ Options
Options:
-d, --download-dir PATH Download directory. Can also be specified by
setting the environment variable NRKDOWNLOAD_DIR
[default: /Users/marhoy/Downloads/nrkdownload]
[default: ~/Downloads/nrkdownload]
--version Print version string
-v Increase logger verbosity. Can be repeated up to
four times. [default: 0; x<=4]
Expand Down
27 changes: 21 additions & 6 deletions docs/50_examples.rst
@@ -1,6 +1,14 @@
Examples
========


Downloading programs
--------------------

For downloading a specific program that is not part of a series, the URL
could look like e.g. https://tv.nrk.no/program/MUHH49000021


Dowloading series
-----------------

Expand All @@ -10,17 +18,24 @@ page with the URL https://tv.nrk.no/serie/elias. If you give this URL as an argu
``nrkdownload``, all (available) episodes in all seasons will be downloaded.


Downloading seasons
-------------------
Downloading a single season
---------------------------

If you are only interested in a specific season of a series, click around on
the webpages until you are only looking at that season. As an example, if you
wanted to download the third season of SKAM, you would use an URL like
https://tv.nrk.no/serie/skam/sesong/3


Downloading programs
--------------------
Downloading a single episode
----------------------------

If you want to download only a single episode of a series, navigate https://tv.nrk.no
until that episode is selected. The URL will look like e.g.
https://tv.nrk.no/serie/kongen-av-gulset/sesong/1/episode/3/avspiller or
https://tv.nrk.no/serie/klassequizen/2021/DSRR21000521/avspiller, where information
about the episode is included.

Giving a URL like this as argument to nrkdownload, will result in only this single
episode to be downloaded.

For downloading a specific program that is not part of a series, the URL
could look like e.g. https://tv.nrk.no/program/KOID28004110/pushwagner
82 changes: 41 additions & 41 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "nrkdownload"
version = "3.0.0"
version = "3.1.0"
description = ""
authors = ["Martin Høy <marhoy@gmail.com>"]
readme = "README.md"
Expand All @@ -18,7 +18,7 @@ halo = "^0.0.31"
[tool.poetry.dev-dependencies]
black = "^22.3.0"
flake8 = "^4.0.1"
mypy = "^0.942"
mypy = "^0.950"
types-requests = "^2.27.16"
types-setuptools = "^57.4.14"
pydocstyle = "^6.1.1"
Expand All @@ -37,6 +37,14 @@ nrkdownload = "nrkdownload.cli:app"
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

[tool.pytest.ini_options]
addopts = "--verbose --cov-report term-missing:skip-covered --cov=nrkdownload"
# Ignore deprecation warnings from third party packages
filterwarnings = [
"ignore::DeprecationWarning:past.*",
"ignore::DeprecationWarning:halo.*",
]

[tool.isort]
profile = "black"

Expand Down

0 comments on commit 59050a7

Please sign in to comment.