WebSVN – Kolibri OS – Diff – /programs/network/downloader/downloader.asm

         mcall   68, 11                  ; init heap so we can allocate memory dynamically
 ; load libraries
         stdcall dll.Load, @IMPORT
         test    eax, eax
-        jnz     exit
+        jnz     mainloop.exit
 ; wanted events
         jmp     mainloop
   .button:
         mcall   17      ; get id
         cmp     ah, 1   ; button id=1 ?
-        je      exit
+        je      .exit
         cmp     [btn_text], sz_download
         je      download
+        cmp     [btn_text], sz_open
+        je      open_file
-        cmp     [btn_text], sz_open
+  .exit:
-        je      open_file
+        mcall   -1      ; exit
   .mouse:
-  .mouse:
+        invoke  edit_box_mouse, edit1
-        invoke  edit_box_mouse, edit1
+        jmp     mainloop
-        jmp     mainloop
-open_file:
 ;        mcall   70, ...
-        jmp     mainloop
-exit:
+open_file:
-error:
+        mcall   70, fileopen
-        mcall   -1      ; exit
+        jmp     mainloop
 ; invoke OpenDialog
         invoke  OpenDialog_Start, OpenDialog_data
         mcall   40, EVM_REDRAW + EVM_BUTTON + EVM_STACK
         call    draw_window
-; Create the file
+; Create the local file
         mov     [fileinfo], 2           ; create/write to file
         xor     eax, eax
         mov     [fileinfo.offset], eax
         mov     [fileinfo.offset+4], eax
         mov     [fileinfo.size], eax
         mcall   70, fileinfo
         test    eax, eax
-        jnz     error                   ; TODO: print error message
+        jnz     create_error
-; And start the download
+; Start the download
         invoke  HTTP_get, url, 0, FLAG_STREAM or FLAG_REUSE_BUFFER, 0
+        test    eax, eax
-        test    eax, eax
+        jz      get_error
         jz      error                   ; TODO: print error message
         mov     [identifier], eax
-        mov     [offset], 0
+        mov     [offset], 0
         mov     [btn_text], sz_cancel
+        mov     [status], sz_downloading
+        or      [edit1.flags], ed_figure_only
+        and     [edit1.flags], not ed_focus
         push    [sc.work]
+        pop     [edit1.color]
+        call    draw_window
+        jmp     download_loop
+get_error:
+        mov     [btn_text], sz_exit
+        mov     [status], sz_err_http
+        jmp     redraw
+create_error:
+        mov     [btn_text], sz_exit
-        or      [edit1.flags], ed_figure_only
+        mov     [status], sz_err_create
-        call    draw_window
+        jmp     redraw
 download_loop:
         mcall   10
         cmp     eax, EV_REDRAW
         je      .redraw
         cmp     eax, EV_BUTTON
         je      .button
-        invoke  HTTP_receive, [identifier]
-        test    eax, eax
-        jz      save_chunk
-        mov     eax, [identifier]
-        push    [eax + http_msg.content_length]
-        pop     [pb.max]
         push    [eax + http_msg.content_received]
-        pop     [pb.value]
+        invoke  HTTP_receive, [identifier]
         test    eax, eax
-        invoke  progressbar_draw, pb
+        jz      got_data
         jmp     download_loop
   .redraw:
         call    draw_window
         jmp     download_loop
+  .button:
+        jmp     http_free
+got_data:
+        mov     ebp, [identifier]
+        test    [ebp + http_msg.flags], 0xffff0000      ; error?
-  .button:
-        jmp     http_free
-save_chunk:
-        mov     ebp, [identifier]
+        jnz     http_error
+        cmp     [fileinfo], 3                           ; Did we write before?
+        je      .write
-        test    [ebp + http_msg.flags], 0xffff0000      ; error?
+        test    [ebp + http_msg.flags], FLAG_CONTENT_LENGTH
-        jnz     http_free
+        jz      .first_write
+        mov     eax, [ebp + http_msg.content_length]
+        mov     [pb.max], eax
         DEBUGF  1, "new file size=%u\n", eax
-        cmp     [fileinfo], 3
+        mov     [fileinfo], 4                           ; set end of file
-        je      @f
+        mov     [fileinfo.offset], eax                  ; new file size
-        DEBUGF  1, "new file size=%u\n", [ebp + http_msg.content_length]
+        mcall   70, fileinfo
+        test    eax, eax
-        mov     [fileinfo], 4                           ; set end of file
+        jnz     write_error
         mov     eax, [ebp + http_msg.content_length]
         mov     [fileinfo.offset], eax                  ; new file size
-        mcall   70, fileinfo
+  .first_write:
         mov     [fileinfo], 3                           ; write to existing file
-        mov     [fileinfo], 3                           ; write to existing file
+  .write:
-  @@:
+        mov     ecx, [ebp + http_msg.content_received]
+        sub     ecx, [offset]
+        jz      download_loop                           ; more then 0 data bytes?
+        mov     [fileinfo.size], ecx
+        mov     eax, [ebp + http_msg.content_ptr]
-        mov     ecx, [ebp + http_msg.content_received]
+        mov     [fileinfo.buffer], eax
-        sub     ecx, [offset]
+        mov     ebx, [offset]
+        mov     [fileinfo.offset], ebx
+        DEBUGF  1, "Writing to disk: size=%u offset=%u\n", ecx, ebx
+        mcall   70, fileinfo
-        mov     [fileinfo.size], ecx
+        test    eax, eax                                ; check error code
-        mov     eax, [ebp + http_msg.content_ptr]
+        jnz     write_error
+        cmp     ebx, ecx                                ; check if all bytes were written to disk
+        jne     write_error
         mov     [fileinfo.buffer], eax
+        mov     eax, [ebp + http_msg.content_received]
+        mov     [offset], eax
+        mov     [pb.value], eax
+        invoke  progressbar_draw, pb
+        test    [ebp + http_msg.flags], FLAG_GOT_ALL_DATA
+        jz      download_loop
+; Download completed successfully
+        mov     [status], sz_complete
+        mov     [pb.progress_color], 0x0000c800         ; green
+        mov     [btn_text], sz_open
+        jmp     http_free
         mov     ebx, [offset]
-        mov     [fileinfo.offset], ebx
+write_error:
-        DEBUGF  1, "Writing to disk: size=%u offset=%u\n", ecx, ebx
+        mov     [status], sz_err_full
-        mcall   70, fileinfo
+        mov     [pb.progress_color], 0x00c80000         ; red
         mov     ecx, [ebp + http_msg.content_ptr]
         test    ecx, ecx
         jz      @f
         mcall   68, 13                                  ; free the buffer
   @@:
         invoke  HTTP_free, [identifier]                 ; free headers and connection
-        mov     [btn_text], sz_open
-        call    draw_window
-        jmp     mainloop
+        jmp     redraw
 draw_window:
         mcall   12, 1   ; start window draw
         mov     edx, [sc.work]
         or      edx, 0x34000000
         mcall   0, <50, 320>, <350, 110>, , 0, title
 ; draw button
-        mcall   8, <229,75>, <60,16>, 22, [sc.work_button]      ; download
+        mcall   8, <229,75>, <60,16>, 22, [sc.work_button]
 ; draw button text
         mov     ecx, [sc.work_button_text]
+        or      ecx, 80000000h
+        mcall   4, <240,65>, , [btn_text]
+; draw status text
+        mov     ecx, [sc.work_text]
         or      ecx, 80000000h
-        mcall   4, <240,65>, , [btn_text]
+        mcall   4, <10,65>, , [status]
 ; draw editbox
         edit_boxes_set_sys_color edit1, editboxes_end, sc
         invoke  edit_box_draw, edit1
         cmp     [identifier], 0
         je     @f
-; draw progressbar
-        invoke  progressbar_draw, pb
-  @@:
+; draw progressbar
-        mcall   12, 2   ; end window draw
-        ret
+        invoke  progressbar_draw, pb
   @@:
         mcall   12, 2   ; end window draw
 dont_draw:
   .size         dd 0
   .buffer       dd 0
                 db 0
                 dd fname_buf
+fileopen        dd 7
+                dd 0                    ; flags
+                dd fname_buf            ; parameters
+                dd 0                    ; reserved
+                dd 0                    ; reserved
+                db "/sys/@open", 0      ; path
 edit1           edit_box 299, 5, 10, 0xffffff, 0x0000ff, 0x0080ff, 0x000000, 0x8000, URLMAXLEN, url, mouse_dd, ed_focus+ed_always_focus, 0, 0
 editboxes_end:
+identifier      dd 0
-identifier      dd 0
+btn_text        dd sz_download
-btn_text        dd sz_download
+status          dd sz_null
 sz_download     db 'Download', 0
+sz_cancel       db ' Cancel ', 0
+sz_open         db '  Open  ', 0
+sz_exit         db '  Exit  ', 0
+sz_null         db 0
+sz_downloading  db 'Downloading..', 0
+sz_complete     db 'Download completed', 0
+sz_err_create   db 'Could not create the local file!', 0
-sz_cancel       db ' Cancel ', 0
+sz_err_full     db 'Disk full!', 0
-sz_open         db '  Open  ', 0
+sz_err_http     db 'HTTP error!', 0
 title           db 'HTTP Downloader', 0

Subversion Repositories Kolibri OS

(root)/programs/network/downloader/downloader.asm – Rev 5540 → 5543