mirror of
https://github.com/meeb/tubesync.git
synced 2025-06-25 06:26:37 +00:00
Merge branch 'meeb:main' into delete-source-reworked
This commit is contained in:
commit
c7e1f88cb2
2
.github/actions/string-case/action.yml
vendored
2
.github/actions/string-case/action.yml
vendored
@ -20,7 +20,7 @@ outputs:
|
|||||||
runs:
|
runs:
|
||||||
using: 'composite'
|
using: 'composite'
|
||||||
steps:
|
steps:
|
||||||
- name: Retrieve releases
|
- name: Set outputs
|
||||||
id: 'set'
|
id: 'set'
|
||||||
env:
|
env:
|
||||||
INPUT_STRING: '${{ inputs.string }}'
|
INPUT_STRING: '${{ inputs.string }}'
|
||||||
|
10
.github/sh/library/variables.inc.sh
vendored
Normal file
10
.github/sh/library/variables.inc.sh
vendored
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
# For setting single line variables in the environment or output
|
||||||
|
set_sl_var() { local f='%s=%s\n' ; printf -- "${f}" "$@" ; } ;
|
||||||
|
|
||||||
|
# Used together to set multiple line variables in the environment or output
|
||||||
|
mk_delim() { local f='%s_EOF_%d_' ; printf -- "${f}" "$1" "${RANDOM}" ; } ;
|
||||||
|
open_ml_var() { local f=''\%'s<<'\%'s\n' ; printf -- "${f}" "$2" "$1" ; } ;
|
||||||
|
close_ml_var() { local f='%s\n' ; printf -- "${f}" "$1" ; } ;
|
||||||
|
|
4
.github/workflows/ci.yaml
vendored
4
.github/workflows/ci.yaml
vendored
@ -83,7 +83,7 @@ jobs:
|
|||||||
cat >| .ffmpeg.releases.json <<'EOF'
|
cat >| .ffmpeg.releases.json <<'EOF'
|
||||||
${{ needs.info.outputs.ffmpeg-releases }}
|
${{ needs.info.outputs.ffmpeg-releases }}
|
||||||
EOF
|
EOF
|
||||||
mk_delim() { printf -- '"%s_EOF_%d_"' "$1" "${RANDOM}" ; } ;
|
mk_delim() { local f='%s_EOF_%d_' ; printf -- "${f}" "$1" "${RANDOM}" ; } ;
|
||||||
open_ml_var() { local f=''\%'s<<'\%'s\n' ; printf -- "${f}" "$2" "$1" ; } ;
|
open_ml_var() { local f=''\%'s<<'\%'s\n' ; printf -- "${f}" "$2" "$1" ; } ;
|
||||||
close_ml_var() { local f='%s\n' ; printf -- "${f}" "$1" ; } ;
|
close_ml_var() { local f='%s\n' ; printf -- "${f}" "$1" ; } ;
|
||||||
{
|
{
|
||||||
@ -104,6 +104,8 @@ jobs:
|
|||||||
close_ml_var "${delim}" "${var}" ;
|
close_ml_var "${delim}" "${var}" ;
|
||||||
unset -v delim jq_arg var ;
|
unset -v delim jq_arg var ;
|
||||||
} >> "${GITHUB_ENV}"
|
} >> "${GITHUB_ENV}"
|
||||||
|
cat -v "${GITHUB_ENV}"
|
||||||
|
rm -v -f .ffmpeg.releases.json
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v3
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
|
@ -145,6 +145,9 @@ class CommaSepChoiceField(models.CharField):
|
|||||||
# The data was lost; we can regenerate it.
|
# The data was lost; we can regenerate it.
|
||||||
args_dict = {key: self.__dict__[key] for key in CommaSepChoice._fields}
|
args_dict = {key: self.__dict__[key] for key in CommaSepChoice._fields}
|
||||||
args_dict['selected_choices'] = list(value)
|
args_dict['selected_choices'] = list(value)
|
||||||
|
# setting a string manually should not result in characters
|
||||||
|
if isinstance(value, str) and len(value) > 0:
|
||||||
|
args_dict['selected_choices'] = value.split(self.separator)
|
||||||
data = CommaSepChoice(**args_dict)
|
data = CommaSepChoice(**args_dict)
|
||||||
value = data.selected_choices
|
value = data.selected_choices
|
||||||
s_value = super().get_prep_value(value)
|
s_value = super().get_prep_value(value)
|
||||||
|
Loading…
Reference in New Issue
Block a user