1
0
mirror of https://github.com/spl0k/supysonic.git synced 2024-12-22 17:06:17 +00:00

Use mtime as folder/track creation date

Closes #145
This commit is contained in:
spl0k 2019-04-07 15:05:40 +02:00
parent 270fa9883b
commit 92fed40f87

View File

@ -12,6 +12,7 @@ import mimetypes
import mutagen import mutagen
import time import time
from datetime import datetime
from pony.orm import db_session from pony.orm import db_session
from .covers import find_cover_in_folder, CoverFile from .covers import find_cover_in_folder, CoverFile
@ -114,8 +115,9 @@ class Scanner:
raise TypeError('Expecting string, got ' + str(type(path))) raise TypeError('Expecting string, got ' + str(type(path)))
tr = Track.get(path = path) tr = Track.get(path = path)
mtime = int(os.path.getmtime(path)) if os.path.exists(path) else 0 # condition for some tests
if tr is not None: if tr is not None:
if not self.__force and not int(os.path.getmtime(path)) > tr.last_modification: if not self.__force and not mtime > tr.last_modification:
return return
tag = self.__try_load_tag(path) tag = self.__try_load_tag(path)
@ -144,7 +146,7 @@ class Scanner:
trdict['bitrate'] = int(tag.info.bitrate if hasattr(tag.info, 'bitrate') else os.path.getsize(path) * 8 / tag.info.length) // 1000 trdict['bitrate'] = int(tag.info.bitrate if hasattr(tag.info, 'bitrate') else os.path.getsize(path) * 8 / tag.info.length) // 1000
trdict['content_type'] = mimetypes.guess_type(path, False)[0] or 'application/octet-stream' trdict['content_type'] = mimetypes.guess_type(path, False)[0] or 'application/octet-stream'
trdict['last_modification'] = int(os.path.getmtime(path)) trdict['last_modification'] = mtime
tralbum = self.__find_album(albumartist, album) tralbum = self.__find_album(albumartist, album)
trartist = self.__find_artist(artist) trartist = self.__find_artist(artist)
@ -154,6 +156,7 @@ class Scanner:
trdict['folder'] = self.__find_folder(path) trdict['folder'] = self.__find_folder(path)
trdict['album'] = tralbum trdict['album'] = tralbum
trdict['artist'] = trartist trdict['artist'] = trartist
trdict['created'] = datetime.fromtimestamp(mtime)
Track(**trdict) Track(**trdict)
self.__stats.added.tracks += 1 self.__stats.added.tracks += 1
@ -284,7 +287,8 @@ class Scanner:
if folder is not None: if folder is not None:
break break
children.append(dict(root = False, name = os.path.basename(path), path = path)) created = datetime.fromtimestamp(os.path.getmtime(path))
children.append(dict(root = False, name = os.path.basename(path), path = path, created = created))
path = os.path.dirname(path) path = os.path.dirname(path)
assert folder is not None assert folder is not None