yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-06 01:49:56 +02:00
Code Issues Releases Wiki Activity

Now use import job everywhere, even for direct file imports

Browse source
This commit is contained in:
Eliot Berriot 2017-12-27 20:29:26 +01:00
parent 5d2dbbc828
commit 2e616282fd
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
9 changed files with 318 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

18
api/funkwhale_api/music/models.py
View file

@ -384,9 +384,17 @@ class TrackFile(models.Model):
class ImportBatch(models.Model):
IMPORT_BATCH_SOURCES = [
('api', 'api'),
('shell', 'shell')
]
source = models.CharField(
max_length=30, default='api', choices=IMPORT_BATCH_SOURCES)
creation_date = models.DateTimeField(default=timezone.now)
submitted_by = models.ForeignKey(
'users.User', related_name='imports', on_delete=models.CASCADE)
'users.User',
related_name='imports',
on_delete=models.CASCADE)
class Meta:
ordering = ['-creation_date']
@ -411,12 +419,16 @@ class ImportJob(models.Model):
blank=True,
on_delete=models.CASCADE)
source = models.URLField()
mbid = models.UUIDField(editable=False)
mbid = models.UUIDField(editable=False, null=True, blank=True)
STATUS_CHOICES = (
('pending', 'Pending'),
('finished', 'finished'),
('finished', 'Finished'),
('errored', 'Errored'),
('skipped', 'Skipped'),
)
status = models.CharField(choices=STATUS_CHOICES, default='pending', max_length=30)
audio_file = models.FileField(
upload_to='imports/%Y/%m/%d', max_length=255, null=True, blank=True)
class Meta:
ordering = ('id', )