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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2014-2015. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2014-2017. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
-;;  pasta.asm - Paste text to paste.kolibrios.org from a file or   ;;
+;;  pasta.asm - Paste text to dpaste.com from a file or from       ;;
-;;              from clipboard.                                    ;;
+;;              clipboard.                                         ;;
 ;;                                                                 ;;
 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
         push    eax
         mcall   68, 13, [clipboard_data]
         pop     [clipboard_data]
+; Post to the server
+        mov     ecx, [clipboard_data_length]
-; Connect to the server
+        add     ecx, sz_paste_head.length
-        invoke  HTTP_get, sz_url, 0, FLAG_BLOCK or FLAG_KEEPALIVE, 0
+        invoke  HTTP_post, sz_url, 0, FLAG_BLOCK, 0, sz_ctype, ecx
         test    eax, eax
-        jz      error_free_clip
-        mov     [identifier], eax
+        jz      error_free_clip_disconnect
-  .again:
-        invoke  HTTP_receive, [identifier]
-        test    eax, eax
+        mov     [identifier], eax
-        jnz     .again
-        invoke  HTTP_find_header_field, [identifier], sz_set_cookie
-        mov     edi, cookie
-        test    eax, eax
-        jz      .no_cookie
-        mov     esi, eax
-  .cookie_loop:
-        lodsb
-        stosb
-        cmp     al, 13
-        je      .cookie_end
-        cmp     al, 10
-        je      .cookie_end
-        cmp     al, 0
-        je      .cookie_end
-        jmp     .cookie_loop
-  .cookie_end:
-        dec     edi
-  .no_cookie:
-        mov     ax, 0x0a0d
-        stosw
-        xor     al, al
+; Send the data to the server
+        invoke  HTTP_send, [identifier], sz_paste_head, sz_paste_head.length
-        stosb
+        push    [clipboard_data]
+        pop     [send_ptr]
   .again:
-        mov     ecx, [clipboard_data_length]
+        invoke  HTTP_send, [identifier], [send_ptr], [clipboard_data_length]
-        add     ecx, sz_paste_head.length + sz_paste_tail.length
-        invoke  HTTP_post, sz_url, [identifier], FLAG_BLOCK, sz_cookie, sz_ctype, ecx
-        test    eax, eax
+        cmp     eax, -1
-        jz      error_free_clip_disconnect
+        je      error_free_clip_disconnect
-; Send the data to the server
+        test    eax, eax
-        mov     ecx, [eax + http_msg.socket]
+        jz      error_free_clip_disconnect
-        mcall   75, 6, , sz_paste_head, sz_paste_head.length, 0
+        add     [send_ptr], eax
-        mcall   75, 6, , [clipboard_data], [clipboard_data_length], 0
+        sub     [clipboard_data_length], eax
         jnz     .again2
         invoke  HTTP_disconnect, [identifier]
+        mov     ebp, [identifier]
+        test    [ebp + http_msg.flags], 0xffff0000             ; Test error bits
+        jnz     error_free_http
+        test    [ebp + http_msg.flags], FLAG_GOT_HEADER
-        mov     ebp, [identifier]
+        jz      error_free_http
-        cmp     [ebp + http_msg.status], 302    ; found
+        cmp     [ebp + http_msg.status], 201    ; created
-        jne     error_free_http
+        jne     error_http_code
-        invoke  HTTP_find_header_field, [identifier], sz_location
-        test    eax, eax
-        jz      error_free_http
+        invoke  HTTP_find_header_field, [identifier], sz_location
-        push    eax
-        mov     esi, sz_failed
-        mov     edi, paste_url
-        mov     ecx, 2
-        rep movsd
-        pop     esi
-  .url_loop:
-        lodsb
-        stosb
-        cmp     al, 13
-        je      .url_end
-        cmp     al, 10
-        je      .url_end
-        cmp     al, 0
-        je      .url_end
-        jmp     .url_loop
-  .url_end:
-        dec     edi
-        lea     ecx, [edi - paste_url + 4]
-        mov     eax, '" -t'
-        stosd
+        test    eax, eax
-        mov     ax, 'O'
+        jz      error_free_http
-        stosw
-        mov     [notify_struct.msg], paste_url
+        mov     esi, eax
-        mcall   70, notify_struct
+        call    notify
         mcall   54, 3                   ; Delete last slot in the clipboard
+        mov     dword[notify_msg-4], ecx
+        mov     dword[notify_msg+0], 0   ; Text
+        mov     dword[notify_msg+4], 1   ; cp0866
-        mov     dword[paste_url-4], ecx
+        mcall   54, 2, , notify_msg-4    ; Write URL to the clipboard
         mov     dword[paste_url+0], 0   ; Text
-        mov     dword[paste_url+4], 1   ; cp0866
+        invoke  HTTP_free, [identifier]
-        mcall   54, 2, , paste_url-4    ; Write URL to the clipboard
+        mcall   -1
         mcall   70, notify_struct
+        mcall   -1
+notify:
+        mov     edi, notify_msg.text
+  .msg_loop:
+        lodsb
+        stosb
+        cmp     al, 13
+        je      .msg_end
+        cmp     al, 10
+        je      .msg_end
+        cmp     al, 0
+        je      .msg_end
+        jmp     .msg_loop
+  .msg_end:
+        dec     edi
+        lea     ecx, [edi - notify_msg + 4]
+        mov     eax, '" -t'
+        stosd
+        mov     ax, 'O'
+        stosw
+        mov     [notify_struct.msg], notify_msg
+        mcall   70, notify_struct
-        mcall   -1
+        ret
 ;---------------------------------------------------------------------
 ; Data area
 library lib_http,               'http.obj'
 import  lib_http, \
         HTTP_get,               'get', \
+        HTTP_post,              'post', \
-        HTTP_post,              'post', \
+        HTTP_send,              'send', \
         HTTP_receive,           'receive', \
         HTTP_find_header_field, 'find_header_field', \
         HTTP_free,              'free', \
         HTTP_escape,            'escape', \
         dd param
 notify_struct:
         dd 7            ; run application
         dd 0
-  .msg  dd paste_url
+  .msg  dd notify_msg
         dd 0
         dd 0
         db '/sys/@notify', 0
 sz_url                  db 'http://paste.kolibrios.org/', 0
-sz_set_cookie           db 'set-cookie', 0
+sz_url                  db 'http://dpaste.com/api/v2/', 0
 sz_location             db 'location', 0
 sz_ctype                db 'application/x-www-form-urlencoded', 0
 sz_failed               db '"Pasta!',10,'Paste failed!" -E', 0
-sz_paste_head           db 'code='
-.length = $ - sz_paste_head
-sz_paste_tail           db '%0D%0A&language=text&webpage='
-.length = $ - sz_paste_tail
+sz_paste_head           db 'content='
-sz_cookie               db 'Cookie: '
+.length = $ - sz_paste_head
 cookie                  db 0
-                        rb 1024
+notify_msg              db '"Pasta!',10
   .text                 rb 1024
-paste_url               rb 1024
+param                   rb 1024

Subversion Repositories Kolibri OS

(root)/programs/network/pasta/pasta.asm – Rev 5770 → 7100