Some changes to track parsing

tersicore/formats.py

@@ -55,10 +55,44 @@ def parse_resource(res, path):
     if res.codec is 'mp3':
         media.tags = mutagen.mp3.EasyMP3(path)
 
-    res.track.track_number = parse('tracknumber', media.tags)
-    res.track.total_tracks = parse('totaltracks', media.tags)
-    res.track.disc_number = parse('discnumber', media.tags)
-    res.track.total_discs = parse('totaldiscs', media.tags)
+    # some tracks may have tracknumber formatted as "x/y", where
+    # x is the current track number and
+    # y is the total number of tracks
+    parsed_track = parse('tracknumber', media.tags)
+    track_number = None
+    total_tracks = parse('totaltracks', media.tags)
+    if parsed_track is not None:
+        slash_index = parsed_track.find("/")
+        track_number = (parsed_track[0:slash_index] if slash_index >= 0
+                        else parsed_track)
+        total_tracks = (parsed_track[slash_index + 1:] if slash_index >= 0
+                        else total_tracks)
+        if track_number == "0":
+            track_number = None
+        if total_tracks == "0":
+            total_tracks = None
+        if type(track_number) is str and len(track_number) == 1:
+            track_number = "0" + track_number
+    res.track.track_number = track_number
+    res.track.total_tracks = total_tracks
+
+    # same thing happens with disc number
+    parsed_disc = parse('discnumber', media.tags)
+    disc_number = None
+    total_discs = parse('totaldiscs', media.tags)
+    if parsed_disc is not None:
+        slash_index = parsed_disc.find("/")
+        disc_number = (parsed_disc[0:slash_index] if slash_index >= 0
+                       else parsed_disc)
+        total_discs = (parsed_disc[slash_index + 1:] if slash_index >= 0
+                       else total_discs)
+        if disc_number == "0":
+            disc_number = None
+        if total_discs == "0":
+            total_discs = None
+    res.track.disc_number = disc_number
+    res.track.total_discs = total_discs
+
     res.track.label = parse('organization', media.tags)
     res.track.title = parse('title', media.tags)
     res.track.artist = parse('artist', media.tags)