Fix mediadb str issues

.github/workflows/push.yml

@@ -4,8 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04 # 22.04 doesn't have Python 3.6
     env:
       DISPLAY: ':99.0'
     strategy:
@@ -36,7 +35,7 @@ jobs:
     - name: Install python dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install .[dev]
+        python -m pip install .[dev,mediadb]
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

.travis.yml

@@ -28,7 +28,7 @@ install:
   - python -m pip install --upgrade --user pip setuptools wheel
   - pip install --upgrade setuptools
   - pip install --upgrade cython
-  - pip install .[dev]
+  - pip install .[dev,mediadb]
 script:
   # stop the build if there are Python syntax errors or undefined names
   - flake8 --count --select=E9,F63,F7,F82 --show-source --statistics coherence/ tests/

coherence/backends/mediadb_storage.py

@@ -135,7 +135,7 @@ def get_tags(filename):
 
 def sanitize(filename):
     badchars = ''.join(set(string.punctuation) - set('-_+.~'))
-    f = str(filename.lower())
+    f = filename.lower()
     for old, new in (('ä', 'ae'), ('ö', 'oe'), ('ü', 'ue'), ('ß', 'ss')):
         f = f.replace(str(old), str(new))
     f = f.replace(badchars, '_')
@@ -583,12 +583,12 @@ def check_for_cover_art(path):
                     return ''
 
         def got_tags(tags, file):
-            # print 'got_tags', tags
+            self.debug('got_tags', tags)
 
-            album = tags.get('album', '')
-            artist = tags.get('artist', '')
-            title = tags.get('title', '')
-            track = tags.get('track', 0)
+            album: bytes = tags.get('album', b'')
+            artist: bytes = tags.get('artist', b'')
+            title: bytes = tags.get('title', b'')
+            track: int = tags.get('track', 0)
 
             if len(artist) == 0:
                 return
@@ -601,12 +601,12 @@ def got_tags(tags, file):
                 title = 'UNKNOWN_TITLE'
             # print 'Tags:', file, album, artist, title, track
 
-            artist_ds = self.db.findOrCreate(Artist, name=str(artist, 'utf8'))
+            artist_ds = self.db.findOrCreate(Artist, name=artist.decode('utf-8'))
             album_ds = self.db.findOrCreate(
-                Album, title=str(album, 'utf8'), artist=artist_ds
+                Album, title=album.decode('utf-8'), artist=artist_ds
             )
             if len(album_ds.cover) == 0:
-                dirname = str(os.path.dirname(file), 'utf-8')
+                dirname = os.path.dirname(file)
                 album_ds.cover = check_for_cover_art(dirname)
                 if len(album_ds.cover) > 0:
                     filename = f'{album_ds.artist.name} - {album_ds.title}'
@@ -619,12 +619,12 @@ def got_tags(tags, file):
                     )
                     album_ds.cover = filename
             # print album_ds.cover
-            track_ds = self.db.findOrCreate(
+            self.db.findOrCreate(
                 Track,
-                title=str(title, 'utf8'),
-                track_nr=int(track),
+                title=title.decode('utf-8'),
+                track_nr=track,
                 album=album_ds,
-                location=str(file, 'utf8'),
+                location=file,
             )
 
         for file in self.filelist: