Wed, 27 Nov 2024 18:45:08 +0100
add upload/download list, resolves #512
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" |
87
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
35 | #include "upload.h" |
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
36 | #include "download.h" |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
37 | |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
38 | #include "system.h" |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
39 | #include "common/context.h" |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
40 | |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
41 | #include <libidav/config.h> |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | #include <libidav/utils.h> |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | DavBrowser* davbrowser_create(UiObject *toplevel) { |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | DavBrowser *doc = ui_document_new(sizeof(DavBrowser)); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | UiContext *ctx = ui_document_context(doc); |
95
e92c72705da4
add upload/download list, resolves #512
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
93
diff
changeset
|
47 | doc->window = toplevel; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | doc->ctx = ctx; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
50 | doc->navigation_stack = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
51 | doc->navstack_enabled = true; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
52 | doc->navstack_pos = 0; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
53 | |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | doc->dav_queue = ui_threadpool_create(1); |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
55 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
56 | 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
|
57 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | doc->path = ui_string_new(ctx, "path"); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | doc->resources = ui_list_new(ctx, "reslist"); |
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 | return doc; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
63 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | 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
|
66 | if (browser->current) { |
5a8762fcfecc
update toolkit / set window size
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
67 | dav_resource_free_all(browser->current); |
5a8762fcfecc
update toolkit / set window size
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
68 | } |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | ui_list_clear(browser->resources); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | |
13
5a8762fcfecc
update toolkit / set window size
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
71 | browser->current = collection; |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
72 | browser->res_counter++; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | for (DavResource *res = collection->children; res; res = res->next) { |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | ui_list_append(browser->resources, res); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
75 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
76 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | browser->resources->update(browser->resources, 0); |
68 | 78 | |
79 | ui_set_group(ui->ctx, APP_STATE_BROWSER_SESSION); | |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | // ------------------------------ davbrowser_connect2repo ------------------------------ |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | |
85
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
84 | 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
|
85 | 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
|
86 | 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
|
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 | 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
|
89 | 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
|
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 | 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
|
92 | } DavConnect2Repo; |
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 | 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
|
95 | 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
|
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 | 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
|
98 | 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
|
99 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
100 | 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
|
101 | 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
|
102 | 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
|
103 | 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
|
104 | } else { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
105 | 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
|
106 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
107 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
108 | 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
|
109 | 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
|
110 | 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
|
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 | 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
|
114 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
115 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
116 | 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
|
117 | 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
|
118 | 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
|
119 | char *password_free = NULL; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
120 | 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
|
121 | user = repo->user.value.ptr; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
122 | 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
|
123 | 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
|
124 | 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
|
125 | } else { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
126 | 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
|
127 | 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
|
128 | 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
|
129 | 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
|
130 | 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
|
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 | } else { |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
133 | 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
|
134 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
135 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
136 | 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
|
137 | 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
|
138 | 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
|
139 | .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
|
140 | .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
|
141 | .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
|
142 | .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
|
143 | .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
|
144 | .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
|
145 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
146 | 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
|
147 | 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
|
148 | 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
|
149 | 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
|
150 | 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
|
151 | 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
|
152 | 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
|
153 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
154 | 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
|
155 | 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
|
156 | 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
|
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 | 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
|
159 | 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
|
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 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
162 | 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
|
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 | 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
|
165 | } |
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 | 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
|
168 | 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
|
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 | } |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
171 | } |
85
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
172 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
173 | 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
|
174 | 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
|
175 | 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
|
176 | } |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
177 | 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
|
178 | |
93
5ee236155955
use repo encryption and SSL settings, resolves #516
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
179 | sn->flags = dav_repository_get_flags(repo); |
5ee236155955
use repo encryption and SSL settings, resolves #516
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
180 | sn->key = dav_context_get_key(application_dav_context(), repo->default_key.value.ptr); |
5ee236155955
use repo encryption and SSL settings, resolves #516
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
181 | curl_easy_setopt(sn->handle, CURLOPT_SSLVERSION, repo->ssl_version); |
5ee236155955
use repo encryption and SSL settings, resolves #516
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
182 | if(repo->cert.value.ptr) { |
5ee236155955
use repo encryption and SSL settings, resolves #516
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
183 | curl_easy_setopt(sn->handle, CURLOPT_CAINFO, repo->cert.value.ptr); |
5ee236155955
use repo encryption and SSL settings, resolves #516
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
184 | } |
5ee236155955
use repo encryption and SSL settings, resolves #516
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
185 | if(!repo->verification.value) { |
5ee236155955
use repo encryption and SSL settings, resolves #516
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
186 | curl_easy_setopt(sn->handle, CURLOPT_SSL_VERIFYPEER, 0); |
5ee236155955
use repo encryption and SSL settings, resolves #516
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
187 | curl_easy_setopt(sn->handle, CURLOPT_SSL_VERIFYHOST, 0); |
5ee236155955
use repo encryption and SSL settings, resolves #516
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
188 | } |
5ee236155955
use repo encryption and SSL settings, resolves #516
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
189 | |
5ee236155955
use repo encryption and SSL settings, resolves #516
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
190 | |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
191 | 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
|
192 | 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
|
193 | 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
|
194 | } else { |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
195 | 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
|
196 | } |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
197 | |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
198 | 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
|
199 | 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
|
200 | free(dav_path); |
56
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 | SessionAuthData *auth = cxMalloc(sn->mp->allocator, sizeof(SessionAuthData)); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
203 | auth->obj = ui; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
204 | auth->cond = ui_condvar_create(); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
205 | auth->sn = sn; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
206 | 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
|
207 | auth->password = NULL; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
208 | dav_session_set_authcallback(sn, jobthr_davbrowser_auth, auth); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
209 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
210 | 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
|
211 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
212 | return 0; |
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
213 | } |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
214 | |
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
215 | // ------------------------------ davbrowser_auth ------------------------------ |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
216 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
217 | static int davbrowser_auth_dialog(void *data) { |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
218 | SessionAuthData *auth = data; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
219 | auth_dialog(auth); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
220 | return 0; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
221 | } |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
222 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
223 | 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
|
224 | dav_session_free(auth->sn, auth->user); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
225 | dav_session_free(auth->sn, auth->password); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
226 | auth->user = user ? dav_session_strdup(auth->sn, user) : NULL; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
227 | auth->password = password ? dav_session_strdup(auth->sn, password) : NULL; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
228 | } |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
229 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
230 | int jobthr_davbrowser_auth(DavSession *sn, void *data) { |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
231 | SessionAuthData *auth = data; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
232 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
233 | ui_call_mainthread(davbrowser_auth_dialog, auth); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
234 | ui_condvar_wait(auth->cond); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
235 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
236 | if(auth->cond->intdata) { |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
237 | dav_session_set_auth(sn, auth->user, auth->password); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
238 | } |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
239 | dav_session_free(auth->sn, auth->password); |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
240 | auth->password = NULL; |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
241 | |
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
242 | return 0; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
243 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
244 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
245 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
246 | // ------------------------------ davbrowser_query_path ------------------------------ |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
247 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
248 | typedef struct DavBrowserQueryPath { |
11
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
249 | UiThreadpool *pool; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
250 | DavBrowser *browser; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
251 | char *path; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
252 | DavResource *result; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
253 | } DavBrowserQueryPath; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
254 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
255 | static int browser_query_path(void *data) { |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
256 | DavBrowserQueryPath *query = data; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
257 | DavSession *sn = query->browser->sn; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
258 | |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
259 | 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
|
260 | query->result = res; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
261 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
262 | return 0; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
263 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
264 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
265 | static void browser_query_finished(UiEvent *event, void *data) { |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
266 | DavBrowserQueryPath *query = data; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
267 | DavBrowser *browser = event->document; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
268 | |
11
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
269 | 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
|
270 | if (query->result) { |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
271 | 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
|
272 | } else { |
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
273 | 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
|
274 | 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
|
275 | } |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
276 | |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
277 | window_progress(event->window, 0); |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
278 | } else { |
11
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
279 | // operation aborted |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
280 | if (query->result) { |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
281 | 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
|
282 | } |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
283 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
284 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
285 | free(query->path); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
286 | free(query); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
287 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
288 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
289 | 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
|
290 | if (!browser->sn) { |
7cfd36aa005b
add refresh button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
16
diff
changeset
|
291 | // TODO: error |
7cfd36aa005b
add refresh button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
16
diff
changeset
|
292 | return; |
7cfd36aa005b
add refresh button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
16
diff
changeset
|
293 | } |
7cfd36aa005b
add refresh button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
16
diff
changeset
|
294 | |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
295 | // 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
|
296 | size_t len = path ? strlen(path) : 0; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
297 | if (len == 1 && *path == '/') { |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
298 | path = ""; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
299 | } |
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
|
300 | |
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
|
301 | // 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
|
302 | // 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
|
303 | 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
|
304 | char *full_path_col = util_concat_path(full_path, "/"); |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
305 | 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
|
306 | 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
|
307 | 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
|
308 | if (!cx_strprefix(cpath, newc)) { |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
309 | ui_set(browser->path, full_path); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
310 | } |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
311 | 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
|
312 | free(full_path_col); |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
313 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
314 | 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
|
315 | query->pool = browser->dav_queue; |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
316 | query->browser = browser; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
317 | query->path = strdup(path); |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
318 | query->result = NULL; |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
319 | 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
|
320 | |
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
321 | window_progress(ui->window, 1); |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
322 | |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
323 | davbrowser_add2navstack(browser, browser->repo_base, path); |
8
726b24766437
implement connecting to repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
324 | } |
11
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
325 | |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
326 | 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
|
327 | if (browser->repo_base) { |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
328 | 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
|
329 | cxstring newurl = cx_str(url); |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
330 | |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
331 | if (cx_strprefix(newurl, base)) { |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
332 | 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
|
333 | 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
|
334 | return; |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
335 | } |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
336 | } |
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
337 | |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
338 | 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
|
339 | 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
|
340 | |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
341 | 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
|
342 | 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
|
343 | 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
|
344 | return; |
44ebbb4c8a13
add support for secret store credentials when connecting to repositories, resolves #496
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
345 | } |
16
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
346 | |
f2e79b69d233
switch DavSession in davbrowser_query_url when a different server is specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
347 | 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
|
348 | 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
|
349 | } |
11
26acbfa75c1f
add handler for the path bar activate events
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
350 | } |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
351 | |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
352 | 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
|
353 | DavResourceViewType type = DAV_RESOURCE_VIEW_PROPERTIES; |
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
354 | if(!contenttype) { |
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
355 | contenttype = res->contenttype; |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
356 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
357 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
358 | if(res->iscollection) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
359 | // default type |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
360 | } else if(contenttype) { |
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
361 | cxstring ctype = cx_str(contenttype); |
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
362 | if(cx_strprefix(ctype, CX_STR("text/"))) { |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
363 | type = DAV_RESOURCE_VIEW_TEXT; |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
364 | } else if(cx_strprefix(ctype, CX_STR("image/"))) { |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
365 | type = DAV_RESOURCE_VIEW_IMAGE; |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
366 | } 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
|
367 | if(cx_strsuffix(ctype, CX_STR("json"))) { |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
368 | type = DAV_RESOURCE_VIEW_TEXT; |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
369 | } else if(cx_strsuffix(ctype, CX_STR("/xml"))) { |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
370 | type = DAV_RESOURCE_VIEW_TEXT; |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
371 | } else if(cx_strsuffix(ctype, CX_STR("+xml"))) { |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
372 | type = DAV_RESOURCE_VIEW_TEXT; |
53
da05df77652e
add menu items to open resource properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
373 | } else if(cx_strsuffix(ctype, CX_STR("/xml"))) { |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
374 | type = DAV_RESOURCE_VIEW_TEXT; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
375 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
376 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
377 | } else { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
378 | cxstring path = cx_str(res->path); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
379 | if(cx_strsuffix(path, CX_STR(".png"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
380 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
381 | } else if(cx_strsuffix(path, CX_STR(".jpg"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
382 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
383 | } else if(cx_strsuffix(path, CX_STR(".jpeg"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
384 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
385 | } else if(cx_strsuffix(path, CX_STR(".tif"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
386 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
387 | } else if(cx_strsuffix(path, CX_STR(".tiff"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
388 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
389 | } else if(cx_strsuffix(path, CX_STR(".webp"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
390 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
391 | } else if(cx_strsuffix(path, CX_STR(".bmp"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
392 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
393 | } else if(cx_strsuffix(path, CX_STR(".gif"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
394 | type = DAV_RESOURCE_VIEW_IMAGE; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
395 | } else if(cx_strsuffix(path, CX_STR(".txt"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
396 | type = DAV_RESOURCE_VIEW_TEXT; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
397 | } else if(cx_strsuffix(path, CX_STR(".md"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
398 | type = DAV_RESOURCE_VIEW_TEXT; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
399 | } else if(cx_strsuffix(path, CX_STR(".xml"))) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
400 | type = DAV_RESOURCE_VIEW_TEXT; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
401 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
402 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
403 | |
52
0c881944fa10
add resourceviewer info and properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
404 | resourceviewer_new(browser, res->path, type); |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
405 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
406 | |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
407 | 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
|
408 | if (browser->navstack_enabled) { |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
409 | 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
|
410 | char *nav_url = cxListAt(browser->navigation_stack, 0); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
411 | cxListRemove(browser->navigation_stack, 0); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
412 | free(nav_url); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
413 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
414 | browser->navstack_pos = 0; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
415 | |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
416 | char *nav_url = util_concat_path(base, path); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
417 | cxListInsert(browser->navigation_stack, 0, nav_url); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
418 | |
49
2f71f4ee247a
update toolkit, ucx, libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
419 | if (cxListSize(browser->navigation_stack) > DAVBROWSER_MAX_NAVLIST) { |
2f71f4ee247a
update toolkit, ucx, libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
420 | 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
|
421 | free(nav); |
49
2f71f4ee247a
update toolkit, ucx, libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
422 | 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
|
423 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
424 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
425 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
426 | |
68 | 427 | void davbrowser_navigation_parent(UiObject *ui, DavBrowser *browser) { |
428 | if(browser->current) { | |
429 | char *parent = util_parent_path(browser->current->path); | |
430 | if(strlen(parent) > 0) { | |
431 | davbrowser_query_path(ui, browser, parent); | |
432 | } | |
433 | free(parent); | |
434 | } | |
435 | } | |
436 | ||
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
437 | void davbrowser_navigation_back(UiObject *ui, DavBrowser *browser) { |
49
2f71f4ee247a
update toolkit, ucx, libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
438 | 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
|
439 | browser->navstack_pos++; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
440 | 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
|
441 | browser->navstack_enabled = false; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
442 | davbrowser_query_url(ui, browser, nav_url); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
443 | browser->navstack_enabled = true; |
48
ae61523bce20
improve pathbar visuals
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
444 | ui_set(browser->path, nav_url); |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
445 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
446 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
447 | |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
448 | void davbrowser_navigation_forward(UiObject *ui, DavBrowser *browser) { |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
449 | if (browser->navstack_pos > 0) { |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
450 | browser->navstack_pos--; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
451 | 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
|
452 | browser->navstack_enabled = false; |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
453 | davbrowser_query_url(ui, browser, nav_url); |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
454 | browser->navstack_enabled = true; |
48
ae61523bce20
improve pathbar visuals
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
455 | ui_set(browser->path, nav_url); |
15
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
456 | } |
78684a24dc52
implement navigation back/forward buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
457 | } |
18
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
458 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
459 | |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
460 | 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
|
461 | if (!browser->sn) { |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
462 | return; // TODO: error msg |
af411868ab9b
implement dnd upload (without progressbar)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
463 | } |
87
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
464 | |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
465 | cxmutstr wtitle = cx_asprintf("Upload to: %s", ui_get(browser->path)); |
87
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
466 | UiObject *dialog = ui_simple_window(wtitle.ptr, NULL); |
20
db263186edf3
improve upload progress window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
467 | free(wtitle.ptr); |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
468 | |
87
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
469 | DavFileUpload *upload = dav_upload_create(browser, dialog, files); |
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
470 | transfer_window_init(dialog, action_upload_cancel); |
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
471 | dav_upload_start(upload); |
95
e92c72705da4
add upload/download list, resolves #512
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
93
diff
changeset
|
472 | application_register_transfer(&upload->trans); |
31
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
473 | } |
bf810176ddb8
implement download progress bar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
474 | |
87
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
475 | void davbrowser_download(UiObject *ui, DavBrowser *browser, DavResource *reslist, const char *local_path) { |
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
476 | cxmutstr wtitle = cx_asprintf("Download to: %s", local_path); |
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
477 | UiObject *dialog = ui_simple_window(wtitle.ptr, NULL); |
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
478 | free(wtitle.ptr); |
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
85
diff
changeset
|
479 | |
87
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
480 | DavFileDownload *download = dav_download_create(browser, dialog, reslist, local_path); |
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
481 | transfer_window_init(dialog, action_download_cancel); |
5360027fb282
download/upload refactoring, add cancel button, resolves #498 fixes #506
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
482 | dav_download_start(download); |
95
e92c72705da4
add upload/download list, resolves #512
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
93
diff
changeset
|
483 | application_register_transfer(&download->trans); |
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
484 | } |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
485 | |
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
486 | |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
487 | // ------------------------------------- Path Operation (DELETE, MKCOL) ------------------------------------- |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
488 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
489 | enum DavPathOpType { |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
490 | DAV_PATH_OP_DELETE = 0, |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
491 | DAV_PATH_OP_CREATE |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
492 | }; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
493 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
494 | typedef struct DavPathOp { |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
495 | UiObject *ui; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
496 | DavBrowser *browser; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
497 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
498 | // operation type (delete, mkcol, ...) |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
499 | enum DavPathOpType op; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
500 | // clone of the browser's DavSession |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
501 | DavSession *sn; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
502 | // path array |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
503 | char **path; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
504 | // browser->resources indices |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
505 | size_t *list_indices; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
506 | // number of path/list_indices elements |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
507 | size_t nelm; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
508 | // path is collection |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
509 | DavBool iscollection; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
510 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
511 | // 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
|
512 | // 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
|
513 | DavResource *collection; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
514 | int64_t collection_ctn; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
515 | } DavPathOp; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
516 | |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
517 | typedef struct DavPathOpResult { |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
518 | UiObject *ui; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
519 | DavBrowser *browser; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
520 | DavResource *collection; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
521 | int64_t collection_ctn; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
522 | enum DavPathOpType op; |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
523 | DavBool iscollection; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
524 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
525 | char *path; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
526 | int res_index; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
527 | int result; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
528 | char *errormsg; |
84
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
529 | |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
530 | time_t result_lastmodified; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
531 | uint64_t result_contentlength; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
532 | char *result_contenttype; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
533 | } DavPathOpResult; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
534 | |
89
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
535 | typedef struct DavRenameOp { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
536 | UiObject *ui; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
537 | DavBrowser *browser; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
538 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
539 | // clone of the browser's DavSession |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
540 | DavSession *sn; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
541 | char *path; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
542 | char *newname; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
543 | int result; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
544 | char *errormsg; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
545 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
546 | // browser->resources index |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
547 | size_t index; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
548 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
549 | // browser->current ptr when the PathOp started |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
550 | // used in combination with collection_ctn to check if the browser list changed |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
551 | DavResource *collection; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
552 | int64_t collection_ctn; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
553 | } DavRenameOp; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
554 | |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
555 | 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
|
556 | DavPathOpResult *result = data; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
557 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
558 | 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
|
559 | 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
|
560 | free(msg.ptr); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
561 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
562 | if (result->errormsg) { |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
563 | free(result->errormsg); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
564 | } |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
565 | free(result->path); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
566 | free(result); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
567 | return 0; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
568 | } |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
569 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
570 | 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
|
571 | DavPathOpResult *result = data; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
572 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
573 | 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
|
574 | 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
|
575 | 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
|
576 | } |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
577 | |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
578 | free(result->path); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
579 | free(result); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
580 | return 0; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
581 | } |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
582 | |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
583 | 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
|
584 | DavPathOpResult *result = data; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
585 | |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
586 | 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
|
587 | 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
|
588 | free(msg.ptr); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
589 | |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
590 | if (result->errormsg) { |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
591 | free(result->errormsg); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
592 | } |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
593 | free(result->path); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
594 | free(result); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
595 | return 0; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
596 | } |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
597 | |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
598 | 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
|
599 | DavPathOpResult *result = data; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
600 | |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
601 | 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
|
602 | 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
|
603 | res->iscollection = result->iscollection; |
84
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
604 | res->lastmodified = result->result_lastmodified; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
605 | res->contentlength = result->result_contentlength; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
606 | 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
|
607 | // 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
|
608 | ui_list_append(result->browser->resources, res); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
609 | result->browser->resources->update(result->browser->resources, 0); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
610 | } |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
611 | |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
612 | free(result->path); |
84
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
613 | free(result->result_contenttype); |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
614 | free(result); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
615 | return 0; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
616 | } |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
617 | |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
618 | static int jobthr_path_op(void *data) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
619 | DavPathOp *op = data; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
620 | |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
621 | for (int i = op->nelm-1; i >= 0; i--) { |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
622 | if (op->path[i]) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
623 | DavResource *res = dav_resource_new(op->sn, op->path[i]); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
624 | |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
625 | DavPathOpResult *result = malloc(sizeof(DavPathOpResult)); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
626 | result->ui = op->ui; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
627 | result->browser = op->browser; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
628 | result->collection = op->collection; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
629 | result->collection_ctn = op->collection_ctn; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
630 | result->op = op->op; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
631 | result->path = strdup(res->path); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
632 | result->result = 0; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
633 | 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
|
634 | result->errormsg = NULL; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
635 | result->iscollection = op->iscollection; |
84
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
636 | result->result_lastmodified = 0; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
637 | result->result_contentlength = 0; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
638 | result->result_contenttype = NULL; |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
639 | |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
640 | 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
|
641 | 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
|
642 | if (dav_delete(res)) { |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
643 | 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
|
644 | result_callback = uithr_pathop_delete_error; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
645 | } |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
646 | ui_call_mainthread(result_callback, result); |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
647 | } else if (op->op == DAV_PATH_OP_CREATE) { |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
648 | res->iscollection = op->iscollection; |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
649 | 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
|
650 | if (dav_create(res)) { |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
651 | 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
|
652 | result_callback = uithr_pathop_create_resource_error; |
84
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
653 | } else { |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
654 | // try to load some basic resource properties |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
655 | // 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
|
656 | // we just don't have the new properties |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
657 | dav_load_prop(res, NULL, 0); |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
658 | result->result_lastmodified = res->lastmodified; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
659 | result->result_contentlength = res->contentlength; |
57a359c52617
load properties after resource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
660 | 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
|
661 | } |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
662 | ui_call_mainthread(result_callback, result); |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
663 | } |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
664 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
665 | dav_resource_free(res); |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
666 | free(op->path[i]); |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
667 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
668 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
669 | |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
670 | dav_session_destroy(op->sn); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
671 | free(op->path); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
672 | free(op->list_indices); |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
673 | free(op); |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
674 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
675 | return 0; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
676 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
677 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
678 | void davbrowser_delete(UiObject *ui, DavBrowser *browser, UiListSelection selection) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
679 | DavPathOp *op = malloc(sizeof(DavPathOp)); |
27
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
680 | op->ui = ui; |
c254ed644edf
remove deleted resources from the browser list
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
681 | op->browser = browser; |
26
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
682 | op->op = DAV_PATH_OP_DELETE; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
683 | op->sn = dav_session_clone(browser->sn); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
684 | op->path = calloc(selection.count, sizeof(char*)); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
685 | op->list_indices = calloc(selection.count, sizeof(size_t)); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
686 | op->nelm = selection.count; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
687 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
688 | op->collection = browser->current; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
689 | op->collection_ctn = browser->res_counter; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
690 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
691 | for (int i = 0; i < selection.count; i++) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
692 | DavResource *res = ui_list_get(browser->resources, selection.rows[i]); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
693 | if (res) { |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
694 | op->path[i] = strdup(res->path); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
695 | op->list_indices[i] = selection.rows[i]; |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
696 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
697 | } |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
698 | |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
699 | ui_job(ui, jobthr_path_op, op, NULL, NULL); |
40d6af793c1a
implement resource deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
700 | } |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
701 | |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
702 | 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
|
703 | DavPathOp *op = malloc(sizeof(DavPathOp)); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
704 | op->ui = ui; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
705 | op->browser = browser; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
706 | op->op = DAV_PATH_OP_CREATE; |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
707 | op->sn = dav_session_clone(browser->sn); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
708 | op->path = calloc(1, sizeof(char*)); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
709 | op->list_indices = calloc(1, sizeof(size_t)); |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
710 | op->nelm = 1; |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
711 | op->iscollection = iscollection; |
28
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
712 | |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
713 | 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
|
714 | |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
715 | op->collection = browser->current; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
716 | op->collection_ctn = browser->res_counter; |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
717 | |
1ecc1183f046
implement new-collection toolbar button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
718 | 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
|
719 | } |
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
720 | |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
721 | void davbrowser_mkcol(UiObject *ui, DavBrowser *browser, const char *name) { |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
722 | davbrowser_create_resource(ui, browser, name, TRUE); |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
723 | } |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
724 | |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
725 | void davbrowser_newfile(UiObject *ui, DavBrowser *browser, const char *name) { |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
726 | davbrowser_create_resource(ui, browser, name, FALSE); |
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
727 | } |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
728 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
729 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
730 | |
89
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
731 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
732 | static int jobthr_rename(void *data) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
733 | DavRenameOp *op = data; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
734 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
735 | DavResource *res = dav_get(op->sn, op->path, NULL); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
736 | if(!res) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
737 | fprintf(stderr, "Error: Cannot get resource %s\n", op->path); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
738 | op->result = 1; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
739 | return 0; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
740 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
741 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
742 | char *cryptoname = dav_get_string_property_ns(res, DAV_NS, "crypto-name"); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
743 | char *cryptokey = dav_get_string_property_ns(res, DAV_NS, "crypto-key"); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
744 | if(cryptoname && cryptokey) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
745 | // encrypted resource, the name is stored in the crypto-name property |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
746 | // these properties are only loaded if encryption is enabled for |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
747 | // this session |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
748 | DavKey *key = dav_context_get_key(op->sn->context, cryptokey); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
749 | if(!key) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
750 | cxmutstr error = cx_asprintf_a(op->sn->mp->allocator, "Cannot rename resource: crypto key %s not found.", cryptokey); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
751 | op->errormsg = error.ptr; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
752 | op->result = 1; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
753 | return 0; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
754 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
755 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
756 | // check if a resource with this name already exists |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
757 | char *parent = util_parent_path(res->path); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
758 | char *newpath = util_concat_path(parent, op->newname); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
759 | DavResource *testres = dav_resource_new(op->sn, newpath); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
760 | if(dav_exists(testres)) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
761 | cxmutstr error = cx_asprintf_a(op->sn->mp->allocator, "A resource with the name %s already exists.", op->newname); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
762 | op->errormsg = error.ptr; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
763 | op->result = 1; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
764 | } else { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
765 | char *crname = aes_encrypt(op->newname, strlen(op->newname), key); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
766 | dav_set_string_property_ns(res, DAV_NS, "crypto-name", crname); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
767 | free(crname); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
768 | if(dav_store(res)) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
769 | op->result = 1; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
770 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
771 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
772 | free(parent); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
773 | free(newpath); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
774 | } else { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
775 | // rename the resource by changing the url mapping with MOVE |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
776 | char *parent = util_parent_path(res->href); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
777 | char *new_href = util_concat_path(parent, op->newname); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
778 | char *dest = util_get_url(op->sn, new_href); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
779 | free(parent); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
780 | free(new_href); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
781 | if(dav_moveto(res, dest, false)) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
782 | op->result = 1; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
783 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
784 | free(dest); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
785 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
786 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
787 | if(op->result && !op->errormsg) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
788 | cxmutstr error = cx_asprintf_a(op->sn->mp->allocator, "Error: %d", op->sn->error); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
789 | op->errormsg = error.ptr; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
790 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
791 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
792 | return 0; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
793 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
794 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
795 | static void uithr_rename_finished(UiEvent *event, void *data) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
796 | DavRenameOp *op = data; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
797 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
798 | if(!op->result) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
799 | // update name in the browser list |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
800 | if (op->browser->current == op->collection && op->browser->res_counter == op->collection_ctn) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
801 | DavResource *res = ui_list_get(op->browser->resources, op->index); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
802 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
803 | char *parent = util_parent_path(res->path); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
804 | char *newpath = util_concat_path(parent, op->newname); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
805 | dav_session_free(res->session, res->path); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
806 | dav_session_free(res->session, res->name); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
807 | res->path = dav_session_strdup(res->session, newpath); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
808 | res->name = dav_session_strdup(res->session, op->newname); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
809 | op->browser->resources->update(op->browser->resources, 0); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
810 | free(parent); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
811 | free(newpath); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
812 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
813 | } else { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
814 | // error |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
815 | ui_dialog(op->ui, .title = "Error", .content = op->errormsg, .closebutton_label = "OK"); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
816 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
817 | dav_session_destroy(op->sn); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
818 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
819 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
820 | static void action_resource_rename(UiEvent *event, void *data) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
821 | DavRenameOp *op = data; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
822 | if(event->intval == 1) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
823 | char *newname = event->eventdata; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
824 | if(!newname || strlen(newname) == 0) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
825 | ui_dialog(op->ui, .title = "Error", .content = "No name specified", .closebutton_label = "OK"); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
826 | dav_session_destroy(op->sn); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
827 | return; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
828 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
829 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
830 | char *s = strchr(newname, '/'); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
831 | if(s) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
832 | ui_dialog(op->ui, .title = "Error", .content = "Character '/' is not allowed", .closebutton_label = "OK"); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
833 | dav_session_destroy(op->sn); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
834 | return; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
835 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
836 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
837 | op->newname = dav_session_strdup(op->sn, newname); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
838 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
839 | ui_job(op->ui, jobthr_rename, op, uithr_rename_finished, op); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
840 | return; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
841 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
842 | dav_session_destroy(op->sn); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
843 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
844 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
845 | void davbrowser_rename(UiObject *ui, DavBrowser *browser, UiListSelection selection) { |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
846 | DavSession *sn = dav_session_clone(browser->sn); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
847 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
848 | DavResource *res = ui_list_get(browser->resources, selection.rows[0]); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
849 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
850 | DavRenameOp *rename = dav_session_malloc(sn, sizeof(DavRenameOp)); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
851 | memset(rename, 0, sizeof(DavRenameOp)); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
852 | rename->browser = browser; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
853 | rename->ui = ui; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
854 | rename->sn = sn; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
855 | rename->path = dav_session_strdup(sn, res->path); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
856 | rename->index = selection.rows[0]; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
857 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
858 | rename->collection = browser->current; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
859 | rename->collection_ctn = browser->res_counter; |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
860 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
861 | ui_dialog(ui, |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
862 | .title = "Rename", |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
863 | .content = res->name, |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
864 | .input = TRUE, |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
865 | .input_value = res->name, |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
866 | .result = action_resource_rename, |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
867 | .resultdata = rename, |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
868 | .button1_label = "Rename", |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
869 | .closebutton_label = "Cancel"); |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
870 | } |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
871 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
872 | |
2fbb3cac05a5
implement rename
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
873 | |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
874 | 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
|
875 | DavResourceViewer *doc = ui_document_new(sizeof(DavResourceViewer)); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
876 | UiContext *ctx = ui_document_context(doc); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
877 | doc->ctx = ctx; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
878 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
879 | doc->sn = dav_session_clone(sn); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
880 | doc->path = strdup(path); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
881 | doc->type = type; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
882 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
883 | doc->tabview = ui_int_new(ctx, "tabview"); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
884 | doc->loading = ui_int_new(ctx, "loading"); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
885 | doc->message = ui_string_new(ctx, "message"); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
886 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
887 | doc->text = ui_text_new(ctx, "text"); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
888 | doc->image = ui_generic_new(ctx, "image"); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
889 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
890 | doc->properties = ui_list_new(ctx, "properties"); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
891 | |
52
0c881944fa10
add resourceviewer info and properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
892 | 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
|
893 | 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
|
894 | 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
|
895 | 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
|
896 | 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
|
897 | 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
|
898 | |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
899 | return doc; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
900 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
901 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
902 | static char* gen_tmp_download_filename(const char *name) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
903 | char *dir = ui_getappdir(); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
904 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
905 | unsigned char rd[8]; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
906 | memset(rd, 0, 8); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
907 | dav_rand_bytes(rd, 8); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
908 | char *hex = util_hexstr(rd, 8); |
77
5de33c2d94c6
fix text/image preview loading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
68
diff
changeset
|
909 | 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
|
910 | return tmp.ptr; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
911 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
912 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
913 | static int jobthr_resourceviewer_load(void *data) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
914 | DavResourceViewer *doc = data; |
54
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
915 | |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
916 | DavResource *res = dav_resource_new(doc->sn, doc->path); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
917 | doc->error = dav_load(res); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
918 | if(!doc->error) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
919 | doc->current = res; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
920 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
921 | if(res->contentlength < DAV_RESOURCEVIEWER_PREVIEW_MAX_SIZE) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
922 | if(doc->type == DAV_RESOURCE_VIEW_TEXT) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
923 | 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
|
924 | 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
|
925 | cxBufferPut(doc->text_content, 0); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
926 | if(err) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
927 | doc->error = err; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
928 | doc->message_str = "Cannot load content"; // TODO: better message |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
929 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
930 | } else if(doc->type == DAV_RESOURCE_VIEW_IMAGE) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
931 | 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
|
932 | FILE *f = sys_fopen(tmp, "wb"); |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
933 | if(f) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
934 | 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
|
935 | if(!err) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
936 | doc->tmp_file = tmp; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
937 | } else { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
938 | free(tmp); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
939 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
940 | fclose(f); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
941 | } else { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
942 | free(tmp); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
943 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
944 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
945 | } else { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
946 | // TODO: add file too large message |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
947 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
948 | } else { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
949 | doc->message_str = "Cannot load properties"; // TODO: better message |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
950 | dav_resource_free(res); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
951 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
952 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
953 | return 0; |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
954 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
955 | |
54
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
956 | static void resourceviewer_set_info(DavResourceViewer *doc) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
957 | DavResource *res = doc->current; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
958 | if(!res) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
959 | return; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
960 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
961 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
962 | 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
|
963 | ui_set(doc->info_url, url); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
964 | free(url); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
965 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
966 | ui_set(doc->info_name, res->name); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
967 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
968 | if(res->iscollection) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
969 | ui_set(doc->info_type, "Collection"); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
970 | } else { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
971 | if(res->contenttype) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
972 | cxmutstr type = cx_asprintf("Resource (%s)", res->contenttype); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
973 | ui_set(doc->info_type, type.ptr); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
974 | free(type.ptr); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
975 | } else { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
976 | ui_set(doc->info_type, "Resource"); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
977 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
978 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
979 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
980 | char *keyprop = dav_get_string_property_ns( |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
981 | res, |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
982 | DAV_NS, |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
983 | "crypto-key"); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
984 | if(keyprop) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
985 | cxmutstr info_encrypted = cx_asprintf("Yes Key: %s", keyprop); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
986 | ui_set(doc->info_encrypted, info_encrypted.ptr); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
987 | free(info_encrypted.ptr); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
988 | } else { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
989 | ui_set(doc->info_encrypted, "No"); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
990 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
991 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
992 | char *etag = dav_get_string_property_ns( |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
993 | res, |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
994 | "DAV:", |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
995 | "getetag"); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
996 | ui_set(doc->info_etag, etag); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
997 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
998 | if(res->contentlength > 0) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
999 | char *sz = util_size_str(FALSE, res->contentlength); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1000 | 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
|
1001 | ui_set(doc->info_size, size_str.ptr); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1002 | free(size_str.ptr); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1003 | } else { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1004 | ui_set(doc->info_size, "0"); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1005 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1006 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1007 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1008 | static void resourceviewer_update_proplist(DavResourceViewer *doc) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1009 | DavResource *res = doc->current; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1010 | if(!res) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1011 | return; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1012 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1013 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1014 | size_t count = 0; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1015 | DavPropName *properties = dav_get_property_names(res, &count); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1016 | for(int i=0;i<count;i++) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1017 | DavPropertyList *prop = ui_malloc(doc->ctx, sizeof(DavPropertyList)); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1018 | 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
|
1019 | prop->name = ui_strdup(doc->ctx, properties[i].name); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1020 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1021 | 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
|
1022 | if(xval) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1023 | if(dav_xml_isstring(xval)) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1024 | char *value = dav_xml_getstring(xval); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1025 | if(value) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1026 | prop->value_simplified = NULL; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1027 | prop->value_full = ui_strdup(doc->ctx, value); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1028 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1029 | } else { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1030 | 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
|
1031 | 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
|
1032 | prop->value_simplified = value.ptr; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1033 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1034 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1035 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1036 | ui_list_append(doc->properties, prop); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1037 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1038 | doc->properties->update(doc->properties, 0); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1039 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1040 | |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1041 | static void resourceviewer_load_finished(UiEvent *event, void *data) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1042 | DavResourceViewer *doc = data; |
54
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1043 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1044 | if(doc->window_closed) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1045 | dav_resourceviewer_destroy(doc); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1046 | return; |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1047 | } |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1048 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1049 | resourceviewer_set_info(doc); |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1050 | resourceviewer_update_proplist(doc); |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1051 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1052 | if(doc->type == DAV_RESOURCE_VIEW_TEXT) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1053 | ui_set(doc->text, doc->text_content->space); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1054 | } else if(doc->type == DAV_RESOURCE_VIEW_IMAGE) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1055 | ui_image_load_file(doc->image, doc->tmp_file); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1056 | } |
54
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1057 | |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1058 | ui_set(doc->tabview, 1); |
78
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1059 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1060 | doc->loaded = TRUE; |
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1061 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1062 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1063 | void dav_resourceviewer_load(UiObject *ui, DavResourceViewer *res) { |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1064 | ui_set(res->loading, 1); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1065 | ui_set(res->message, "Loading..."); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1066 | ui_set(res->tabview, 0); |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1067 | |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1068 | 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
|
1069 | } |
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1070 | |
78
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1071 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1072 | typedef struct ResourceViewerUploadFile { |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1073 | UiObject *ui; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1074 | DavSession *sn; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1075 | char *path; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1076 | cxmutstr text; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1077 | int error; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1078 | } ResourceViewerUploadFile; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1079 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1080 | static int jobthr_upload_text(void *data) { |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1081 | ResourceViewerUploadFile *upload = data; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1082 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1083 | 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
|
1084 | 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
|
1085 | upload->error = dav_store(res); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1086 | dav_resource_free(res); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1087 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1088 | return 0; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1089 | } |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1090 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1091 | 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
|
1092 | ResourceViewerUploadFile *upload = data; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1093 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1094 | if(upload->error) { |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1095 | 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
|
1096 | 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
|
1097 | free(errormsg.ptr); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1098 | 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
|
1099 | } |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1100 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1101 | dav_session_destroy(upload->sn); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1102 | free(upload->path); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1103 | free(upload->text.ptr); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1104 | free(upload); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1105 | } |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1106 | |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1107 | void dav_resourceviewer_save(UiObject *ui, DavResourceViewer *res) { |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1108 | if(res->type == DAV_RESOURCE_VIEW_TEXT) { |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1109 | DavSession *newsn = dav_session_clone(res->current->session); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1110 | ResourceViewerUploadFile *upload = malloc(sizeof(ResourceViewerUploadFile)); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1111 | upload->ui = ui; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1112 | upload->sn = newsn; |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1113 | upload->path = strdup(res->current->path); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1114 | char *text = ui_get(res->text); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1115 | size_t textlen = strlen(text); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1116 | upload->text = cx_strdup(cx_strn(text, textlen)); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1117 | 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
|
1118 | ui_unset_group(ui->ctx, RESOURCEVIEWER_STATE_MODIFIED); |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1119 | } |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1120 | } |
ad7ced6cf00b
implement resourceviewer textfile save button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
1121 | |
54
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1122 | void dav_resourceviewer_destroy(DavResourceViewer *res) { |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1123 | |
3ca3acefc66a
add resourceviewer cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
53
diff
changeset
|
1124 | } |
91
7ee944cf53de
add transfer speed indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
89
diff
changeset
|
1125 | |
7ee944cf53de
add transfer speed indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
89
diff
changeset
|
1126 | |
7ee944cf53de
add transfer speed indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
89
diff
changeset
|
1127 | uint64_t dav_transfer_speed(TransferProgress *progress, time_t current) { |
7ee944cf53de
add transfer speed indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
89
diff
changeset
|
1128 | size_t bytes = progress->transferred_bytes - progress->speedtest_bytes; |
7ee944cf53de
add transfer speed indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
89
diff
changeset
|
1129 | time_t t = current - progress->speedtest_start; |
7ee944cf53de
add transfer speed indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
89
diff
changeset
|
1130 | |
7ee944cf53de
add transfer speed indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
89
diff
changeset
|
1131 | progress->speedtest_start = current; |
7ee944cf53de
add transfer speed indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
89
diff
changeset
|
1132 | progress->speedtest_bytes = progress->transferred_bytes; |
7ee944cf53de
add transfer speed indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
89
diff
changeset
|
1133 | |
7ee944cf53de
add transfer speed indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
89
diff
changeset
|
1134 | return bytes/t; |
7ee944cf53de
add transfer speed indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
89
diff
changeset
|
1135 | } |