mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Fixed importing with direct filename, fix GH-124

Browse Source
This commit is contained in:
krateng 2022-04-21 21:15:53 +02:00
parent df6bbebe31
commit 28163348fa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maloja/proccontrol/tasks/import_scrobbles.py
View File

@ -117,7 +117,8 @@ def import_scrobbles(inputf):
return result return result
def parse_spotify_lite(inputf): def parse_spotify_lite(inputf):
inputfolder = os.path.dirname(inputf) pth = os.path
inputfolder = pth.relpath(pth.dirname(pth.abspath(inputf)))
filenames = re.compile(r'StreamingHistory[0-9]+\.json') filenames = re.compile(r'StreamingHistory[0-9]+\.json')
inputfiles = [os.path.join(inputfolder,f) for f in os.listdir(inputfolder) if filenames.match(f)] inputfiles = [os.path.join(inputfolder,f) for f in os.listdir(inputfolder) if filenames.match(f)]
@ -161,8 +162,8 @@ def parse_spotify_lite(inputf):
def parse_spotify_full(inputf): def parse_spotify_full(inputf):
pth = os.path
inputfolder = os.path.dirname(inputf) inputfolder = pth.relpath(pth.dirname(pth.abspath(inputf)))
filenames = re.compile(r'endsong_[0-9]+\.json') filenames = re.compile(r'endsong_[0-9]+\.json')
inputfiles = [os.path.join(inputfolder,f) for f in os.listdir(inputfolder) if filenames.match(f)] inputfiles = [os.path.join(inputfolder,f) for f in os.listdir(inputfolder) if filenames.match(f)]