More bugfixes

Author: ErrorNoInternet

download.go

@@ -44,6 +44,7 @@ func startDownload(url string, path string, contentLength int64, outputFile *os.
 		threadContainer.Add(progressBarContainer.container)
 		go downloadChunk(url, path, workerId, outputFile, offset, progressBarContainer)
 		time.Sleep(50 * time.Millisecond)
+		activeWorkers++
 		workerId++
 	}
 	for activeWorkers > 0 {
@@ -55,7 +56,6 @@ func startDownload(url string, path string, contentLength int64, outputFile *os.
 }
 
 func downloadChunk(url string, path string, workerId int, outputFile *os.File, offset int64, progressBarContainer *ChunkContainer) {
-	activeWorkers++
 	success := false
 
 	for !success {

main.go

@@ -27,6 +27,7 @@ var (
 	downloadButton  *widget.Button
 	threadContainer *fyne.Container
 	usedContainers  []*fyne.Container
+	stopTime        int64
 	activeWorkers   int
 	downloading     bool
 
@@ -110,12 +111,18 @@ func main() {
 
 func cleanContainers() {
 	for downloading || activeWorkers >= 1 {
+		if stopTime != 0 {
+			if time.Now().Unix()-stopTime > int64(timeout) {
+				enableDownloads()
+				return
+			}
+		}
+
 		removeIndex := -1
 		for index, container := range usedContainers {
 			threadContainer.Remove(container)
 			removeIndex = index
 		}
-		fmt.Println(len(usedContainers), activeWorkers)
 		if removeIndex != -1 {
 			usedContainers = append(usedContainers[:removeIndex], usedContainers[removeIndex+1:]...)
 		}
@@ -155,6 +162,7 @@ func startDownloadManager(urlEntry *widget.Entry, pathEntry *widget.Entry) {
 		downloading = false
 		downloadButton.SetText("Cancelling...")
 		downloadButton.Disable()
+		stopTime = time.Now().Unix()
 		return
 	}
 
@@ -218,6 +226,7 @@ func startDownloadManager(urlEntry *widget.Entry, pathEntry *widget.Entry) {
 		return
 	}
 
+	stopTime = 0
 	startDownload(url, path, contentLength, outputFile)
 	enableDownloads()
 }