MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1193-unknown-error' into 'develop' 

Fix #1193: Fixed crash with negative track position in file tags

Closes #1193

See merge request funkwhale/funkwhale!1204
This commit is contained in:
Agate 2020-08-18 21:12:27 +02:00
parent 9010fa5f08 2e197e0a27
commit 175e9cf8b9
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/funkwhale_api/music/metadata.py
View File

@ -697,6 +697,12 @@ class AlbumSerializer(serializers.Serializer):
return v return v
def get_valid_position(v):
if v <= 0:
v = 1
return v
class PositionField(serializers.CharField): class PositionField(serializers.CharField):
def to_internal_value(self, v): def to_internal_value(self, v):
v = super().to_internal_value(v) v = super().to_internal_value(v)
@ -704,15 +710,15 @@ class PositionField(serializers.CharField):
return v return v
try: try:
return int(v) return get_valid_position(int(v))
except ValueError: except ValueError:
# maybe the position is of the form "1/4" # maybe the position is of the form "1/4"
pass pass
try: try:
return int(v.split("/")[0]) return get_valid_position(int(v.split("/")[0]))
except (ValueError, AttributeError, IndexError): except (ValueError, AttributeError, IndexError):
pass return
class DescriptionField(serializers.CharField): class DescriptionField(serializers.CharField):

1
changes/changelog.d/1193.bugfix Normal file
View File

@ -0,0 +1 @@
Fixed crash with negative track position in file tags (#1193)