From 06a5ee939a2c0d97193abca9cf60d7d5a65ae14a Mon Sep 17 00:00:00 2001
From: David Magnus Henriques <eorl@bruder.space>
Date: Sat, 26 May 2018 13:06:40 +0200
Subject: [PATCH 1/4] Changed ID3Tag for Track-Number to TRCK

Until now the ID3Tag for the Track-Number was read from TPOS.
The Problem is, that TPOS is the part of the set (eg disc number)
and not the track-number. TRCK is the correct tag for the track
number.

Fixes #220
---
 api/funkwhale_api/music/metadata.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/funkwhale_api/music/metadata.py b/api/funkwhale_api/music/metadata.py
index 3aa643e56..5c8c065f5 100644
--- a/api/funkwhale_api/music/metadata.py
+++ b/api/funkwhale_api/music/metadata.py
@@ -67,7 +67,7 @@ VALIDATION = {
 
 CONF = {
     'OggVorbis': {
-        'getter': lambda f, k: f[k][0],
+        'getter': lambda f, k: f[kTr][0],
         'fields': {
             'track_number': {
                 'field': 'TRACKNUMBER',
@@ -132,7 +132,7 @@ CONF = {
         'getter': get_id3_tag,
         'fields': {
             'track_number': {
-                'field': 'TPOS',
+                'field': 'TRCK',
                 'to_application': convert_track_number
             },
             'title': {

From e478bb923e1bfac47bfbb813ea3161a1b3e8ff52 Mon Sep 17 00:00:00 2001
From: David Magnus Henriques <eorl@bruder.space>
Date: Sat, 26 May 2018 13:16:20 +0200
Subject: [PATCH 2/4] Improved Unit test

The tracknumber and the compilation number are now not identical
anymore
---
 api/tests/music/test.mp3         | Bin 297745 -> 297745 bytes
 api/tests/music/test_metadata.py |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/tests/music/test.mp3 b/api/tests/music/test.mp3
index 35a6e5fcef6fb272010c19534995393f840eafa7..8502de71b8284e9f30a397f58401d96fc42dbb17 100644
GIT binary patch
delta 581
zcmZvX!ArtW9LIlen;64DEQAi?Arj1k&Y<WN+7>L0Ew@BNg21qWxgonmhYlU2ZtIbq
zI(V&9c<9ijKcTz-L&uKU?@eif9UgC=&%W<{f6wd3ynd{#${RcYkaI9qGml@32;-k3
zoIwYg$fmAHxUEdJ<?AjuU_l#fa9N~KF5)J6Rq2`?&<vyyGg%2#z043x2>z1`Cc>m6
z2V0N>)@f>$`k&6D%)utpb*1v3){j`-l0VTtoWjL)SQ{Y1=4Ds1d8sYLvC1^Gd85x{
zM9kD`H8hEPl3;Y8$Vf@=Dapt%6h`!c^KlYQ(>0O~PG;z_keS6kpCRDA%Ve7#I%)bv
zq8tDnb@sxO^D64n!n9ZOGpkN2xS>U>q!r+$pXk|opsr9Q>4<9(pdWmScAN;!awkFH
z76S?TEJW!y-<a2J0>kyts}(UTyCr-e&IkG7z{&GBqT3T)f{Vk&zlpB!5)U`Kj@7nZ
PI&hXBKktMcjvN01{rr9p

delta 516
zcmbO@O=#jYAuUfAV`c^h2F47A5YG@JAd4Hw`Tx&}A(bJIA%!6%z|{~aC=L{ytj{DS
z782y_4dk-`v7x?6h@+1akflG-$51RJz&{u+V;JJ=>H_4+PM*prKe>j<nNfOj9-}Nr
zNJK;gP*{EPb4E=VCw1}{=5!dxeDXv#*~xdAWMBfVPywFF(^%s;LV|-`!N%?b8XL=^
zKAD|0Mj^z-F$5?Gakv44IfDU%5kp9@Kgc&QhjRlxg3N~*uQ}PDNgKv#2im1OS(_~e
zCZIW43RSjKB*Z@`5^k9h&?*B4v(3`%8#5>WW^&^S_76a^R5m2iH3(fX12hcE;U4Q_
z2~Z9R2nB_tAUN>77!nzBp%IV|Q|}8`e}q{L=0JD2U?H>8<|hSe%#%M9cr<gBv~!g(
l0x=U1GjHcAVOcH4{-mfNGbg`f^1}j==@+_K?3oz<0{}{fdZGXT

diff --git a/api/tests/music/test_metadata.py b/api/tests/music/test_metadata.py
index bacec07fb..9f9c93984 100644
--- a/api/tests/music/test_metadata.py
+++ b/api/tests/music/test_metadata.py
@@ -43,10 +43,10 @@ def test_can_get_metadata_from_ogg_theora_file(field, value):
 
 @pytest.mark.parametrize('field,value', [
     ('title', 'Bend'),
-    ('artist', 'Binärpilot'),
+    ('artist', 'Bindrpilot'),
     ('album', 'You Can\'t Stop Da Funk'),
     ('date', datetime.date(2006, 2, 7)),
-    ('track_number', 1),
+    ('track_number', 2),
     ('musicbrainz_albumid', uuid.UUID('ce40cdb1-a562-4fd8-a269-9269f98d4124')),
     ('musicbrainz_recordingid', uuid.UUID('f269d497-1cc0-4ae4-a0c4-157ec7d73fcb')),
     ('musicbrainz_artistid', uuid.UUID('9c6bddde-6228-4d9f-ad0d-03f6fcb19e13')),

From 737063946a770da1a26a9d7e16f3eec7f9eb334f Mon Sep 17 00:00:00 2001
From: David Magnus Henriques <eorl@bruder.space>
Date: Sat, 26 May 2018 13:18:18 +0200
Subject: [PATCH 3/4] Added Changelog

---
 changes/changelog.d/220.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/changelog.d/220.bugfix

diff --git a/changes/changelog.d/220.bugfix b/changes/changelog.d/220.bugfix
new file mode 100644
index 000000000..1913df1bd
--- /dev/null
+++ b/changes/changelog.d/220.bugfix
@@ -0,0 +1 @@
+Read ID3Tag Tracknumber from TRCK (#220)

From 8790631a65bd409e6f48be41a24c5cbc0da5e84d Mon Sep 17 00:00:00 2001
From: David Magnus Henriques <eorl@bruder.space>
Date: Sat, 26 May 2018 13:23:08 +0200
Subject: [PATCH 4/4] Removed Typo which broke oggVorbis-import

---
 api/funkwhale_api/music/metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/funkwhale_api/music/metadata.py b/api/funkwhale_api/music/metadata.py
index 5c8c065f5..522c64c85 100644
--- a/api/funkwhale_api/music/metadata.py
+++ b/api/funkwhale_api/music/metadata.py
@@ -67,7 +67,7 @@ VALIDATION = {
 
 CONF = {
     'OggVorbis': {
-        'getter': lambda f, k: f[kTr][0],
+        'getter': lambda f, k: f[k][0],
         'fields': {
             'track_number': {
                 'field': 'TRACKNUMBER',