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
zcmbO@O=#jYAs<f{V`c^h2F47A5YG@J1_lOR1_s9e|C|_78S)rX7#J8r0$dFl7#Jj>
z!kJ*<B8CEnOokkWe1;N`5=S2=1_lPhiD8EIAPxS(3=9mcAQ62-2G0N=5SN*OfsuhB
z#KkcLZifMbIfDTM$j%V|ph&o|5rYAP0fQOH+(_3TY{CJdAnSy|F7jeXWXOd&HlKlk
z2jpImks$X@&Sw$hWnc&i_Qw<nfcgofhKqqABqAb$fq_AG5~D1L=j-aiz`!6sajraw
z7aZ&g;!U2)1m;4NYED*V)C9>wxZ0DWShSJ3)0njx87A&_VYHkaSfDxi9ispf1H<Io
zd2Z|w4W5$&3%og?_WFa>C>N+9Oh}&`#+Z)aR)STu=LaB!swW2)$WOk_6vN0c`2e%p
z<h%l&$@)xj2nC&!0}Es)uVN9H{EayVQ#gl_VY3$N#!Q}&AZKp|1_mYu1_q<e3k!^x
uo4HEbxk?z@xk{MYxk{L~bCs~H7GqB-D#*;qFPXfsKxF!bE*5(xrvCu_{C*Dr

delta 516
zcmbO@O=#jYAuUfAV`c^h2F47A5YG@J1_lOh1_s9e|C|_78S)rX7(xPE4H+01#2FYE
zC+jnbiG>6?dowUFurM$%80wpZIQlp-Ffiy(^f43*3Gfew%NU0Ey1FnhFvw1x$|yg%
zhRK;xdU774EJsL0L<9o^gZkv>jG8b`>f|rX=`fD@<cVyulkYOgzyw;M0z8wavBq(P
z1P8l<jors6KRK2~eKI?1j6#TuV+h>g1`Os51`I|FA;JD2-@qKs9TMP*%!e7TIoY2{
z8^&p$JdsUzvNl@`Oh9w86sl~eNQi$>B-}D11_K5I2D8o5>>D#D|7LRI3ib~`3N6`?
zNY@~A#SG9eD2IEjk0n4kBp?(Nl7isC_hLw7$c08gK1{tYT>TMdHJAh4;ev(CN}Hb)
zs4-9eP~g$bRnpE?!r0DL!qm=H!n~cUgk`lD`;(%A%$)p^$qx%ereEk{v1elZ4**Jr
BdZGXT

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',