Skip to content

Commit

Permalink
Bump version to 1.0.5 and formatting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
justin025 committed Dec 21, 2024
1 parent bb1f35c commit 3187eca
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 24 deletions.
2 changes: 1 addition & 1 deletion distros/arch/PKGBUILD
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions distros/fedora/onthespot.spec
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 <[email protected]> - 1.0.4-1
* Sat Nov 30 2024 Justin Donofrio <[email protected]> - 1.0.5-1
- Initial package creation
24 changes: 12 additions & 12 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/onthespot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/onthespot/api/apple_music.py
Original file line number Diff line number Diff line change
Expand Up @@ -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', '')
Expand Down
10 changes: 5 additions & 5 deletions src/onthespot/api/qobuz.py
Original file line number Diff line number Diff line change
Expand Up @@ -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", "")
})

Expand All @@ -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", '')
})

Expand All @@ -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", '')
})

Expand All @@ -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]
})

Expand All @@ -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

Expand Down
4 changes: 3 additions & 1 deletion src/onthespot/gui/mainui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit 3187eca

Please sign in to comment.