From af0cfe029d14346eeadb0caea31ba38db67069a0 Mon Sep 17 00:00:00 2001
From: dave <dave@davepedu.com>
Date: Thu, 2 Jun 2022 15:29:15 -0700
Subject: [PATCH] strip extra whitespace in tags

---
 pysonic/scanner.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pysonic/scanner.py b/pysonic/scanner.py
index 6303fd2..5f680b2 100644
--- a/pysonic/scanner.py
+++ b/pysonic/scanner.py
@@ -326,6 +326,8 @@ class PysonicFilesystemScanner(object):
         except (ValueError, AttributeError):
             pass
 
+        logging.info("scanning %s", fpath)
+
         # these fields are format-specific
         #TODO determine if having WAV_TYPES does anything at all
         if ftype in MPX_TYPES or ftype in WAV_TYPES:
@@ -334,23 +336,23 @@ class PysonicFilesystemScanner(object):
             except (KeyError, IndexError):
                 pass
             try:
-                meta["artist"] = ''.join(audio['TPE1'].text)
+                meta["artist"] = ''.join(audio['TPE1'].text).strip()
             except KeyError:
                 pass
             try:
-                meta["album"] = ''.join(audio['TALB'].text)
+                meta["album"] = ''.join(audio['TALB'].text).strip()
             except KeyError:
                 pass
             try:
-                meta["title"] = ''.join(audio['TIT2'].text)
+                meta["title"] = ''.join(audio['TIT2'].text).strip()
             except KeyError:
                 pass
             try:
-                meta["year"] = audio['TDRC'].text[0].year
+                meta["year"] = int(audio['TDRC'].text[0].year)
             except (KeyError, IndexError):
                 pass
             try:
-                meta["genre"] = audio['TCON'].text[0]
+                meta["genre"] = audio['TCON'].text[0].strip()
             except (KeyError, IndexError):
                 pass
 
@@ -360,15 +362,15 @@ class PysonicFilesystemScanner(object):
             except (KeyError, IndexError):
                 pass
             try:
-                meta["artist"] = audio["artist"][0]
+                meta["artist"] = audio["artist"][0].strip()
             except (KeyError, IndexError):
                 pass
             try:
-                meta["album"] = audio["album"][0]
+                meta["album"] = audio["album"][0].strip()
             except (KeyError, IndexError):
                 pass
             try:
-                meta["title"] = audio["title"][0]
+                meta["title"] = audio["title"][0].strip()
             except (KeyError, IndexError):
                 pass
             try:
@@ -376,7 +378,7 @@ class PysonicFilesystemScanner(object):
             except (KeyError, IndexError):
                 pass
             try:
-                meta["genre"] = audio["genre"][0]
+                meta["genre"] = audio["genre"][0].strip()
             except (KeyError, IndexError):
                 pass