diff --git a/catalog/sites/bandcamp.py b/catalog/sites/bandcamp.py index 5db2c6e2..b820c862 100644 --- a/catalog/sites/bandcamp.py +++ b/catalog/sites/bandcamp.py @@ -55,7 +55,7 @@ class Bandcamp(AbstractSite): raise ValueError("given url contains no valid info") genre = [] # TODO: parse tags - track_list = [] + track_list = "" release_nodes = content.xpath( "//div[@class='tralbumData tralbum-credits']/text()" ) diff --git a/catalog/sites/discogs.py b/catalog/sites/discogs.py index 95d17661..e56b97e4 100644 --- a/catalog/sites/discogs.py +++ b/catalog/sites/discogs.py @@ -58,7 +58,7 @@ class DiscogsRelease(AbstractSite): "title": title, "artist": artist, "genre": genre, - "track_list": track_list, + "track_list": "\n".join(track_list), "release_date": None, # only year provided by API "company": company, "media": media, @@ -107,7 +107,7 @@ class DiscogsMaster(AbstractSite): "title": title, "artist": artist, "genre": genre, - "track_list": track_list, + "track_list": "\n".join(track_list), "cover_image_url": image_url, } ) diff --git a/catalog/templates/catalog_edit.html b/catalog/templates/catalog_edit.html index 39d674d0..9d9fdafc 100644 --- a/catalog/templates/catalog_edit.html +++ b/catalog/templates/catalog_edit.html @@ -74,7 +74,6 @@
-\
{% trans '合并到另一条目' %}
diff --git a/catalog/templates/item_base.html b/catalog/templates/item_base.html index 3085c830..a7c1578e 100644 --- a/catalog/templates/item_base.html +++ b/catalog/templates/item_base.html @@ -110,16 +110,6 @@
{% endif %} - {% if item.track_list %} -
-
{% trans '曲目' %}
-

{{ item.track_list | linebreaksbr }}

- -
- {% endif %} - {% block content %} {% if item.contents %}