From: Hans Oischinger <hans.oischinger@gmail.com>
Date: Wed, 8 Sep 2021 14:22:24 +0000 (+0200)
Subject: Fix tag reading exceptions (#157)
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=a698b81b694dcf5f20fcce977d60636442e40c37;p=music-assistant-server.git

Fix tag reading exceptions (#157)

The disc and track numbers are often stored as strings containing e.g.
"1/16" which leads to exceptions.
Also taglib sometimes returns empty lists which also produces an
exception.

This fix avoids some common exceptions.
---

diff --git a/music_assistant/providers/file/__init__.py b/music_assistant/providers/file/__init__.py
index 7a17e8ee..d12f5b10 100644
--- a/music_assistant/providers/file/__init__.py
+++ b/music_assistant/providers/file/__init__.py
@@ -2,6 +2,7 @@
 import base64
 import logging
 import os
+import re
 from typing import List, Optional
 
 import taglib
@@ -368,12 +369,14 @@ class FileProvider(MusicProvider):
             track.artists.add(artist)
         if "GENRE" in song.tags:
             track.metadata["genres"] = song.tags["GENRE"]
-        if "ISRC" in song.tags:
+        if "ISRC" in song.tags and song.tags["ISRC"]:
             track.isrc = song.tags["ISRC"][0]
-        if "DISCNUMBER" in song.tags:
-            track.disc_number = int(song.tags["DISCNUMBER"][0])
-        if "TRACKNUMBER" in song.tags:
-            track.track_number = int(song.tags["TRACKNUMBER"][0])
+        if "DISCNUMBER" in song.tags and song.tags["DISCNUMBER"]:
+            regexp_numbers = re.findall(r'\d+', song.tags["DISCNUMBER"][0])
+            track.disc_number = int(regexp_numbers[0] if regexp_numbers else "0")
+        if "TRACKNUMBER" in song.tags and song.tags["TRACKNUMBER"]:
+            regexp_numbers = re.findall(r'\d+', song.tags["TRACKNUMBER"][0])
+            track.track_number = int(regexp_numbers[0] if regexp_numbers else "0")
         quality_details = ""
         if filename.endswith(".flac"):
             # TODO: get bit depth