storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add tags to playlist items in web interface

Browse Source
This commit is contained in:
Terry Geng
2020-03-20 13:24:31 +08:00
parent 701403b1a2
commit 70f358f964
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
interface.py
View File

@@ -181,9 +181,13 @@ def playlist():
items = [] items = []
for index, item_wrapper in enumerate(var.playlist): for index, item_wrapper in enumerate(var.playlist):
tag_tuples = []
for tag in item_wrapper.item().tags:
tag_tuples.append([tag, tags_color_lookup[tag]])
items.append(render_template('playlist.html', items.append(render_template('playlist.html',
index=index, index=index,
tags_color_lookup=tags_color_lookup, tag_tuples=tag_tuples,
m=item_wrapper.item(), m=item_wrapper.item(),
playlist=var.playlist playlist=var.playlist
) )
@@ -491,9 +495,16 @@ def library():
'active_page': current_page 'active_page': current_page
}) })
elif request.form['action'] == 'edit_tags': elif request.form['action'] == 'edit_tags':
item = var.music_db.query_music_by_id(request.form['id']) tags = list(dict.fromkeys(request.form['tags'].split(","))) # remove duplicated items
item['tags'] = list(dict.fromkeys(request.form['tags'].split(","))) # remove duplicated items if request.form['id'] in var.cache:
var.music_db.insert_music(item) music_wrapper = get_cached_wrapper_by_id(var.bot, request.form['id'], user)
music_wrapper.clear_tags()
music_wrapper.add_tags(tags)
var.playlist.version += 1
else:
item = var.music_db.query_music_by_id(request.form['id'])
item['tags'] = tags
var.music_db.insert_music(item)
return redirect("./", code=302) return redirect("./", code=302)
else: else:

8
templates/index.html
View File

@@ -598,7 +598,7 @@
tag.addClass('tag-clicked'); tag.addClass('tag-clicked');
tag.removeClass('tag-unclicked'); tag.removeClass('tag-unclicked');
} else { } else {
tag.addClass('tag-umclicked'); tag.addClass('tag-unclicked');
tag.removeClass('tag-clicked'); tag.removeClass('tag-clicked');
} }
updateResults(); updateResults();
@@ -684,8 +684,7 @@
var tag_edit_copy = tag_edit_element.clone(); var tag_edit_copy = tag_edit_element.clone();
tag_edit_copy.click(function(){ tag_edit_copy.click(function(){
addTagModalPrepare(item.id, item.title, item.tags); addTagModalShow(item.id, item.title, item.tags);
add_tag_modal.modal('show');
}); });
tag_edit_copy.appendTo(tags); tag_edit_copy.appendTo(tags);
@@ -895,7 +894,7 @@
var modal_tag = $(".modal-tag"); var modal_tag = $(".modal-tag");
var modal_tag_text = $(".modal-tag-text"); var modal_tag_text = $(".modal-tag-text");
function addTagModalPrepare(_id, _title, _tag_tuples){ function addTagModalShow(_id, _title, _tag_tuples){
add_tag_modal_title.html("Edit tags for " + _title); add_tag_modal_title.html("Edit tags for " + _title);
add_tag_modal_item_id.val(_id); add_tag_modal_item_id.val(_id);
add_tag_modal_tags.empty(); add_tag_modal_tags.empty();
@@ -910,6 +909,7 @@
tag_copy.appendTo(add_tag_modal_tags); tag_copy.appendTo(add_tag_modal_tags);
modal_tag_text.html(""); modal_tag_text.html("");
}); });
add_tag_modal.modal('show');
} }
function addTagModalAdd(){ function addTagModalAdd(){

7
templates/playlist.html
View File

@@ -39,8 +39,11 @@
Unknown Artist Unknown Artist
{% endif %} {% endif %}
<br /> <br />
{% for tag in m.tags %}
<span class="badge badge-{{ tags_color_lookup[tag] }}">{{ tag }}</span> <a class="tag-space tag-click"
onclick='addTagModalShow("{{ m.id }}", "{{ m.title }}", {{ tag_tuples | tojson }});'><i class="fas fa-edit" style="color: #AAAAAA"></i></a>
{% for tag_tuple in tag_tuples %}
<span class="badge badge-{{ tag_tuple[1] }}">{{ tag_tuple[0] }}</span>
{% endfor %} {% endfor %}
</div> </div>
</td> </td>