mirror of
https://code.eliotberriot.com/funkwhale/funkwhale.git
synced 2025-10-04 22:09:23 +02:00
Cleaning exeptions
This commit is contained in:
parent
7af11d3fdb
commit
3f619c1f00
1 changed files with 58 additions and 50 deletions
|
@ -1,11 +1,13 @@
|
|||
import logging
|
||||
import re
|
||||
from datetime import datetime
|
||||
# /!\ The next import have xml vulnerabilities but this shouldn't have security implication in funkwhale
|
||||
# since there are only used to generate xspf file.
|
||||
from xml.etree.ElementTree import Element, SubElement
|
||||
|
||||
from defusedxml import ElementTree as etree
|
||||
from defusedxml import minidom
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
|
||||
from funkwhale_api.music.models import Album, Artist, Track
|
||||
from funkwhale_api.playlists.models import Playlist
|
||||
|
@ -45,8 +47,9 @@ def get_track_id_from_xspf(xspf_file):
|
|||
artist = track.find(".//creator").text
|
||||
title = track.find(".//title").text
|
||||
album = track.find(".//album").text
|
||||
except Exception as e:
|
||||
logger.info(f"Error while parsing Xml file : {e!r}")
|
||||
except AttributeError as e:
|
||||
logger.info(f"Couldn't find the following attribute while parsing the xml file : {e!r}")
|
||||
continue
|
||||
# Finding track id in the db
|
||||
try:
|
||||
artist_id = Artist.objects.get(name=artist)
|
||||
|
@ -57,12 +60,11 @@ def get_track_id_from_xspf(xspf_file):
|
|||
track_id = Track.objects.get(
|
||||
title=title, artist=artist_id.id, album=album_id.id
|
||||
)
|
||||
except Exception as e:
|
||||
if e:
|
||||
try:
|
||||
track_id = Track.objects.get(title=title, artist=artist_id.id)
|
||||
except Exception as e:
|
||||
logger.info(f"Error while quering database : {e!r}")
|
||||
except ObjectDoesNotExist:
|
||||
try:
|
||||
track_id = Track.objects.get(title=title, artist=artist_id.id)
|
||||
except ObjectDoesNotExist as e:
|
||||
logger.info(f"Couldn't find track in the database : {e!r}")
|
||||
if track_id:
|
||||
track_list.append(track_id.id)
|
||||
added_track_count = added_track_count + 1
|
||||
|
@ -81,59 +83,65 @@ def generate_xspf_from_playlist(playlist_id):
|
|||
This returns a string containing playlist data in xspf format
|
||||
"""
|
||||
fw_playlist = Playlist.objects.get(id=playlist_id)
|
||||
plt_tracks = fw_playlist.playlist_tracks.prefetch_related('track')
|
||||
top = Element("playlist")
|
||||
top.set("version", "1")
|
||||
title_xspf = SubElement(top, "title")
|
||||
title_xspf.text = fw_playlist.name
|
||||
date_xspf = SubElement(top, "date")
|
||||
date_xspf.text = str(fw_playlist.creation_date)
|
||||
trackList_xspf = SubElement(top, "trackList")
|
||||
plt_tracks = fw_playlist.playlist_tracks.prefetch_related('track')
|
||||
xpsf_playlist = Element("playlist")
|
||||
xpsf_tracklist = write_xpsf_headers(xpsf_playlist, fw_playlist.name, str(fw_playlist.creation_date))
|
||||
|
||||
for plt_track in plt_tracks:
|
||||
track = plt_track.track
|
||||
track_xspf = SubElement(trackList_xspf, "track")
|
||||
location_xspf = SubElement(track_xspf, "location")
|
||||
location_xspf.text = "https://" + track.domain_name + track.listen_url
|
||||
title_xspf = SubElement(track_xspf, "title")
|
||||
title_xspf.text = str(track.title)
|
||||
creator_xspf = SubElement(track_xspf, "creator")
|
||||
creator_xspf.text = str(track.artist)
|
||||
if str(track.album) == "[non-album tracks]":
|
||||
continue
|
||||
else:
|
||||
album_xspf = SubElement(track_xspf, "album")
|
||||
album_xspf.text = str(track.album)
|
||||
return prettify(top)
|
||||
write_xspf_track_data(track, xpsf_tracklist)
|
||||
return prettify(xpsf_playlist)
|
||||
|
||||
|
||||
def generate_xspf_from_tracks_ids(tracks_ids):
|
||||
"""
|
||||
This returns a string containing playlist data in xspf format. It's used for test purposes.
|
||||
"""
|
||||
|
||||
top = Element("playlist")
|
||||
top.set("version", "1")
|
||||
# top.append(Element.fromstring('version="1"'))
|
||||
title_xspf = SubElement(top, "title")
|
||||
title_xspf.text = "An automated generated playlist"
|
||||
trackList_xspf = SubElement(top, "trackList")
|
||||
xspf_title = "An automated generated playlist"
|
||||
now = datetime.now()
|
||||
xpsf_date = now.strftime("%m/%d/%Y")
|
||||
xpsf_playlist = Element("playlist")
|
||||
xpsf_tracklist = write_xpsf_headers(xpsf_playlist, xspf_title, xpsf_date)
|
||||
|
||||
for track_id in tracks_ids:
|
||||
track = Track.objects.get(id=track_id)
|
||||
track_xspf = SubElement(trackList_xspf, "track")
|
||||
location_xspf = SubElement(track_xspf, "location")
|
||||
location_xspf.text = "https://" + track.domain_name + track.listen_url
|
||||
title_xspf = SubElement(track_xspf, "title")
|
||||
title_xspf.text = str(track.title)
|
||||
creator_xspf = SubElement(track_xspf, "creator")
|
||||
creator_xspf.text = str(track.artist)
|
||||
if str(track.album) == "[non-album tracks]":
|
||||
continue
|
||||
else:
|
||||
album_xspf = SubElement(track_xspf, "album")
|
||||
album_xspf.text = str(track.album)
|
||||
return prettify(top)
|
||||
try:
|
||||
track = Track.objects.get(id=track_id)
|
||||
write_xspf_track_data(track, xpsf_tracklist)
|
||||
except ObjectDoesNotExist as e:
|
||||
logger.info(f"Error while quering database : {e!r}")
|
||||
return prettify(xpsf_playlist)
|
||||
|
||||
|
||||
def write_xpsf_headers(xpsf_playlist, xpsf_title, xpsf_date):
|
||||
"""
|
||||
This generate the playlist metadata and return a trackList subelement used to insert each track
|
||||
into the playlist
|
||||
"""
|
||||
xpsf_playlist.set("version", "1")
|
||||
title_xspf = SubElement(xpsf_playlist, "title")
|
||||
title_xspf.text = xpsf_title
|
||||
date_xspf = SubElement(xpsf_playlist, "date")
|
||||
date_xspf.text = xpsf_date
|
||||
trackList_xspf = SubElement(xpsf_playlist, "trackList")
|
||||
return trackList_xspf
|
||||
|
||||
|
||||
def write_xspf_track_data(track, trackList_xspf):
|
||||
"""
|
||||
Insert a track into the trackList subelement of a xspf file
|
||||
"""
|
||||
track_xspf = SubElement(trackList_xspf, "track")
|
||||
location_xspf = SubElement(track_xspf, "location")
|
||||
location_xspf.text = "https://" + track.domain_name + track.listen_url
|
||||
title_xspf = SubElement(track_xspf, "title")
|
||||
title_xspf.text = str(track.title)
|
||||
creator_xspf = SubElement(track_xspf, "creator")
|
||||
creator_xspf.text = str(track.artist)
|
||||
if str(track.album) == "[non-album tracks]":
|
||||
return
|
||||
else:
|
||||
album_xspf = SubElement(track_xspf, "album")
|
||||
album_xspf.text = str(track.album)
|
||||
|
||||
|
||||
def prettify(elem):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue