Compare commits

..

10 Commits

Author SHA1 Message Date
dependabot[bot]
25cb98b380
Merge bbe08d0f43 into f2f5446c18 2023-12-23 16:56:43 +00:00
dependabot[bot]
bbe08d0f43
Bump werkzeug from 2.3.8 to 3.0.1
Bumps [werkzeug](https://github.com/pallets/werkzeug) from 2.3.8 to 3.0.1.
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/werkzeug/compare/2.3.8...3.0.1)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-23 16:56:41 +00:00
f2f5446c18 fixed poetry lock 2023-12-23 19:52:24 +03:00
dependabot[bot]
f39e49ab39
Bump django-colorfield from 0.8.0 to 0.11.0 (#218)
Bumps [django-colorfield](https://github.com/fabiocaccamo/django-colorfield) from 0.8.0 to 0.11.0.
- [Release notes](https://github.com/fabiocaccamo/django-colorfield/releases)
- [Changelog](https://github.com/fabiocaccamo/django-colorfield/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fabiocaccamo/django-colorfield/compare/0.8.0...0.11.0)

---
updated-dependencies:
- dependency-name: django-colorfield
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexander Karpov <51019345+Alexander-D-Karpov@users.noreply.github.com>
2023-12-23 19:47:05 +03:00
dependabot[bot]
0f465e40de
Bump rawpy from 0.18.1 to 0.19.0 (#217)
Bumps [rawpy](https://github.com/letmaik/rawpy) from 0.18.1 to 0.19.0.
- [Release notes](https://github.com/letmaik/rawpy/releases)
- [Commits](https://github.com/letmaik/rawpy/compare/v0.18.1...v0.19.0)

---
updated-dependencies:
- dependency-name: rawpy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-23 19:46:32 +03:00
8f19d51410 updated files 2023-12-19 12:51:59 +03:00
07640962fa fixed music 2023-12-18 17:30:47 +03:00
fbddd3c1dc updated compose 2023-12-18 14:54:12 +03:00
79e865bf37 updated author creation 2023-12-18 14:51:24 +03:00
75d787f460 fixed music processing 2023-12-18 03:50:51 +03:00
10 changed files with 129 additions and 363 deletions

View File

@ -13,6 +13,11 @@
from ..documents import FileDocument from ..documents import FileDocument
from .lema import lemmatize_and_remove_stopwords from .lema import lemmatize_and_remove_stopwords
"""
Calculus on types of searches:
https://new.akarpov.ru/files/FZUTFBIyfbdlDHVzxUNU
"""
class BaseSearch: class BaseSearch:
def __init__(self, queryset: QuerySet | None = None): def __init__(self, queryset: QuerySet | None = None):

View File

@ -92,9 +92,7 @@ def get_queryset(self):
): ):
return self.filter(BaseFileItem.objects.none()) return self.filter(BaseFileItem.objects.none())
return self.filter( return self.filter(
BaseFileItem.objects.cache().filter( BaseFileItem.objects.filter(user=self.request.user, parent__isnull=True)
user=self.request.user, parent__isnull=True
)
) )

View File

@ -0,0 +1,31 @@
# Generated by Django 4.2.8 on 2023-12-18 11:44
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("music", "0012_album_meta_author_albums_author_meta"),
]
operations = [
migrations.RemoveField(
model_name="author",
name="albums",
),
migrations.AddField(
model_name="album",
name="authors",
field=models.ManyToManyField(related_name="albums", to="music.album"),
),
migrations.AlterField(
model_name="album",
name="name",
field=models.CharField(max_length=200, unique=True),
),
migrations.AlterField(
model_name="author",
name="name",
field=models.CharField(max_length=200, unique=True),
),
]

View File

@ -0,0 +1,17 @@
# Generated by Django 4.2.8 on 2023-12-18 14:30
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("music", "0013_remove_author_albums_album_authors_alter_album_name_and_more"),
]
operations = [
migrations.AlterField(
model_name="album",
name="authors",
field=models.ManyToManyField(related_name="albums", to="music.author"),
),
]

View File

@ -8,10 +8,9 @@
class Author(BaseImageModel, ShortLinkModel): class Author(BaseImageModel, ShortLinkModel):
name = models.CharField(max_length=200) name = models.CharField(max_length=200, unique=True)
link = models.URLField(blank=True) link = models.URLField(blank=True)
meta = models.JSONField(blank=True, null=True) meta = models.JSONField(blank=True, null=True)
albums = models.ManyToManyField("Album", related_name="authors")
def get_absolute_url(self): def get_absolute_url(self):
return reverse("music:author", kwargs={"slug": self.slug}) return reverse("music:author", kwargs={"slug": self.slug})
@ -21,9 +20,10 @@ def __str__(self):
class Album(BaseImageModel, ShortLinkModel): class Album(BaseImageModel, ShortLinkModel):
name = models.CharField(max_length=200) name = models.CharField(max_length=200, unique=True)
link = models.URLField(blank=True) link = models.URLField(blank=True)
meta = models.JSONField(blank=True, null=True) meta = models.JSONField(blank=True, null=True)
authors = models.ManyToManyField("Author", related_name="albums")
def get_absolute_url(self): def get_absolute_url(self):
return reverse("music:album", kwargs={"slug": self.slug}) return reverse("music:album", kwargs={"slug": self.slug})

View File

@ -27,16 +27,28 @@ def load_track(
if album and type(album) is str and album.startswith("['"): if album and type(album) is str and album.startswith("['"):
album = album.replace("['", "").replace("']", "") album = album.replace("['", "").replace("']", "")
re_authors = []
if authors: if authors:
authors = [Author.objects.get_or_create(name=x)[0] for x in authors if authors] for x in authors:
else: try:
authors = [] re_authors.append(Author.objects.get(name=x))
except Author.DoesNotExist:
re_authors.append(Author.objects.create(name=x))
authors = re_authors
album_name = None
if album: if album:
if type(album) is str: if type(album) is str:
album = Album.objects.get_or_create(name=album)[0] album_name = album
elif type(album) is list: elif type(album) is list:
album = Album.objects.get_or_create(name=album[0])[0] album_name = album[0]
else: else:
album_name = None
if album_name:
try:
album = Album.objects.get(name=album_name)
except Album.DoesNotExist:
album = Album.objects.create(name=album_name)
if not album_name:
album = None album = None
if sng := Song.objects.filter( if sng := Song.objects.filter(
@ -101,7 +113,7 @@ def load_track(
album.save() album.save()
if authors: if authors:
song.authors.set(authors) song.authors.set([x.id for x in authors])
# set music meta # set music meta
tag = MutagenFile(song.file.path) tag = MutagenFile(song.file.path)

View File

@ -62,8 +62,6 @@ def load_file_meta(track: int, user_id: int) -> str:
que.delete() que.delete()
return "" return ""
print("Start downloading")
filename = f"_{str(randint(10000, 9999999))}" filename = f"_{str(randint(10000, 9999999))}"
orig_path = f"{settings.MEDIA_ROOT}/{filename}.mp3" orig_path = f"{settings.MEDIA_ROOT}/{filename}.mp3"
album = track.albums[0] album = track.albums[0]
@ -76,13 +74,10 @@ def load_file_meta(track: int, user_id: int) -> str:
except NotFoundError: except NotFoundError:
img_pth = None img_pth = None
print("Downloaded file")
try: try:
lyrics = track.get_lyrics("LRC").fetch_lyrics() lyrics = track.get_lyrics("LRC").fetch_lyrics()
except NotFoundError: except NotFoundError:
lyrics = "" lyrics = ""
print("Start loading")
song = load_track( song = load_track(
orig_path, orig_path,
img_pth, img_pth,
@ -96,7 +91,6 @@ def load_file_meta(track: int, user_id: int) -> str:
explicit=track.explicit, explicit=track.explicit,
track_source=track.track_source, track_source=track.track_source,
) )
print("Loaded")
if os.path.exists(orig_path): if os.path.exists(orig_path):
os.remove(orig_path) os.remove(orig_path)
if os.path.exists(img_pth): if os.path.exists(img_pth):
@ -132,31 +126,31 @@ def update_album_info(album: AlbumModel) -> None:
"description": search_album.description, "description": search_album.description,
"type": search_album.type, "type": search_album.type,
} }
authors = []
if search_album.artists:
authors = [
Author.objects.get_or_create(name=x.name)[0]
for x in search_album.artists
]
album.authors.set(authors)
album.meta = data album.meta = data
image_path = str(settings.MEDIA_ROOT + f"/_{str(randint(10000, 99999))}.png") image_path = str(settings.MEDIA_ROOT + f"/_{str(randint(10000, 99999))}.png")
if not search_album.cover_uri: if search_album.cover_uri:
album.save() search_album.download_cover(filename=image_path)
return with open(image_path, "rb") as f:
search_album.download_cover(filename=image_path) album.image = File(f, name=image_path.split("/")[-1])
with open(image_path, "rb") as f: album.save()
album.image = File(f, name=image_path.split("/")[-1]) os.remove(image_path)
album.save()
os.remove(image_path) authors = []
if search_album.artists:
for x in search_album.artists:
try:
authors.append(Author.objects.get(name=x.name))
except Author.DoesNotExist:
authors.append(Author.objects.create(name=x.name))
album.authors.set([x.id for x in authors])
album.save()
def update_author_info(author: Author) -> None: def update_author_info(author: Author) -> None:
client = login() client = login()
search = client.search(author.name, type_="artist") # type: Search search = client.search(author.name, type_="artist") # type: Search
print("Loading author info " + author.name)
if search.artists: if search.artists:
search_artist = search.artists.results[0] search_artist = search.artists.results[0]
data = { data = {
@ -171,7 +165,6 @@ def update_author_info(author: Author) -> None:
if not search_artist.cover: if not search_artist.cover:
author.save() author.save()
return return
print("Downloading image")
search_artist.cover.download(filename=image_path) search_artist.cover.download(filename=image_path)
with open(image_path, "rb") as f: with open(image_path, "rb") as f:
author.image = File(f, name=image_path.split("/")[-1]) author.image = File(f, name=image_path.split("/")[-1])

View File

@ -3,7 +3,6 @@
set -o errexit set -o errexit
set -o nounset set -o nounset
python manage.py makemigrations
python manage.py migrate python manage.py migrate
rm -f './celerybeat.pid' rm -f './celerybeat.pid'
celery -A config.celery_app beat -l INFO celery -A config.celery_app beat -l INFO

357
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -28,7 +28,7 @@ django-crispy-forms = "^2.1"
crispy-bootstrap5 = "^0.7" crispy-bootstrap5 = "^0.7"
django-redis = "^5.2.0" django-redis = "^5.2.0"
django-ckeditor = "^6.5.1" django-ckeditor = "^6.5.1"
django-colorfield = "^0.8.0" django-colorfield = "^0.11.0"
djangorestframework = "^3.14.0" djangorestframework = "^3.14.0"
django-rest-auth = "^0.9.5" django-rest-auth = "^0.9.5"
django-cors-headers = "^4.0.0" django-cors-headers = "^4.0.0"
@ -77,7 +77,7 @@ pydub = "^0.25.1"
python-mpd2 = "^3.0.5" python-mpd2 = "^3.0.5"
yandex-music = "^2.1.1" yandex-music = "^2.1.1"
pyjwt = "^2.8.0" pyjwt = "^2.8.0"
rawpy = "^0.18.1" rawpy = "^0.19.0"
xvfbwrapper = "^0.2.9" xvfbwrapper = "^0.2.9"
vtk = "^9.2.6" vtk = "^9.2.6"
ffmpeg-python = "^0.2.0" ffmpeg-python = "^0.2.0"