Fix file parts are not joined when resume

Author: kiennq

http.go

@@ -123,8 +123,9 @@ func partCalculate(par int64, len int64, url string) []Part {
 		// Padding 0 before path name as filename will be sorted as string
 		fname := fmt.Sprintf("%s.part%06d", file, j)
 		path := filepath.Join(folder, fname) // ~/.hget/download-file-name/part-name
-		ret[j] = Part{Url: url, Path: path, RangeFrom: from, RangeTo: to}
+		ret[j] = Part{Index: j, Url: url, Path: path, RangeFrom: from, RangeTo: to}
 	}
+
 	return ret
 }
 
@@ -134,25 +135,31 @@ func (d *HttpDownloader) Do(doneChan chan bool, fileChan chan string, errorChan
 	var barpool *pb.Pool
 	var err error
 
-	if DisplayProgressBar() {
-		bars = make([]*pb.ProgressBar, 0)
-		for i, part := range d.parts {
-			newbar := pb.New64(part.RangeTo - part.RangeFrom).SetUnits(pb.U_BYTES).Prefix(color.YellowString(fmt.Sprintf("%s-%d", d.file, i)))
-			bars = append(bars, newbar)
+	for _, p := range d.parts {
+
+		if p.RangeTo <= p.RangeFrom {
+			fileChan <- p.Path
+			stateSaveChan <- Part{
+				Index:     p.Index,
+				Url:       d.url,
+				Path:      p.Path,
+				RangeFrom: p.RangeFrom,
+				RangeTo:   p.RangeTo,
+			}
+
+			continue
+		}
+
+		var bar *pb.ProgressBar
+
+		if DisplayProgressBar() {
+			bar = pb.New64(p.RangeTo - p.RangeFrom).SetUnits(pb.U_BYTES).Prefix(color.YellowString(fmt.Sprintf("%s-%d", d.file, p.Index)))
+			bars = append(bars, bar)
 		}
-		barpool, err = pb.StartPool(bars...)
-		FatalCheck(err)
-	}
 
-	for i, p := range d.parts {
 		ws.Add(1)
-		go func(d *HttpDownloader, loop int64, part Part) {
+		go func(d *HttpDownloader, bar *pb.ProgressBar, part Part) {
 			defer ws.Done()
-			var bar *pb.ProgressBar
-
-			if DisplayProgressBar() {
-				bar = bars[loop]
-			}
 
 			var ranges string
 			if part.RangeTo != d.len {
@@ -214,20 +221,27 @@ func (d *HttpDownloader) Do(doneChan chan bool, fileChan chan string, errorChan
 				// interrupt download by forcefully close the input stream
 				resp.Body.Close()
 				<-finishDownloadChan
-				stateSaveChan <- Part{
-					Url:       d.url,
-					Path:      part.Path,
-					RangeFrom: current + part.RangeFrom,
-					RangeTo:   part.RangeTo,
-				}
 			case <-finishDownloadChan:
 			}
 
-			bar.Update()
-			bar.Finish()
-		}(d, int64(i), p)
+			stateSaveChan <- Part{
+				Index:     part.Index,
+				Url:       d.url,
+				Path:      part.Path,
+				RangeFrom: current + part.RangeFrom,
+				RangeTo:   part.RangeTo,
+			}
+
+			if DisplayProgressBar() {
+				bar.Update()
+				bar.Finish()
+			}
+		}(d, bar, p)
 	}
 
+	barpool, err = pb.StartPool(bars...)
+	FatalCheck(err)
+
 	ws.Wait()
 	doneChan <- true
 	barpool.Stop()

http_test.go

@@ -13,15 +13,22 @@ func TestPartCalculate(t *testing.T) {
 	if len(parts) != 10 {
 		t.Fatalf("parts length should be 10")
 	}
+
 	if parts[0].Url != "http://foo.bar/file" {
 		t.Fatalf("part url was wrong")
 	}
+
 	usr, _ := user.Current()
 	dir := filepath.Join(usr.HomeDir, dataFolder, "file/file.part000001")
 	if parts[1].Path != dir {
 		t.Fatalf("part path was wrong")
 	}
+
 	if parts[0].RangeFrom != 0 && parts[0].RangeTo != 10 {
 		t.Fatalf("part range was wrong")
 	}
+
+	if parts[1].Index != 1 {
+		t.Fatal("part index was wrong")
+	}
 }

main.go

@@ -62,7 +62,6 @@ func main() {
 
 func Execute(url string, state *State, conn int, skiptls bool) {
 	//otherwise is hget <URL> command
-	var err error
 
 	signal_chan := make(chan os.Signal, 1)
 	signal.Notify(signal_chan,
@@ -121,7 +120,7 @@ func Execute(url string, state *State, conn int, skiptls bool) {
 					return
 				}
 			} else {
-				err = JoinFile(files, filepath.Base(url))
+				err := JoinFile(files, filepath.Base(url))
 				FatalCheck(err)
 				err = os.RemoveAll(FolderOf(url))
 				FatalCheck(err)

state.go

@@ -16,6 +16,7 @@ type State struct {
 }
 
 type Part struct {
+	Index     int64
 	Url       string
 	Path      string
 	RangeFrom int64