fixed error handling and messeges

Code-Hex · Code-Hex · commit f585ac897d8f · 2022-01-03T22:48:04.000+09:00
diff --git a/option.go b/option.go
@@ -14,7 +14,7 @@ type Options struct {
 	Help      bool   `short:"h" long:"help"`
 	Procs     int    `short:"p" long:"procs"`
 	Output    string `short:"o" long:"output"`
-	Timeout   int    `short:"t" long:"timeout"`
+	Timeout   int    `short:"t" long:"timeout" default:"10"`
 	UserAgent string `short:"u" long:"user-agent"`
 	Referer   string `short:"r" long:"referer"`
 	Update    bool   `long:"check-update"`
@@ -43,7 +43,7 @@ func (opts Options) usage(version string) []byte {
   -h,  --help                   print usage and exit
   -p,  --procs <num>            split ratio to download file
   -o,  --output <filename>      output file to <filename>
-  -t,  --timeout <seconds>      timeout of checking request in seconds
+  -t,  --timeout <seconds>      timeout of checking request in seconds (default 10s)
   -u,  --user-agent <agent>     identify as <agent>
   -r,  --referer <referer>      identify as <referer>
   --check-update                check if there is update available
diff --git a/pget.go b/pget.go
@@ -166,7 +166,7 @@ func (pget *Pget) parseURLs() error {
 
 	if len(pget.URLs) < 1 {
 		fmt.Fprintf(stdout, "Please input url separate with space or newline\n")
-		fmt.Fprintf(stdout, "Start download at ^D\n")
+		fmt.Fprintf(stdout, "Start download with ^D\n")
 
 		// scanning url from stdin
 		scanner := bufio.NewScanner(os.Stdin)
diff --git a/requests.go b/requests.go
@@ -41,7 +41,7 @@ func Check(ctx context.Context, c *CheckConfig) (*Target, error) {
 	defer cancel()
 
 	if len(c.URLs) == 0 {
-		return nil, errors.New("invalid target URL is zero")
+		return nil, errors.New("URL is required at least one")
 	}
 
 	infos, err := getMirrorInfos(ctx, c.URLs)
@@ -76,7 +76,7 @@ func getMirrorInfos(ctx context.Context, urls []string) ([]*mirrorInfo, error) {
 		eg.Go(func() error {
 			info, err := getMirrorInfo(ctx, url)
 			if err != nil {
-				return err
+				return errors.Wrap(err, url)
 			}
 
 			mu.Lock()
@@ -102,17 +102,17 @@ type mirrorInfo struct {
 func getMirrorInfo(ctx context.Context, url string) (*mirrorInfo, error) {
 	req, err := http.NewRequest("HEAD", url, nil)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to make head request: %q", url)
+		return nil, errors.Wrap(err, "failed to make head request")
 	}
 	req = req.WithContext(ctx)
 
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to head request: %q", url)
+		return nil, errors.Wrap(err, "failed to head request")
 	}
 
 	if resp.Header.Get("Accept-Ranges") != "bytes" {
-		return nil, errors.Errorf("does not support range request: %q", url)
+		return nil, errors.New("does not support range request")
 	}
 
 	if resp.ContentLength <= 0 {
