Compare commits

...
6 Commits
Author SHA1 Message Date
Niko Storni 03161a5a02 prefer 1080p videos 2019-08-05 20:08:46 +02:00
Niko Storni 6dc2c39ee6 limit description length
rather than limiting lines count
2019-08-02 10:01:33 -04:00
Niko Storni 87211e802d reduce tags length 2019-08-02 09:05:24 -04:00
Niko Storni 3ba0c97634 fix flags 2019-07-25 18:33:05 -04:00
Niko Storni 9d65fce6bc do not apply limits if disabled 2019-07-25 18:22:56 -04:00
Niko Storni d5ed4ce753 facilitate streaming by moving the moov atom 2019-07-25 18:15:14 -04:00
2 changed files with 20 additions and 10 deletions

No files matched your search

+19 -9
View File
@@ -162,17 +162,17 @@ func (v *YoutubeVideo) getFullPath() string {
}
func (v *YoutubeVideo) getAbbrevDescription() string {
maxLines := 10
maxLength := 2800
description := strings.TrimSpace(v.description)
additionalDescription := "\nhttps://www.youtube.com/watch?v=" + v.id
khanAcademyClaimID := "5fc52291980268b82413ca4c0ace1b8d749f3ffb"
if v.lbryChannelID == khanAcademyClaimID {
additionalDescription = additionalDescription + "\nNote: All Khan Academy content is available for free at (www.khanacademy.org)"
}
if strings.Count(description, "\n") < maxLines {
return description + "\n..." + additionalDescription
if len(description) > maxLength {
description = description[:maxLength]
}
return strings.Join(strings.Split(description, "\n")[:maxLines], "\n") + "\n..." + additionalDescription
return description + "\n..." + additionalDescription
}
func (v *YoutubeVideo) download(useIPv6 bool) error {
@@ -191,7 +191,7 @@ func (v *YoutubeVideo) download(useIPv6 bool) error {
return nil
}
qualities := []string{
//"1080",
"1080",
"720",
"480",
"320",
@@ -199,17 +199,27 @@ func (v *YoutubeVideo) download(useIPv6 bool) error {
qualityIndex := 0
ytdlArgs := []string{
"--no-progress",
"--max-filesize",
fmt.Sprintf("%dM", v.maxVideoSize),
"--match-filter",
fmt.Sprintf("duration <= %d", int(math.Round(v.maxVideoLength*3600))),
"-o" + strings.TrimSuffix(v.getFullPath(), ".mp4"),
"--merge-output-format",
"mp4",
"--postprocessor-args",
"-movflags faststart",
"--abort-on-unavailable-fragment",
"--fragment-retries",
"0",
}
if v.maxVideoSize > 0 {
ytdlArgs = append(ytdlArgs,
"--max-filesize",
fmt.Sprintf("%dM", v.maxVideoSize),
)
}
if v.maxVideoLength > 0 {
ytdlArgs = append(ytdlArgs,
"--match-filter",
fmt.Sprintf("duration <= %d", int(math.Round(v.maxVideoLength*3600))),
)
}
sourceAddress, err := ipManager.GetNextIP(useIPv6)
if err != nil {
if sourceAddress == "throttled" {
+1 -1
View File
@@ -71,7 +71,7 @@ func SanitizeTags(tags []string, youtubeChannelID string) ([]string, error) {
return sanitizedTags, nil
}
const TagMaxLength = 255
const TagMaxLength = 50
func normalizeTag(t string) (string, error) {
t = strings.ToLower(t)