From 3187eca5c7577a9d756a7e7dcb9cf02f1b950d1a Mon Sep 17 00:00:00 2001 From: Justin Donofrio Date: Sat, 21 Dec 2024 15:58:12 -0500 Subject: [PATCH] Bump version to 1.0.5 and formatting fixes --- distros/arch/PKGBUILD | 2 +- distros/fedora/onthespot.spec | 4 ++-- ...ot-1.0.4.ebuild => onthespot-1.0.5.ebuild} | 0 requirements.txt | 24 +++++++++---------- setup.cfg | 2 +- src/onthespot/__init__.py | 2 +- src/onthespot/api/apple_music.py | 2 +- src/onthespot/api/qobuz.py | 10 ++++---- src/onthespot/gui/mainui.py | 4 +++- 9 files changed, 26 insertions(+), 24 deletions(-) rename distros/gentoo/media-sound/onthespot/{onthespot-1.0.4.ebuild => onthespot-1.0.5.ebuild} (100%) diff --git a/distros/arch/PKGBUILD b/distros/arch/PKGBUILD index 9f22c41..3ccf7b7 100644 --- a/distros/arch/PKGBUILD +++ b/distros/arch/PKGBUILD @@ -1,5 +1,5 @@ pkgname=onthespot-git -pkgver=1.0.4 +pkgver=1.0.5 _branch="main" pkgrel=1 pkgdesc="Qt based music downloader written in python" diff --git a/distros/fedora/onthespot.spec b/distros/fedora/onthespot.spec index d096122..b31f6a4 100644 --- a/distros/fedora/onthespot.spec +++ b/distros/fedora/onthespot.spec @@ -1,5 +1,5 @@ Name: onthespot -Version: 1.0.4 +Version: 1.0.5 Release: 1%{?dist} Summary: A music downloader License: GPL-2.0 @@ -47,5 +47,5 @@ install -m 0644 %{SOURCE2} %{buildroot}/usr/share/icons/hicolor/256x256/apps/ /usr/share/applications/org.onthespot.OnTheSpot.desktop %changelog -* Sat Nov 30 2024 Justin Donofrio - 1.0.4-1 +* Sat Nov 30 2024 Justin Donofrio - 1.0.5-1 - Initial package creation diff --git a/distros/gentoo/media-sound/onthespot/onthespot-1.0.4.ebuild b/distros/gentoo/media-sound/onthespot/onthespot-1.0.5.ebuild similarity index 100% rename from distros/gentoo/media-sound/onthespot/onthespot-1.0.4.ebuild rename to distros/gentoo/media-sound/onthespot/onthespot-1.0.5.ebuild diff --git a/requirements.txt b/requirements.txt index ddcec1e..b76b8f0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ -flask -librespot -m3u8 -music-tag -mutagen -pillow -pyqt6 -pyqt6_sip -pywidevine -requests -urllib3 -yt-dlp +flask>=3.1.0 +git+https://github.com/justin025/librespot-python.git +m3u8>=6.0.0 +music-tag>=0.4.3 +mutagen>=1.47.0 +pillow>=10.4.0 +pyqt6>=6.8.0 +pyqt6_sip>=13.9.1 +pywidevine>=1.8.0 +requests>=2.32.3 +urllib3>=2.2.3 +yt-dlp>=2024.12.13 diff --git a/setup.cfg b/setup.cfg index 0f6c961..0b5e780 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = onthespot -version = 1.0.4 +version = 1.0.5 description = A simple and easy to use media downloader. long_description = file: README.md long_description_content_type = text/markdown diff --git a/src/onthespot/__init__.py b/src/onthespot/__init__.py index 111e258..10f3a02 100644 --- a/src/onthespot/__init__.py +++ b/src/onthespot/__init__.py @@ -57,7 +57,7 @@ def main(): config.set_('theme', f'background-color: white; color: black;') # Set Application Version - version = "v1.0.4" + version = "v1.0.5" logger.info(f'OnTheSpot Version: {version}') config.set_("version", version) diff --git a/src/onthespot/api/apple_music.py b/src/onthespot/api/apple_music.py index 9d9abde..cfd183a 100644 --- a/src/onthespot/api/apple_music.py +++ b/src/onthespot/api/apple_music.py @@ -407,7 +407,7 @@ def apple_music_get_artist_album_ids(session, artist_id): def apple_music_get_playlist_data(session, playlist_id): logger.info(f"Get playlist data for playlist: {playlist_id}") - playlist_data = make_call(f"{BASE_URL}/catalog/{session.cookies.get("itua")}/playlists/{playlist_id}", session=session, skip_cache=True) + playlist_data = make_call(f"{BASE_URL}/catalog/{session.cookies.get('itua')}/playlists/{playlist_id}", session=session, skip_cache=True) playlist_name = playlist_data.get('data', [])[0].get('attributes', {}).get('name', '') playlist_by = playlist_data.get('data', [])[0].get('attributes', {}).get('curatorName', '') diff --git a/src/onthespot/api/qobuz.py b/src/onthespot/api/qobuz.py index dfd50ea..e7a016c 100644 --- a/src/onthespot/api/qobuz.py +++ b/src/onthespot/api/qobuz.py @@ -174,7 +174,7 @@ def qobuz_get_search_results(token, search_term, content_types): 'item_by': track.get('performer', '').get('name', ''), 'item_type': "track", 'item_service': "qobuz", - 'item_url': f'https://play.qobuz.com/track/{track['id']}', + 'item_url': f'https://play.qobuz.com/track/{track["id"]}', 'item_thumbnail_url': track.get("album", {}).get("image", {}).get("small", "") }) @@ -188,7 +188,7 @@ def qobuz_get_search_results(token, search_term, content_types): 'item_by': album.get('artist', '').get('name', ''), 'item_type': "album", 'item_service': "qobuz", - 'item_url': f'https://play.qobuz.com/album/{album['id']}', + 'item_url': f'https://play.qobuz.com/album/{album["id"]}', 'item_thumbnail_url': album.get("image", {}).get("small", '') }) @@ -202,7 +202,7 @@ def qobuz_get_search_results(token, search_term, content_types): 'item_by': artist.get('name', ''), 'item_type': "artist", 'item_service': "qobuz", - 'item_url': f'https://play.qobuz.com/artist/{artist['id']}', + 'item_url': f'https://play.qobuz.com/artist/{artist["id"]}', 'item_thumbnail_url': artist.get("picture", '') }) @@ -216,7 +216,7 @@ def qobuz_get_search_results(token, search_term, content_types): 'item_by': playlist.get('owner', '').get('name', 'Qobuz'), 'item_type': "playlist", 'item_service': "qobuz", - 'item_url': f'https://play.qobuz.com/playlist/{playlist['id']}', + 'item_url': f'https://play.qobuz.com/playlist/{playlist["id"]}', 'item_thumbnail_url': playlist.get("image_rectangle", [])[0] }) @@ -230,7 +230,7 @@ def qobuz_get_track_metadata(token, item_id): try: track_data = make_call(f'{BASE_URL}/track/get?track_id={item_id}', headers=headers) - album_data = make_call(f'{BASE_URL}/album/get?album_id={track_data.get('album', {}).get('id', '')}', headers=headers) + album_data = make_call(f'{BASE_URL}/album/get?album_id={track_data.get("album", {}).get("id", "")}', headers=headers) except Exception: return diff --git a/src/onthespot/gui/mainui.py b/src/onthespot/gui/mainui.py index 093d349..f3e201d 100644 --- a/src/onthespot/gui/mainui.py +++ b/src/onthespot/gui/mainui.py @@ -634,9 +634,11 @@ def set_login_fields(self): self.lb_login_username.show() self.lb_login_username.setText(self.tr("Email")) self.inp_login_username.show() - self.lb_login_password.setText(self.tr("Password")) + self.inp_login_username.setPlaceholderText("Enter your email") self.lb_login_password.show() + self.lb_login_password.setText(self.tr("Password")) self.inp_login_password.show() + self.inp_login_password.setPlaceholderText("Enter your password") self.btn_login_add.clicked.disconnect() self.btn_login_add.show() self.btn_login_add.setIcon(QIcon())