Some changes to track parsing

.gitignore

@@ -79,7 +79,7 @@ celerybeat-schedule
 .env
 
 # virtualenv
-venv/
+tersicore_venv/
 ENV/
 
 # Spyder project settings
@@ -91,3 +91,6 @@ ENV/
 # Config file
 tersicore.conf
 logging.conf
+
+# sqlite db file
+*.db

docs/uwsgi/local_debug.ini

@@ -0,0 +1,6 @@
+[uwsgi]
+http = 127.0.0.1:9090
+mount = /=rest:app
+virtualenv = ./tersicore_venv
+manage-script-name = true
+wsgi-disable-file-wrapper = true

requirements.txt

@@ -3,3 +3,4 @@ pymysql
 watchdog
 mutagen
 flask
+python-dateutil

tersicore/database.py

@@ -45,7 +45,7 @@ class Track(Base):
     album_artist = sql.Column(sql.String(256))
     album = sql.Column(sql.String(256))
     compilation = sql.Column(sql.Boolean)
-    date = sql.Column(sql.Date)
+    date = sql.Column(sql.String(32))
     label = sql.Column(sql.String(256))
     isrc = sql.Column(sql.String(256))
 

tersicore/formats.py

@@ -1,7 +1,7 @@
-from datetime import date
 from fnmatch import fnmatch
 
 import mutagen
+import dateutil.parser
 import mutagen.id3
 import mutagen.mp3
 import mutagen.oggvorbis
@@ -55,10 +55,35 @@ 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)
+    total_tracks = parse('totaltracks', media.tags)
+    if parsed_track is not None:
+        split = parsed_track.split("/")
+        track_number = None if split[0] == "0" else split[0]
+        if total_tracks is None and len(split) > 1:
+            total_tracks = None if split[1] == "0" else split[1]
+        if type(track_number) is str and len(track_number) == 1:
+            track_number.rjust(2, "0")
+    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:
+        split = parsed_disc.split("/")
+        disc_number = None if split[0] == "0" else split[0]
+        if total_discs is not None and len(split) > 1:
+            total_discs = None if split[1] == "0" else split[1]
+        if type(disc_number) is str and len(disc_number) == 1:
+            disc_number.rjust(2, "0")
+    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)
@@ -67,8 +92,12 @@ def parse_resource(res, path):
     res.track.isrc = parse('isrc', media.tags)
 
     raw_date = parse('date', media.tags)
-    if raw_date not in [None, '']:
-        res.track.date = date(int(raw_date), 1, 1)
+    # since date is a string field, we can find date formatted in different
+    # ways. We try to parse it using dateutil.parser
+    try:
+        res.track.date = dateutil.parser.parse(raw_date)
+    except ValueError:
+        res.track.date = None
 
     if res.codec == 'mp3':
         res.track.album_artist = parse('albumartist', media.tags)