From 01f6448e72a2c99f79a7ebc82aeb9e4d7aed0857 Mon Sep 17 00:00:00 2001 From: Niko Storni Date: Fri, 25 Jun 2021 19:09:00 +0200 Subject: [PATCH] revert aria2c usage --- ip_manager/throttle.go | 4 +--- sources/youtubeVideo.go | 10 +--------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ip_manager/throttle.go b/ip_manager/throttle.go index 6289dee..7d12bc9 100644 --- a/ip_manager/throttle.go +++ b/ip_manager/throttle.go @@ -2,7 +2,6 @@ package ip_manager import ( "net" - "os" "sort" "sync" "time" @@ -46,8 +45,7 @@ func GetIPPool(stopGrp *stop.Group) (*IPPool, error) { var pool []throttledIP for _, address := range addrs { if ipnet, ok := address.(*net.IPNet); ok && ipnet.IP.IsGlobalUnicast() { - ipv6Disabled := os.Getenv("DISABLE_IPV6") != "" - if ipnet.IP.To16() != nil && govalidator.IsIPv6(ipnet.IP.String()) && !ipv6Disabled { + if ipnet.IP.To16() != nil && govalidator.IsIPv6(ipnet.IP.String()) { pool = append(pool, throttledIP{ IP: ipnet.IP.String(), LastUse: time.Now().Add(-5 * time.Minute), diff --git a/sources/youtubeVideo.go b/sources/youtubeVideo.go index 7ed5a37..f80b117 100644 --- a/sources/youtubeVideo.go +++ b/sources/youtubeVideo.go @@ -279,15 +279,7 @@ func (v *YoutubeVideo) download() error { "--load-info-json", metadataPath, } - ipv6Disabled := os.Getenv("DISABLE_IPV6") != "" - if ipv6Disabled { - ytdlArgs = append(ytdlArgs, - "--external-downloader", - "aria2c", - "--external-downloader-args", - "aria2c:-j 16 -x 16 -s 16 -k 1M", - ) - } + userAgent := []string{"--user-agent", downloader.ChromeUA} if v.maxVideoSize > 0 { ytdlArgs = append(ytdlArgs,