From b97a6cda105a4eb2cc8dcf73fbe7804c4d498136 Mon Sep 17 00:00:00 2001 From: Maya Date: Fri, 30 Oct 2020 20:04:36 +0300 Subject: [PATCH] Added location of uploaded data --- ...033_data_uploaded_data_storage_location.py | 23 +++++++++++++++++++ cvat/apps/engine/models.py | 14 +++++++++++ 2 files changed, 37 insertions(+) create mode 100644 cvat/apps/engine/migrations/0033_data_uploaded_data_storage_location.py diff --git a/cvat/apps/engine/migrations/0033_data_uploaded_data_storage_location.py b/cvat/apps/engine/migrations/0033_data_uploaded_data_storage_location.py new file mode 100644 index 00000000..84caba3e --- /dev/null +++ b/cvat/apps/engine/migrations/0033_data_uploaded_data_storage_location.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.1 on 2020-10-22 09:29 + +import cvat.apps.engine.models +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('engine', '0032_remove_task_z_order'), + ] + + operations = [ + migrations.AddField( + model_name='data', + name='uploaded_data_storage_location', + field=models.CharField( + choices=[('local', 'LOCAL'), ('share', 'SHARE')], + default=cvat.apps.engine.models.UploadedDataStorageLocationChoice['LOCAL'], + max_length=15 + ), + ), + ] diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py index d99181bc..92ab5dfb 100644 --- a/cvat/apps/engine/models.py +++ b/cvat/apps/engine/models.py @@ -54,6 +54,18 @@ class StorageMethodChoice(str, Enum): def __str__(self): return self.value +class UploadedDataStorageLocationChoice(str, Enum): + #AWS_S3 = 'aws_s3_bucket' + LOCAL = 'local' + SHARE = 'share' + + @classmethod + def choices(cls): + return tuple((x.value, x.name) for x in cls) + + def __str__(self): + return self.value + class Data(models.Model): chunk_size = models.PositiveIntegerField(null=True) size = models.PositiveIntegerField(default=0) @@ -66,6 +78,8 @@ class Data(models.Model): original_chunk_type = models.CharField(max_length=32, choices=DataChoice.choices(), default=DataChoice.IMAGESET) storage_method = models.CharField(max_length=15, choices=StorageMethodChoice.choices(), default=StorageMethodChoice.FILE_SYSTEM) + uploaded_data_storage_location = models.CharField(max_length=15, choices=UploadedDataStorageLocationChoice.choices(), + default=UploadedDataStorageLocationChoice.LOCAL) class Meta: default_permissions = ()