diff --git a/librespot/version.py b/librespot/__init__.py similarity index 92% rename from librespot/version.py rename to librespot/__init__.py index c471e24..f942b23 100644 --- a/librespot/version.py +++ b/librespot/__init__.py @@ -1,3 +1,4 @@ +from __future__ import annotations from librespot.proto.Keyexchange_pb2 import BuildInfo, Platform, Product, ProductFlags import platform @@ -28,4 +29,4 @@ class Version: return BuildInfo(product=Product.PRODUCT_CLIENT, product_flags=[ProductFlags.PRODUCT_FLAG_NONE], platform=Version.platform(), - version=112800721) + version=112800721) \ No newline at end of file diff --git a/librespot/core.py b/librespot/core.py index c42c305..c86a7c3 100644 --- a/librespot/core.py +++ b/librespot/core.py @@ -1,12 +1,9 @@ from __future__ import annotations - -import urllib.parse - from Cryptodome import Random from Cryptodome.Hash import HMAC, SHA1 from Cryptodome.PublicKey import RSA from Cryptodome.Signature import PKCS1_v1_5 -from librespot import util +from librespot import util, Version from librespot.audio import AudioKeyManager, CdnManager, PlayableContentFeeder from librespot.audio.storage import ChannelManager from librespot.cache import CacheManager @@ -16,7 +13,6 @@ from librespot.metadata import AlbumId, ArtistId, EpisodeId, ShowId, TrackId from librespot.proto import Authentication_pb2 as Authentication, Connect_pb2 as Connect, Keyexchange_pb2 as Keyexchange, Metadata_pb2 as Metadata from librespot.proto.ExplicitContentPubsub_pb2 import UserAttributesUpdate from librespot.structure import Closeable, MessageListener, RequestListener, SubListener -from librespot.version import Version import base64 import concurrent.futures import defusedxml.ElementTree @@ -35,6 +31,7 @@ import struct import threading import time import typing +import urllib.parse import websocket diff --git a/requirements.txt b/requirements.txt index 9fd7329..bc26142 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,5 @@ protobuf==3.17.3 pycryptodomex==3.10.1 pyogg==0.6.14a.1 requests==2.26.0 -websocket-client==1.2.1 \ No newline at end of file +websocket-client==1.2.1 +zeroconf==0.36.2 \ No newline at end of file diff --git a/setup.py b/setup.py index 478d19a..679e4e3 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ setuptools.setup(name="librespot", packages=setuptools.find_packages("."), install_requires=[ "defusedxml", "protobuf", "pycryptodomex", "pyogg", - "requests" + "requests", "zeroconf" ], classifiers=[ "Development Status :: 1 - Planning",