mirror of
https://github.com/meeb/tubesync.git
synced 2025-06-23 13:36:35 +00:00
Handle multiple matches for metadata when searching by key
This commit is contained in:
parent
3c85d5531e
commit
ce2dd7bbea
@ -435,14 +435,33 @@ def media_post_delete(sender, instance, **kwargs):
|
|||||||
try:
|
try:
|
||||||
if instance_qs.count():
|
if instance_qs.count():
|
||||||
with atomic(durable=False):
|
with atomic(durable=False):
|
||||||
instance_qs.update(media=skipped_media)
|
# clear the link to a media instance
|
||||||
|
Metadata.objects.filter(media=skipped_media).update(media=None)
|
||||||
|
# choose the oldest metadata for our key
|
||||||
|
md = instance_qs.filter(
|
||||||
|
key=skipped_media.key,
|
||||||
|
).order_by(
|
||||||
|
'key',
|
||||||
|
'created',
|
||||||
|
).first()
|
||||||
|
# set the link to a media instance only on our selected metadata
|
||||||
|
log.info('Reusing old metadata for "{}": {}', skipped_media.key, skipped_media.name)
|
||||||
|
instance_qs.filter(uuid=md.uuid).update(media=skipped_media)
|
||||||
|
# delete any metadata that we are no longer using
|
||||||
|
instance_qs.exclude(uuid=md.uuid).delete()
|
||||||
|
|
||||||
except IntegrityError:
|
except IntegrityError:
|
||||||
|
# this probably won't happen, but try it without a transaction
|
||||||
try:
|
try:
|
||||||
with atomic(durable=False):
|
# clear the link to a media instance
|
||||||
# Delete the new metadata
|
Metadata.objects.filter(media=skipped_media).update(media=None)
|
||||||
Metadata.objects.filter(media=skipped_media).delete()
|
# keep one metadata
|
||||||
instance_qs.update(media=skipped_media)
|
md = instance_qs.order_by('created').first()
|
||||||
|
instance_qs.filter(uuid=md.uuid).update(media=skipped_media)
|
||||||
|
except IntegrityError as e:
|
||||||
|
log.exception('media_post_delete: could not update selected metadata: {}', e)
|
||||||
finally:
|
finally:
|
||||||
# Delete the old metadata, if it wasn't used
|
log.debug('Deleting metadata for "{}": {}', skipped_media.key, skipped_media.pk)
|
||||||
|
# delete the old metadata
|
||||||
instance_qs.delete()
|
instance_qs.delete()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user