Thu, 14 Nov 2024 23:22:35 +0100
add support for secret store credentials when connecting to repositories, resolves #496
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | * Copyright 2024 Olaf Wintermann. All rights reserved. |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include "davcontroller.h" |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | #include "window.h" |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | #include <cx/printf.h> |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
34 | #include "config.h" |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
35 | |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
36 | #include "system.h" |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
37 | #include "common/context.h" |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
38 | |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
39 | #include <libidav/config.h> |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | #include <libidav/utils.h> |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | DavBrowser* davbrowser_create(UiObject *toplevel) { |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | DavBrowser *doc = ui_document_new(sizeof(DavBrowser)); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | UiContext *ctx = ui_document_context(doc); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | doc->ctx = ctx; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
47 | doc->navigation_stack = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
48 | doc->navstack_enabled = true; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
49 | doc->navstack_pos = 0; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
50 | |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | doc->dav_queue = ui_threadpool_create(1); |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
52 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
53 | doc->res_open_inprogress = cxHashMapCreate(ctx->allocator, CX_STORE_POINTERS, 4); |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | doc->path = ui_string_new(ctx, "path"); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | doc->resources = ui_list_new(ctx, "reslist"); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | return doc; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | void davbrowser_set_collection(UiObject *ui, DavBrowser *browser, DavResource *collection) { |
13
5a8762fcfecc
update toolkit / set window size
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
63 | if (browser->current) { |
5a8762fcfecc
update toolkit / set window size
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
64 | dav_resource_free_all(browser->current); |
5a8762fcfecc
update toolkit / set window size
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
65 | } |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
66 | ui_list_clear(browser->resources); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
67 | |
13
5a8762fcfecc
update toolkit / set window size
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
68 | browser->current = collection; |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
69 | browser->res_counter++; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | for (DavResource *res = collection->children; res; res = res->next) { |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
71 | ui_list_append(browser->resources, res); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
72 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | browser->resources->update(browser->resources, 0); |
68 | 75 | |
76 | ui_set_group(ui->ctx, APP_STATE_BROWSER_SESSION); | |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
79 | // ------------------------------ davbrowser_connect2repo ------------------------------ |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | |
85
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
81 | typedef struct DavConnect2Repo { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
82 | UiObject *ui; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
83 | DavBrowser *browser; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
84 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
85 | DavCfgRepository *repo; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
86 | char *path; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
87 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
88 | UiString *password; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
89 | } DavConnect2Repo; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
90 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
91 | static void dialog_secretstore_decrypt(UiEvent *event, void *data) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
92 | DavConnect2Repo *c2r = event->window; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
93 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
94 | if(event->intval == 4) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
95 | char *pw = ui_get(c2r->password); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
96 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
97 | PwdStore *secrets = get_pwdstore(); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
98 | pwdstore_setpassword(secrets, pw); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
99 | if(pwdstore_decrypt(secrets)) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
100 | ui_dialog(c2r->ui, .title = "Error", .content = "Cannot decrypt Secret Store", .closebutton_label = "OK"); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
101 | } else { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
102 | davbrowser_connect2repo(c2r->ui, c2r->browser, c2r->repo, c2r->path); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
103 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
104 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
105 | free(c2r->path); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
106 | if(!c2r->repo->node) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
107 | dav_repository_free(get_config(), c2r->repo); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
108 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
109 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
110 | ui_close(event->obj); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
111 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
112 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
113 | int davbrowser_connect2repo(UiObject *ui, DavBrowser *browser, DavCfgRepository *repo, const char *path) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
114 | char *user = NULL; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
115 | char *password = NULL; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
116 | char *password_free = NULL; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
117 | if (repo->user.value.ptr && repo->password.value.ptr) { |
85
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
118 | user = repo->user.value.ptr; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
119 | cxmutstr decodedpw = dav_repository_get_decodedpassword(repo); |
85
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
120 | password = decodedpw.ptr; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
121 | password_free = decodedpw.ptr; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
122 | } else { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
123 | PwdStore *secrets = get_pwdstore(); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
124 | const char *credentials = NULL; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
125 | if(repo->stored_user.value.ptr) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
126 | if(pwdstore_has_id(secrets, repo->stored_user.value.ptr)) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
127 | credentials = repo->stored_user.value.ptr; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
128 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
129 | } else { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
130 | credentials = get_location_credentials(repo, path); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
131 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
132 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
133 | if(credentials) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
134 | if(!secrets->isdecrypted) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
135 | UiObject *obj = ui_dialog_window(ui, |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
136 | .title = "Authentication", |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
137 | .lbutton1 = "Cancel", |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
138 | .rbutton4 = "Connect", |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
139 | .default_button = 4, |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
140 | .show_closebutton = UI_OFF, |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
141 | .onclick = dialog_secretstore_decrypt); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
142 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
143 | DavConnect2Repo *c2r = ui_malloc(obj->ctx, sizeof(DavConnect2Repo)); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
144 | c2r->ui = ui; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
145 | c2r->browser = browser; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
146 | c2r->repo = repo; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
147 | c2r->path = path ? strdup(path) : NULL; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
148 | c2r->password = ui_string_new(obj->ctx, NULL); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
149 | obj->window = c2r; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
150 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
151 | ui_grid(obj, .margin = 20, .columnspacing = 12, .rowspacing = 16) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
152 | ui_llabel(obj, .label = "Decrypt Secret Store", .colspan = 2); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
153 | ui_newline(obj); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
154 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
155 | ui_llabel(obj, .label = "Password"); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
156 | ui_passwordfield(obj, .value = c2r->password, .hexpand = TRUE); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
157 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
158 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
159 | ui_show(obj); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
160 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
161 | return 1; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
162 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
163 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
164 | if(!get_stored_credentials(credentials, &user, &password)) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
165 | fprintf(stderr, "Error: failed to get user/password for credentials %s\n", credentials); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
166 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
167 | } |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
168 | } |
85
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
169 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
170 | DavSession *sn = dav_session_new(application_dav_context(), repo->url.value.ptr); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
171 | if (user && password) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
172 | dav_session_set_auth(sn, user, password); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
173 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
174 | free(password_free); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
175 | |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
176 | browser->sn = sn; |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
177 | if (repo->name.value.length > 0) { |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
178 | browser->repo_base = cx_strdup(cx_strn(repo->name.value.ptr, repo->name.value.length)).ptr; |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
179 | } else { |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
180 | browser->repo_base = cx_strdup(cx_strn(repo->url.value.ptr, repo->url.value.length)).ptr; |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
181 | } |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
182 | |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
183 | char *dav_path = util_concat_path(browser->repo_base, path); |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
184 | ui_set(browser->path, dav_path); |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
185 | free(dav_path); |
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
186 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
187 | SessionAuthData *auth = cxMalloc(sn->mp->allocator, sizeof(SessionAuthData)); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
188 | auth->obj = ui; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
189 | auth->cond = ui_condvar_create(); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
190 | auth->sn = sn; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
191 | auth->user = repo->user.value.ptr ? cx_strdup_a(sn->mp->allocator, cx_strcast(repo->user.value)).ptr : NULL; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
192 | auth->password = NULL; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
193 | dav_session_set_authcallback(sn, jobthr_davbrowser_auth, auth); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
194 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
195 | davbrowser_query_path(ui, browser, path); |
85
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
196 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
197 | return 0; |
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
198 | } |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
199 | |
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
200 | // ------------------------------ davbrowser_auth ------------------------------ |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
201 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
202 | static int davbrowser_auth_dialog(void *data) { |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
203 | SessionAuthData *auth = data; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
204 | auth_dialog(auth); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
205 | return 0; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
206 | } |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
207 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
208 | void davbrowser_auth_set_user_pwd(SessionAuthData *auth, const char *user, const char *password) { |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
209 | dav_session_free(auth->sn, auth->user); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
210 | dav_session_free(auth->sn, auth->password); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
211 | auth->user = user ? dav_session_strdup(auth->sn, user) : NULL; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
212 | auth->password = password ? dav_session_strdup(auth->sn, password) : NULL; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
213 | } |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
214 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
215 | int jobthr_davbrowser_auth(DavSession *sn, void *data) { |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
216 | SessionAuthData *auth = data; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
217 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
218 | ui_call_mainthread(davbrowser_auth_dialog, auth); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
219 | ui_condvar_wait(auth->cond); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
220 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
221 | if(auth->cond->intdata) { |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
222 | dav_session_set_auth(sn, auth->user, auth->password); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
223 | } |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
224 | dav_session_free(auth->sn, auth->password); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
225 | auth->password = NULL; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
226 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
227 | return 0; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
228 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
229 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
230 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
231 | // ------------------------------ davbrowser_query_path ------------------------------ |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
232 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
233 | typedef struct DavBrowserQueryPath { |
11
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
234 | UiThreadpool *pool; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
235 | DavBrowser *browser; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
236 | char *path; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
237 | DavResource *result; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
238 | } DavBrowserQueryPath; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
239 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
240 | static int browser_query_path(void *data) { |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
241 | DavBrowserQueryPath *query = data; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
242 | DavSession *sn = query->browser->sn; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
243 | |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
244 | DavResource *res = dav_query(sn, "select `idav:crypto-name`,`idav:crypto-key`,D:lockdiscovery from %s with depth = 1 order by iscollection desc, name", query->path); |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
245 | query->result = res; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
246 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
247 | return 0; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
248 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
249 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
250 | static void browser_query_finished(UiEvent *event, void *data) { |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
251 | DavBrowserQueryPath *query = data; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
252 | DavBrowser *browser = event->document; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
253 | |
11
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
254 | if (query->pool == browser->dav_queue) { |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
255 | if (query->result) { |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
256 | davbrowser_set_collection(event->obj, browser, query->result); |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
257 | } else { |
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
258 | cxmutstr error = cx_asprintf("Error %d", query->browser->sn->error); |
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
259 | ui_dialog(event->obj, .title = "Error", .content = error.ptr, .closebutton_label = "OK"); |
11
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
260 | } |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
261 | |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
262 | window_progress(event->window, 0); |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
263 | } else { |
11
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
264 | // operation aborted |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
265 | if (query->result) { |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
266 | dav_resource_free_all(query->result); |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
267 | } |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
268 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
269 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
270 | free(query->path); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
271 | free(query); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
272 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
273 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
274 | void davbrowser_query_path(UiObject *ui, DavBrowser *browser, const char *path) { |
17
7cfd36aa005b
add refresh button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
16
diff
changeset
|
275 | if (!browser->sn) { |
7cfd36aa005b
add refresh button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
16
diff
changeset
|
276 | // TODO: error |
7cfd36aa005b
add refresh button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
16
diff
changeset
|
277 | return; |
7cfd36aa005b
add refresh button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
16
diff
changeset
|
278 | } |
7cfd36aa005b
add refresh button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
16
diff
changeset
|
279 | |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
280 | // for comparison, we need the current base_url/repo_name + path |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
281 | size_t len = path ? strlen(path) : 0; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
282 | if (len == 1 && *path == '/') { |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
283 | path = ""; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
284 | } |
12
3eb0cbab53db
don't change the path bar value if the new path is a prefix of the current path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
285 | |
3eb0cbab53db
don't change the path bar value if the new path is a prefix of the current path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
286 | // check if the new path is a prefix of the current path |
3eb0cbab53db
don't change the path bar value if the new path is a prefix of the current path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
287 | // if not, we have to set the pathbar string to the new path |
10
f8dfc5705516
create DavSession in the main GUI thread
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
8
diff
changeset
|
288 | char *full_path = util_concat_path(browser->repo_base, path); |
12
3eb0cbab53db
don't change the path bar value if the new path is a prefix of the current path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
289 | char *full_path_col = util_concat_path(full_path, "/"); |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
290 | char *current_path = ui_get(browser->path); |
12
3eb0cbab53db
don't change the path bar value if the new path is a prefix of the current path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
291 | cxstring cpath = cx_str(current_path); |
3eb0cbab53db
don't change the path bar value if the new path is a prefix of the current path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
292 | cxstring newc = cx_str(full_path_col); |
3eb0cbab53db
don't change the path bar value if the new path is a prefix of the current path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
293 | if (!cx_strprefix(cpath, newc)) { |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
294 | ui_set(browser->path, full_path); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
295 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
296 | free(full_path); |
12
3eb0cbab53db
don't change the path bar value if the new path is a prefix of the current path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
297 | free(full_path_col); |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
298 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
299 | DavBrowserQueryPath *query = malloc(sizeof(DavBrowserQueryPath)); |
11
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
300 | query->pool = browser->dav_queue; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
301 | query->browser = browser; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
302 | query->path = strdup(path); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
303 | query->result = NULL; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
304 | ui_threadpool_job(browser->dav_queue, ui, browser_query_path, query, browser_query_finished, query); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
305 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
306 | window_progress(ui->window, 1); |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
307 | |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
308 | davbrowser_add2navstack(browser, browser->repo_base, path); |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
309 | } |
11
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
310 | |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
311 | void davbrowser_query_url(UiObject *ui, DavBrowser *browser, const char *url) { |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
312 | if (browser->repo_base) { |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
313 | cxstring base = cx_str(browser->repo_base); |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
314 | cxstring newurl = cx_str(url); |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
315 | |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
316 | if (cx_strprefix(newurl, base)) { |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
317 | const char *path = url + base.length; |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
318 | davbrowser_query_path(ui, browser, path); |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
319 | return; |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
320 | } |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
321 | } |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
322 | |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
323 | char *path = NULL; |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
324 | DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path); |
85
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
325 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
326 | int ret = davbrowser_connect2repo(ui, browser, repo, path); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
327 | free(path); |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
328 | if(ret) { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
329 | return; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
330 | } |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
331 | |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
332 | if (!repo->node) { |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
333 | dav_repository_free(get_config(), repo); |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
334 | } |
11
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
335 | } |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
336 | |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
337 | void davbrowser_open_resource(UiObject *ui, DavBrowser *browser, DavResource *res, const char *contenttype) { |
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
338 | DavResourceViewType type = DAV_RESOURCE_VIEW_PROPERTIES; |
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
339 | if(!contenttype) { |
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
340 | contenttype = res->contenttype; |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
341 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
342 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
343 | if(res->iscollection) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
344 | // default type |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
345 | } else if(contenttype) { |
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
346 | cxstring ctype = cx_str(contenttype); |
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
347 | if(cx_strprefix(ctype, CX_STR("text/"))) { |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
348 | type = DAV_RESOURCE_VIEW_TEXT; |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
349 | } else if(cx_strprefix(ctype, CX_STR("image/"))) { |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
350 | type = DAV_RESOURCE_VIEW_IMAGE; |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
351 | } else if(cx_strprefix(ctype, CX_STR("application/"))) { |
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
352 | if(cx_strsuffix(ctype, CX_STR("json"))) { |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
353 | type = DAV_RESOURCE_VIEW_TEXT; |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
354 | } else if(cx_strsuffix(ctype, CX_STR("/xml"))) { |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
355 | type = DAV_RESOURCE_VIEW_TEXT; |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
356 | } else if(cx_strsuffix(ctype, CX_STR("+xml"))) { |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
357 | type = DAV_RESOURCE_VIEW_TEXT; |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
358 | } else if(cx_strsuffix(ctype, CX_STR("/xml"))) { |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
359 | type = DAV_RESOURCE_VIEW_TEXT; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
360 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
361 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
362 | } else { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
363 | cxstring path = cx_str(res->path); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
364 | if(cx_strsuffix(path, CX_STR(".png"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
365 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
366 | } else if(cx_strsuffix(path, CX_STR(".jpg"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
367 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
368 | } else if(cx_strsuffix(path, CX_STR(".jpeg"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
369 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
370 | } else if(cx_strsuffix(path, CX_STR(".tif"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
371 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
372 | } else if(cx_strsuffix(path, CX_STR(".tiff"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
373 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
374 | } else if(cx_strsuffix(path, CX_STR(".webp"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
375 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
376 | } else if(cx_strsuffix(path, CX_STR(".bmp"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
377 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
378 | } else if(cx_strsuffix(path, CX_STR(".gif"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
379 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
380 | } else if(cx_strsuffix(path, CX_STR(".txt"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
381 | type = DAV_RESOURCE_VIEW_TEXT; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
382 | } else if(cx_strsuffix(path, CX_STR(".md"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
383 | type = DAV_RESOURCE_VIEW_TEXT; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
384 | } else if(cx_strsuffix(path, CX_STR(".xml"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
385 | type = DAV_RESOURCE_VIEW_TEXT; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
386 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
387 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
388 | |
52
0c881944fa10
add resourceviewer info and properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
389 | resourceviewer_new(browser, res->path, type); |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
390 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
391 | |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
392 | void davbrowser_add2navstack(DavBrowser *browser, const char *base, const char *path) { |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
393 | if (browser->navstack_enabled) { |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
394 | for (int i = 0; i < browser->navstack_pos; i++) { |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
395 | char *nav_url = cxListAt(browser->navigation_stack, 0); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
396 | cxListRemove(browser->navigation_stack, 0); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
397 | free(nav_url); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
398 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
399 | browser->navstack_pos = 0; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
400 | |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
401 | char *nav_url = util_concat_path(base, path); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
402 | cxListInsert(browser->navigation_stack, 0, nav_url); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
403 | |
49
2f71f4ee247a
update toolkit, ucx, libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
404 | if (cxListSize(browser->navigation_stack) > DAVBROWSER_MAX_NAVLIST) { |
2f71f4ee247a
update toolkit, ucx, libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
405 | char *nav = cxListAt(browser->navigation_stack, cxListSize(browser->navigation_stack) - 1); |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
406 | free(nav); |
49
2f71f4ee247a
update toolkit, ucx, libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
407 | cxListRemove(browser->navigation_stack, cxListSize(browser->navigation_stack) - 1); |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
408 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
409 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
410 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
411 | |
68 | 412 | void davbrowser_navigation_parent(UiObject *ui, DavBrowser *browser) { |
413 | if(browser->current) { | |
414 | char *parent = util_parent_path(browser->current->path); | |
415 | if(strlen(parent) > 0) { | |
416 | davbrowser_query_path(ui, browser, parent); | |
417 | } | |
418 | free(parent); | |
419 | } | |
420 | } | |
421 | ||
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
422 | void davbrowser_navigation_back(UiObject *ui, DavBrowser *browser) { |
49
2f71f4ee247a
update toolkit, ucx, libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
423 | if (browser->navstack_pos+1 < cxListSize(browser->navigation_stack)) { |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
424 | browser->navstack_pos++; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
425 | char *nav_url = cxListAt(browser->navigation_stack, browser->navstack_pos); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
426 | browser->navstack_enabled = false; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
427 | davbrowser_query_url(ui, browser, nav_url); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
428 | browser->navstack_enabled = true; |
48
ae61523bce20
improve pathbar visuals
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
429 | ui_set(browser->path, nav_url); |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
430 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
431 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
432 | |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
433 | void davbrowser_navigation_forward(UiObject *ui, DavBrowser *browser) { |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
434 | if (browser->navstack_pos > 0) { |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
435 | browser->navstack_pos--; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
436 | char *nav_url = cxListAt(browser->navigation_stack, browser->navstack_pos); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
437 | browser->navstack_enabled = false; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
438 | davbrowser_query_url(ui, browser, nav_url); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
439 | browser->navstack_enabled = true; |
48
ae61523bce20
improve pathbar visuals
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
440 | ui_set(browser->path, nav_url); |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
441 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
442 | } |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
443 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
444 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
445 | // ------------------------------------- File Upload ------------------------------------- |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
446 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
447 | typedef struct DavFileUpload { |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
448 | UiObject *ui; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
449 | DavBrowser *browser; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
450 | DavSession *sn; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
451 | UiFileList files; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
452 | char *base_path; |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
453 | UiThreadpool *queue; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
454 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
455 | size_t total_bytes; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
456 | size_t total_files; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
457 | size_t total_directories; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
458 | size_t uploaded_bytes; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
459 | size_t uploaded_files; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
460 | size_t uploaded_directories; |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
461 | |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
462 | DavBool upload_file; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
463 | size_t current_file_size; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
464 | size_t current_file_upload; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
465 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
466 | char *current_file_name; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
467 | |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
468 | UiObject *dialog; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
469 | UiDouble *progress; |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
470 | UiString *label_top_left; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
471 | UiString *label_top_right; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
472 | UiString *label_bottom_left; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
473 | UiString *label_bottom_right; |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
474 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
475 | // The collection, the files are uploaded to |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
476 | // It is only safe to access the collection ptr, if |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
477 | // collection == browser->current && collection_ctn == browser->res_counter |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
478 | // and obviously it can only be accessed from the UI thread |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
479 | DavResource *collection; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
480 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
481 | // copy of browser->res_counter, used for integrity check |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
482 | int64_t collection_ctn; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
483 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
484 | // current uploaded resource, created as part of the browser session |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
485 | // only if collection == browser->current && collection_ctn == browser->res_counter |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
486 | DavResource *current_resource; |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
487 | } DavFileUpload; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
488 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
489 | typedef struct DUFile { |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
490 | char *path; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
491 | char *upload_path; |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
492 | size_t bytes; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
493 | DavBool isdirectory; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
494 | DavFileUpload *upload; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
495 | DavError error; |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
496 | } DUFile; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
497 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
498 | static double upload_progress(DavFileUpload *upload) { |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
499 | return ((double)upload->uploaded_bytes / (double)upload->total_bytes) * 100; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
500 | } |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
501 | |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
502 | static void update_upload_labels(DavFileUpload *upload) { |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
503 | char *sz_total = util_size_str(FALSE, upload->total_bytes); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
504 | char *sz_uploaded = util_size_str2(FALSE, upload->uploaded_bytes, upload->total_bytes, 2); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
505 | char *sz_uploaded_end = strchr(sz_uploaded, ' '); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
506 | if (sz_uploaded_end) { |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
507 | *sz_uploaded_end = 0; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
508 | } |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
509 | |
25
915131bc3233
update upload progress bar in update_upload_labels()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
510 | double progress = upload_progress(upload); |
915131bc3233
update upload progress bar in update_upload_labels()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
511 | ui_set(upload->progress, upload_progress(upload)); |
915131bc3233
update upload progress bar in update_upload_labels()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
512 | |
24
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
513 | cxmutstr label1; |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
514 | if (upload->total_files + upload->total_directories > 1) { |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
515 | label1 = cx_asprintf( |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
516 | "%s/%s %zu/%zu files", |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
517 | sz_uploaded, |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
518 | sz_total, |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
519 | upload->uploaded_files+upload->uploaded_directories, |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
520 | upload->total_files+upload->total_directories); |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
521 | } else { |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
522 | label1 = cx_asprintf( |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
523 | "%s/%s", |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
524 | sz_uploaded, |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
525 | sz_total); |
12ad3393c151
don't show number of uploading files when there is only 1 file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
526 | } |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
527 | ui_set(upload->label_top_left, label1.ptr); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
528 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
529 | free(sz_total); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
530 | free(label1.ptr); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
531 | |
22
d7942163a2a3
don't show progress percent when the file size is 0
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
532 | if (upload->current_file_size > 0) { |
d7942163a2a3
don't show progress percent when the file size is 0
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
533 | cxmutstr file_label = cx_asprintf("%s (%.0f%%)", upload->current_file_name, ((float)upload->current_file_upload/(float)upload->current_file_size)*100); |
d7942163a2a3
don't show progress percent when the file size is 0
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
534 | ui_set(upload->label_top_right, file_label.ptr); |
d7942163a2a3
don't show progress percent when the file size is 0
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
535 | free(file_label.ptr); |
d7942163a2a3
don't show progress percent when the file size is 0
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
536 | } |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
537 | } |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
538 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
539 | static int uithr_update_upload_labels(void *data) { |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
540 | update_upload_labels(data); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
541 | return 0; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
542 | } |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
543 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
544 | static void upload_dav_progress(DavResource *res, int64_t total, int64_t now, void *data) { |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
545 | DavFileUpload *upload = data; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
546 | if (upload->upload_file) { |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
547 | if (now > upload->current_file_size) { |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
548 | // current_file_size is not accurate (either the file was changed after the last stat |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
549 | // or we have some extra bytes because of encryption |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
550 | // adjust current_file_size and the total upload size |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
551 | int64_t extra = now - upload->current_file_size; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
552 | upload->current_file_size += extra; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
553 | upload->total_bytes += extra; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
554 | } |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
555 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
556 | int64_t new_progress = now - upload->current_file_upload; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
557 | upload->uploaded_bytes += new_progress; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
558 | upload->current_file_upload = now; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
559 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
560 | ui_call_mainthread(uithr_update_upload_labels, upload); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
561 | } |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
562 | } |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
563 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
564 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
565 | typedef struct FileNameUpdate { |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
566 | DavFileUpload *upload; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
567 | char *name; |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
568 | char *path; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
569 | DavBool iscollection; |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
570 | } FileNameUpdate; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
571 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
572 | static int uithr_update_file_label(FileNameUpdate *update) { |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
573 | // replace upload->current_filename with update->name |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
574 | if (update->upload->current_file_name) { |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
575 | free(update->upload->current_file_name); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
576 | } |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
577 | update->upload->current_file_name = update->name; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
578 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
579 | ui_set(update->upload->label_top_right, update->name); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
580 | |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
581 | DavFileUpload *upload = update->upload; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
582 | DavBrowser *browser = upload->browser; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
583 | // update the resource list in the browser, if the current collection has not changed |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
584 | if (upload->collection == browser->current && upload->collection_ctn == browser->res_counter) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
585 | char *parent = util_parent_path(update->path); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
586 | cxstring parent_s = cx_str(parent); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
587 | cxstring colpath_s = cx_str(upload->collection->path); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
588 | if (parent_s.length > 0 && parent_s.ptr[parent_s.length - 1] == '/') { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
589 | parent_s.length--; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
590 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
591 | if (colpath_s.length > 0 && colpath_s.ptr[colpath_s.length - 1] == '/') { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
592 | colpath_s.length--; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
593 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
594 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
595 | // only update, if the added resource has the current collection as parent |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
596 | if (!cx_strcmp(parent_s, colpath_s)) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
597 | DavResource *ui_res = dav_resource_new(upload->collection->session, update->path); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
598 | ui_res->iscollection = update->iscollection; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
599 | ui_res->lastmodified = time(NULL); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
600 | ui_res->creationdate = time(NULL); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
601 | upload->current_resource = ui_res; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
602 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
603 | ui_list_append(browser->resources, ui_res); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
604 | browser->resources->update(browser->resources, 0); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
605 | } else { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
606 | upload->current_resource = NULL; // maybe not necessary |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
607 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
608 | free(parent); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
609 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
610 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
611 | free(update->path); |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
612 | free(update); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
613 | return 0; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
614 | } |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
615 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
616 | static int qthr_file_upload(void *data) { |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
617 | DUFile *f = data; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
618 | DavFileUpload *upload = f->upload; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
619 | DavSession *sn = upload->sn; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
620 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
621 | FILE *in = sys_fopen(f->path, "rb"); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
622 | if (!in) { |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
623 | // TODO: error msg |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
624 | return 0; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
625 | } |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
626 | |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
627 | upload->upload_file = TRUE; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
628 | upload->current_file_size = f->bytes; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
629 | upload->current_file_upload = 0; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
630 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
631 | DavResource *res = dav_resource_new(sn, f->upload_path); |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
632 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
633 | FileNameUpdate *ui_update = malloc(sizeof(FileNameUpdate)); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
634 | ui_update->upload = upload; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
635 | ui_update->name = strdup(res->name); |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
636 | ui_update->path = strdup(res->path); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
637 | ui_update->iscollection = FALSE; |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
638 | ui_call_mainthread((ui_threadfunc)uithr_update_file_label, ui_update); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
639 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
640 | dav_set_content(res, in, (dav_read_func)fread, (dav_seek_func)fseek); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
641 | if (dav_store(res)) { |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
642 | f->error = sn->error; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
643 | } |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
644 | dav_resource_free(res); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
645 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
646 | fclose(in); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
647 | |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
648 | upload->upload_file = FALSE; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
649 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
650 | return 0; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
651 | } |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
652 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
653 | static void uithr_file_uploaded(UiEvent *event, void *data) { |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
654 | DUFile *file = data; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
655 | DavFileUpload *upload = file->upload; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
656 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
657 | upload->uploaded_files++; |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
658 | //upload->uploaded_bytes += file->bytes; |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
659 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
660 | double progress = upload_progress(upload); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
661 | ui_set(upload->progress, upload_progress(upload)); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
662 | |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
663 | update_upload_labels(upload); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
664 | |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
665 | // update resource content length in the browser |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
666 | DavBrowser *browser = upload->browser; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
667 | if (upload->collection == browser->current && upload->collection_ctn == browser->res_counter) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
668 | if (upload->current_resource) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
669 | upload->current_resource->contentlength = upload->current_file_upload; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
670 | browser->resources->update(browser->resources, 0); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
671 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
672 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
673 | upload->current_resource = NULL; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
674 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
675 | free(file->path); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
676 | free(file->upload_path); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
677 | } |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
678 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
679 | static int qthr_dir_upload(void *data) { |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
680 | DUFile *f = data; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
681 | DavFileUpload *upload = f->upload; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
682 | DavSession *sn = upload->sn; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
683 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
684 | DavResource *res = dav_resource_new(sn, f->upload_path); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
685 | res->iscollection = TRUE; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
686 | |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
687 | FileNameUpdate *ui_update = malloc(sizeof(FileNameUpdate)); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
688 | ui_update->upload = upload; |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
689 | ui_update->name = strdup(res->name); |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
690 | ui_update->path = strdup(res->path); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
691 | ui_update->iscollection = TRUE; |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
692 | ui_call_mainthread((ui_threadfunc)uithr_update_file_label, ui_update); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
693 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
694 | if (dav_create(res)) { |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
695 | f->error = sn->error; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
696 | } |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
697 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
698 | dav_resource_free(res); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
699 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
700 | return 0; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
701 | } |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
702 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
703 | static void uithr_dir_uploaded(UiEvent *event, void *data) { |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
704 | DUFile *file = data; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
705 | DavFileUpload *upload = file->upload; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
706 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
707 | upload->uploaded_directories++; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
708 | |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
709 | update_upload_labels(upload); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
710 | |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
711 | upload->current_resource = NULL; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
712 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
713 | free(file->path); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
714 | free(file->upload_path); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
715 | } |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
716 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
717 | static int qthr_upload_finished(void *data) { |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
718 | return 0; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
719 | } |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
720 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
721 | static void uithr_upload_finished(UiEvent *event, void *data) { |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
722 | DavFileUpload *upload = data; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
723 | ui_threadpool_destroy(upload->queue); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
724 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
725 | free(upload->base_path); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
726 | dav_session_destroy(upload->sn); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
727 | } |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
728 | |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
729 | static int jobthr_upload_scan(void *data) { |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
730 | DavFileUpload *upload = data; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
731 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
732 | CxList *stack = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
733 | for (int i = 0; i < upload->files.nfiles; i++) { |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
734 | DUFile *f = malloc(sizeof(DUFile)); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
735 | f->path = strdup(upload->files.files[i]); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
736 | f->upload_path = util_concat_path(upload->base_path, util_path_file_name(f->path)); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
737 | f->isdirectory = FALSE; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
738 | f->bytes = 0; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
739 | f->upload = upload; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
740 | f->error = 0; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
741 | cxListInsert(stack, 0, f); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
742 | } |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
743 | |
49
2f71f4ee247a
update toolkit, ucx, libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
744 | while (cxListSize(stack) > 0) { |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
745 | DUFile *f = cxListAt(stack, 0); |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
746 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
747 | char *path = util_concat_path(upload->base_path, f->upload_path); |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
748 | cxListRemove(stack, 0); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
749 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
750 | SYS_STAT s; |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
751 | if (!sys_stat(f->path, &s)) { |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
752 | if (S_ISDIR(s.st_mode)) { |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
753 | f->isdirectory = TRUE; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
754 | upload->total_directories++; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
755 | ui_threadpool_job(upload->queue, upload->ui, qthr_dir_upload, f, uithr_dir_uploaded, f); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
756 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
757 | SYS_DIR dir = sys_opendir(f->path); |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
758 | if (dir) { |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
759 | SysDirEnt *entry; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
760 | int nument = 0; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
761 | while((entry = sys_readdir(dir)) != NULL) { |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
762 | if(!strcmp(entry->name, ".") || !strcmp(entry->name, "..")) { |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
763 | continue; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
764 | } |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
765 | |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
766 | cxmutstr newpath = util_concat_sys_path(cx_str(f->path), cx_str(entry->name)); |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
767 | char *new_upload_path = util_concat_path(f->upload_path, entry->name); |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
768 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
769 | DUFile *child = malloc(sizeof(DUFile)); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
770 | child->path = newpath.ptr; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
771 | child->upload_path = new_upload_path; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
772 | child->isdirectory = FALSE; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
773 | child->bytes = 0; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
774 | child->upload = upload; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
775 | child->error = 0; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
776 | cxListAdd(stack, child); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
777 | } |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
778 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
779 | sys_closedir(dir); |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
780 | } |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
781 | } else if (S_ISREG(s.st_mode)) { |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
782 | f->isdirectory = FALSE; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
783 | f->bytes = s.st_size; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
784 | upload->total_files++; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
785 | upload->total_bytes += s.st_size; |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
786 | ui_threadpool_job(upload->queue, upload->ui, qthr_file_upload, f, uithr_file_uploaded, f); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
787 | } |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
788 | } |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
789 | } // TODO: else error msg |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
790 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
791 | ui_threadpool_job(upload->queue, upload->ui, qthr_upload_finished, upload, uithr_upload_finished, upload); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
792 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
793 | ui_filelist_free(upload->files); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
794 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
795 | return 0; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
796 | } |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
797 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
798 | static void uithr_upload_scan_finished(UiEvent *event, void *data) { |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
799 | DavFileUpload *upload = data; |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
800 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
801 | update_upload_labels(upload); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
802 | } |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
803 | |
21
3060a5a1d5fd
don't crash when the upload is in progress and the window is closed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
804 | static void upload_window_closed(UiEvent *event, void *data) { |
3060a5a1d5fd
don't crash when the upload is in progress and the window is closed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
805 | // noop, prevents context destruction |
3060a5a1d5fd
don't crash when the upload is in progress and the window is closed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
806 | } |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
807 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
808 | void davbrowser_upload_files(UiObject *ui, DavBrowser *browser, UiFileList files) { |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
809 | if (!browser->sn) { |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
810 | return; // TODO: error msg |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
811 | } |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
812 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
813 | // we need a clone of the current session, because the upload |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
814 | // is done in a separate thread |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
815 | DavSession *upload_session = dav_session_clone(browser->sn); |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
816 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
817 | // create upload obj, that contains all relevant data for the upload |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
818 | DavFileUpload *upload = malloc(sizeof(DavFileUpload)); |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
819 | memset(upload, 0, sizeof(DavFileUpload)); |
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
820 | |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
821 | dav_session_set_progresscallback(upload_session, NULL, upload_dav_progress, upload); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
822 | |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
823 | upload->ui = ui; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
824 | upload->browser = browser; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
825 | upload->sn = upload_session; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
826 | upload->files = files; |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
827 | upload->base_path = strdup(browser->current->path); |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
828 | upload->queue = ui_threadpool_create(1); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
829 | |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
830 | upload->collection = browser->current; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
831 | upload->collection_ctn = browser->res_counter; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
832 | |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
833 | // create upload progress window |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
834 | cxmutstr wtitle = cx_asprintf("Upload to: %s", ui_get(browser->path)); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
835 | UiObject *dialog = ui_simple_window(wtitle.ptr, upload); |
21
3060a5a1d5fd
don't crash when the upload is in progress and the window is closed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
836 | ui_context_closefunc(dialog->ctx, upload_window_closed, NULL); |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
837 | free(wtitle.ptr); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
838 | upload->dialog = dialog; |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
839 | ui_window_size(dialog, 550, 120); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
840 | upload->progress = ui_double_new(dialog->ctx, NULL); |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
841 | upload->label_top_left = ui_string_new(dialog->ctx, NULL); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
842 | upload->label_top_right = ui_string_new(dialog->ctx, NULL); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
843 | upload->label_bottom_left = ui_string_new(dialog->ctx, NULL); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
844 | upload->label_bottom_right = ui_string_new(dialog->ctx, NULL); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
845 | |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
846 | ui_grid(dialog, .margin = 10, .spacing = 10, .fill = TRUE) { |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
847 | ui_llabel(dialog, .value = upload->label_top_left, .hexpand = TRUE); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
848 | ui_rlabel(dialog, .value = upload->label_top_right); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
849 | ui_newline(dialog); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
850 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
851 | ui_progressbar(dialog, .value = upload->progress, .colspan = 2, .hexpand = TRUE); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
852 | ui_newline(dialog); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
853 | |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
854 | ui_llabel(dialog, .value = upload->label_bottom_left); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
855 | ui_rlabel(dialog, .value = upload->label_bottom_right); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
856 | ui_newline(dialog); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
857 | } |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
858 | |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
859 | ui_set(upload->label_top_left, ""); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
860 | ui_set(upload->label_top_right, ""); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
861 | ui_set(upload->label_bottom_left, ""); |
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
862 | ui_set(upload->label_bottom_right, ""); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
863 | ui_set(upload->progress, 0); |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
864 | |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
865 | ui_show(dialog); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
866 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
867 | // start upload and stat threads |
19
813c97c5b6d3
add a very basic upload progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
868 | ui_job(ui, jobthr_upload_scan, upload, uithr_upload_scan_finished, upload); |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
869 | } |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
870 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
871 | |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
872 | // ------------------------------------- File Download ------------------------------------- |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
873 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
874 | typedef struct DavFileDownload { |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
875 | UiObject *ui; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
876 | DavBrowser *browser; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
877 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
878 | DavSession *sn; |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
879 | DavSession *download_sn; |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
880 | DavResource *reslist; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
881 | char *local_path; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
882 | DavBool isdirectory; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
883 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
884 | UiThreadpool *queue; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
885 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
886 | size_t total_bytes; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
887 | size_t total_files; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
888 | size_t total_directories; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
889 | size_t downloaded_bytes; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
890 | size_t downloaded_files; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
891 | size_t downloaded_directories; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
892 | |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
893 | size_t current_file_size; |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
894 | size_t current_file_downloaded; |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
895 | |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
896 | UiObject *dialog; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
897 | UiDouble *progress; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
898 | UiString *label_top_left; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
899 | UiString *label_top_right; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
900 | UiString *label_bottom_left; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
901 | UiString *label_bottom_right; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
902 | } DavFileDownload; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
903 | |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
904 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
905 | static int uithr_download_update_progress(void *data) { |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
906 | DavFileDownload *download = data; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
907 | char *sz_total = util_size_str(FALSE, download->total_bytes); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
908 | char *sz_downloaded = util_size_str2(FALSE, download->downloaded_bytes, download->total_bytes, 2); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
909 | char *sz_downloaded_end = strchr(sz_downloaded, ' '); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
910 | if (sz_downloaded_end) { |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
911 | *sz_downloaded_end = 0; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
912 | } |
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
31
diff
changeset
|
913 | |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
914 | if (download->total_bytes > 0) { |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
915 | double progress = (double)download->downloaded_bytes / (double)download->total_bytes; |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
916 | ui_set(download->progress, progress*100); |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
917 | } |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
918 | |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
919 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
920 | cxmutstr label1; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
921 | if (download->total_files + download->total_directories > 1) { |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
922 | label1 = cx_asprintf( |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
923 | "%s/%s %zu/%zu files", |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
924 | sz_downloaded, |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
925 | sz_total, |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
926 | download->downloaded_files+download->downloaded_directories, |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
927 | download->total_files+download->total_directories); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
928 | } else { |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
929 | label1 = cx_asprintf( |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
930 | "%s/%s", |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
931 | sz_downloaded, |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
932 | sz_total); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
933 | } |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
934 | ui_set(download->label_top_left, label1.ptr); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
935 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
936 | free(sz_total); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
937 | free(label1.ptr); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
938 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
939 | |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
940 | return 1; |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
941 | } |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
942 | |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
943 | // dav download file |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
944 | typedef struct DDFile { |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
945 | DavFileDownload *download; |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
946 | size_t size; |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
947 | char *path; |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
948 | char *to; |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
949 | FILE *fd; |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
950 | } DDFile; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
951 | |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
952 | static size_t ddfile_write(const void *buf, size_t size, size_t count, void *stream) { |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
953 | DDFile *file = stream; |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
954 | |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
955 | size_t w = fwrite(buf, size, count, file->fd); |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
956 | file->download->current_file_downloaded += w; |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
957 | |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
958 | file->download->downloaded_bytes += w; |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
959 | |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
960 | if (file->download->current_file_downloaded > file->download->current_file_size) { |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
961 | size_t diff = file->download->current_file_downloaded - file->download->current_file_size; |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
962 | file->download->current_file_size = file->download->current_file_downloaded; |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
963 | file->download->total_bytes += diff; |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
964 | } |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
965 | |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
966 | ui_call_mainthread(uithr_download_update_progress, file->download); |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
967 | |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
968 | return w; |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
969 | } |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
970 | |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
971 | static int qthr_download_resource(void *data) { |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
972 | DDFile *file = data; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
973 | |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
974 | file->download->current_file_downloaded = 0; |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
975 | file->download->current_file_size = file->size; |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
976 | |
77
5de33c2d94c6
fix text/image preview loading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
977 | FILE *f = sys_fopen(file->to, "wb"); |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
978 | if (!f) { |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
979 | return 0; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
980 | } |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
981 | file->fd = f; |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
982 | |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
983 | DavResource *res = dav_resource_new(file->download->download_sn, file->path); |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
984 | dav_get_content(res, file, (dav_write_func)ddfile_write); |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
985 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
986 | file->download->downloaded_files++; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
987 | |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
988 | ui_call_mainthread(uithr_download_update_progress, file->download); |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
989 | |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
990 | dav_resource_free(res); |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
991 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
992 | fclose(f); |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
993 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
994 | free(file->path); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
995 | free(file->to); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
996 | free(file); |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
997 | |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
998 | return 0; |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
999 | } |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1000 | |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1001 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1002 | typedef struct DlStackElm { |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1003 | DavResource *resource; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1004 | char *sub_path; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1005 | } DlStackElm; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1006 | |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1007 | static int jobthr_download_scan(void *data) { |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1008 | DavFileDownload *download = data; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1009 | DavBrowser *browser = download->browser; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1010 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1011 | // check if the specified local location is a directory |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1012 | SYS_STAT s; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1013 | if (!sys_stat(download->local_path, &s)) { |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1014 | if (S_ISDIR(s.st_mode)) { |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1015 | download->isdirectory = TRUE; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1016 | } |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1017 | } |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1018 | |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1019 | CxList *stack = cxLinkedListCreateSimple(sizeof(DlStackElm)); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1020 | |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1021 | // add selected files to the download queue |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1022 | DavResource *res = download->reslist; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1023 | while (res) { |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1024 | DlStackElm elm; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1025 | elm.resource = res; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1026 | elm.sub_path = strdup(res->name); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1027 | cxListAdd(stack, &elm); |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1028 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1029 | res = res->next; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1030 | } |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1031 | |
49
2f71f4ee247a
update toolkit, ucx, libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
1032 | while (cxListSize(stack) > 0) { |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1033 | DlStackElm *elm = cxListAt(stack, 0); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1034 | DavResource *res = elm->resource; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1035 | char *sub_path = elm->sub_path; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1036 | cxListRemove(stack, 0); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1037 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1038 | if (res->iscollection) { |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1039 | if (dav_load(res)) { |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1040 | // TODO: handle error |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1041 | continue; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1042 | } |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1043 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1044 | // update ui |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
1045 | ui_call_mainthread(uithr_download_update_progress, download); |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1046 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1047 | char *path = util_concat_path(download->local_path, sub_path); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1048 | int err = sys_mkdir(path); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1049 | free(path); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1050 | if (err) { |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1051 | // TODO: handle error |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1052 | } |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1053 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1054 | DavResource *child = res->children; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1055 | while (child) { |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1056 | char *child_path = util_concat_path(sub_path, child->name); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1057 | DlStackElm childelm; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1058 | childelm.resource = child; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1059 | childelm.sub_path = child_path; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1060 | cxListAdd(stack, &childelm); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1061 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1062 | child = child->next; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1063 | } |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1064 | } else { |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1065 | // add the file to the download queue |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1066 | DDFile *file = malloc(sizeof(DDFile)); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1067 | file->download = download; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1068 | file->path = strdup(res->path); |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
1069 | file->size = res->contentlength; |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1070 | if (download->isdirectory) { |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1071 | file->to = util_concat_path(download->local_path, sub_path); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1072 | } else { |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1073 | file->to = strdup(download->local_path); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1074 | } |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1075 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1076 | // stats |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1077 | download->total_files++; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1078 | download->total_bytes += res->contentlength; |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1079 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1080 | // update ui |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
1081 | ui_call_mainthread(uithr_download_update_progress, download); |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1082 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1083 | ui_threadpool_job(download->queue, download->ui, qthr_download_resource, file, NULL, NULL); |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1084 | } |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1085 | } |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1086 | |
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1087 | cxListDestroy(stack); |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
1088 | |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
1089 | return 0; |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1090 | } |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1091 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1092 | static void uithr_download_scan_finished(UiEvent *event, void *data) { |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
1093 | DavFileDownload *download = data; |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1094 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1095 | } |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1096 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1097 | static void download_window_closed(UiEvent *event, void *data) { |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1098 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1099 | } |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1100 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1101 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1102 | void davbrowser_download(UiObject *ui, DavBrowser *browser, DavResource *reslist, const char *local_path) { |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1103 | DavFileDownload *download = malloc(sizeof(DavFileDownload)); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1104 | memset(download, 0, sizeof(DavFileDownload)); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1105 | |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1106 | download->ui = ui; |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1107 | download->browser = browser; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1108 | download->sn = reslist->session; |
30
762afc7adc63
implement recursive collection downloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
1109 | download->download_sn = dav_session_clone(download->sn); |
52
0c881944fa10
add resourceviewer info and properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1110 | download->reslist = reslist; // TODO: is this safe or do we need a copy? |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1111 | download->local_path = strdup(local_path); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1112 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1113 | download->queue = ui_threadpool_create(1); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1114 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1115 | // create download progress window |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1116 | cxmutstr wtitle = cx_asprintf("Download to: %s", local_path); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1117 | UiObject *dialog = ui_simple_window(wtitle.ptr, download); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1118 | ui_context_closefunc(dialog->ctx, download_window_closed, NULL); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1119 | free(wtitle.ptr); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1120 | download->dialog = dialog; |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1121 | ui_window_size(dialog, 550, 120); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1122 | download->progress = ui_double_new(dialog->ctx, NULL); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1123 | download->label_top_left = ui_string_new(dialog->ctx, NULL); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1124 | download->label_top_right = ui_string_new(dialog->ctx, NULL); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1125 | download->label_bottom_left = ui_string_new(dialog->ctx, NULL); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1126 | download->label_bottom_right = ui_string_new(dialog->ctx, NULL); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1127 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1128 | ui_grid(dialog, .margin = 10, .spacing = 10, .fill = TRUE) { |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1129 | ui_llabel(dialog, .value = download->label_top_left, .hexpand = TRUE); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1130 | ui_rlabel(dialog, .value = download->label_top_right); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1131 | ui_newline(dialog); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1132 | |
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
31
diff
changeset
|
1133 | ui_progressbar(dialog, .value = download->progress, .min = 0, .max = 100, .colspan = 2, .hexpand = TRUE); |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1134 | ui_newline(dialog); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1135 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1136 | ui_llabel(dialog, .value = download->label_bottom_left); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1137 | ui_rlabel(dialog, .value = download->label_bottom_right); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1138 | ui_newline(dialog); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1139 | } |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1140 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1141 | ui_set(download->label_top_left, ""); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1142 | ui_set(download->label_top_right, ""); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1143 | ui_set(download->label_bottom_left, ""); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1144 | ui_set(download->label_bottom_right, ""); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1145 | ui_set(download->progress, 0); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1146 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1147 | ui_show(dialog); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1148 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1149 | // start upload and stat threads |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1150 | ui_job(ui, jobthr_download_scan, download, uithr_download_scan_finished, download); |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1151 | } |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1152 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1153 | |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1154 | // ------------------------------------- Path Operation (DELETE, MKCOL) ------------------------------------- |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1155 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1156 | enum DavPathOpType { |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1157 | DAV_PATH_OP_DELETE = 0, |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1158 | DAV_PATH_OP_CREATE |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1159 | }; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1160 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1161 | typedef struct DavPathOp { |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1162 | UiObject *ui; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1163 | DavBrowser *browser; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1164 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1165 | // operation type (delete, mkcol, ...) |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1166 | enum DavPathOpType op; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1167 | // clone of the browser's DavSession |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1168 | DavSession *sn; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1169 | // path array |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1170 | char **path; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1171 | // browser->resources indices |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1172 | size_t *list_indices; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1173 | // number of path/list_indices elements |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1174 | size_t nelm; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1175 | // path is collection |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1176 | DavBool iscollection; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1177 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1178 | // browser->current ptr when the PathOp started |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1179 | // used in combination with collection_ctn to check if the browser list changed |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1180 | DavResource *collection; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1181 | int64_t collection_ctn; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1182 | } DavPathOp; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1183 | |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1184 | typedef struct DavPathOpResult { |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1185 | UiObject *ui; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1186 | DavBrowser *browser; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1187 | DavResource *collection; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1188 | int64_t collection_ctn; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1189 | enum DavPathOpType op; |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1190 | DavBool iscollection; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1191 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1192 | char *path; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1193 | int res_index; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1194 | int result; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1195 | char *errormsg; |
84
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1196 | |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1197 | time_t result_lastmodified; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1198 | uint64_t result_contentlength; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1199 | char *result_contenttype; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1200 | } DavPathOpResult; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1201 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1202 | static int uithr_pathop_delete_error(void *data) { |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1203 | DavPathOpResult *result = data; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1204 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1205 | cxmutstr msg = cx_asprintf("Cannot delete resource %s", result->path); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1206 | ui_dialog(result->ui, .title = "Error", .content = msg.ptr, .button1_label = "OK"); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1207 | free(msg.ptr); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1208 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1209 | if (result->errormsg) { |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1210 | free(result->errormsg); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1211 | } |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1212 | free(result->path); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1213 | free(result); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1214 | return 0; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1215 | } |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1216 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1217 | static int uithr_pathop_delete_sucess(void *data) { |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1218 | DavPathOpResult *result = data; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1219 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1220 | if (result->browser->current == result->collection && result->browser->res_counter == result->collection_ctn) { |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1221 | ui_list_remove(result->browser->resources, result->res_index); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1222 | result->browser->resources->update(result->browser->resources, 0); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1223 | } |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1224 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1225 | free(result->path); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1226 | free(result); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1227 | return 0; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1228 | } |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1229 | |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1230 | static int uithr_pathop_create_resource_error(void *data) { |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1231 | DavPathOpResult *result = data; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1232 | |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1233 | cxmutstr msg = cx_asprintf("Cannot create %s %s", result->iscollection ? "collection" : "resource", result->path); |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1234 | ui_dialog(result->ui, .title = "Error", .content = msg.ptr, .button1_label = "OK"); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1235 | free(msg.ptr); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1236 | |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1237 | if (result->errormsg) { |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1238 | free(result->errormsg); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1239 | } |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1240 | free(result->path); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1241 | free(result); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1242 | return 0; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1243 | } |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1244 | |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1245 | static int uithr_pathop_create_resource_sucess(void *data) { |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1246 | DavPathOpResult *result = data; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1247 | |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1248 | if (result->browser->current == result->collection && result->browser->res_counter == result->collection_ctn) { |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1249 | DavResource *res = dav_resource_new(result->browser->sn, result->path); |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1250 | res->iscollection = result->iscollection; |
84
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1251 | res->lastmodified = result->result_lastmodified; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1252 | res->contentlength = result->result_contentlength; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1253 | res->contenttype = result->result_contenttype ? dav_session_strdup(res->session, result->result_contenttype) : NULL; |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1254 | // TODO: add the resource at the correct position or sort the list after append |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1255 | ui_list_append(result->browser->resources, res); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1256 | result->browser->resources->update(result->browser->resources, 0); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1257 | } |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1258 | |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1259 | free(result->path); |
84
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1260 | free(result->result_contenttype); |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1261 | free(result); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1262 | return 0; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1263 | } |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1264 | |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1265 | static int jobthr_path_op(void *data) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1266 | DavPathOp *op = data; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1267 | |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1268 | for (int i = op->nelm-1; i >= 0; i--) { |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1269 | if (op->path[i]) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1270 | DavResource *res = dav_resource_new(op->sn, op->path[i]); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1271 | |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1272 | DavPathOpResult *result = malloc(sizeof(DavPathOpResult)); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1273 | result->ui = op->ui; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1274 | result->browser = op->browser; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1275 | result->collection = op->collection; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1276 | result->collection_ctn = op->collection_ctn; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1277 | result->op = op->op; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1278 | result->path = strdup(res->path); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1279 | result->result = 0; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1280 | result->res_index = op->list_indices[i]; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1281 | result->errormsg = NULL; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1282 | result->iscollection = op->iscollection; |
84
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1283 | result->result_lastmodified = 0; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1284 | result->result_contentlength = 0; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1285 | result->result_contenttype = NULL; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1286 | |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1287 | if (op->op == DAV_PATH_OP_DELETE) { |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1288 | ui_threadfunc result_callback = uithr_pathop_delete_sucess; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1289 | if (dav_delete(res)) { |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1290 | result->errormsg = op->sn->errorstr ? strdup(op->sn->errorstr) : NULL; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1291 | result_callback = uithr_pathop_delete_error; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1292 | } |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1293 | ui_call_mainthread(result_callback, result); |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1294 | } else if (op->op == DAV_PATH_OP_CREATE) { |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1295 | res->iscollection = op->iscollection; |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1296 | ui_threadfunc result_callback = uithr_pathop_create_resource_sucess; |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1297 | if (dav_create(res)) { |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1298 | result->errormsg = op->sn->errorstr ? strdup(op->sn->errorstr) : NULL; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1299 | result_callback = uithr_pathop_create_resource_error; |
84
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1300 | } else { |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1301 | // try to load some basic resource properties |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1302 | // we don't care about the result, if it fails, |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1303 | // we just don't have the new properties |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1304 | dav_load_prop(res, NULL, 0); |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1305 | result->result_lastmodified = res->lastmodified; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1306 | result->result_contentlength = res->contentlength; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
1307 | result->result_contenttype = res->contenttype ? strdup(res->contenttype) : NULL; |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1308 | } |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1309 | ui_call_mainthread(result_callback, result); |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1310 | } |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1311 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1312 | dav_resource_free(res); |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1313 | free(op->path[i]); |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1314 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1315 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1316 | |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1317 | dav_session_destroy(op->sn); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1318 | free(op->path); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1319 | free(op->list_indices); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1320 | free(op); |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1321 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1322 | return 0; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1323 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1324 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1325 | void davbrowser_delete(UiObject *ui, DavBrowser *browser, UiListSelection selection) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1326 | DavPathOp *op = malloc(sizeof(DavPathOp)); |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1327 | op->ui = ui; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
1328 | op->browser = browser; |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1329 | op->op = DAV_PATH_OP_DELETE; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1330 | op->sn = dav_session_clone(browser->sn); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1331 | op->path = calloc(selection.count, sizeof(char*)); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1332 | op->list_indices = calloc(selection.count, sizeof(size_t)); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1333 | op->nelm = selection.count; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1334 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1335 | op->collection = browser->current; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1336 | op->collection_ctn = browser->res_counter; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1337 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1338 | for (int i = 0; i < selection.count; i++) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1339 | DavResource *res = ui_list_get(browser->resources, selection.rows[i]); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1340 | if (res) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1341 | op->path[i] = strdup(res->path); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1342 | op->list_indices[i] = selection.rows[i]; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1343 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1344 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1345 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1346 | ui_job(ui, jobthr_path_op, op, NULL, NULL); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1347 | } |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1348 | |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1349 | void davbrowser_create_resource(UiObject *ui, DavBrowser *browser, const char *name, DavBool iscollection) { |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1350 | DavPathOp *op = malloc(sizeof(DavPathOp)); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1351 | op->ui = ui; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1352 | op->browser = browser; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1353 | op->op = DAV_PATH_OP_CREATE; |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1354 | op->sn = dav_session_clone(browser->sn); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1355 | op->path = calloc(1, sizeof(char*)); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1356 | op->list_indices = calloc(1, sizeof(size_t)); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1357 | op->nelm = 1; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1358 | op->iscollection = iscollection; |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1359 | |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1360 | op->path[0] = util_concat_path(browser->current->path, name); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1361 | |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1362 | op->collection = browser->current; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1363 | op->collection_ctn = browser->res_counter; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1364 | |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1365 | ui_job(ui, jobthr_path_op, op, NULL, NULL); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1366 | } |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1367 | |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1368 | void davbrowser_mkcol(UiObject *ui, DavBrowser *browser, const char *name) { |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1369 | davbrowser_create_resource(ui, browser, name, TRUE); |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1370 | } |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1371 | |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1372 | void davbrowser_newfile(UiObject *ui, DavBrowser *browser, const char *name) { |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1373 | davbrowser_create_resource(ui, browser, name, FALSE); |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
1374 | } |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1375 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1376 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1377 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1378 | DavResourceViewer* dav_resourceviewer_create(DavSession *sn, const char *path, DavResourceViewType type) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1379 | DavResourceViewer *doc = ui_document_new(sizeof(DavResourceViewer)); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1380 | UiContext *ctx = ui_document_context(doc); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1381 | doc->ctx = ctx; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1382 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1383 | doc->sn = dav_session_clone(sn); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1384 | doc->path = strdup(path); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1385 | doc->type = type; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1386 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1387 | doc->tabview = ui_int_new(ctx, "tabview"); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1388 | doc->loading = ui_int_new(ctx, "loading"); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1389 | doc->message = ui_string_new(ctx, "message"); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1390 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1391 | doc->text = ui_text_new(ctx, "text"); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1392 | doc->image = ui_generic_new(ctx, "image"); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1393 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1394 | doc->properties = ui_list_new(ctx, "properties"); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1395 | |
52
0c881944fa10
add resourceviewer info and properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1396 | doc->info_url = ui_string_new(ctx, "info_url"); |
0c881944fa10
add resourceviewer info and properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1397 | doc->info_name = ui_string_new(ctx, "info_name"); |
0c881944fa10
add resourceviewer info and properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1398 | doc->info_type = ui_string_new(ctx, "info_type"); |
0c881944fa10
add resourceviewer info and properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1399 | doc->info_encrypted = ui_string_new(ctx, "info_encrypted"); |
0c881944fa10
add resourceviewer info and properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1400 | doc->info_etag = ui_string_new(ctx, "info_etag"); |
0c881944fa10
add resourceviewer info and properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1401 | doc->info_size = ui_string_new(ctx, "info_size"); |
0c881944fa10
add resourceviewer info and properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1402 | |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1403 | return doc; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1404 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1405 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1406 | static char* gen_tmp_download_filename(const char *name) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1407 | char *dir = ui_getappdir(); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1408 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1409 | unsigned char rd[8]; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1410 | memset(rd, 0, 8); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1411 | dav_rand_bytes(rd, 8); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1412 | char *hex = util_hexstr(rd, 8); |
77
5de33c2d94c6
fix text/image preview loading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
1413 | cxmutstr tmp = cx_asprintf("%sdownload-%s-%s", dir, hex, name); |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1414 | return tmp.ptr; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1415 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1416 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1417 | static int jobthr_resourceviewer_load(void *data) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1418 | DavResourceViewer *doc = data; |
54
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1419 | |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1420 | DavResource *res = dav_resource_new(doc->sn, doc->path); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1421 | doc->error = dav_load(res); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1422 | if(!doc->error) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1423 | doc->current = res; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1424 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1425 | if(res->contentlength < DAV_RESOURCEVIEWER_PREVIEW_MAX_SIZE) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1426 | if(doc->type == DAV_RESOURCE_VIEW_TEXT) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1427 | doc->text_content = cxBufferCreate(NULL, res->contentlength, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1428 | int err = dav_get_content(res, doc->text_content, (dav_write_func)cxBufferWrite); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1429 | cxBufferPut(doc->text_content, 0); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1430 | if(err) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1431 | doc->error = err; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1432 | doc->message_str = "Cannot load content"; // TODO: better message |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1433 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1434 | } else if(doc->type == DAV_RESOURCE_VIEW_IMAGE) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1435 | char *tmp = gen_tmp_download_filename(res->name); |
77
5de33c2d94c6
fix text/image preview loading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
1436 | FILE *f = sys_fopen(tmp, "wb"); |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1437 | if(f) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1438 | int err = dav_get_content(res, f, (dav_write_func)fwrite); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1439 | if(!err) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1440 | doc->tmp_file = tmp; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1441 | } else { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1442 | free(tmp); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1443 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1444 | fclose(f); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1445 | } else { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1446 | free(tmp); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1447 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1448 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1449 | } else { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1450 | // TODO: add file too large message |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1451 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1452 | } else { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1453 | doc->message_str = "Cannot load properties"; // TODO: better message |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1454 | dav_resource_free(res); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1455 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1456 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1457 | return 0; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1458 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1459 | |
54
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1460 | static void resourceviewer_set_info(DavResourceViewer *doc) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1461 | DavResource *res = doc->current; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1462 | if(!res) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1463 | return; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1464 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1465 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1466 | char *url = util_concat_path(res->session->base_url, res->href); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1467 | ui_set(doc->info_url, url); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1468 | free(url); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1469 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1470 | ui_set(doc->info_name, res->name); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1471 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1472 | if(res->iscollection) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1473 | ui_set(doc->info_type, "Collection"); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1474 | } else { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1475 | if(res->contenttype) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1476 | cxmutstr type = cx_asprintf("Resource (%s)", res->contenttype); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1477 | ui_set(doc->info_type, type.ptr); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1478 | free(type.ptr); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1479 | } else { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1480 | ui_set(doc->info_type, "Resource"); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1481 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1482 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1483 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1484 | char *keyprop = dav_get_string_property_ns( |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1485 | res, |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1486 | DAV_NS, |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1487 | "crypto-key"); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1488 | if(keyprop) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1489 | cxmutstr info_encrypted = cx_asprintf("Yes Key: %s", keyprop); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1490 | ui_set(doc->info_encrypted, info_encrypted.ptr); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1491 | free(info_encrypted.ptr); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1492 | } else { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1493 | ui_set(doc->info_encrypted, "No"); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1494 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1495 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1496 | char *etag = dav_get_string_property_ns( |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1497 | res, |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1498 | "DAV:", |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1499 | "getetag"); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1500 | ui_set(doc->info_etag, etag); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1501 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1502 | if(res->contentlength > 0) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1503 | char *sz = util_size_str(FALSE, res->contentlength); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1504 | cxmutstr size_str = cx_asprintf("%s (%" PRIu64 " bytes)", sz, res->contentlength); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1505 | ui_set(doc->info_size, size_str.ptr); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1506 | free(size_str.ptr); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1507 | } else { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1508 | ui_set(doc->info_size, "0"); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1509 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1510 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1511 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1512 | static void resourceviewer_update_proplist(DavResourceViewer *doc) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1513 | DavResource *res = doc->current; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1514 | if(!res) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1515 | return; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1516 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1517 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1518 | size_t count = 0; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1519 | DavPropName *properties = dav_get_property_names(res, &count); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1520 | for(int i=0;i<count;i++) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1521 | DavPropertyList *prop = ui_malloc(doc->ctx, sizeof(DavPropertyList)); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1522 | prop->ns = properties[i].ns ? ui_strdup(doc->ctx, properties[i].ns) : NULL; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1523 | prop->name = ui_strdup(doc->ctx, properties[i].name); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1524 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1525 | DavXmlNode *xval = dav_get_property_ns(res, prop->ns, prop->name); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1526 | if(xval) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1527 | if(dav_xml_isstring(xval)) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1528 | char *value = dav_xml_getstring(xval); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1529 | if(value) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1530 | prop->value_simplified = NULL; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1531 | prop->value_full = ui_strdup(doc->ctx, value); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1532 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1533 | } else { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1534 | DavXmlNode *x = xval->type == DAV_XML_ELEMENT ? xval : dav_xml_nextelm(xval); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1535 | cxmutstr value = cx_asprintf_a(ui_allocator(doc->ctx), "<%s>...</%s>", x->name, x->name); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1536 | prop->value_simplified = value.ptr; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1537 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1538 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1539 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1540 | ui_list_append(doc->properties, prop); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1541 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1542 | doc->properties->update(doc->properties, 0); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1543 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1544 | |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1545 | static void resourceviewer_load_finished(UiEvent *event, void *data) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1546 | DavResourceViewer *doc = data; |
54
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1547 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1548 | if(doc->window_closed) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1549 | dav_resourceviewer_destroy(doc); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1550 | return; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1551 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1552 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1553 | resourceviewer_set_info(doc); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1554 | resourceviewer_update_proplist(doc); |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1555 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1556 | if(doc->type == DAV_RESOURCE_VIEW_TEXT) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1557 | ui_set(doc->text, doc->text_content->space); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1558 | } else if(doc->type == DAV_RESOURCE_VIEW_IMAGE) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1559 | ui_image_load_file(doc->image, doc->tmp_file); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1560 | } |
54
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1561 | |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1562 | ui_set(doc->tabview, 1); |
78
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1563 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1564 | doc->loaded = TRUE; |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1565 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1566 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1567 | void dav_resourceviewer_load(UiObject *ui, DavResourceViewer *res) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1568 | ui_set(res->loading, 1); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1569 | ui_set(res->message, "Loading..."); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1570 | ui_set(res->tabview, 0); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1571 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1572 | ui_job(ui, jobthr_resourceviewer_load, res, resourceviewer_load_finished, res); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1573 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1574 | |
78
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1575 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1576 | typedef struct ResourceViewerUploadFile { |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1577 | UiObject *ui; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1578 | DavSession *sn; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1579 | char *path; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1580 | cxmutstr text; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1581 | int error; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1582 | } ResourceViewerUploadFile; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1583 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1584 | static int jobthr_upload_text(void *data) { |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1585 | ResourceViewerUploadFile *upload = data; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1586 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1587 | DavResource *res = dav_resource_new(upload->sn, upload->path); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1588 | dav_set_content_data(res, upload->text.ptr, upload->text.length); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1589 | upload->error = dav_store(res); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1590 | dav_resource_free(res); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1591 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1592 | return 0; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1593 | } |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1594 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1595 | static void uithr_upload_text_finished(UiEvent *event, void *data) { |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1596 | ResourceViewerUploadFile *upload = data; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1597 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1598 | if(upload->error) { |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1599 | cxmutstr errormsg = cx_asprintf("Upload failed: %d", upload->sn->error); // TODO: add full error message |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1600 | ui_dialog(event->obj, .title = "Error", .content = errormsg.ptr, .closebutton_label = "OK"); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1601 | free(errormsg.ptr); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1602 | ui_set_group(event->obj->ctx, RESOURCEVIEWER_STATE_MODIFIED); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1603 | } |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1604 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1605 | dav_session_destroy(upload->sn); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1606 | free(upload->path); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1607 | free(upload->text.ptr); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1608 | free(upload); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1609 | } |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1610 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1611 | void dav_resourceviewer_save(UiObject *ui, DavResourceViewer *res) { |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1612 | if(res->type == DAV_RESOURCE_VIEW_TEXT) { |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1613 | DavSession *newsn = dav_session_clone(res->current->session); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1614 | ResourceViewerUploadFile *upload = malloc(sizeof(ResourceViewerUploadFile)); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1615 | upload->ui = ui; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1616 | upload->sn = newsn; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1617 | upload->path = strdup(res->current->path); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1618 | char *text = ui_get(res->text); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1619 | size_t textlen = strlen(text); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1620 | upload->text = cx_strdup(cx_strn(text, textlen)); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1621 | ui_job(ui, jobthr_upload_text, upload, uithr_upload_text_finished, upload); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1622 | ui_unset_group(ui->ctx, RESOURCEVIEWER_STATE_MODIFIED); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1623 | } |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1624 | } |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1625 | |
54
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1626 | void dav_resourceviewer_destroy(DavResourceViewer *res) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1627 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1628 | } |