Skip to content

Commit

Permalink
Format code
Browse files Browse the repository at this point in the history
  • Loading branch information
@dchiller
dchiller committed Oct 5, 2023
1 parent 0184714 commit 92cf01c
Show file tree
Hide file tree
Showing 4 changed files with 171 additions and 41 deletions.
2 changes: 1 addition & 1 deletion web-app/django/VIM/apps/instruments/management/commands/import_instruments.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def get_instrument_data(self, instrument_ids: list[str]) -> list[dict]:

def create_database_objects(self, instrument_attrs: dict, ins_img_url: str) -> None:
"""
Given a dictionary of instrument attributes and a url to an instrument image,
Given a dictionary of instrument attributes and a url to an instrument image,
create the corresponding database objects.
instrument_attrs [dict]: Dictionary of instrument attributes. See
Expand Down
4 changes: 2 additions & 2 deletions web-app/django/VIM/apps/instruments/management/commands/import_languages.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ class Command(BaseCommand):
"""
The import_languages command populates the database with languages in which instrument
names can be provided in VIM.
NOTE: For now, this script only imports English and French.
"""

help = "Imports possible languages for instrument names from Wikidata."

def handle(self, *args, **options):
Expand Down
196 changes: 160 additions & 36 deletions web-app/django/VIM/apps/instruments/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,64 +5,188 @@


class Migration(migrations.Migration):

initial = True

dependencies = [
]
dependencies = []

operations = [
migrations.CreateModel(
name='AVResource',
name="AVResource",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('type', models.CharField(choices=[('audio', 'Audio'), ('video', 'Video'), ('image', 'Image')], help_text='What type of audiovisual resource is this?', max_length=5)),
('format', models.CharField()),
('url', models.URLField(max_length=1000)),
('instrument_date', models.DateField(blank=True, help_text='When was this instrument made?', null=True)),
('instrument_maker', models.CharField(blank=True, help_text='Who made this instrument?')),
('instrument_description', models.TextField(blank=True, help_text='Additional information about the instrument.')),
('source_name', models.CharField(help_text='What is the name of the source of this AVResource?')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"type",
models.CharField(
choices=[
("audio", "Audio"),
("video", "Video"),
("image", "Image"),
],
help_text="What type of audiovisual resource is this?",
max_length=5,
),
),
("format", models.CharField()),
("url", models.URLField(max_length=1000)),
(
"instrument_date",
models.DateField(
blank=True,
help_text="When was this instrument made?",
null=True,
),
),
(
"instrument_maker",
models.CharField(blank=True, help_text="Who made this instrument?"),
),
(
"instrument_description",
models.TextField(
blank=True,
help_text="Additional information about the instrument.",
),
),
(
"source_name",
models.CharField(
help_text="What is the name of the source of this AVResource?"
),
),
],
),
migrations.CreateModel(
name='Instrument',
name="Instrument",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('wikidata_id', models.CharField(max_length=20, unique=True)),
('hornbostel_sachs_class', models.CharField(blank=True, help_text='Hornbostel-Sachs classification', max_length=50)),
('mimo_class', models.CharField(blank=True, help_text='Musical Instrument Museums Online classification', max_length=50)),
('default_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='default_image_of', to='instruments.avresource')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("wikidata_id", models.CharField(max_length=20, unique=True)),
(
"hornbostel_sachs_class",
models.CharField(
blank=True,
help_text="Hornbostel-Sachs classification",
max_length=50,
),
),
(
"mimo_class",
models.CharField(
blank=True,
help_text="Musical Instrument Museums Online classification",
max_length=50,
),
),
(
"default_image",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.PROTECT,
related_name="default_image_of",
to="instruments.avresource",
),
),
],
),
migrations.CreateModel(
name='Language',
name="Language",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('wikidata_code', models.CharField(help_text='Language code in Wikidata', unique=True)),
('wikidata_id', models.CharField(help_text='Language ID (Q number) in Wikidata', unique=True)),
('en_label', models.CharField(help_text='Language label in English')),
('autonym', models.CharField(help_text='Language label in the language itself')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"wikidata_code",
models.CharField(
help_text="Language code in Wikidata", unique=True
),
),
(
"wikidata_id",
models.CharField(
help_text="Language ID (Q number) in Wikidata", unique=True
),
),
("en_label", models.CharField(help_text="Language label in English")),
(
"autonym",
models.CharField(help_text="Language label in the language itself"),
),
],
),
migrations.CreateModel(
name='InstrumentName',
name="InstrumentName",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=50)),
('source_name', models.CharField(help_text='Who or what called the instrument this?', max_length=50)),
('instrument', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='instruments.instrument')),
('language', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='instruments.language')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=50)),
(
"source_name",
models.CharField(
help_text="Who or what called the instrument this?",
max_length=50,
),
),
(
"instrument",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
to="instruments.instrument",
),
),
(
"language",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
to="instruments.language",
),
),
],
),
migrations.AddField(
model_name='avresource',
name='instrument',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='instruments.instrument'),
model_name="avresource",
name="instrument",
field=models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT, to="instruments.instrument"
),
),
migrations.AddField(
model_name='avresource',
name='instrument_description_language',
field=models.ForeignKey(blank=True, help_text='What language is Instrument Description written in?', null=True, on_delete=django.db.models.deletion.PROTECT, to='instruments.language'),
model_name="avresource",
name="instrument_description_language",
field=models.ForeignKey(
blank=True,
help_text="What language is Instrument Description written in?",
null=True,
on_delete=django.db.models.deletion.PROTECT,
to="instruments.language",
),
),
]
10 changes: 8 additions & 2 deletions web-app/django/VIM/apps/instruments/models/instrument.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,11 @@ class Instrument(models.Model):
null=True,
related_name="default_image_of",
)
hornbostel_sachs_class = models.CharField(max_length=50, blank=True, help_text = "Hornbostel-Sachs classification")
mimo_class = models.CharField(max_length=50, blank=True, help_text = "Musical Instrument Museums Online classification")
hornbostel_sachs_class = models.CharField(
max_length=50, blank=True, help_text="Hornbostel-Sachs classification"
)
mimo_class = models.CharField(
max_length=50,
blank=True,
help_text="Musical Instrument Museums Online classification",
)

0 comments on commit 92cf01c

Please sign in to comment.