Rework ID3v2 user URL link frame abstractions [#22]

* Add ``ID3v2UserURLLink`` class.
* Change ``ID3v2UserURLLinkFrame`` to have only value attribute.
  that contains a single user URL link object.
* Change ``ID3v2Frames`` to present a list of user URL link
  objects for ``WXXX`` key.

CHANGELOG.md

@@ -40,6 +40,7 @@ This project adheres to [Semantic Versioning](https://semver.org).
 	* ``OggOpusVorbisComments``.
 * ``ID3v2GeneralEncapsulatedObject``.
 * ``ID3v2PrivateInfo``.
+* ``ID3v2UserURLLink``.
 
 ### Changed
 
@@ -64,6 +65,12 @@ This project adheres to [Semantic Versioning](https://semver.org).
 		that contains a single private information object.
 	* Change ``ID3v2Frames`` to present a list of private info
 		objects for ``PRIV`` key.
+* Rework ID3v2 user URL link frame abstractions.
+	* Add ``ID3v2UserURLLink`` class.
+	* Change ``ID3v2UserURLLinkFrame`` to have only value attribute.
+		that contains a single user URL link object.
+	* Change ``ID3v2Frames`` to present a list of user URL link
+		objects for ``WXXX`` key.
 
 ### Removed
 

src/audio_metadata/formats/id3v2.py

@@ -266,10 +266,7 @@ def parse(cls, data, id3_version):
 				frames[f'{frame.id}:{frame.description}:{frame.language}'].append(frame.value)
 			elif isinstance(
 				frame,
-				(
-					ID3v2UserTextFrame,
-					ID3v2UserURLLinkFrame,
-				),
+				ID3v2UserTextFrame,
 			):
 				frames[f'{frame.id}:{frame.description}'].append(frame.value)
 			elif isinstance(

src/audio_metadata/formats/id3v2_frames.py

@@ -24,6 +24,7 @@
 	'ID3v2UnsynchronizedLyricsFrame',
 	'ID3v2URLLinkFrame',
 	'ID3v2UserTextFrame',
+	'ID3v2UserURLLink',
 	'ID3v2UserURLLinkFrame',
 	'ID3v2YearFrame',
 ]
@@ -114,11 +115,9 @@ class ID3v2PrivateInfo(AttrMapping):
 	repr=False,
 	kw_only=True,
 )
-class ID3v2GeneralEncapsulatedObject(AttrMapping):
-	mime_type = attrib()
-	filename = attrib()
+class ID3v2UserURLLink(AttrMapping):
 	description = attrib()
-	value = attrib()
+	url = attrib()
 
 
 class ID3v2Picture(Picture):
@@ -312,7 +311,6 @@ class ID3v2URLLinkFrame(ID3v2BaseFrame):
 	kw_only=True,
 )
 class ID3v2UserURLLinkFrame(ID3v2BaseFrame):
-	description = attrib()
 	value = attrib()
 
 
@@ -694,19 +692,6 @@ def parse(cls, data, struct_pattern, size_len, per_byte):
 						genres.append('Remix')
 
 			kwargs['value'] = genres
-		elif frame_type is ID3v2GEOBFrame:
-			encoding = determine_encoding(frame_data[0:1])
-
-			mime_type, remainder = split_encoded(frame_data[1:], encoding)
-			filename, remainder = split_encoded(remainder, encoding)
-			description, value = split_encoded(remainder, encoding)
-
-			kwargs['value'] = ID3v2GeneralEncapsulatedObject(
-				mime_type=mime_type,
-				filename=filename,
-				description=description,
-				value=value,
-			)
 		elif frame_type is ID3v2PictureFrame:
 			kwargs['value'] = frame_data
 		elif frame_type is ID3v2PrivateFrame:
@@ -730,8 +715,10 @@ def parse(cls, data, struct_pattern, size_len, per_byte):
 			encoding = determine_encoding(frame_data)
 
 			description, url = split_encoded(frame_data[1:], encoding)
-			kwargs['description'] = decode_bytestring(description, encoding)
-			kwargs['url'] = unquote(decode_bytestring(url))
+			kwargs['value'] = ID3v2UserURLLink(
+				description=decode_bytestring(description, encoding),
+				url=unquote(decode_bytestring(url)),
+			)
 		elif issubclass(
 			frame_type,
 			(