rectify control of progress callback

Author: StefanKarpinski

src/Curl/Easy.jl

@@ -4,7 +4,7 @@ mutable struct Easy
     ready    :: Threads.Event
     seeker   :: Union{Function,Nothing}
     output   :: Channel{Vector{UInt8}}
-    progress :: Channel{NTuple{4,Int}}
+    progress :: Function
     req_hdrs :: Ptr{curl_slist_t}
     res_hdrs :: Vector{String}
     code     :: CURLcode
@@ -13,14 +13,14 @@ end
 
 const EMPTY_BYTE_VECTOR = UInt8[]
 
-function Easy()
+function Easy(progress::Union{Function,Nothing})
     easy = Easy(
         curl_easy_init(),
         EMPTY_BYTE_VECTOR,
         Threads.Event(),
         nothing,
         Channel{Vector{UInt8}}(Inf),
-        Channel{NTuple{4,Int}}(Inf),
+        something(progress, (_, _, _, _) -> nothing),
         C_NULL,
         String[],
         typemax(CURLcode),
@@ -372,7 +372,7 @@ function progress_callback(
     ul_now   :: curl_off_t,
 )::Cint
     easy = unsafe_pointer_to_objref(easy_p)::Easy
-    put!(easy.progress, (dl_total, dl_now, ul_total, ul_now))
+    easy.progress(dl_total, dl_now, ul_total, ul_now)
     return 0
 end
 

src/Curl/Multi.jl

@@ -85,7 +85,6 @@ function check_multi_info(multi::Multi)
             easy = unsafe_pointer_to_objref(easy_p_ref[])::Easy
             @assert easy_handle == easy.handle
             easy.code = message.code
-            close(easy.progress)
             close(easy.output)
             easy.input = nothing
             notify(easy.ready)

src/Downloads.jl

@@ -308,7 +308,7 @@ function request(
     progress = p_func(progress, input, output)
     arg_read(input) do input
         arg_write(output) do output
-            with_handle(Easy()) do easy
+            with_handle(Easy(progress)) do easy
                 # setup the request
                 set_url(easy, url)
                 set_timeout(easy, timeout)
@@ -348,11 +348,6 @@ function request(
                         @async for buf in easy.output
                             write(output, buf)
                         end
-                        if progress !== nothing
-                            @async for prog in easy.progress
-                                progress(prog...)
-                            end
-                        end
                         if have_input
                             @async upload_data(easy, input)
                         end