Compare commits
83 commits
Author | SHA1 | Date | |
---|---|---|---|
|
88bb8ea789 | ||
|
6ae051157f | ||
|
c260d7b83f | ||
|
25904371de | ||
|
184d0328a9 | ||
|
aceaa69c9a | ||
|
de737fb4ee | ||
|
6f97f93dcc | ||
|
a23e1c5181 | ||
|
35b264bae4 | ||
|
353e32bd6b | ||
|
0fa96932a4 | ||
|
90c3614d6a | ||
|
fa68aa4ae8 | ||
|
8a26cf88d8 | ||
|
82cb504871 | ||
|
9d4283a924 | ||
|
e4d2ebc4a0 | ||
|
d5f1c3d3ac | ||
|
e737ae2f34 | ||
|
f4547a5821 | ||
|
a14a50a333 | ||
|
77d1b0009c | ||
|
d505d57fc4 | ||
|
3890cb4c04 | ||
|
5bccda1102 | ||
|
36d89a69e8 | ||
|
a28dea1158 | ||
|
6c888343c8 | ||
|
ffebde28e2 | ||
|
befb5aeceb | ||
|
370ff77f21 | ||
|
cdfc23b5e4 | ||
|
d5fe263c23 | ||
|
e90d717b66 | ||
|
b4c8dc7282 | ||
|
6f30559a3a | ||
|
a91bac007d | ||
|
c0f9f4222a | ||
|
47872dbb32 | ||
|
74392c4d71 | ||
|
97eab1719f | ||
|
e4b7af41f9 | ||
|
7f1c90cfea | ||
|
68c0197028 | ||
|
9e62e37b1e | ||
|
c26c5f86aa | ||
|
f7a73aa62f | ||
|
34e0e54fea | ||
|
02da99f4b0 | ||
|
5f302e0813 | ||
|
47eda3ea70 | ||
|
7da76f49bd | ||
|
1c669d8bb0 | ||
|
0f59831dc2 | ||
|
8d8263ce42 | ||
|
07ce433fc0 | ||
|
dc4bd8474c | ||
|
b05b8454f5 | ||
|
56fc297371 | ||
|
9f59dd770c | ||
|
f0ea480334 | ||
|
165e4761f4 | ||
|
cdb88b9bbb | ||
|
879591e1cc | ||
|
6a7a23cd9a | ||
|
793ae1453c | ||
|
111334328e | ||
|
15f0ccfd58 | ||
|
94432d62b0 | ||
|
dab0a5b661 | ||
|
7f07babdf4 | ||
|
f5ea06c6c9 | ||
|
4ea1df0930 | ||
|
e63ecc7bea | ||
|
28403386a8 | ||
|
8647cbdd48 | ||
|
a37ac22e6c | ||
|
7861fd55bd | ||
|
219be9f61a | ||
|
8169fad09d | ||
|
0152d98b28 | ||
|
d03e25fc6c |
5
.github/release-drafter.yml
vendored
5
.github/release-drafter.yml
vendored
|
@ -22,6 +22,11 @@ categories:
|
||||||
exclude-labels:
|
exclude-labels:
|
||||||
- "changelog: skip"
|
- "changelog: skip"
|
||||||
|
|
||||||
|
autolabeler:
|
||||||
|
- label: "changelog: skip"
|
||||||
|
branch:
|
||||||
|
- "/pre-commit-ci-update-config/"
|
||||||
|
|
||||||
template: |
|
template: |
|
||||||
$CHANGES
|
$CHANGES
|
||||||
|
|
||||||
|
|
13
.github/renovate.json
vendored
13
.github/renovate.json
vendored
|
@ -1,16 +1,13 @@
|
||||||
{
|
{
|
||||||
"extends": [
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
"config:base"
|
"extends": ["config:base"],
|
||||||
],
|
"labels": ["changelog: skip", "dependencies"],
|
||||||
"labels": [
|
|
||||||
"changelog: skip",
|
|
||||||
"dependencies"
|
|
||||||
],
|
|
||||||
"packageRules": [
|
"packageRules": [
|
||||||
{
|
{
|
||||||
"groupName": "github-actions",
|
"groupName": "github-actions",
|
||||||
"matchManagers": ["github-actions"],
|
"matchManagers": ["github-actions"],
|
||||||
"separateMajorMinor": "false"
|
"separateMajorMinor": "false"
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"schedule": ["on the first day of the month"]
|
||||||
}
|
}
|
||||||
|
|
82
.github/workflows/deploy.yml
vendored
82
.github/workflows/deploy.yml
vendored
|
@ -2,50 +2,74 @@ name: Deploy
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches: [main]
|
||||||
- main
|
tags: ["*"]
|
||||||
|
pull_request:
|
||||||
|
branches: [main]
|
||||||
release:
|
release:
|
||||||
types:
|
types:
|
||||||
- published
|
- published
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
# Always build & lint package.
|
||||||
if: github.repository_owner == 'pylast'
|
build-package:
|
||||||
|
name: Build & verify package
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up Python
|
- uses: hynek/build-and-inspect-python-package@v2
|
||||||
uses: actions/setup-python@v4
|
|
||||||
|
# Upload to Test PyPI on every commit on main.
|
||||||
|
release-test-pypi:
|
||||||
|
name: Publish in-dev package to test.pypi.org
|
||||||
|
if: |
|
||||||
|
github.repository_owner == 'pylast'
|
||||||
|
&& github.event_name == 'push'
|
||||||
|
&& github.ref == 'refs/heads/main'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: build-package
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
id-token: write
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Download packages built by build-and-inspect-python-package
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
python-version: "3.x"
|
name: Packages
|
||||||
cache: pip
|
path: dist
|
||||||
cache-dependency-path: pyproject.toml
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Upload package to Test PyPI
|
||||||
run: |
|
|
||||||
python -m pip install -U pip
|
|
||||||
python -m pip install -U build twine wheel
|
|
||||||
|
|
||||||
- name: Build package
|
|
||||||
run: |
|
|
||||||
python -m build
|
|
||||||
twine check --strict dist/*
|
|
||||||
|
|
||||||
- name: Publish package to PyPI
|
|
||||||
if: github.event.action == 'published'
|
|
||||||
uses: pypa/gh-action-pypi-publish@release/v1
|
uses: pypa/gh-action-pypi-publish@release/v1
|
||||||
with:
|
with:
|
||||||
user: __token__
|
repository-url: https://test.pypi.org/legacy/
|
||||||
password: ${{ secrets.pypi_password }}
|
|
||||||
|
|
||||||
- name: Publish package to TestPyPI
|
# Upload to real PyPI on GitHub Releases.
|
||||||
uses: pypa/gh-action-pypi-publish@release/v1
|
release-pypi:
|
||||||
|
name: Publish released package to pypi.org
|
||||||
|
if: |
|
||||||
|
github.repository_owner == 'pylast'
|
||||||
|
&& github.event.action == 'published'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: build-package
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
id-token: write
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Download packages built by build-and-inspect-python-package
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
user: __token__
|
name: Packages
|
||||||
password: ${{ secrets.test_pypi_password }}
|
path: dist
|
||||||
repository_url: https://test.pypi.org/legacy/
|
|
||||||
|
- name: Upload package to PyPI
|
||||||
|
uses: pypa/gh-action-pypi-publish@release/v1
|
||||||
|
|
5
.github/workflows/labels.yml
vendored
5
.github/workflows/labels.yml
vendored
|
@ -1,5 +1,8 @@
|
||||||
name: Sync labels
|
name: Sync labels
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
|
@ -12,7 +15,7 @@ jobs:
|
||||||
sync:
|
sync:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: micnncim/action-label-syncer@v1
|
- uses: micnncim/action-label-syncer@v1
|
||||||
with:
|
with:
|
||||||
prune: false
|
prune: false
|
||||||
|
|
14
.github/workflows/lint.yml
vendored
14
.github/workflows/lint.yml
vendored
|
@ -2,13 +2,21 @@ name: Lint
|
||||||
|
|
||||||
on: [push, pull_request, workflow_dispatch]
|
on: [push, pull_request, workflow_dispatch]
|
||||||
|
|
||||||
|
env:
|
||||||
|
FORCE_COLOR: 1
|
||||||
|
PIP_DISABLE_PIP_VERSION_CHECK: 1
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/setup-python@v4
|
- uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: "3.x"
|
python-version: "3.x"
|
||||||
- uses: pre-commit/action@v3.0.0
|
cache: pip
|
||||||
|
- uses: pre-commit/action@v3.0.1
|
||||||
|
|
18
.github/workflows/release-drafter.yml
vendored
18
.github/workflows/release-drafter.yml
vendored
|
@ -5,14 +5,30 @@ on:
|
||||||
# branches to consider in the event; optional, defaults to all
|
# branches to consider in the event; optional, defaults to all
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
# pull_request event is required only for autolabeler
|
||||||
|
pull_request:
|
||||||
|
# Only following types are handled by the action, but one can default to all as well
|
||||||
|
types: [opened, reopened, synchronize]
|
||||||
|
# pull_request_target event is required for autolabeler to support PRs from forks
|
||||||
|
# pull_request_target:
|
||||||
|
# types: [opened, reopened, synchronize]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update_release_draft:
|
update_release_draft:
|
||||||
if: github.repository_owner == 'pylast'
|
if: github.repository_owner == 'pylast'
|
||||||
|
permissions:
|
||||||
|
# write permission is required to create a GitHub Release
|
||||||
|
contents: write
|
||||||
|
# write permission is required for autolabeler
|
||||||
|
# otherwise, read permission is required at least
|
||||||
|
pull-requests: write
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
# Drafts your next release notes as pull requests are merged into "main"
|
# Drafts your next release notes as pull requests are merged into "main"
|
||||||
- uses: release-drafter/release-drafter@v5
|
- uses: release-drafter/release-drafter@v6
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
6
.github/workflows/require-pr-label.yml
vendored
6
.github/workflows/require-pr-label.yml
vendored
|
@ -8,8 +8,12 @@ jobs:
|
||||||
label:
|
label:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
issues: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: mheap/github-action-required-labels@v2
|
- uses: mheap/github-action-required-labels@v5
|
||||||
with:
|
with:
|
||||||
mode: minimum
|
mode: minimum
|
||||||
count: 1
|
count: 1
|
||||||
|
|
10
.github/workflows/test.yml
vendored
10
.github/workflows/test.yml
vendored
|
@ -11,18 +11,18 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
python-version: ["pypy-3.8", "3.7", "3.8", "3.9", "3.10", "3.11"]
|
python-version: ["pypy3.10", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
|
||||||
os: [ubuntu-latest]
|
os: [ubuntu-latest]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up Python ${{ matrix.python-version }}
|
- name: Set up Python ${{ matrix.python-version }}
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python-version }}
|
python-version: ${{ matrix.python-version }}
|
||||||
|
allow-prereleases: true
|
||||||
cache: pip
|
cache: pip
|
||||||
cache-dependency-path: pyproject.toml
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
|
@ -40,7 +40,7 @@ jobs:
|
||||||
PYLAST_USERNAME: ${{ secrets.PYLAST_USERNAME }}
|
PYLAST_USERNAME: ${{ secrets.PYLAST_USERNAME }}
|
||||||
|
|
||||||
- name: Upload coverage
|
- name: Upload coverage
|
||||||
uses: codecov/codecov-action@v3
|
uses: codecov/codecov-action@v3.1.5
|
||||||
with:
|
with:
|
||||||
flags: ${{ matrix.os }}
|
flags: ${{ matrix.os }}
|
||||||
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
|
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
|
||||||
|
|
|
@ -1,63 +1,74 @@
|
||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/asottile/pyupgrade
|
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||||
rev: v3.1.0
|
rev: v0.5.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: pyupgrade
|
- id: ruff
|
||||||
args: [--py37-plus]
|
args: [--exit-non-zero-on-fix]
|
||||||
|
|
||||||
- repo: https://github.com/psf/black
|
- repo: https://github.com/psf/black-pre-commit-mirror
|
||||||
rev: 22.10.0
|
rev: 24.4.2
|
||||||
hooks:
|
hooks:
|
||||||
- id: black
|
- id: black
|
||||||
args: [--target-version=py37]
|
|
||||||
|
|
||||||
- repo: https://github.com/asottile/blacken-docs
|
- repo: https://github.com/asottile/blacken-docs
|
||||||
rev: v1.12.1
|
rev: 1.18.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: blacken-docs
|
- id: blacken-docs
|
||||||
args: [--target-version=py37]
|
args: [--target-version=py38]
|
||||||
additional_dependencies: [black==22.10.0]
|
additional_dependencies: [black]
|
||||||
|
|
||||||
- repo: https://github.com/PyCQA/isort
|
|
||||||
rev: 5.10.1
|
|
||||||
hooks:
|
|
||||||
- id: isort
|
|
||||||
|
|
||||||
- repo: https://github.com/PyCQA/flake8
|
|
||||||
rev: 5.0.4
|
|
||||||
hooks:
|
|
||||||
- id: flake8
|
|
||||||
additional_dependencies: [flake8-2020, flake8-implicit-str-concat]
|
|
||||||
|
|
||||||
- repo: https://github.com/pre-commit/pygrep-hooks
|
|
||||||
rev: v1.9.0
|
|
||||||
hooks:
|
|
||||||
- id: python-check-blanket-noqa
|
|
||||||
|
|
||||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||||
rev: v4.3.0
|
rev: v4.6.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: check-json
|
- id: check-added-large-files
|
||||||
|
- id: check-case-conflict
|
||||||
- id: check-merge-conflict
|
- id: check-merge-conflict
|
||||||
|
- id: check-json
|
||||||
- id: check-toml
|
- id: check-toml
|
||||||
- id: check-yaml
|
- id: check-yaml
|
||||||
|
- id: debug-statements
|
||||||
- id: end-of-file-fixer
|
- id: end-of-file-fixer
|
||||||
- id: requirements-txt-fixer
|
- id: forbid-submodules
|
||||||
|
- id: trailing-whitespace
|
||||||
|
exclude: .github/(ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE).md
|
||||||
|
|
||||||
|
- repo: https://github.com/python-jsonschema/check-jsonschema
|
||||||
|
rev: 0.28.6
|
||||||
|
hooks:
|
||||||
|
- id: check-github-workflows
|
||||||
|
- id: check-renovate
|
||||||
|
|
||||||
|
- repo: https://github.com/rhysd/actionlint
|
||||||
|
rev: v1.7.1
|
||||||
|
hooks:
|
||||||
|
- id: actionlint
|
||||||
|
|
||||||
- repo: https://github.com/tox-dev/pyproject-fmt
|
- repo: https://github.com/tox-dev/pyproject-fmt
|
||||||
rev: 0.3.5
|
rev: 2.1.3
|
||||||
hooks:
|
hooks:
|
||||||
- id: pyproject-fmt
|
- id: pyproject-fmt
|
||||||
|
|
||||||
- repo: https://github.com/abravalheri/validate-pyproject
|
- repo: https://github.com/abravalheri/validate-pyproject
|
||||||
rev: v0.10.1
|
rev: v0.18
|
||||||
hooks:
|
hooks:
|
||||||
- id: validate-pyproject
|
- id: validate-pyproject
|
||||||
|
|
||||||
- repo: https://github.com/tox-dev/tox-ini-fmt
|
- repo: https://github.com/tox-dev/tox-ini-fmt
|
||||||
rev: 0.5.2
|
rev: 1.3.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: tox-ini-fmt
|
- id: tox-ini-fmt
|
||||||
|
|
||||||
|
- repo: https://github.com/pre-commit/mirrors-prettier
|
||||||
|
rev: v4.0.0-alpha.8
|
||||||
|
hooks:
|
||||||
|
- id: prettier
|
||||||
|
args: [--prose-wrap=always, --print-width=88]
|
||||||
|
exclude: .github/(ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE).md
|
||||||
|
|
||||||
|
- repo: meta
|
||||||
|
hooks:
|
||||||
|
- id: check-hooks-apply
|
||||||
|
- id: check-useless-excludes
|
||||||
|
|
||||||
ci:
|
ci:
|
||||||
autoupdate_schedule: quarterly
|
autoupdate_schedule: quarterly
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
checks:
|
|
||||||
python:
|
|
||||||
code_rating: true
|
|
||||||
duplicate_code: true
|
|
||||||
filter:
|
|
||||||
excluded_paths:
|
|
||||||
- '*/test/*'
|
|
||||||
tools:
|
|
||||||
external_code_coverage: true
|
|
94
CHANGELOG.md
94
CHANGELOG.md
|
@ -12,117 +12,125 @@ See GitHub Releases:
|
||||||
|
|
||||||
## Changed
|
## Changed
|
||||||
|
|
||||||
* Fix unsafe creation of temp file for caching, and improve exception raising (#356) @kvanzuijlen
|
- Fix unsafe creation of temp file for caching, and improve exception raising (#356)
|
||||||
* [pre-commit.ci] pre-commit autoupdate (#362) @pre-commit-ci
|
@kvanzuijlen
|
||||||
|
- [pre-commit.ci] pre-commit autoupdate (#362) @pre-commit-ci
|
||||||
|
|
||||||
## [4.1.0] - 2021-01-04
|
## [4.1.0] - 2021-01-04
|
||||||
|
|
||||||
## Added
|
## Added
|
||||||
|
|
||||||
* Add support for streaming (#336) @kvanzuijlen
|
- Add support for streaming (#336) @kvanzuijlen
|
||||||
* Add Python 3.9 final to Travis CI (#350) @sheetalsingala
|
- Add Python 3.9 final to Travis CI (#350) @sheetalsingala
|
||||||
|
|
||||||
## Changed
|
## Changed
|
||||||
|
|
||||||
* Update copyright year (#360) @hugovk
|
- Update copyright year (#360) @hugovk
|
||||||
* Replace Travis CI with GitHub Actions (#352) @hugovk
|
- Replace Travis CI with GitHub Actions (#352) @hugovk
|
||||||
* [pre-commit.ci] pre-commit autoupdate (#359) @pre-commit-ci
|
- [pre-commit.ci] pre-commit autoupdate (#359) @pre-commit-ci
|
||||||
|
|
||||||
## Fixed
|
## Fixed
|
||||||
|
|
||||||
* Set limit to 50 by default, not 1 (#355) @hugovk
|
- Set limit to 50 by default, not 1 (#355) @hugovk
|
||||||
|
|
||||||
|
|
||||||
## [4.0.0] - 2020-10-07
|
## [4.0.0] - 2020-10-07
|
||||||
|
|
||||||
## Added
|
## Added
|
||||||
|
|
||||||
* Add support for Python 3.9 (#347) @hugovk
|
- Add support for Python 3.9 (#347) @hugovk
|
||||||
|
|
||||||
## Removed
|
## Removed
|
||||||
|
|
||||||
* Remove deprecated `Artist.get_cover_image`, `User.get_artist_tracks` and `STATUS_TOKEN_ERROR` (#348) @hugovk
|
- Remove deprecated `Artist.get_cover_image`, `User.get_artist_tracks` and
|
||||||
* Drop support for EOL Python 3.5 (#346) @hugovk
|
`STATUS_TOKEN_ERROR` (#348) @hugovk
|
||||||
|
- Drop support for EOL Python 3.5 (#346) @hugovk
|
||||||
|
|
||||||
## [3.3.0] - 2020-06-25
|
## [3.3.0] - 2020-06-25
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
* `User.get_now_playing`: Add album and cover image to info (#330) @hugovk
|
- `User.get_now_playing`: Add album and cover image to info (#330) @hugovk
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
* Improve handling of error responses from the API (#327) @spiritualized
|
- Improve handling of error responses from the API (#327) @spiritualized
|
||||||
|
|
||||||
### Deprecated
|
### Deprecated
|
||||||
|
|
||||||
* Deprecate `Artist.get_cover_image`, they're no longer available from Last.fm (#332) @hugovk
|
- Deprecate `Artist.get_cover_image`, they're no longer available from Last.fm (#332)
|
||||||
|
@hugovk
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
* Fix `artist.get_bio_content()` to return `None` if bio is empty (#326) @hugovk
|
- Fix `artist.get_bio_content()` to return `None` if bio is empty (#326) @hugovk
|
||||||
|
|
||||||
|
|
||||||
## [3.2.1] - 2020-03-05
|
## [3.2.1] - 2020-03-05
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
* Only Python 3 is supported: don't create universal wheel (#318) @hugovk
|
- Only Python 3 is supported: don't create universal wheel (#318) @hugovk
|
||||||
* Fix regression calling `get_recent_tracks` with `limit=None` (#320) @hugovk
|
- Fix regression calling `get_recent_tracks` with `limit=None` (#320) @hugovk
|
||||||
* Fix `DeprecationWarning`: Please use `assertRegex` instead (#323) @hugovk
|
- Fix `DeprecationWarning`: Please use `assertRegex` instead (#323) @hugovk
|
||||||
|
|
||||||
## [3.2.0] - 2020-01-03
|
## [3.2.0] - 2020-01-03
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
* Support for Python 3.8
|
- Support for Python 3.8
|
||||||
* Store album art URLs when you call `GetTopAlbums` ([#307])
|
- Store album art URLs when you call `GetTopAlbums` ([#307])
|
||||||
* Retry paging through results on exception ([#297])
|
- Retry paging through results on exception ([#297])
|
||||||
* More error status codes from https://last.fm/api/errorcodes ([#297])
|
- More error status codes from https://last.fm/api/errorcodes ([#297])
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
* Respect `get_recent_tracks`' limit when there's a now playing track ([#310])
|
- Respect `get_recent_tracks`' limit when there's a now playing track ([#310])
|
||||||
* Move installable code to `src/` ([#301])
|
- Move installable code to `src/` ([#301])
|
||||||
* Update `get_weekly_artist_charts` docstring: only for `User` ([#311])
|
- Update `get_weekly_artist_charts` docstring: only for `User` ([#311])
|
||||||
* Remove Python 2 warnings, `python_requires` should be enough ([#312])
|
- Remove Python 2 warnings, `python_requires` should be enough ([#312])
|
||||||
* Use setuptools_scm to simplify versioning during release ([#316])
|
- Use setuptools_scm to simplify versioning during release ([#316])
|
||||||
* Various lint and test updates
|
- Various lint and test updates
|
||||||
|
|
||||||
### Deprecated
|
### Deprecated
|
||||||
|
|
||||||
* Last.fm's `user.getArtistTracks` has now been deprecated by Last.fm and is no longer
|
- Last.fm's `user.getArtistTracks` has now been deprecated by Last.fm and is no longer
|
||||||
available. Last.fm returns a "Deprecated - This type of request is no longer
|
available. Last.fm returns a "Deprecated - This type of request is no longer
|
||||||
supported" error when calling it. A future version of pylast will remove its
|
supported" error when calling it. A future version of pylast will remove its
|
||||||
`User.get_artist_tracks` altogether. ([#305])
|
`User.get_artist_tracks` altogether. ([#305])
|
||||||
|
|
||||||
* `STATUS_TOKEN_ERROR` is deprecated and will be removed in a future version.
|
- `STATUS_TOKEN_ERROR` is deprecated and will be removed in a future version. Use
|
||||||
Use `STATUS_OPERATION_FAILED` instead.
|
`STATUS_OPERATION_FAILED` instead.
|
||||||
|
|
||||||
## [3.1.0] - 2019-03-07
|
## [3.1.0] - 2019-03-07
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
* Extract username from session via new
|
- Extract username from session via new
|
||||||
`SessionKeyGenerator.get_web_auth_session_key_username` ([#290])
|
`SessionKeyGenerator.get_web_auth_session_key_username` ([#290])
|
||||||
* `User.get_track_scrobbles` ([#298])
|
- `User.get_track_scrobbles` ([#298])
|
||||||
|
|
||||||
### Deprecated
|
### Deprecated
|
||||||
|
|
||||||
* `User.get_artist_tracks`. Use `User.get_track_scrobbles` as a partial replacement.
|
- `User.get_artist_tracks`. Use `User.get_track_scrobbles` as a partial replacement.
|
||||||
([#298])
|
([#298])
|
||||||
|
|
||||||
## [3.0.0] - 2019-01-01
|
## [3.0.0] - 2019-01-01
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
* This changelog file ([#273])
|
|
||||||
|
- This changelog file ([#273])
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
|
|
||||||
* Support for Python 2.7 ([#265])
|
- Support for Python 2.7 ([#265])
|
||||||
|
|
||||||
* Constants `COVER_SMALL`, `COVER_MEDIUM`, `COVER_LARGE`, `COVER_EXTRA_LARGE`
|
- Constants `COVER_SMALL`, `COVER_MEDIUM`, `COVER_LARGE`, `COVER_EXTRA_LARGE` and
|
||||||
and `COVER_MEGA`. Use `SIZE_SMALL` etc. instead. ([#282])
|
`COVER_MEGA`. Use `SIZE_SMALL` etc. instead. ([#282])
|
||||||
|
|
||||||
## [2.4.0] - 2018-08-08
|
## [2.4.0] - 2018-08-08
|
||||||
|
|
||||||
### Deprecated
|
### Deprecated
|
||||||
|
|
||||||
* Support for Python 2.7 ([#265])
|
- Support for Python 2.7 ([#265])
|
||||||
|
|
||||||
[4.2.0]: https://github.com/pylast/pylast/compare/4.1.0...4.2.0
|
[4.2.0]: https://github.com/pylast/pylast/compare/4.1.0...4.2.0
|
||||||
[4.1.0]: https://github.com/pylast/pylast/compare/4.0.0...4.1.0
|
[4.1.0]: https://github.com/pylast/pylast/compare/4.0.0...4.1.0
|
||||||
|
|
92
README.md
92
README.md
|
@ -15,49 +15,44 @@ Use the pydoc utility for help on usage or see [tests/](tests/) for examples.
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
Install via pip:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
python3 -m pip install pylast
|
|
||||||
```
|
|
||||||
|
|
||||||
Install latest development version:
|
Install latest development version:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
python3 -m pip install -U git+https://github.com/pylast/pylast
|
python3 -m pip install -U git+https://git.hirad.it/Hirad/pylast
|
||||||
```
|
```
|
||||||
|
|
||||||
Or from requirements.txt:
|
Or from requirements.txt:
|
||||||
|
|
||||||
```txt
|
```txt
|
||||||
-e https://github.com/pylast/pylast.git#egg=pylast
|
-e https://git.hirad.it/Hirad/pylast#egg=pylast
|
||||||
```
|
```
|
||||||
|
|
||||||
Note:
|
Note:
|
||||||
|
|
||||||
* pyLast 5.1+ supports Python 3.7-3.11.
|
- pyLast 5.3+ supports Python 3.8-3.13.
|
||||||
* pyLast 5.0+ supports Python 3.7-3.10.
|
- pyLast 5.2+ supports Python 3.8-3.12.
|
||||||
* pyLast 4.3+ supports Python 3.6-3.10.
|
- pyLast 5.1 supports Python 3.7-3.11.
|
||||||
* pyLast 4.0 - 4.2 supports Python 3.6-3.9.
|
- pyLast 5.0 supports Python 3.7-3.10.
|
||||||
* pyLast 3.2 - 3.3 supports Python 3.5-3.8.
|
- pyLast 4.3 - 4.5 supports Python 3.6-3.10.
|
||||||
* pyLast 3.0 - 3.1 supports Python 3.5-3.7.
|
- pyLast 4.0 - 4.2 supports Python 3.6-3.9.
|
||||||
* pyLast 2.2 - 2.4 supports Python 2.7.10+, 3.4-3.7.
|
- pyLast 3.2 - 3.3 supports Python 3.5-3.8.
|
||||||
* pyLast 2.0 - 2.1 supports Python 2.7.10+, 3.4-3.6.
|
- pyLast 3.0 - 3.1 supports Python 3.5-3.7.
|
||||||
* pyLast 1.7 - 1.9 supports Python 2.7, 3.3-3.6.
|
- pyLast 2.2 - 2.4 supports Python 2.7.10+, 3.4-3.7.
|
||||||
* pyLast 1.0 - 1.6 supports Python 2.7, 3.3-3.4.
|
- pyLast 2.0 - 2.1 supports Python 2.7.10+, 3.4-3.6.
|
||||||
* pyLast 0.5 supports Python 2, 3.
|
- pyLast 1.7 - 1.9 supports Python 2.7, 3.3-3.6.
|
||||||
* pyLast < 0.5 supports Python 2.
|
- pyLast 1.0 - 1.6 supports Python 2.7, 3.3-3.4.
|
||||||
|
- pyLast 0.5 supports Python 2, 3.
|
||||||
|
- pyLast < 0.5 supports Python 2.
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
* Simple public interface.
|
- Simple public interface.
|
||||||
* Access to all the data exposed by the Last.fm web services.
|
- Access to all the data exposed by the Last.fm web services.
|
||||||
* Scrobbling support.
|
- Scrobbling support.
|
||||||
* Full object-oriented design.
|
- Full object-oriented design.
|
||||||
* Proxy support.
|
- Proxy support.
|
||||||
* Internal caching support for some web services calls (disabled by default).
|
- Internal caching support for some web services calls (disabled by default).
|
||||||
* Support for other API-compatible networks like Libre.fm.
|
- Support for other API-compatible networks like Libre.fm.
|
||||||
|
|
||||||
|
|
||||||
## Getting started
|
## Getting started
|
||||||
|
|
||||||
|
@ -84,7 +79,43 @@ network = pylast.LastFMNetwork(
|
||||||
username=username,
|
username=username,
|
||||||
password_hash=password_hash,
|
password_hash=password_hash,
|
||||||
)
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
Alternatively, instead of creating `network` with a username and password, you can
|
||||||
|
authenticate with a session key:
|
||||||
|
|
||||||
|
```python
|
||||||
|
import pylast
|
||||||
|
|
||||||
|
SESSION_KEY_FILE = os.path.join(os.path.expanduser("~"), ".session_key")
|
||||||
|
network = pylast.LastFMNetwork(API_KEY, API_SECRET)
|
||||||
|
if not os.path.exists(SESSION_KEY_FILE):
|
||||||
|
skg = pylast.SessionKeyGenerator(network)
|
||||||
|
url = skg.get_web_auth_url()
|
||||||
|
|
||||||
|
print(f"Please authorize this script to access your account: {url}\n")
|
||||||
|
import time
|
||||||
|
import webbrowser
|
||||||
|
|
||||||
|
webbrowser.open(url)
|
||||||
|
|
||||||
|
while True:
|
||||||
|
try:
|
||||||
|
session_key = skg.get_web_auth_session_key(url)
|
||||||
|
with open(SESSION_KEY_FILE, "w") as f:
|
||||||
|
f.write(session_key)
|
||||||
|
break
|
||||||
|
except pylast.WSError:
|
||||||
|
time.sleep(1)
|
||||||
|
else:
|
||||||
|
session_key = open(SESSION_KEY_FILE).read()
|
||||||
|
|
||||||
|
network.session_key = session_key
|
||||||
|
```
|
||||||
|
|
||||||
|
And away we go:
|
||||||
|
|
||||||
|
```python
|
||||||
# Now you can use that object everywhere
|
# Now you can use that object everywhere
|
||||||
track = network.get_track("Iron Maiden", "The Nomad")
|
track = network.get_track("Iron Maiden", "The Nomad")
|
||||||
track.love()
|
track.love()
|
||||||
|
@ -105,8 +136,9 @@ integration and unit tests with Last.fm, and plenty of code examples.
|
||||||
|
|
||||||
For integration tests you need a test account at Last.fm that will become cluttered with
|
For integration tests you need a test account at Last.fm that will become cluttered with
|
||||||
test data, and an API key and secret. Either copy
|
test data, and an API key and secret. Either copy
|
||||||
[example_test_pylast.yaml](example_test_pylast.yaml) to test_pylast.yaml and fill out
|
[example_test_pylast.yaml](https://github.com/pylast/pylast/blob/main/example_test_pylast.yaml)
|
||||||
the credentials, or set them as environment variables like:
|
to test_pylast.yaml and fill out the credentials, or set them as environment variables
|
||||||
|
like:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
export PYLAST_USERNAME=TODO_ENTER_YOURS_HERE
|
export PYLAST_USERNAME=TODO_ENTER_YOURS_HERE
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# Release Checklist
|
# Release Checklist
|
||||||
|
|
||||||
- [ ] Get `main` to the appropriate code release state.
|
- [ ] Get `main` to the appropriate code release state.
|
||||||
[GitHub Actions](https://github.com/pylast/pylast/actions) should be running cleanly for
|
[GitHub Actions](https://github.com/pylast/pylast/actions) should be running
|
||||||
all merges to `main`.
|
cleanly for all merges to `main`.
|
||||||
[](https://github.com/pylast/pylast/actions)
|
[](https://github.com/pylast/pylast/actions)
|
||||||
|
|
||||||
- [ ] Edit release draft, adjust text if needed:
|
- [ ] Edit release draft, adjust text if needed:
|
||||||
|
@ -12,7 +12,8 @@
|
||||||
|
|
||||||
- [ ] Publish release
|
- [ ] Publish release
|
||||||
|
|
||||||
- [ ] Check the tagged [GitHub Actions build](https://github.com/pylast/pylast/actions/workflows/deploy.yml)
|
- [ ] Check the tagged
|
||||||
|
[GitHub Actions build](https://github.com/pylast/pylast/actions/workflows/deploy.yml)
|
||||||
has deployed to [PyPI](https://pypi.org/project/pylast/#history)
|
has deployed to [PyPI](https://pypi.org/project/pylast/#history)
|
||||||
|
|
||||||
- [ ] Check installation:
|
- [ ] Check installation:
|
||||||
|
|
|
@ -16,46 +16,45 @@ keywords = [
|
||||||
"scrobbling",
|
"scrobbling",
|
||||||
]
|
]
|
||||||
license = { text = "Apache-2.0" }
|
license = { text = "Apache-2.0" }
|
||||||
maintainers = [{name = "Hugo van Kemenade"}]
|
maintainers = [
|
||||||
authors = [{name = "Amr Hassan <amr.hassan@gmail.com> and Contributors", email = "amr.hassan@gmail.com"}]
|
{ name = "Hugo van Kemenade" },
|
||||||
requires-python = ">=3.7"
|
|
||||||
dependencies = [
|
|
||||||
"httpx",
|
|
||||||
'importlib-metadata; python_version < "3.8"',
|
|
||||||
]
|
]
|
||||||
dynamic = [
|
authors = [
|
||||||
"version",
|
{ name = "Amr Hassan <amr.hassan@gmail.com> and Contributors", email = "amr.hassan@gmail.com" },
|
||||||
]
|
]
|
||||||
|
requires-python = ">=3.8"
|
||||||
classifiers = [
|
classifiers = [
|
||||||
"Development Status :: 5 - Production/Stable",
|
"Development Status :: 5 - Production/Stable",
|
||||||
"License :: OSI Approved :: Apache Software License",
|
"License :: OSI Approved :: Apache Software License",
|
||||||
"Programming Language :: Python :: 3",
|
|
||||||
"Programming Language :: Python :: 3 :: Only",
|
"Programming Language :: Python :: 3 :: Only",
|
||||||
"Programming Language :: Python :: 3.7",
|
|
||||||
"Programming Language :: Python :: 3.8",
|
"Programming Language :: Python :: 3.8",
|
||||||
"Programming Language :: Python :: 3.9",
|
"Programming Language :: Python :: 3.9",
|
||||||
"Programming Language :: Python :: 3.10",
|
"Programming Language :: Python :: 3.10",
|
||||||
"Programming Language :: Python :: 3.11",
|
"Programming Language :: Python :: 3.11",
|
||||||
|
"Programming Language :: Python :: 3.12",
|
||||||
|
"Programming Language :: Python :: 3.13",
|
||||||
"Programming Language :: Python :: Implementation :: CPython",
|
"Programming Language :: Python :: Implementation :: CPython",
|
||||||
"Programming Language :: Python :: Implementation :: PyPy",
|
"Programming Language :: Python :: Implementation :: PyPy",
|
||||||
"Topic :: Internet",
|
"Topic :: Internet",
|
||||||
"Topic :: Multimedia :: Sound/Audio",
|
"Topic :: Multimedia :: Sound/Audio",
|
||||||
"Topic :: Software Development :: Libraries :: Python Modules",
|
"Topic :: Software Development :: Libraries :: Python Modules",
|
||||||
]
|
]
|
||||||
[project.optional-dependencies]
|
dynamic = [
|
||||||
tests = [
|
"version",
|
||||||
|
]
|
||||||
|
dependencies = [
|
||||||
|
"httpx",
|
||||||
|
]
|
||||||
|
optional-dependencies.tests = [
|
||||||
"flaky",
|
"flaky",
|
||||||
"pytest",
|
"pytest",
|
||||||
"pytest-cov",
|
"pytest-cov",
|
||||||
"pytest-random-order",
|
"pytest-random-order",
|
||||||
"pyyaml",
|
"pyyaml",
|
||||||
]
|
]
|
||||||
|
urls.Changelog = "https://github.com/pylast/pylast/releases"
|
||||||
[project.urls]
|
urls.Homepage = "https://github.com/pylast/pylast"
|
||||||
Changelog = "https://github.com/pylast/pylast/releases"
|
urls.Source = "https://github.com/pylast/pylast"
|
||||||
Homepage = "https://github.com/pylast/pylast"
|
|
||||||
Source = "https://github.com/pylast/pylast"
|
|
||||||
|
|
||||||
|
|
||||||
[tool.hatch]
|
[tool.hatch]
|
||||||
version.source = "vcs"
|
version.source = "vcs"
|
||||||
|
@ -63,5 +62,36 @@ version.source = "vcs"
|
||||||
[tool.hatch.version.raw-options]
|
[tool.hatch.version.raw-options]
|
||||||
local_scheme = "no-local-version"
|
local_scheme = "no-local-version"
|
||||||
|
|
||||||
[tool.isort]
|
[tool.ruff]
|
||||||
profile = "black"
|
fix = true
|
||||||
|
|
||||||
|
lint.select = [
|
||||||
|
"C4", # flake8-comprehensions
|
||||||
|
"E", # pycodestyle errors
|
||||||
|
"EM", # flake8-errmsg
|
||||||
|
"F", # pyflakes errors
|
||||||
|
"I", # isort
|
||||||
|
"ISC", # flake8-implicit-str-concat
|
||||||
|
"LOG", # flake8-logging
|
||||||
|
"PGH", # pygrep-hooks
|
||||||
|
"RUF022", # unsorted-dunder-all
|
||||||
|
"RUF100", # unused noqa (yesqa)
|
||||||
|
"UP", # pyupgrade
|
||||||
|
"W", # pycodestyle warnings
|
||||||
|
"YTT", # flake8-2020
|
||||||
|
]
|
||||||
|
lint.extend-ignore = [
|
||||||
|
"E203", # Whitespace before ':'
|
||||||
|
"E221", # Multiple spaces before operator
|
||||||
|
"E226", # Missing whitespace around arithmetic operator
|
||||||
|
"E241", # Multiple spaces after ','
|
||||||
|
]
|
||||||
|
lint.isort.known-first-party = [
|
||||||
|
"pylast",
|
||||||
|
]
|
||||||
|
lint.isort.required-imports = [
|
||||||
|
"from __future__ import annotations",
|
||||||
|
]
|
||||||
|
|
||||||
|
[tool.pyproject-fmt]
|
||||||
|
max_supported_python = "3.13"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#
|
#
|
||||||
# pylast -
|
# pylast -
|
||||||
# A Python interface to Last.fm and Libre.fm
|
# A Python interface to Last.fm and music.lonestar.it
|
||||||
#
|
#
|
||||||
# Copyright 2008-2010 Amr Hassan
|
# Copyright 2008-2010 Amr Hassan
|
||||||
# Copyright 2013-2021 hugovk
|
# Copyright 2013-2021 hugovk
|
||||||
|
@ -23,6 +23,7 @@ from __future__ import annotations
|
||||||
import collections
|
import collections
|
||||||
import hashlib
|
import hashlib
|
||||||
import html.entities
|
import html.entities
|
||||||
|
import importlib.metadata
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
@ -36,18 +37,11 @@ from xml.dom import Node, minidom
|
||||||
|
|
||||||
import httpx
|
import httpx
|
||||||
|
|
||||||
try:
|
|
||||||
# Python 3.8+
|
|
||||||
import importlib.metadata as importlib_metadata
|
|
||||||
except ImportError:
|
|
||||||
# Python 3.7 and lower
|
|
||||||
import importlib_metadata # type: ignore
|
|
||||||
|
|
||||||
__author__ = "Amr Hassan, hugovk, Mice Pápai"
|
__author__ = "Amr Hassan, hugovk, Mice Pápai"
|
||||||
__copyright__ = "Copyright (C) 2008-2010 Amr Hassan, 2013-2021 hugovk, 2017 Mice Pápai"
|
__copyright__ = "Copyright (C) 2008-2010 Amr Hassan, 2013-2021 hugovk, 2017 Mice Pápai"
|
||||||
__license__ = "apache2"
|
__license__ = "apache2"
|
||||||
__email__ = "amr.hassan@gmail.com"
|
__email__ = "amr.hassan@gmail.com"
|
||||||
__version__ = importlib_metadata.version(__name__)
|
__version__ = importlib.metadata.version(__name__)
|
||||||
|
|
||||||
|
|
||||||
# 1 : This error does not exist
|
# 1 : This error does not exist
|
||||||
|
@ -535,26 +529,25 @@ class _Network:
|
||||||
|
|
||||||
def scrobble(
|
def scrobble(
|
||||||
self,
|
self,
|
||||||
artist,
|
artist: str,
|
||||||
title,
|
title: str,
|
||||||
timestamp,
|
timestamp: int,
|
||||||
album=None,
|
album: str | None = None,
|
||||||
album_artist=None,
|
album_artist: str | None = None,
|
||||||
track_number=None,
|
track_number: int | None = None,
|
||||||
duration=None,
|
duration: int | None = None,
|
||||||
stream_id=None,
|
stream_id: str | None = None,
|
||||||
context=None,
|
context: str | None = None,
|
||||||
mbid=None,
|
mbid: str | None = None,
|
||||||
):
|
):
|
||||||
|
|
||||||
"""Used to add a track-play to a user's profile.
|
"""Used to add a track-play to a user's profile.
|
||||||
|
|
||||||
Parameters:
|
Parameters:
|
||||||
artist (Required) : The artist name.
|
artist (Required) : The artist name.
|
||||||
title (Required) : The track name.
|
title (Required) : The track name.
|
||||||
timestamp (Required) : The time the track started playing, in UNIX
|
timestamp (Required) : The time the track started playing, in Unix
|
||||||
timestamp format (integer number of seconds since 00:00:00,
|
timestamp format (integer number of seconds since 00:00:00,
|
||||||
January 1st 1970 UTC). This must be in the UTC time zone.
|
January 1st 1970 UTC).
|
||||||
album (Optional) : The album name.
|
album (Optional) : The album name.
|
||||||
album_artist (Optional) : The album artist - if this differs from
|
album_artist (Optional) : The album artist - if this differs from
|
||||||
the track artist.
|
the track artist.
|
||||||
|
@ -600,7 +593,6 @@ class _Network:
|
||||||
|
|
||||||
params = {}
|
params = {}
|
||||||
for i in range(len(tracks_to_scrobble)):
|
for i in range(len(tracks_to_scrobble)):
|
||||||
|
|
||||||
params[f"artist[{i}]"] = tracks_to_scrobble[i]["artist"]
|
params[f"artist[{i}]"] = tracks_to_scrobble[i]["artist"]
|
||||||
params[f"track[{i}]"] = tracks_to_scrobble[i]["title"]
|
params[f"track[{i}]"] = tracks_to_scrobble[i]["title"]
|
||||||
|
|
||||||
|
@ -621,7 +613,6 @@ class _Network:
|
||||||
}
|
}
|
||||||
|
|
||||||
for arg in additional_args:
|
for arg in additional_args:
|
||||||
|
|
||||||
if arg in tracks_to_scrobble[i] and tracks_to_scrobble[i][arg]:
|
if arg in tracks_to_scrobble[i] and tracks_to_scrobble[i][arg]:
|
||||||
if arg in args_map_to:
|
if arg in args_map_to:
|
||||||
maps_to = args_map_to[arg]
|
maps_to = args_map_to[arg]
|
||||||
|
@ -637,7 +628,6 @@ class _Network:
|
||||||
|
|
||||||
|
|
||||||
class LastFMNetwork(_Network):
|
class LastFMNetwork(_Network):
|
||||||
|
|
||||||
"""A Last.fm network object
|
"""A Last.fm network object
|
||||||
|
|
||||||
api_key: a provided API_KEY
|
api_key: a provided API_KEY
|
||||||
|
@ -715,7 +705,7 @@ class LastFMNetwork(_Network):
|
||||||
|
|
||||||
class LibreFMNetwork(_Network):
|
class LibreFMNetwork(_Network):
|
||||||
"""
|
"""
|
||||||
A preconfigured _Network object for Libre.fm
|
A preconfigured _Network object for music.lonestar.it
|
||||||
|
|
||||||
api_key: a provided API_KEY
|
api_key: a provided API_KEY
|
||||||
api_secret: a provided API_SECRET
|
api_secret: a provided API_SECRET
|
||||||
|
@ -736,29 +726,28 @@ class LibreFMNetwork(_Network):
|
||||||
username: str = "",
|
username: str = "",
|
||||||
password_hash: str = "",
|
password_hash: str = "",
|
||||||
) -> None:
|
) -> None:
|
||||||
|
|
||||||
super().__init__(
|
super().__init__(
|
||||||
name="Libre.fm",
|
name="music.lonestar.it",
|
||||||
homepage="https://libre.fm",
|
homepage="https://music.lonestar.it",
|
||||||
ws_server=("libre.fm", "/2.0/"),
|
ws_server=("music.lonestar.it", "/2.0/"),
|
||||||
api_key=api_key,
|
api_key=api_key,
|
||||||
api_secret=api_secret,
|
api_secret=api_secret,
|
||||||
session_key=session_key,
|
session_key=session_key,
|
||||||
username=username,
|
username=username,
|
||||||
password_hash=password_hash,
|
password_hash=password_hash,
|
||||||
domain_names={
|
domain_names={
|
||||||
DOMAIN_ENGLISH: "libre.fm",
|
DOMAIN_ENGLISH: "music.lonestar.it",
|
||||||
DOMAIN_GERMAN: "libre.fm",
|
DOMAIN_GERMAN: "music.lonestar.it",
|
||||||
DOMAIN_SPANISH: "libre.fm",
|
DOMAIN_SPANISH: "music.lonestar.it",
|
||||||
DOMAIN_FRENCH: "libre.fm",
|
DOMAIN_FRENCH: "music.lonestar.it",
|
||||||
DOMAIN_ITALIAN: "libre.fm",
|
DOMAIN_ITALIAN: "music.lonestar.it",
|
||||||
DOMAIN_POLISH: "libre.fm",
|
DOMAIN_POLISH: "music.lonestar.it",
|
||||||
DOMAIN_PORTUGUESE: "libre.fm",
|
DOMAIN_PORTUGUESE: "music.lonestar.it",
|
||||||
DOMAIN_SWEDISH: "libre.fm",
|
DOMAIN_SWEDISH: "music.lonestar.it",
|
||||||
DOMAIN_TURKISH: "libre.fm",
|
DOMAIN_TURKISH: "music.lonestar.it",
|
||||||
DOMAIN_RUSSIAN: "libre.fm",
|
DOMAIN_RUSSIAN: "music.lonestar.it",
|
||||||
DOMAIN_JAPANESE: "libre.fm",
|
DOMAIN_JAPANESE: "music.lonestar.it",
|
||||||
DOMAIN_CHINESE: "libre.fm",
|
DOMAIN_CHINESE: "music.lonestar.it",
|
||||||
},
|
},
|
||||||
urls={
|
urls={
|
||||||
"album": "artist/%(artist)s/album/%(album)s",
|
"album": "artist/%(artist)s/album/%(album)s",
|
||||||
|
@ -904,6 +893,7 @@ class _Request:
|
||||||
username = "" if username is None else f"?username={username}"
|
username = "" if username is None else f"?username={username}"
|
||||||
|
|
||||||
(host_name, host_subdir) = self.network.ws_server
|
(host_name, host_subdir) = self.network.ws_server
|
||||||
|
timeout = httpx.Timeout(5, read=10)
|
||||||
|
|
||||||
if self.network.is_proxy_enabled():
|
if self.network.is_proxy_enabled():
|
||||||
client = httpx.Client(
|
client = httpx.Client(
|
||||||
|
@ -911,12 +901,14 @@ class _Request:
|
||||||
base_url=f"https://{host_name}",
|
base_url=f"https://{host_name}",
|
||||||
headers=HEADERS,
|
headers=HEADERS,
|
||||||
proxies=self.network.proxy,
|
proxies=self.network.proxy,
|
||||||
|
timeout=timeout,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
client = httpx.Client(
|
client = httpx.Client(
|
||||||
verify=SSL_CONTEXT,
|
verify=SSL_CONTEXT,
|
||||||
base_url=f"https://{host_name}",
|
base_url=f"https://{host_name}",
|
||||||
headers=HEADERS,
|
headers=HEADERS,
|
||||||
|
timeout=timeout,
|
||||||
)
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -1166,7 +1158,7 @@ class _BaseObject:
|
||||||
|
|
||||||
def get_wiki_published_date(self):
|
def get_wiki_published_date(self):
|
||||||
"""
|
"""
|
||||||
Returns the summary of the wiki.
|
Returns the date on which the wiki was published.
|
||||||
Only for Album/Track.
|
Only for Album/Track.
|
||||||
"""
|
"""
|
||||||
return self.get_wiki("published")
|
return self.get_wiki("published")
|
||||||
|
@ -1180,7 +1172,7 @@ class _BaseObject:
|
||||||
|
|
||||||
def get_wiki_content(self):
|
def get_wiki_content(self):
|
||||||
"""
|
"""
|
||||||
Returns the summary of the wiki.
|
Returns the content of the wiki.
|
||||||
Only for Album/Track.
|
Only for Album/Track.
|
||||||
"""
|
"""
|
||||||
return self.get_wiki("content")
|
return self.get_wiki("content")
|
||||||
|
@ -1250,8 +1242,10 @@ class _Chartable(_BaseObject):
|
||||||
from_date value to the to_date value.
|
from_date value to the to_date value.
|
||||||
chart_kind should be one of "album", "artist" or "track"
|
chart_kind should be one of "album", "artist" or "track"
|
||||||
"""
|
"""
|
||||||
|
import sys
|
||||||
|
|
||||||
method = ".getWeekly" + chart_kind.title() + "Chart"
|
method = ".getWeekly" + chart_kind.title() + "Chart"
|
||||||
chart_type = eval(chart_kind.title()) # string to type
|
chart_type = getattr(sys.modules[__name__], chart_kind.title())
|
||||||
|
|
||||||
params = self._get_params()
|
params = self._get_params()
|
||||||
if from_date and to_date:
|
if from_date and to_date:
|
||||||
|
@ -1363,11 +1357,11 @@ class _Taggable(_BaseObject):
|
||||||
new_tags.append(tag)
|
new_tags.append(tag)
|
||||||
|
|
||||||
for i in range(0, len(old_tags)):
|
for i in range(0, len(old_tags)):
|
||||||
if not c_old_tags[i] in c_new_tags:
|
if c_old_tags[i] not in c_new_tags:
|
||||||
to_remove.append(old_tags[i])
|
to_remove.append(old_tags[i])
|
||||||
|
|
||||||
for i in range(0, len(new_tags)):
|
for i in range(0, len(new_tags)):
|
||||||
if not c_new_tags[i] in c_old_tags:
|
if c_new_tags[i] not in c_old_tags:
|
||||||
to_add.append(new_tags[i])
|
to_add.append(new_tags[i])
|
||||||
|
|
||||||
self.remove_tags(to_remove)
|
self.remove_tags(to_remove)
|
||||||
|
@ -1515,7 +1509,7 @@ class _Opus(_Taggable):
|
||||||
return f"{self.get_artist().get_name()} - {self.get_title()}"
|
return f"{self.get_artist().get_name()} - {self.get_title()}"
|
||||||
|
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
if type(self) != type(other):
|
if type(self) is not type(other):
|
||||||
return False
|
return False
|
||||||
a = self.get_title().lower()
|
a = self.get_title().lower()
|
||||||
b = other.get_title().lower()
|
b = other.get_title().lower()
|
||||||
|
@ -1553,7 +1547,7 @@ class _Opus(_Taggable):
|
||||||
return self.info["image"][size]
|
return self.info["image"][size]
|
||||||
|
|
||||||
def get_title(self, properly_capitalized: bool = False):
|
def get_title(self, properly_capitalized: bool = False):
|
||||||
"""Returns the artist or track title."""
|
"""Returns the album or track title."""
|
||||||
if properly_capitalized:
|
if properly_capitalized:
|
||||||
self.title = _extract(
|
self.title = _extract(
|
||||||
self._request(self.ws_prefix + ".getInfo", True), "name"
|
self._request(self.ws_prefix + ".getInfo", True), "name"
|
||||||
|
@ -2305,8 +2299,8 @@ class User(_Chartable):
|
||||||
self,
|
self,
|
||||||
limit: int = 10,
|
limit: int = 10,
|
||||||
cacheable: bool = True,
|
cacheable: bool = True,
|
||||||
time_from=None,
|
time_from: int | None = None,
|
||||||
time_to=None,
|
time_to: int | None = None,
|
||||||
stream: bool = False,
|
stream: bool = False,
|
||||||
now_playing: bool = False,
|
now_playing: bool = False,
|
||||||
):
|
):
|
||||||
|
@ -2317,13 +2311,11 @@ class User(_Chartable):
|
||||||
Parameters:
|
Parameters:
|
||||||
limit : If None, it will try to pull all the available data.
|
limit : If None, it will try to pull all the available data.
|
||||||
from (Optional) : Beginning timestamp of a range - only display
|
from (Optional) : Beginning timestamp of a range - only display
|
||||||
scrobbles after this time, in UNIX timestamp format (integer
|
scrobbles after this time, in Unix timestamp format (integer
|
||||||
number of seconds since 00:00:00, January 1st 1970 UTC). This
|
number of seconds since 00:00:00, January 1st 1970 UTC).
|
||||||
must be in the UTC time zone.
|
|
||||||
to (Optional) : End timestamp of a range - only display scrobbles
|
to (Optional) : End timestamp of a range - only display scrobbles
|
||||||
before this time, in UNIX timestamp format (integer number of
|
before this time, in Unix timestamp format (integer number of
|
||||||
seconds since 00:00:00, January 1st 1970 UTC). This must be in
|
seconds since 00:00:00, January 1st 1970 UTC).
|
||||||
the UTC time zone.
|
|
||||||
stream: If True, it will yield tracks as soon as a page has been retrieved.
|
stream: If True, it will yield tracks as soon as a page has been retrieved.
|
||||||
|
|
||||||
This method uses caching. Enable caching only if you're pulling a
|
This method uses caching. Enable caching only if you're pulling a
|
||||||
|
@ -2392,7 +2384,7 @@ class User(_Chartable):
|
||||||
return _extract(doc, "registered")
|
return _extract(doc, "registered")
|
||||||
|
|
||||||
def get_unixtime_registered(self):
|
def get_unixtime_registered(self):
|
||||||
"""Returns the user's registration date as a UNIX timestamp."""
|
"""Returns the user's registration date as a Unix timestamp."""
|
||||||
|
|
||||||
doc = self._request(self.ws_prefix + ".getInfo", True)
|
doc = self._request(self.ws_prefix + ".getInfo", True)
|
||||||
|
|
||||||
|
@ -2787,7 +2779,8 @@ def _collect_nodes(
|
||||||
main.getAttribute("totalPages") or main.getAttribute("totalpages")
|
main.getAttribute("totalPages") or main.getAttribute("totalpages")
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
raise PyLastError("No total pages attribute")
|
msg = "No total pages attribute"
|
||||||
|
raise PyLastError(msg)
|
||||||
|
|
||||||
for node in main.childNodes:
|
for node in main.childNodes:
|
||||||
if not node.nodeType == xml.dom.Node.TEXT_NODE and (
|
if not node.nodeType == xml.dom.Node.TEXT_NODE and (
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
"""
|
"""
|
||||||
Integration (not unit) tests for pylast.py
|
Integration (not unit) tests for pylast.py
|
||||||
"""
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import pylast
|
import pylast
|
||||||
|
|
||||||
from .test_pylast import TestPyLastWithLastFm
|
from .test_pylast import TestPyLastWithLastFm
|
||||||
|
@ -94,8 +96,8 @@ class TestPyLastAlbum(TestPyLastWithLastFm):
|
||||||
image = album.get_cover_image()
|
image = album.get_cover_image()
|
||||||
|
|
||||||
# Assert
|
# Assert
|
||||||
self.assert_startswith(image, "https://")
|
assert image.startswith("https://")
|
||||||
self.assert_endswith(image, ".gif")
|
assert image.endswith(".gif") or image.endswith(".png")
|
||||||
|
|
||||||
def test_mbid(self) -> None:
|
def test_mbid(self) -> None:
|
||||||
# Arrange
|
# Arrange
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
"""
|
"""
|
||||||
Integration (not unit) tests for pylast.py
|
Integration (not unit) tests for pylast.py
|
||||||
"""
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
import pylast
|
import pylast
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
"""
|
"""
|
||||||
Integration (not unit) tests for pylast.py
|
Integration (not unit) tests for pylast.py
|
||||||
"""
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import pylast
|
import pylast
|
||||||
|
|
||||||
from .test_pylast import TestPyLastWithLastFm
|
from .test_pylast import TestPyLastWithLastFm
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
"""
|
"""
|
||||||
Integration (not unit) tests for pylast.py
|
Integration (not unit) tests for pylast.py
|
||||||
"""
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import pylast
|
import pylast
|
||||||
|
|
||||||
from .test_pylast import TestPyLastWithLastFm
|
from .test_pylast import TestPyLastWithLastFm
|
||||||
|
@ -16,7 +18,7 @@ class TestPyLastLibrary(TestPyLastWithLastFm):
|
||||||
representation = repr(library)
|
representation = repr(library)
|
||||||
|
|
||||||
# Assert
|
# Assert
|
||||||
self.assert_startswith(representation, "pylast.Library(")
|
assert representation.startswith("pylast.Library(")
|
||||||
|
|
||||||
def test_str(self) -> None:
|
def test_str(self) -> None:
|
||||||
# Arrange
|
# Arrange
|
||||||
|
@ -26,7 +28,7 @@ class TestPyLastLibrary(TestPyLastWithLastFm):
|
||||||
string = str(library)
|
string = str(library)
|
||||||
|
|
||||||
# Assert
|
# Assert
|
||||||
self.assert_endswith(string, "'s Library")
|
assert string.endswith("'s Library")
|
||||||
|
|
||||||
def test_library_is_hashable(self) -> None:
|
def test_library_is_hashable(self) -> None:
|
||||||
# Arrange
|
# Arrange
|
||||||
|
|
|
@ -2,15 +2,17 @@
|
||||||
"""
|
"""
|
||||||
Integration (not unit) tests for pylast.py
|
Integration (not unit) tests for pylast.py
|
||||||
"""
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
from flaky import flaky
|
from flaky import flaky
|
||||||
|
|
||||||
import pylast
|
import pylast
|
||||||
|
|
||||||
from .test_pylast import PyLastTestCase, load_secrets
|
from .test_pylast import load_secrets
|
||||||
|
|
||||||
|
|
||||||
@flaky(max_runs=3, min_passes=1)
|
@flaky(max_runs=3, min_passes=1)
|
||||||
class TestPyLastWithLibreFm(PyLastTestCase):
|
class TestPyLastWithLibreFm:
|
||||||
"""Own class for Libre.fm because we don't need the Last.fm setUp"""
|
"""Own class for Libre.fm because we don't need the Last.fm setUp"""
|
||||||
|
|
||||||
def test_libre_fm(self) -> None:
|
def test_libre_fm(self) -> None:
|
||||||
|
@ -38,4 +40,4 @@ class TestPyLastWithLibreFm(PyLastTestCase):
|
||||||
representation = repr(network)
|
representation = repr(network)
|
||||||
|
|
||||||
# Assert
|
# Assert
|
||||||
self.assert_startswith(representation, "pylast.LibreFMNetwork(")
|
assert representation.startswith("pylast.LibreFMNetwork(")
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
"""
|
"""
|
||||||
Integration (not unit) tests for pylast.py
|
Integration (not unit) tests for pylast.py
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import re
|
import re
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
@ -330,12 +333,12 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
|
||||||
# Assert
|
# Assert
|
||||||
assert len(images) == 4
|
assert len(images) == 4
|
||||||
|
|
||||||
self.assert_startswith(images[pylast.SIZE_SMALL], "https://")
|
assert images[pylast.SIZE_SMALL].startswith("https://")
|
||||||
self.assert_endswith(images[pylast.SIZE_SMALL], ".png")
|
assert images[pylast.SIZE_SMALL].endswith(".png")
|
||||||
assert "/34s/" in images[pylast.SIZE_SMALL]
|
assert "/34s/" in images[pylast.SIZE_SMALL]
|
||||||
|
|
||||||
self.assert_startswith(images[pylast.SIZE_EXTRA_LARGE], "https://")
|
assert images[pylast.SIZE_EXTRA_LARGE].startswith("https://")
|
||||||
self.assert_endswith(images[pylast.SIZE_EXTRA_LARGE], ".png")
|
assert images[pylast.SIZE_EXTRA_LARGE].endswith(".png")
|
||||||
assert "/300x300/" in images[pylast.SIZE_EXTRA_LARGE]
|
assert "/300x300/" in images[pylast.SIZE_EXTRA_LARGE]
|
||||||
|
|
||||||
def test_artist_search(self) -> None:
|
def test_artist_search(self) -> None:
|
||||||
|
@ -362,12 +365,12 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
|
||||||
# Assert
|
# Assert
|
||||||
assert len(images) == 5
|
assert len(images) == 5
|
||||||
|
|
||||||
self.assert_startswith(images[pylast.SIZE_SMALL], "https://")
|
assert images[pylast.SIZE_SMALL].startswith("https://")
|
||||||
self.assert_endswith(images[pylast.SIZE_SMALL], ".png")
|
assert images[pylast.SIZE_SMALL].endswith(".png")
|
||||||
assert "/34s/" in images[pylast.SIZE_SMALL]
|
assert "/34s/" in images[pylast.SIZE_SMALL]
|
||||||
|
|
||||||
self.assert_startswith(images[pylast.SIZE_EXTRA_LARGE], "https://")
|
assert images[pylast.SIZE_EXTRA_LARGE].startswith("https://")
|
||||||
self.assert_endswith(images[pylast.SIZE_EXTRA_LARGE], ".png")
|
assert images[pylast.SIZE_EXTRA_LARGE].endswith(".png")
|
||||||
assert "/300x300/" in images[pylast.SIZE_EXTRA_LARGE]
|
assert "/300x300/" in images[pylast.SIZE_EXTRA_LARGE]
|
||||||
|
|
||||||
def test_track_search(self) -> None:
|
def test_track_search(self) -> None:
|
||||||
|
@ -396,12 +399,12 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
|
||||||
# Assert
|
# Assert
|
||||||
assert len(images) == 4
|
assert len(images) == 4
|
||||||
|
|
||||||
self.assert_startswith(images[pylast.SIZE_SMALL], "https://")
|
assert images[pylast.SIZE_SMALL].startswith("https://")
|
||||||
self.assert_endswith(images[pylast.SIZE_SMALL], ".png")
|
assert images[pylast.SIZE_SMALL].endswith(".png")
|
||||||
assert "/34s/" in images[pylast.SIZE_SMALL]
|
assert "/34s/" in images[pylast.SIZE_SMALL]
|
||||||
|
|
||||||
self.assert_startswith(images[pylast.SIZE_EXTRA_LARGE], "https://")
|
assert images[pylast.SIZE_EXTRA_LARGE].startswith("https://")
|
||||||
self.assert_endswith(images[pylast.SIZE_EXTRA_LARGE], ".png")
|
assert images[pylast.SIZE_EXTRA_LARGE].endswith(".png")
|
||||||
assert "/300x300/" in images[pylast.SIZE_EXTRA_LARGE]
|
assert "/300x300/" in images[pylast.SIZE_EXTRA_LARGE]
|
||||||
|
|
||||||
def test_search_get_total_result_count(self) -> None:
|
def test_search_get_total_result_count(self) -> None:
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
"""
|
"""
|
||||||
Integration (not unit) tests for pylast.py
|
Integration (not unit) tests for pylast.py
|
||||||
"""
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
@ -32,25 +34,17 @@ def load_secrets(): # pragma: no cover
|
||||||
return doc
|
return doc
|
||||||
|
|
||||||
|
|
||||||
class PyLastTestCase:
|
|
||||||
def assert_startswith(self, s, prefix, start=None, end=None) -> None:
|
|
||||||
assert s.startswith(prefix, start, end)
|
|
||||||
|
|
||||||
def assert_endswith(self, s, suffix, start=None, end=None) -> None:
|
|
||||||
assert s.endswith(suffix, start, end)
|
|
||||||
|
|
||||||
|
|
||||||
def _no_xfail_rerun_filter(err, name, test, plugin) -> bool:
|
def _no_xfail_rerun_filter(err, name, test, plugin) -> bool:
|
||||||
for _ in test.iter_markers(name="xfail"):
|
for _ in test.iter_markers(name="xfail"):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
@flaky(max_runs=3, min_passes=1, rerun_filter=_no_xfail_rerun_filter)
|
@flaky(max_runs=3, min_passes=1, rerun_filter=_no_xfail_rerun_filter)
|
||||||
class TestPyLastWithLastFm(PyLastTestCase):
|
class TestPyLastWithLastFm:
|
||||||
|
|
||||||
secrets = None
|
secrets = None
|
||||||
|
|
||||||
def unix_timestamp(self):
|
@staticmethod
|
||||||
|
def unix_timestamp() -> int:
|
||||||
return int(time.time())
|
return int(time.time())
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
@ -71,7 +65,8 @@ class TestPyLastWithLastFm(PyLastTestCase):
|
||||||
password_hash=password_hash,
|
password_hash=password_hash,
|
||||||
)
|
)
|
||||||
|
|
||||||
def helper_is_thing_hashable(self, thing) -> None:
|
@staticmethod
|
||||||
|
def helper_is_thing_hashable(thing) -> None:
|
||||||
# Arrange
|
# Arrange
|
||||||
things = set()
|
things = set()
|
||||||
|
|
||||||
|
@ -82,7 +77,8 @@ class TestPyLastWithLastFm(PyLastTestCase):
|
||||||
assert thing is not None
|
assert thing is not None
|
||||||
assert len(things) == 1
|
assert len(things) == 1
|
||||||
|
|
||||||
def helper_validate_results(self, a, b, c) -> None:
|
@staticmethod
|
||||||
|
def helper_validate_results(a, b, c) -> None:
|
||||||
# Assert
|
# Assert
|
||||||
assert a is not None
|
assert a is not None
|
||||||
assert b is not None
|
assert b is not None
|
||||||
|
@ -106,27 +102,31 @@ class TestPyLastWithLastFm(PyLastTestCase):
|
||||||
# Assert
|
# Assert
|
||||||
self.helper_validate_results(result1, result2, result3)
|
self.helper_validate_results(result1, result2, result3)
|
||||||
|
|
||||||
def helper_at_least_one_thing_in_top_list(self, things, expected_type) -> None:
|
@staticmethod
|
||||||
|
def helper_at_least_one_thing_in_top_list(things, expected_type) -> None:
|
||||||
# Assert
|
# Assert
|
||||||
assert len(things) > 1
|
assert len(things) > 1
|
||||||
assert isinstance(things, list)
|
assert isinstance(things, list)
|
||||||
assert isinstance(things[0], pylast.TopItem)
|
assert isinstance(things[0], pylast.TopItem)
|
||||||
assert isinstance(things[0].item, expected_type)
|
assert isinstance(things[0].item, expected_type)
|
||||||
|
|
||||||
def helper_only_one_thing_in_top_list(self, things, expected_type) -> None:
|
@staticmethod
|
||||||
|
def helper_only_one_thing_in_top_list(things, expected_type) -> None:
|
||||||
# Assert
|
# Assert
|
||||||
assert len(things) == 1
|
assert len(things) == 1
|
||||||
assert isinstance(things, list)
|
assert isinstance(things, list)
|
||||||
assert isinstance(things[0], pylast.TopItem)
|
assert isinstance(things[0], pylast.TopItem)
|
||||||
assert isinstance(things[0].item, expected_type)
|
assert isinstance(things[0].item, expected_type)
|
||||||
|
|
||||||
def helper_only_one_thing_in_list(self, things, expected_type) -> None:
|
@staticmethod
|
||||||
|
def helper_only_one_thing_in_list(things, expected_type) -> None:
|
||||||
# Assert
|
# Assert
|
||||||
assert len(things) == 1
|
assert len(things) == 1
|
||||||
assert isinstance(things, list)
|
assert isinstance(things, list)
|
||||||
assert isinstance(things[0], expected_type)
|
assert isinstance(things[0], expected_type)
|
||||||
|
|
||||||
def helper_two_different_things_in_top_list(self, things, expected_type) -> None:
|
@staticmethod
|
||||||
|
def helper_two_different_things_in_top_list(things, expected_type) -> None:
|
||||||
# Assert
|
# Assert
|
||||||
assert len(things) == 2
|
assert len(things) == 2
|
||||||
thing1 = things[0]
|
thing1 = things[0]
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
"""
|
"""
|
||||||
Integration (not unit) tests for pylast.py
|
Integration (not unit) tests for pylast.py
|
||||||
"""
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import pylast
|
import pylast
|
||||||
|
|
||||||
from .test_pylast import TestPyLastWithLastFm
|
from .test_pylast import TestPyLastWithLastFm
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
"""
|
"""
|
||||||
Integration (not unit) tests for pylast.py
|
Integration (not unit) tests for pylast.py
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import time
|
import time
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
@ -135,11 +138,7 @@ class TestPyLastTrack(TestPyLastWithLastFm):
|
||||||
similar = track.get_similar()
|
similar = track.get_similar()
|
||||||
|
|
||||||
# Assert
|
# Assert
|
||||||
found = False
|
found = any(str(track.item) == "Cher - Strong Enough" for track in similar)
|
||||||
for track in similar:
|
|
||||||
if str(track.item) == "Madonna - Vogue":
|
|
||||||
found = True
|
|
||||||
break
|
|
||||||
assert found
|
assert found
|
||||||
|
|
||||||
def test_track_get_similar_limits(self) -> None:
|
def test_track_get_similar_limits(self) -> None:
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
"""
|
"""
|
||||||
Integration (not unit) tests for pylast.py
|
Integration (not unit) tests for pylast.py
|
||||||
"""
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import calendar
|
import calendar
|
||||||
import datetime as dt
|
import datetime as dt
|
||||||
import inspect
|
import inspect
|
||||||
|
@ -24,7 +26,7 @@ class TestPyLastUser(TestPyLastWithLastFm):
|
||||||
representation = repr(user)
|
representation = repr(user)
|
||||||
|
|
||||||
# Assert
|
# Assert
|
||||||
self.assert_startswith(representation, "pylast.User('RJ',")
|
assert representation.startswith("pylast.User('RJ',")
|
||||||
|
|
||||||
def test_str(self) -> None:
|
def test_str(self) -> None:
|
||||||
# Arrange
|
# Arrange
|
||||||
|
@ -345,7 +347,7 @@ class TestPyLastUser(TestPyLastWithLastFm):
|
||||||
url = user.get_image()
|
url = user.get_image()
|
||||||
|
|
||||||
# Assert
|
# Assert
|
||||||
self.assert_startswith(url, "https://")
|
assert url.startswith("https://")
|
||||||
|
|
||||||
def test_user_get_library(self) -> None:
|
def test_user_get_library(self) -> None:
|
||||||
# Arrange
|
# Arrange
|
||||||
|
@ -428,8 +430,8 @@ class TestPyLastUser(TestPyLastWithLastFm):
|
||||||
image = user.get_image()
|
image = user.get_image()
|
||||||
|
|
||||||
# Assert
|
# Assert
|
||||||
self.assert_startswith(image, "https://")
|
assert image.startswith("https://")
|
||||||
self.assert_endswith(image, ".png")
|
assert image.endswith(".png")
|
||||||
|
|
||||||
def test_get_url(self) -> None:
|
def test_get_url(self) -> None:
|
||||||
# Arrange
|
# Arrange
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
@ -25,7 +27,7 @@ def test_get_cache_key(artist) -> None:
|
||||||
|
|
||||||
@pytest.mark.parametrize("obj", [pylast.Artist("B\xe9l", mock_network())])
|
@pytest.mark.parametrize("obj", [pylast.Artist("B\xe9l", mock_network())])
|
||||||
def test_cast_and_hash(obj) -> None:
|
def test_cast_and_hash(obj) -> None:
|
||||||
assert type(str(obj)) is str
|
assert isinstance(str(obj), str)
|
||||||
assert isinstance(hash(obj), int)
|
assert isinstance(hash(obj), int)
|
||||||
|
|
||||||
|
|
||||||
|
|
26
tox.ini
26
tox.ini
|
@ -1,27 +1,35 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist =
|
requires =
|
||||||
|
tox>=4.2
|
||||||
|
env_list =
|
||||||
lint
|
lint
|
||||||
py{py3, 311, 310, 39, 38, 37}
|
py{py3, 313, 312, 311, 310, 39, 38}
|
||||||
isolated_build = true
|
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
passenv =
|
extras =
|
||||||
|
tests
|
||||||
|
pass_env =
|
||||||
FORCE_COLOR
|
FORCE_COLOR
|
||||||
PYLAST_API_KEY
|
PYLAST_API_KEY
|
||||||
PYLAST_API_SECRET
|
PYLAST_API_SECRET
|
||||||
PYLAST_PASSWORD_HASH
|
PYLAST_PASSWORD_HASH
|
||||||
PYLAST_USERNAME
|
PYLAST_USERNAME
|
||||||
extras =
|
|
||||||
tests
|
|
||||||
commands =
|
commands =
|
||||||
pytest -v -s -W all --cov pylast --cov tests --cov-report term-missing --cov-report xml --random-order {posargs}
|
{envpython} -m pytest -v -s -W all \
|
||||||
|
--cov pylast \
|
||||||
|
--cov tests \
|
||||||
|
--cov-report html \
|
||||||
|
--cov-report term-missing \
|
||||||
|
--cov-report xml \
|
||||||
|
--random-order \
|
||||||
|
{posargs}
|
||||||
|
|
||||||
[testenv:lint]
|
[testenv:lint]
|
||||||
passenv =
|
|
||||||
PRE_COMMIT_COLOR
|
|
||||||
skip_install = true
|
skip_install = true
|
||||||
deps =
|
deps =
|
||||||
pre-commit
|
pre-commit
|
||||||
|
pass_env =
|
||||||
|
PRE_COMMIT_COLOR
|
||||||
commands =
|
commands =
|
||||||
pre-commit run --all-files --show-diff-on-failure
|
pre-commit run --all-files --show-diff-on-failure
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue