Pipfile

+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+mutagen = "*"
+urwid = "*"
+
+[dev-packages]
+
+[requires]
+python_version = "3.11"

Pipfile.lock

+{
+    "_meta": {
+        "hash": {
+            "sha256": "47467328fdd8e1fdcc63ccab3fe3cdc8053b79ed24e0192f8861b4aded150eb8"
+        },
+        "pipfile-spec": 6,
+        "requires": {
+            "python_version": "3.11"
+        },
+        "sources": [
+            {
+                "name": "pypi",
+                "url": "https://pypi.org/simple",
+                "verify_ssl": true
+            }
+        ]
+    },
+    "default": {
+        "mutagen": {
+            "hashes": [
+                "sha256:6e5f8ba84836b99fe60be5fb27f84be4ad919bbb6b49caa6ae81e70584b55e58",
+                "sha256:8af0728aa2d5c3ee5a727e28d0627966641fddfe804c23eabb5926a4d770aed5"
+            ],
+            "index": "pypi",
+            "version": "==1.46.0"
+        },
+        "urwid": {
+            "hashes": [
+                "sha256:588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae"
+            ],
+            "index": "pypi",
+            "version": "==2.1.2"
+        }
+    },
+    "develop": {}
+}

extractors/FlacExtractor.py

@@ -4,6 +4,7 @@ from mutagen.flac import FLAC
 
 from extractors.MediaExtractor import MediaExtractor
 from models.TrackMeta import TrackMeta
+from util.extract_numbers import extract_numbers
 from util.optional_map import optional_map
 
 
@@ -21,6 +22,8 @@ class FlacExtractor(MediaExtractor):
         return None
 
     def extract_tags(self) -> TrackMeta:
+        discnumber, disctotal = optional_map(self.extract_tag('discnumber'), extract_numbers)
+        tracknumber, tracktotal = optional_map(self.extract_tag('tracknumber'), extract_numbers)
         return TrackMeta(
             album=self.extract_tag('album'),
             albumsort=self.extract_tag('albumsort'),
@@ -29,14 +32,14 @@ class FlacExtractor(MediaExtractor):
             artist=self.extract_tag('artist'),
             artistsort=self.extract_tag('artistsort'),
             catalognumber=self.extract_tag('catalognumber'),
-            discnumber=optional_map(self.extract_tag('discnumber'), int),
-            disctotal=optional_map(self.extract_tag('disctotal'), int),
+            discnumber=discnumber,
+            disctotal=optional_map(self.extract_tag('disctotal'), int) or disctotal,
             label=self.extract_tag('label'),
             media=self.extract_tag('media'),
             originaldate=self.extract_tag('originaldate'),
             originalyear=self.extract_tag('originalyear'),
             title=self.extract_tag('title'),
             titlesort=self.extract_tag('titlesort'),
-            tracknumber=optional_map(self.extract_tag('tracknumber'), int),
-            tracktotal=optional_map(self.extract_tag('tracktotal'), int),
+            tracknumber=tracknumber,
+            tracktotal=optional_map(self.extract_tag('tracktotal'), int) or tracktotal,
         )