From 4c5f20b4d7304dcbff35a46da418464ffd533fd1 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Sun, 17 Nov 2024 14:30:35 +0000 Subject: [PATCH 1/9] fix: skilljson (#22) --- locale/en-us/skill.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 locale/en-us/skill.json diff --git a/locale/en-us/skill.json b/locale/en-us/skill.json new file mode 100644 index 0000000..fb40f87 --- /dev/null +++ b/locale/en-us/skill.json @@ -0,0 +1,7 @@ +{ + "name": "Spotify Skill", + "examples": [ + "play motorhead in spotify", + "play heavy metal" + ] +} From 7a6cdbc4d3c1512ae383e85a777a6b1e4ce075aa Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Sun, 17 Nov 2024 14:30:47 +0000 Subject: [PATCH 2/9] Increment Version to 0.1.8a1 --- version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.py b/version.py index 070ca80..1f23b29 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 1 -VERSION_BUILD = 7 -VERSION_ALPHA = 0 +VERSION_BUILD = 8 +VERSION_ALPHA = 1 # END_VERSION_BLOCK From a91645bad8dab0f4aa328b64062aac66084ae03b Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Sun, 17 Nov 2024 14:31:06 +0000 Subject: [PATCH 3/9] Update Changelog --- CHANGELOG.md | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18ffd07..234855c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,28 +1,12 @@ # Changelog -## [0.1.7a1](https://github.com/OpenVoiceOS/skill-ovos-spotify/tree/0.1.7a1) (2024-11-05) +## [0.1.8a1](https://github.com/OpenVoiceOS/skill-ovos-spotify/tree/0.1.8a1) (2024-11-17) -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-spotify/compare/0.1.6a1...0.1.7a1) +[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-spotify/compare/0.1.7...0.1.8a1) **Merged pull requests:** -- fix:allow workshop 3.0.0 [\#20](https://github.com/OpenVoiceOS/skill-ovos-spotify/pull/20) ([JarbasAl](https://github.com/JarbasAl)) - -## [0.1.6a1](https://github.com/OpenVoiceOS/skill-ovos-spotify/tree/0.1.6a1) (2024-10-31) - -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-spotify/compare/0.1.5a1...0.1.6a1) - -**Merged pull requests:** - -- fix:allow workshop 3.0.0 [\#18](https://github.com/OpenVoiceOS/skill-ovos-spotify/pull/18) ([JarbasAl](https://github.com/JarbasAl)) - -## [0.1.5a1](https://github.com/OpenVoiceOS/skill-ovos-spotify/tree/0.1.5a1) (2024-10-15) - -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-spotify/compare/0.1.4...0.1.5a1) - -**Merged pull requests:** - -- fix:update\_requirements [\#16](https://github.com/OpenVoiceOS/skill-ovos-spotify/pull/16) ([JarbasAl](https://github.com/JarbasAl)) +- fix: skilljson [\#22](https://github.com/OpenVoiceOS/skill-ovos-spotify/pull/22) ([JarbasAl](https://github.com/JarbasAl)) From a3d3d96d61a572185d6df7eef1353002a2c16d6a Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 19 Nov 2024 20:43:48 +0000 Subject: [PATCH 4/9] fix:allow workshop 3.0.0 (#24) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 58f8204..7591721 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ ovos-utils>=0.1.0 ovos-bus-client>=0.0.9,<2.0.0 -ovos-workshop>=0.0.16,<3.0.0 +ovos-workshop>=0.0.16,<4.0.0 ovos-backend-client>=0.1.0,<2.0.0 spotipy \ No newline at end of file From 6e62e845f1a03bae03bbc5c0b1557113f267e4a1 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 19 Nov 2024 20:44:02 +0000 Subject: [PATCH 5/9] Increment Version to 0.1.9a1 --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 1f23b29..a43aa3e 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 1 -VERSION_BUILD = 8 +VERSION_BUILD = 9 VERSION_ALPHA = 1 # END_VERSION_BLOCK From 7a052b197462716e8b6f1e0c54931db0e178f1af Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 19 Nov 2024 20:44:24 +0000 Subject: [PATCH 6/9] Update Changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 234855c..3696b46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.1.9a1](https://github.com/OpenVoiceOS/skill-ovos-spotify/tree/0.1.9a1) (2024-11-19) + +[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-spotify/compare/0.1.8a1...0.1.9a1) + +**Merged pull requests:** + +- fix:allow workshop 3.0.0 [\#24](https://github.com/OpenVoiceOS/skill-ovos-spotify/pull/24) ([JarbasAl](https://github.com/JarbasAl)) + ## [0.1.8a1](https://github.com/OpenVoiceOS/skill-ovos-spotify/tree/0.1.8a1) (2024-11-17) [Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-spotify/compare/0.1.7...0.1.8a1) From 4d770196f438f9968a5bcdb5dd141c34e561915d Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Wed, 20 Nov 2024 12:26:14 +0000 Subject: [PATCH 7/9] drop backend client (#26) * drop backend client * Update requirements.txt * Update spotify.py * Update requirements.txt --- requirements.txt | 5 ++--- spotify.py | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7591721..74c3e8e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -ovos-utils>=0.1.0 +ovos-utils>=0.5.0 ovos-bus-client>=0.0.9,<2.0.0 ovos-workshop>=0.0.16,<4.0.0 -ovos-backend-client>=0.1.0,<2.0.0 -spotipy \ No newline at end of file +spotipy diff --git a/spotify.py b/spotify.py index 5406faf..5fae002 100644 --- a/spotify.py +++ b/spotify.py @@ -5,8 +5,7 @@ import requests import spotipy -from ovos_backend_client.api import OAuthApi -from ovos_backend_client.database import OAuthTokenDatabase, OAuthApplicationDatabase +from ovos_utils.oauth import OAuthTokenDatabase, OAuthApplicationDatabase, get_oauth_token from ovos_utils.log import LOG from ovos_utils.parse import match_one, fuzzy_match, MatchStrategy from ovos_utils.xdg_utils import xdg_config_home @@ -47,8 +46,7 @@ def is_token_expired(token_info: dict): @staticmethod def get_access_token(): - t = OAuthApi().get_oauth_token(OAUTH_TOKEN_ID, - auto_refresh=True) + t = get_oauth_token(OAUTH_TOKEN_ID, auto_refresh=True) # TODO auto_refresh flag not working if OVOSSpotifyCredentials.is_token_expired(t): LOG.warning("SPOTIFY TOKEN EXPIRED") From 42729f38ad3a2fe2de253cc29dc29dcee430aa3f Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Wed, 20 Nov 2024 12:26:28 +0000 Subject: [PATCH 8/9] Increment Version to 0.1.9a2 --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index a43aa3e..21582cb 100644 --- a/version.py +++ b/version.py @@ -2,5 +2,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 1 VERSION_BUILD = 9 -VERSION_ALPHA = 1 +VERSION_ALPHA = 2 # END_VERSION_BLOCK From d57452fd949961542b58e04138ef8811d15b727c Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Wed, 20 Nov 2024 12:26:50 +0000 Subject: [PATCH 9/9] Update Changelog --- CHANGELOG.md | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3696b46..1689335 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +1,28 @@ # Changelog -## [0.1.9a1](https://github.com/OpenVoiceOS/skill-ovos-spotify/tree/0.1.9a1) (2024-11-19) +## [0.1.9a2](https://github.com/OpenVoiceOS/ovos-skill-spotify/tree/0.1.9a2) (2024-11-20) -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-spotify/compare/0.1.8a1...0.1.9a1) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-spotify/compare/0.1.9a1...0.1.9a2) **Merged pull requests:** -- fix:allow workshop 3.0.0 [\#24](https://github.com/OpenVoiceOS/skill-ovos-spotify/pull/24) ([JarbasAl](https://github.com/JarbasAl)) +- drop backend client [\#26](https://github.com/OpenVoiceOS/ovos-skill-spotify/pull/26) ([JarbasAl](https://github.com/JarbasAl)) -## [0.1.8a1](https://github.com/OpenVoiceOS/skill-ovos-spotify/tree/0.1.8a1) (2024-11-17) +## [0.1.9a1](https://github.com/OpenVoiceOS/ovos-skill-spotify/tree/0.1.9a1) (2024-11-19) -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-spotify/compare/0.1.7...0.1.8a1) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-spotify/compare/0.1.8a1...0.1.9a1) **Merged pull requests:** -- fix: skilljson [\#22](https://github.com/OpenVoiceOS/skill-ovos-spotify/pull/22) ([JarbasAl](https://github.com/JarbasAl)) +- fix:allow workshop 3.0.0 [\#24](https://github.com/OpenVoiceOS/ovos-skill-spotify/pull/24) ([JarbasAl](https://github.com/JarbasAl)) + +## [0.1.8a1](https://github.com/OpenVoiceOS/ovos-skill-spotify/tree/0.1.8a1) (2024-11-17) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-spotify/compare/0.1.7...0.1.8a1) + +**Merged pull requests:** + +- fix: skilljson [\#22](https://github.com/OpenVoiceOS/ovos-skill-spotify/pull/22) ([JarbasAl](https://github.com/JarbasAl))