Fix linter errors (#4733)
This commit is contained in:
@@ -68,7 +68,7 @@ func RegisterFediverseOTP(accessToken, userID, userDisplayName, account string)
|
|||||||
defer lock.Unlock()
|
defer lock.Unlock()
|
||||||
|
|
||||||
if len(pendingAuthRequests)+1 > maxPendingRequests {
|
if len(pendingAuthRequests)+1 > maxPendingRequests {
|
||||||
return request, false, errors.New("please try again later, too many pending requests")
|
return request, false, errors.New("too many pending requests, please try again later")
|
||||||
}
|
}
|
||||||
|
|
||||||
code, _ := createCode()
|
code, _ := createCode()
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@ var _getInboundDetailsFromMetadataRE = regexp.MustCompile(`\{(.*?)\}`)
|
|||||||
func getInboundDetailsFromMetadata(metadata []interface{}) (models.RTMPStreamMetadata, error) {
|
func getInboundDetailsFromMetadata(metadata []interface{}) (models.RTMPStreamMetadata, error) {
|
||||||
metadataComponentsString := fmt.Sprintf("%+v", metadata)
|
metadataComponentsString := fmt.Sprintf("%+v", metadata)
|
||||||
if !strings.Contains(metadataComponentsString, "onMetaData") {
|
if !strings.Contains(metadataComponentsString, "onMetaData") {
|
||||||
return models.RTMPStreamMetadata{}, errors.New("not a onMetaData message")
|
return models.RTMPStreamMetadata{}, errors.New("not an onMetaData message")
|
||||||
}
|
}
|
||||||
|
|
||||||
submatchall := _getInboundDetailsFromMetadataRE.FindAllString(metadataComponentsString, 1)
|
submatchall := _getInboundDetailsFromMetadataRE.FindAllString(metadataComponentsString, 1)
|
||||||
|
|||||||
@@ -225,10 +225,8 @@ func (t *Transcoder) getFlags() *execInfo {
|
|||||||
environ := []string{
|
environ := []string{
|
||||||
reportEnv,
|
reportEnv,
|
||||||
}
|
}
|
||||||
ffmpegFlags := []string{
|
ffmpegFlags := make([]string, 0, 64)
|
||||||
"-hide_banner",
|
ffmpegFlags = append(ffmpegFlags, "-hide_banner", "-loglevel", "warning")
|
||||||
"-loglevel", "warning",
|
|
||||||
}
|
|
||||||
ffmpegFlags = append(ffmpegFlags, t.codec.GlobalFlags()...)
|
ffmpegFlags = append(ffmpegFlags, t.codec.GlobalFlags()...)
|
||||||
ffmpegFlags = append(ffmpegFlags, []string{
|
ffmpegFlags = append(ffmpegFlags, []string{
|
||||||
"-fflags", "+genpts", // Generate presentation time stamp if missing
|
"-fflags", "+genpts", // Generate presentation time stamp if missing
|
||||||
@@ -370,7 +368,7 @@ func (v *HLSVariant) getVariantString(t *Transcoder) []string {
|
|||||||
|
|
||||||
// Get the command flags for the variants.
|
// Get the command flags for the variants.
|
||||||
func (t *Transcoder) getVariantsString() []string {
|
func (t *Transcoder) getVariantsString() []string {
|
||||||
var variantsCommandFlags []string
|
variantsCommandFlags := make([]string, 0, len(t.variants)*20)
|
||||||
streamMap := make([]string, 0, len(t.variants))
|
streamMap := make([]string, 0, len(t.variants))
|
||||||
|
|
||||||
for _, variant := range t.variants {
|
for _, variant := range t.variants {
|
||||||
@@ -418,7 +416,8 @@ func (v *HLSVariant) getVideoQualityString(t *Transcoder) []string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
gop := v.framerate * t.currentLatencyLevel.SecondsPerSegment // force an i-frame every segment
|
gop := v.framerate * t.currentLatencyLevel.SecondsPerSegment // force an i-frame every segment
|
||||||
cmd := []string{
|
cmd := make([]string, 0, 20)
|
||||||
|
cmd = append(cmd,
|
||||||
"-map", "v:0",
|
"-map", "v:0",
|
||||||
fmt.Sprintf("-c:v:%d", v.index), t.codec.Name(), // Video codec used for this variant
|
fmt.Sprintf("-c:v:%d", v.index), t.codec.Name(), // Video codec used for this variant
|
||||||
fmt.Sprintf("-b:v:%d", v.index), fmt.Sprintf("%dk", v.getAllocatedVideoBitrate()), // The average bitrate for this variant allowing space for audio
|
fmt.Sprintf("-b:v:%d", v.index), fmt.Sprintf("%dk", v.getAllocatedVideoBitrate()), // The average bitrate for this variant allowing space for audio
|
||||||
@@ -426,7 +425,7 @@ func (v *HLSVariant) getVideoQualityString(t *Transcoder) []string {
|
|||||||
fmt.Sprintf("-g:v:%d", v.index), fmt.Sprintf("%d", gop), // Suggested interval where i-frames are encoded into the segments
|
fmt.Sprintf("-g:v:%d", v.index), fmt.Sprintf("%d", gop), // Suggested interval where i-frames are encoded into the segments
|
||||||
fmt.Sprintf("-keyint_min:v:%d", v.index), fmt.Sprintf("%d", gop), // minimum i-keyframe interval
|
fmt.Sprintf("-keyint_min:v:%d", v.index), fmt.Sprintf("%d", gop), // minimum i-keyframe interval
|
||||||
fmt.Sprintf("-r:v:%d", v.index), fmt.Sprintf("%d", v.framerate),
|
fmt.Sprintf("-r:v:%d", v.index), fmt.Sprintf("%d", v.framerate),
|
||||||
}
|
)
|
||||||
cmd = append(cmd, t.codec.VariantFlags(v)...)
|
cmd = append(cmd, t.codec.VariantFlags(v)...)
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ type TimestampedValue struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func makeTimestampedValuesFromDatapoints(dp []*tstorage.DataPoint) []TimestampedValue {
|
func makeTimestampedValuesFromDatapoints(dp []*tstorage.DataPoint) []TimestampedValue {
|
||||||
tv := []TimestampedValue{}
|
tv := make([]TimestampedValue, 0, len(dp))
|
||||||
for _, d := range dp {
|
for _, d := range dp {
|
||||||
tv = append(tv, TimestampedValue{Time: time.Unix(d.Timestamp, 0), Value: d.Value})
|
tv = append(tv, TimestampedValue{Time: time.Unix(d.Timestamp, 0), Value: d.Value})
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -344,7 +344,7 @@ func StringSliceToMap(stringSlice []string) map[string]interface{} {
|
|||||||
|
|
||||||
// Float64MapToSlice is a convenience function to convert a map of floats into.
|
// Float64MapToSlice is a convenience function to convert a map of floats into.
|
||||||
func Float64MapToSlice(float64Map map[string]float64) []float64 {
|
func Float64MapToSlice(float64Map map[string]float64) []float64 {
|
||||||
float64Slice := []float64{}
|
float64Slice := make([]float64, 0, len(float64Map))
|
||||||
|
|
||||||
for _, val := range float64Map {
|
for _, val := range float64Map {
|
||||||
float64Slice = append(float64Slice, val)
|
float64Slice = append(float64Slice, val)
|
||||||
@@ -355,7 +355,7 @@ func Float64MapToSlice(float64Map map[string]float64) []float64 {
|
|||||||
|
|
||||||
// StringMapKeys returns a slice of string keys from a map.
|
// StringMapKeys returns a slice of string keys from a map.
|
||||||
func StringMapKeys(stringMap map[string]interface{}) []string {
|
func StringMapKeys(stringMap map[string]interface{}) []string {
|
||||||
stringSlice := []string{}
|
stringSlice := make([]string, 0, len(stringMap))
|
||||||
for k := range stringMap {
|
for k := range stringMap {
|
||||||
stringSlice = append(stringSlice, k)
|
stringSlice = append(stringSlice, k)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,8 +21,9 @@ func GetServerConfig(w http.ResponseWriter, r *http.Request) {
|
|||||||
usernameBlocklist := configRepository.GetForbiddenUsernameList()
|
usernameBlocklist := configRepository.GetForbiddenUsernameList()
|
||||||
usernameSuggestions := configRepository.GetSuggestedUsernamesList()
|
usernameSuggestions := configRepository.GetSuggestedUsernamesList()
|
||||||
|
|
||||||
videoQualityVariants := make([]models.StreamOutputVariant, 0)
|
streamOutputVariants := configRepository.GetStreamOutputVariants()
|
||||||
for _, variant := range configRepository.GetStreamOutputVariants() {
|
videoQualityVariants := make([]models.StreamOutputVariant, 0, len(streamOutputVariants))
|
||||||
|
for _, variant := range streamOutputVariants {
|
||||||
videoQualityVariants = append(videoQualityVariants, models.StreamOutputVariant{
|
videoQualityVariants = append(videoQualityVariants, models.StreamOutputVariant{
|
||||||
Name: variant.GetName(),
|
Name: variant.GetName(),
|
||||||
IsAudioPassthrough: variant.GetIsAudioPassthrough(),
|
IsAudioPassthrough: variant.GetIsAudioPassthrough(),
|
||||||
|
|||||||
Reference in New Issue
Block a user