jdb/wdiwtlt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: when untagging, the tag is deleted if no more references to it exist.

Browse Source
This commit is contained in:
Jonathan Bernard 2016-03-21 01:15:45 -05:00
parent 902e97c309
commit f3d95955c0
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/groovy/com/jdbernard/wdiwtlt/db/DbApi.groovy
View File

@ -560,7 +560,7 @@ public class DbApi {
if (params.mediaFileId) { if (params.mediaFileId) {
query.append(' AND mf.media_file_id = ? ') query.append(' AND mf.media_file_id = ? ')
sqlParam << params.mediaFileId } sqlParams << params.mediaFileId }
if (params.albumId) { if (params.albumId) {
query.append(' JOIN albums_media_files almf ON ') query.append(' JOIN albums_media_files almf ON ')
@ -834,15 +834,30 @@ public class DbApi {
def tagPlaceHolders = tags.collect { '?' }.join(', ') def tagPlaceHolders = tags.collect { '?' }.join(', ')
def tagIds = tags.collect { it.id } def tagIds = tags.collect { it.id }
String deleteQuery = """ String unassociateTagQuery = """
DELETE FROM media_files_tags DELETE FROM media_files_tags
WHERE tag_id IN ($tagPlaceHolders) AND media_file_id = ?""" WHERE tag_id IN ($tagPlaceHolders) AND media_file_id = ?"""
String checkTagUseQuery =
'SELECT * FROM media_files_tags WHERE tag_id = ?'
String deleteTagQuery = 'DELETE FROM tags WHERE id = ?'
mediaFileIds.each { mfId -> mediaFileIds.each { mfId ->
def params = tagIds + mfId def params = tagIds + mfId
logger.debug('Removing tags.\n\tSQL: {}\n\tPARAMS: {}', logger.debug('Removing tags.\n\tSQL: {}\n\tPARAMS: {}',
deleteQuery, params) unassociateTagQuery, params)
sql.execute(deleteQuery, params) } } } sql.execute(unassociateTagQuery, params) }
tags.each { tag ->
def params = [tag.id]
logger.debug(
'Checking if tag is still in use.\n\tSQL: {}\n\tPARAMS: {}',
checkTagUseQuery, params)
if (sql.rows(checkTagUseQuery, params).size() == 0) {
logger.debug('Deleting unused tag.\n\tSQL: {}, PARAMS: {}',
deleteTagQuery, params)
sql.execute(deleteTagQuery, params) } } } }
/// ### Utility functions /// ### Utility functions
public def withTransaction(Closure c) { public def withTransaction(Closure c) {