diff --git a/index.html b/index.html index 655bfa9f..00883687 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - + MusicX diff --git a/server/app/api.py b/server/app/api.py index 3ad7e117..2cedbd26 100644 --- a/server/app/api.py +++ b/server/app/api.py @@ -70,7 +70,7 @@ def search_by_title(): artist_obj = { "name": artist, - "image": "http://0.0.0.0:8900/images/artists/webp/" + artist.replace("/", "::") + ".webp" + "image": "http://0.0.0.0:8900/images/artists/" + artist.replace("/", "::") + ".webp" } if artist_obj not in artists_dicts: @@ -129,7 +129,7 @@ def get_album_artists(album, artist): for artist in artists: artist_obj = { "name": artist, - "image": "http://0.0.0.0:8900/images/artists/webp/" + artist.replace('/', '::') + ".webp" + "image": "http://0.0.0.0:8900/images/artists/" + artist.replace('/', '::') + ".webp" } final_artists.append(artist_obj) @@ -252,7 +252,7 @@ def getAlbumSongs(query: str): songs = [] for track in all_the_f_music: - if track['album'] == album and track['album_artist'] == artist: + if track.album == album and track.album_artist == artist: songs.append(track) songs = helpers.remove_duplicates(songs) @@ -260,10 +260,10 @@ def getAlbumSongs(query: str): album_obj = { "name": album, "count": len(songs), - "duration": sum(song['length'] for song in songs), - "image": songs[0]['image'], - "artist": songs[0]['album_artist'], - "artist_image": "http://127.0.0.1:8900/images/artists/webp/" + songs[0]['album_artist'].replace('/', '::') + ".webp" + "duration": "56 Minutes", + "image": songs[0].image, + "artist": songs[0].album_artist, + "artist_image": "http://127.0.0.1:8900/images/artists/" + songs[0].album_artist.replace('/', '::') + ".webp" } return {'songs': songs, 'info': album_obj} @@ -275,20 +275,3 @@ def drop_db(title, artist): bio = functions.getAlbumBio(title, artist) return {'bio': bio}, 200 - -@bp.route('/convert') -def convert_images_to_webp(): - path = os.path.join(home_dir, helpers.app_dir, 'images', 'artists') - final_path = os.path.join( - home_dir, helpers.app_dir, 'images', 'artists', 'webp') - - for file in os.scandir(path): - if file.name.endswith(".jpg"): - print(file.name) - print(os.path.join(final_path, file.name.replace('.jpg', '.webp'))) - img = helpers.Image.open(os.path.join(path, file.name)).resize( - (150, 150), helpers.Image.ANTIALIAS) - img.save(os.path.join(final_path, file.name.replace( - '.jpg', '.webp')), format='webp') - - return "Done" diff --git a/server/app/functions.py b/server/app/functions.py index f4516709..ffcc2ec7 100644 --- a/server/app/functions.py +++ b/server/app/functions.py @@ -122,12 +122,12 @@ def extract_thumb(audio_file_path: str = None) -> str: img = Image.open(BytesIO(album_art)) try: - small_img = img.resize((150, 150), Image.ANTIALIAS) + small_img = img.resize((250, 250), Image.ANTIALIAS) small_img.save(img_path, format="webp") except OSError: try: png = img.convert('RGB') - small_img = png.resize((150, 150), Image.ANTIALIAS) + small_img = png.resize((250, 250), Image.ANTIALIAS) small_img.save(img_path, format="webp") except: return use_defaults() diff --git a/src/App.vue b/src/App.vue index e6475d18..388e0890 100644 --- a/src/App.vue +++ b/src/App.vue @@ -75,7 +75,6 @@ export default { }; const collapseSearch = () => { - console.log('hooooo') search.value = false; }; diff --git a/src/assets/images/icons/android-chrome-192x192.png b/src/assets/images/icons/android-chrome-192x192.png new file mode 100644 index 00000000..7f235115 Binary files /dev/null and b/src/assets/images/icons/android-chrome-192x192.png differ diff --git a/src/assets/images/icons/android-chrome-512x512.png b/src/assets/images/icons/android-chrome-512x512.png new file mode 100644 index 00000000..6a53405c Binary files /dev/null and b/src/assets/images/icons/android-chrome-512x512.png differ diff --git a/src/assets/images/icons/apple-touch-icon.png b/src/assets/images/icons/apple-touch-icon.png new file mode 100644 index 00000000..ecd3bb07 Binary files /dev/null and b/src/assets/images/icons/apple-touch-icon.png differ diff --git a/src/assets/images/icons/favicon-16x16.png b/src/assets/images/icons/favicon-16x16.png new file mode 100644 index 00000000..c73e31aa Binary files /dev/null and b/src/assets/images/icons/favicon-16x16.png differ diff --git a/src/assets/images/icons/favicon-32x32.png b/src/assets/images/icons/favicon-32x32.png new file mode 100644 index 00000000..1e1e0693 Binary files /dev/null and b/src/assets/images/icons/favicon-32x32.png differ diff --git a/src/assets/images/icons/favicon.ico b/src/assets/images/icons/favicon.ico new file mode 100644 index 00000000..b7ff4542 Binary files /dev/null and b/src/assets/images/icons/favicon.ico differ diff --git a/src/components/FolderView/SongList.vue b/src/components/FolderView/SongList.vue index a8b29649..ef41da78 100644 --- a/src/components/FolderView/SongList.vue +++ b/src/components/FolderView/SongList.vue @@ -4,6 +4,7 @@ + @@ -12,9 +13,10 @@ @@ -34,12 +36,13 @@ \ No newline at end of file + diff --git a/src/components/shared/SongItem.vue b/src/components/shared/SongItem.vue index e702c453..61474ee6 100644 --- a/src/components/shared/SongItem.vue +++ b/src/components/shared/SongItem.vue @@ -1,14 +1,10 @@ @@ -55,15 +49,15 @@ import perks from "@/composables/perks.js"; import state from "@/composables/state.js"; export default { - props: ["song"], - emits: ['updateQueue', 'loadAlbum'], + props: ["song", "index"], + emits: ["updateQueue", "loadAlbum"], setup(props, { emit }) { function emitUpdate(song) { emit("updateQueue", song); } function emitLoadAlbum(title, artist) { - console.log('hii') + console.log("hii"); emit("loadAlbum", title, artist); } @@ -80,8 +74,19 @@ export default { \ No newline at end of file +
Track Artist Album