feat: dry

Signed-off-by: abzcoding <[email protected]>

Author: abzcoding

http.go

@@ -95,9 +95,7 @@ func NewHTTPDownloader(url string, par int, skipTLS bool, proxyServer string, bw
 		Printf("Download target size: %.1f GB\n", sizeInMb/1024)
 	}
 
-	parsed, err = stdurl.Parse(url)
-	FatalCheck(err)
-	file := filepath.Base(strings.TrimRight(parsed.Path, "/\\"))
+	file := TaskFromURL(url)
 
 	ret := new(HTTPDownloader)
 	ret.rate = 0
@@ -131,9 +129,7 @@ func partCalculate(par int64, len int64, url string) []Part {
 			to = len
 		}
 
-		parsed, err := stdurl.Parse(url)
-		FatalCheck(err)
-		file := filepath.Base(strings.TrimRight(parsed.Path, "/\\"))
+		file := TaskFromURL(url)
 
 		folder := FolderOf(url)
 		if err := MkdirIfNotExist(folder); err != nil {

main.go

@@ -6,13 +6,9 @@ import (
 	"io"
 	"os"
 	"os/signal"
-	"path/filepath"
 	"runtime"
 	"syscall"
 
-	stdurl "net/url"
-	"strings"
-
 	"github.com/imkira/go-task"
 )
 
@@ -111,15 +107,9 @@ func Execute(url string, state *State, conn int, skiptls bool, proxy string, bwL
 	if state == nil {
 		downloader = NewHTTPDownloader(url, conn, skiptls, proxy, bwLimit)
 	} else {
-		// Extract the last path from the URL, excluding parameters.
-		// eg: URL_ADDRESS.com/path/to/file?param=value -> file
-		parsed, err := stdurl.Parse(state.URL)
-		FatalCheck(err)
-		cleanFile := filepath.Base(strings.TrimRight(parsed.Path, "/\\"))
-
 		downloader = &HTTPDownloader{
 			url:       state.URL,
-			file:      cleanFile,
+			file:      TaskFromURL(state.URL),
 			par:       int64(len(state.Parts)),
 			parts:     state.Parts,
 			resumable: true,
@@ -154,13 +144,7 @@ func Execute(url string, state *State, conn int, skiptls bool, proxy string, bwL
 					Warnf("Interrupted, but the download is not resumable. Exiting silently.\n")
 				}
 			} else {
-				// Extract the last path from the URL, excluding parameters.
-				// eg: URL_ADDRESS.com/path/to/file?param=value -> file
-				parsed, err := stdurl.Parse(url)
-				FatalCheck(err)
-				filename := filepath.Base(strings.TrimRight(parsed.Path, "/\\"))
-
-				err = JoinFile(files, filename)
+				err := JoinFile(files, TaskFromURL(url))
 				FatalCheck(err)
 				err = os.RemoveAll(FolderOf(url))
 				FatalCheck(err)

util.go

@@ -55,11 +55,9 @@ func DisplayProgressBar() bool {
 func FolderOf(urlStr string) string {
 	safePath := filepath.Join(os.Getenv("HOME"), dataFolder)
 
-	parsedURL, err := url.Parse(urlStr)
-	FatalCheck(err)
 	// Extract the last path from the URL, excluding parameters.
 	// eg: URL_ADDRESS.com/path/to/file?param=value -> file
-	cleanPath := filepath.Base(strings.TrimRight(parsedURL.Path, "/\\"))
+	cleanPath := TaskFromURL(urlStr)
 
 	fullQualifyPath, err := filepath.Abs(filepath.Join(os.Getenv("HOME"), dataFolder, cleanPath))
 	FatalCheck(err)