@@ -10,60 +10,77 @@ import (
1010 "path/filepath"
1111 "strings"
1212 "sync"
13+ "time"
1314
1415 "github.com/coderj001/go-wallheven/src"
1516)
1617
17- const numGoroutines = src .BASE_CONFIG .NUMGOROUTINES
18- const dir = src .BASE_CONFIG .DIR
19-
20- func DownloadImgs (searchList src.SearchList ) error {
18+ func Downloader (searchList * src.SearchList ) {
2119 var wg sync.WaitGroup
2220 wg .Add (len (searchList .Data ))
23- for i := 0 ; i < numGoroutines ; i ++ {
24- go func (i int ){
25- for j := i ; i < len (searchList .Data ); j += numGoroutines {
26- return nil
27- }
21+ completed := make (chan bool )
22+
23+ for i := 0 ; i < len (searchList .Data ); i ++ {
24+ go downloadImage (& searchList .Data [i ], & wg , completed )
25+ }
26+
27+ // Code for spinner - it takes
28+ spinner := []string {"█" , "▒" , "▓" , "░" }
29+ spinnerIndex := 0
30+ completedCount := 0
31+
32+ for completedCount < len (searchList .Data ) {
33+ select {
34+ case <- completed :
35+ completedCount ++
36+ spinnerIndex = (spinnerIndex + 1 ) % 4
37+ fmt .Printf ("\r Downloading... %s %d/%d" , spinner [spinnerIndex ], completedCount , len (searchList .Data ))
38+ default :
39+ time .Sleep (100 * time .Millisecond )
40+ spinnerIndex = (spinnerIndex + 1 ) % 4
41+ fmt .Printf ("\r Downloading... %s %d/%d" , spinner [spinnerIndex ], completedCount , len (searchList .Data ))
2842 }
2943 }
30- return nil
44+
45+ wg .Wait ()
46+ close (completed )
3147}
3248
33- func downloadImage (imgInfo src.ImageInfo , wg * sync.WaitGroup ) {
49+ func downloadImage (imgInfo * src.ImageInfo , wg * sync.WaitGroup , completed chan bool ) {
3450 defer wg .Done ()
35-
51+ dir := src .BASE_CONFIG .DIR
52+
3653 resp , err := http .Get (imgInfo .Path )
3754 if err != nil {
3855 log .Printf ("Error while downloading (%s): %s\n " , imgInfo .Url , err )
3956 return
4057 }
4158 defer resp .Body .Close ()
42-
59+
4360 // check the dir is exists or not
44- if _ , err := os .Stat (dir ); errors .Is (err , os .ErrNotExist ){
45- err := os .Mkdir (dir , os .ModePerm )
61+ if _ , err := os .Stat (dir ); errors .Is (err , os .ErrNotExist ) {
62+ err := os .Mkdir (dir , os .ModePerm )
4663 if err != nil {
4764 log .Printf ("Error while creating dir (%s): %s\n " , dir , err )
4865 return
4966 }
5067 }
5168
5269 // create the file to store download content
53-
5470 filename := strings .Join ([]string {dir , strings .Join ([]string {imgInfo .Id , filepath .Ext (imgInfo .Path )}, "" )}, "/" )
5571 fileOut , err := os .Create (filename )
5672 if err != nil {
5773 log .Printf ("Unable to create file (%s): %s\n " , imgInfo .Id , err )
5874 return
5975 }
6076 defer fileOut .Close ()
61-
77+
6278 _ , err = io .Copy (fileOut , resp .Body )
6379 if err != nil {
6480 log .Printf ("Error while writing content to file: %s\n " , err )
6581 return
6682 }
67-
68- fmt .Printf ("File downloaded successfully: %s\n " , imgInfo .ShortUrl )
69- }
83+
84+ // fmt.Printf("File downloaded successfully: %s\n", imgInfo.ShortUrl)
85+ completed <- true
86+ }
0 commit comments