novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

refactor: upgrade code to >=python3.7 (pre-commit)

Browse source 
Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2189>
This commit is contained in:
jo 2022-11-23 22:36:56 +01:00 • committed by Marge
commit 8d9946d35a
143 changed files with 454 additions and 582 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/funkwhale_api/subsonic/renderers.py
View file

@ -20,7 +20,7 @@ ET._original_serialize_xml = ET._serialize_xml
def _serialize_xml(write, elem, qnames, namespaces, **kwargs):
if elem.tag == "![CDATA[":
write("<%s%s]]>" % (elem.tag, elem.text))
write(f"<{elem.tag}{elem.text}]]>")
return
return ET._original_serialize_xml(write, elem, qnames, namespaces, **kwargs)

14
api/funkwhale_api/subsonic/serializers.py
View file

@ -39,7 +39,7 @@ def get_track_path(track, suffix):
parts.append(get_valid_filepart(track.album.title))
track_part = get_valid_filepart(track.title) + "." + suffix
if track.position:
track_part = "{} - {}".format(track.position, track_part)
track_part = f"{track.position} - {track_part}"
parts.append(track_part)
return "/".join(parts)
@ -84,7 +84,7 @@ class GetArtistSerializer(serializers.Serializer):
"album": [],
}
if artist.attachment_cover_id:
payload["coverArt"] = "ar-{}".format(artist.id)
payload["coverArt"] = f"ar-{artist.id}"
for album in albums:
album_data = {
"id": album.id,
@ -95,7 +95,7 @@ class GetArtistSerializer(serializers.Serializer):
"songCount": len(album.tracks.all()),
}
if album.attachment_cover_id:
album_data["coverArt"] = "al-{}".format(album.id)
album_data["coverArt"] = f"al-{album.id}"
if album.release_date:
album_data["year"] = album.release_date.year
payload["album"].append(album_data)
@ -128,7 +128,7 @@ def get_track_data(album, track, upload):
"type": "music",
}
if album and album.attachment_cover_id:
data["coverArt"] = "al-{}".format(album.id)
data["coverArt"] = f"al-{album.id}"
if upload.bitrate:
data["bitrate"] = int(upload.bitrate / 1000)
if upload.size:
@ -151,7 +151,7 @@ def get_album2_data(album):
"playCount": album.tracks.aggregate(l=Count("listenings"))["l"] or 0,
}
if album.attachment_cover_id:
payload["coverArt"] = "al-{}".format(album.id)
payload["coverArt"] = f"al-{album.id}"
if album.tagged_items:
# exposes only first genre since the specification uses singular noun
first_genre = album.tagged_items.first()
@ -308,7 +308,7 @@ def get_channel_data(channel, uploads):
"description": channel.artist.description.as_plain_text
if channel.artist.description
else "",
"coverArt": "at-{}".format(channel.artist.attachment_cover.uuid)
"coverArt": f"at-{channel.artist.attachment_cover.uuid}"
if channel.artist.attachment_cover
else "",
"originalImageUrl": channel.artist.attachment_cover.url
@ -333,7 +333,7 @@ def get_channel_episode_data(upload, channel_id):
"description": upload.track.description.as_plain_text
if upload.track.description
else "",
"coverArt": "at-{}".format(upload.track.attachment_cover.uuid)
"coverArt": f"at-{upload.track.attachment_cover.uuid}"
if upload.track.attachment_cover
else "",
"isDir": "false",

6
api/funkwhale_api/subsonic/views.py
View file

@ -67,7 +67,7 @@ def find_object(
{
"error": {
"code": 0,
"message": 'For input string "{}"'.format(raw_value),
"message": f'For input string "{raw_value}"',
}
}
)
@ -86,7 +86,7 @@ def find_object(
{
"error": {
"code": 70,
"message": "{} not found".format(qs.model.__name__),
"message": f"{qs.model.__name__} not found",
}
}
)
@ -904,7 +904,7 @@ class SubsonicViewSet(viewsets.GenericViewSet):
{
"error": {
"code": 0,
"message": "Error while fetching url: {}".format(e),
"message": f"Error while fetching url: {e}",
}
}
)