have get_metadata_4_track() call new get_ext_metadata()
TODO: parsing a successful response always returns a 400 response
This commit is contained in:
Googolplexed0
@@ -57,6 +57,8 @@ from librespot.proto import Connectivity_pb2 as Connectivity
|
||||
from librespot.proto import Keyexchange_pb2 as Keyexchange
|
||||
from librespot.proto import Metadata_pb2 as Metadata
|
||||
from librespot.proto import Playlist4External_pb2 as Playlist4External
|
||||
from librespot.proto.ExtendedMetadata_pb2 import EntityRequest, BatchedEntityRequest, ExtensionQuery
|
||||
from librespot.proto.ExtensionKind_pb2 import ExtensionKind
|
||||
from librespot.proto.ExplicitContentPubsub_pb2 import UserAttributesUpdate
|
||||
from librespot.proto.spotify.login5.v3 import Login5_pb2 as Login5
|
||||
from librespot.proto.spotify.login5.v3.credentials import Credentials_pb2 as Login5Credentials
|
||||
@@ -190,19 +192,27 @@ class ApiClient(Closeable):
|
||||
self.logger.warning("PUT state returned {}. headers: {}".format(
|
||||
response.status_code, response.headers))
|
||||
|
||||
def get_ext_metadata(self, extension_kind: ExtensionKind, uri: str):
|
||||
query = ExtensionQuery(extension_kind=extension_kind)
|
||||
req = EntityRequest(entity_uri=uri, query=[query,])
|
||||
batch = BatchedEntityRequest(entity_request=[req,])
|
||||
headers = CaseInsensitiveDict({"content-type": "application/x-protobuf"})
|
||||
response = self.send("POST", "/extended-metadata/v0/extended-metadata",
|
||||
headers, batch.SerializeToString())
|
||||
return response
|
||||
|
||||
def get_metadata_4_track(self, track: TrackId) -> Metadata.Track:
|
||||
"""
|
||||
|
||||
:param track: TrackId:
|
||||
|
||||
"""
|
||||
response = self.sendToUrl("GET", "https://spclient.wg.spotify.com",
|
||||
"/metadata/4/track/{}".format(track.hex_id()),
|
||||
None, None)
|
||||
response = self.get_ext_metadata(ExtensionKind.TRACK_V4, track.to_spotify_uri())
|
||||
ApiClient.StatusCodeException.check_status(response)
|
||||
body = response.content
|
||||
if body is None:
|
||||
raise RuntimeError()
|
||||
# TODO: update parsing of successful response
|
||||
proto = Metadata.Track()
|
||||
proto.ParseFromString(body)
|
||||
return proto
|
||||
|
||||
35
librespot/proto/EntityExtensionData_pb2.py
Normal file
35
librespot/proto/EntityExtensionData_pb2.py
Normal file
@@ -0,0 +1,35 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: entity_extension_data.proto
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf.internal import builder as _builder
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2
|
||||
|
||||
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x65ntity_extension_data.proto\x12\x18spotify.extendedmetadata\x1a\x19google/protobuf/any.proto\"\x8c\x01\n\x19\x45ntityExtensionDataHeader\x12\x13\n\x0bstatus_code\x18\x01 \x01(\x05\x12\x0c\n\x04\x65tag\x18\x02 \x01(\t\x12\x0e\n\x06locale\x18\x03 \x01(\t\x12\x1c\n\x14\x63\x61\x63he_ttl_in_seconds\x18\x04 \x01(\x03\x12\x1e\n\x16offline_ttl_in_seconds\x18\x05 \x01(\x03\"\x9c\x01\n\x13\x45ntityExtensionData\x12\x43\n\x06header\x18\x01 \x01(\x0b\x32\x33.spotify.extendedmetadata.EntityExtensionDataHeader\x12\x12\n\nentity_uri\x18\x02 \x01(\t\x12,\n\x0e\x65xtension_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.Any\"$\n\x0ePlainListAssoc\x12\x12\n\nentity_uri\x18\x01 \x03(\t\"\r\n\x0b\x41ssocHeader\"|\n\x05\x41ssoc\x12\x35\n\x06header\x18\x01 \x01(\x0b\x32%.spotify.extendedmetadata.AssocHeader\x12<\n\nplain_list\x18\x02 \x01(\x0b\x32(.spotify.extendedmetadata.PlainListAssocB+\n\"com.spotify.extendedmetadata.protoH\x02P\x01\xf8\x01\x01\x62\x06proto3')
|
||||
|
||||
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
|
||||
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'EntityExtensionData_pb2', globals())
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._serialized_options = b'\n\"com.spotify.extendedmetadata.protoH\002P\001\370\001\001'
|
||||
_ENTITYEXTENSIONDATAHEADER._serialized_start=85
|
||||
_ENTITYEXTENSIONDATAHEADER._serialized_end=225
|
||||
_ENTITYEXTENSIONDATA._serialized_start=228
|
||||
_ENTITYEXTENSIONDATA._serialized_end=384
|
||||
_PLAINLISTASSOC._serialized_start=386
|
||||
_PLAINLISTASSOC._serialized_end=422
|
||||
_ASSOCHEADER._serialized_start=424
|
||||
_ASSOCHEADER._serialized_end=437
|
||||
_ASSOC._serialized_start=439
|
||||
_ASSOC._serialized_end=563
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
44
librespot/proto/ExtendedMetadata_pb2.py
Normal file
44
librespot/proto/ExtendedMetadata_pb2.py
Normal file
@@ -0,0 +1,44 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: extended_metadata.proto
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf.internal import builder as _builder
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
import librespot.proto.ExtensionKind_pb2 as extension__kind__pb2
|
||||
import librespot.proto.EntityExtensionData_pb2 as entity__extension__data__pb2
|
||||
|
||||
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x65xtended_metadata.proto\x12\x18spotify.extendedmetadata\x1a\x14\x65xtension_kind.proto\x1a\x1b\x65ntity_extension_data.proto\"_\n\x0e\x45xtensionQuery\x12?\n\x0e\x65xtension_kind\x18\x01 \x01(\x0e\x32\'.spotify.extendedmetadata.ExtensionKind\x12\x0c\n\x04\x65tag\x18\x02 \x01(\t\"\\\n\rEntityRequest\x12\x12\n\nentity_uri\x18\x01 \x01(\t\x12\x37\n\x05query\x18\x02 \x03(\x0b\x32(.spotify.extendedmetadata.ExtensionQuery\"Q\n\x1a\x42\x61tchedEntityRequestHeader\x12\x0f\n\x07\x63ountry\x18\x01 \x01(\t\x12\x11\n\tcatalogue\x18\x02 \x01(\t\x12\x0f\n\x07task_id\x18\x03 \x01(\x0c\"\x9d\x01\n\x14\x42\x61tchedEntityRequest\x12\x44\n\x06header\x18\x01 \x01(\x0b\x32\x34.spotify.extendedmetadata.BatchedEntityRequestHeader\x12?\n\x0e\x65ntity_request\x18\x02 \x03(\x0b\x32\'.spotify.extendedmetadata.EntityRequest\"\xbe\x01\n\x1e\x45ntityExtensionDataArrayHeader\x12\x1d\n\x15provider_error_status\x18\x01 \x01(\x05\x12\x1c\n\x14\x63\x61\x63he_ttl_in_seconds\x18\x02 \x01(\x03\x12\x1e\n\x16offline_ttl_in_seconds\x18\x03 \x01(\x03\x12?\n\x0e\x65xtension_type\x18\x04 \x01(\x0e\x32\'.spotify.extendedmetadata.ExtensionType\"\xec\x01\n\x18\x45ntityExtensionDataArray\x12H\n\x06header\x18\x01 \x01(\x0b\x32\x38.spotify.extendedmetadata.EntityExtensionDataArrayHeader\x12?\n\x0e\x65xtension_kind\x18\x02 \x01(\x0e\x32\'.spotify.extendedmetadata.ExtensionKind\x12\x45\n\x0e\x65xtension_data\x18\x03 \x03(\x0b\x32-.spotify.extendedmetadata.EntityExtensionData\" \n\x1e\x42\x61tchedExtensionResponseHeader\"\xb3\x01\n\x18\x42\x61tchedExtensionResponse\x12H\n\x06header\x18\x01 \x01(\x0b\x32\x38.spotify.extendedmetadata.BatchedExtensionResponseHeader\x12M\n\x11\x65xtended_metadata\x18\x02 \x03(\x0b\x32\x32.spotify.extendedmetadata.EntityExtensionDataArray*4\n\rExtensionType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07GENERIC\x10\x01\x12\t\n\x05\x41SSOC\x10\x02\x42+\n\"com.spotify.extendedmetadata.protoH\x02P\x01\xf8\x01\x01\x62\x06proto3')
|
||||
|
||||
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
|
||||
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'ExtendedMetadata_pb2', globals())
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._serialized_options = b'\n\"com.spotify.extendedmetadata.protoH\002P\001\370\001\001'
|
||||
_EXTENSIONTYPE._serialized_start=1186
|
||||
_EXTENSIONTYPE._serialized_end=1238
|
||||
_EXTENSIONQUERY._serialized_start=104
|
||||
_EXTENSIONQUERY._serialized_end=199
|
||||
_ENTITYREQUEST._serialized_start=201
|
||||
_ENTITYREQUEST._serialized_end=293
|
||||
_BATCHEDENTITYREQUESTHEADER._serialized_start=295
|
||||
_BATCHEDENTITYREQUESTHEADER._serialized_end=376
|
||||
_BATCHEDENTITYREQUEST._serialized_start=379
|
||||
_BATCHEDENTITYREQUEST._serialized_end=536
|
||||
_ENTITYEXTENSIONDATAARRAYHEADER._serialized_start=539
|
||||
_ENTITYEXTENSIONDATAARRAYHEADER._serialized_end=729
|
||||
_ENTITYEXTENSIONDATAARRAY._serialized_start=732
|
||||
_ENTITYEXTENSIONDATAARRAY._serialized_end=968
|
||||
_BATCHEDEXTENSIONRESPONSEHEADER._serialized_start=970
|
||||
_BATCHEDEXTENSIONRESPONSEHEADER._serialized_end=1002
|
||||
_BATCHEDEXTENSIONRESPONSE._serialized_start=1005
|
||||
_BATCHEDEXTENSIONRESPONSE._serialized_end=1184
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
26
librespot/proto/ExtensionKind_pb2.py
Normal file
26
librespot/proto/ExtensionKind_pb2.py
Normal file
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user