technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-09 18:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak decoding in import scripts

Browse Source
This commit is contained in:
Daan Sprenkels
2017-11-03 18:31:34 +01:00
parent 1152317490
commit a7fe50b61d
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
marietje/marietje/management/commands/importhistory.py
View File

@ -56,6 +56,10 @@ class Command(BaseCommand):
song=song, user=user,
state=2, # already played
order=0)
playlist_song.save()
try:
playlist_song.save()
except OperationalError as e:
print('Error: {}'.format(e))
continue
print('Done importing history.')

11
marietje/marietje/management/commands/importsongs.py
View File

@ -1,6 +1,7 @@
import json
from django.core.management.base import BaseCommand
from django.contrib.auth import get_user_model
from django.db.utils import OperationalError
from songs.models import Song
TRACKSDB_FORMAT = b'TrackID Artist Title Genre length Filename Filesize UploadedBy UploadedTimestamp Lounge Deleted trackGain trackPeak\n'
@ -38,12 +39,16 @@ class Command(BaseCommand):
import_song = line.strip(b'\n').split(b'\t')
user = User.objects.filter(username=import_song[7]).first()
song = Song(user=user,
artist=import_song[1].strip(),
title=import_song[2].strip(),
artist=import_song[1].decode('utf-8', errors='ignore').strip(),
title=import_song[2].decode('utf-8', errors='ignore').strip(),
duration=float(import_song[4]),
hash=import_song[5].strip(),
deleted=bool(int(import_song[10])),
old_id=import_song[0])
song.save()
try:
song.save()
except OperationalError as e:
print('Error: {}'.format(e))
continue
print('Done importing songs.')

6
marietje/marietje/management/commands/importusers.py
View File

@ -39,13 +39,13 @@ class Command(BaseCommand):
assert line == USERDB_FORMAT, 'bad 1st line: {}'.format(line)
for line in fp:
import_user = line.strip(b'\n').split(b'\t')
username = import_user[1].decode('utf-8', errors='replace').lower().strip()
username = import_user[1].decode('utf-8', errors='strict').lower().strip()
user, created = User.objects.get_or_create(username=username)
user.name = import_user[2].decode('utf-8', errors='replace').strip()
user.name = import_user[2].decode('utf-8', errors='ignore').strip()
user.email = user.username + '@science.ru.nl'
user.password = 'md5$$' + import_user[3].decode('utf-8', errors='strict')
user.queue = get_first_queue()
user.study = import_user[5].decode('utf-8', errors='replace').strip()
user.study = import_user[5].decode('utf-8', errors='ignore').strip()
user.save()
print('Done importing users.')