Merge branch 'main' into feat/prefer-audio-track
This commit is contained in:
8
.github/actions/FFmpeg/action.yml
vendored
8
.github/actions/FFmpeg/action.yml
vendored
@@ -100,7 +100,13 @@ runs:
|
||||
var='FFMPEG_DATE' ;
|
||||
delim="$(mk_delim "${var}")" ;
|
||||
open_ml_var "${delim}" "${var}" ;
|
||||
jq_arg='[foreach .[] as $release ([{}, []]; [ .[0] + {($release.commit): ([ $release.date ] + (.[0][($release.commit)] // []) ) }, [ .[1][0] // $release.commit ] ] ; .[0][(.[1][0])] ) ][-1][0]' ;
|
||||
jq_arg='.[0].commit as $first_commit |
|
||||
[
|
||||
.[] |
|
||||
select(.commit == $first_commit) |
|
||||
.date
|
||||
] |
|
||||
last' ;
|
||||
jq -r "${jq_arg}" -- .ffmpeg.releases.json ;
|
||||
close_ml_var "${delim}" "${var}" ;
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ def restore_metadata_column(apps, schema_editor):
|
||||
qs = Media.objects.filter(metadata__isnull=False)
|
||||
for media in qs_gen(qs):
|
||||
metadata = media.loaded_metadata
|
||||
for key in {'migrated', '_using_table'}:
|
||||
for key in ('migrated', '_using_table'):
|
||||
metadata.pop(key, None)
|
||||
media.metadata = media.metadata_dumps(arg_dict=metadata)
|
||||
media.save()
|
||||
|
||||
Reference in New Issue
Block a user