diff -r e324291ca9f8 -r 0c881944fa10 application/davcontroller.c --- a/application/davcontroller.c Sun Oct 20 21:24:13 2024 +0200 +++ b/application/davcontroller.c Mon Oct 21 11:14:26 2024 +0200 @@ -256,7 +256,7 @@ } } - dav_resourceviewer_new(browser, res->path, type); + resourceviewer_new(browser, res->path, type); } void davbrowser_add2navstack(DavBrowser *browser, const char *base, const char *path) { @@ -967,7 +967,7 @@ download->browser = browser; download->sn = reslist->session; download->download_sn = dav_session_clone(download->sn); - download->reslist = reslist; + download->reslist = reslist; // TODO: is this safe or do we need a copy? download->local_path = strdup(local_path); download->queue = ui_threadpool_create(1); @@ -1234,6 +1234,13 @@ doc->properties = ui_list_new(ctx, "properties"); + doc->info_url = ui_string_new(ctx, "info_url"); + doc->info_name = ui_string_new(ctx, "info_name"); + doc->info_type = ui_string_new(ctx, "info_type"); + doc->info_encrypted = ui_string_new(ctx, "info_encrypted"); + doc->info_etag = ui_string_new(ctx, "info_etag"); + doc->info_size = ui_string_new(ctx, "info_size"); + return doc; } @@ -1256,6 +1263,79 @@ if(!doc->error) { doc->current = res; + char *url = util_concat_path(res->session->base_url, res->href); + ui_set(doc->info_url, url); + free(url); + + ui_set(doc->info_name, res->name); + + if(res->iscollection) { + ui_set(doc->info_type, "Collection"); + } else { + if(res->contenttype) { + cxmutstr type = cx_asprintf("Resource (%s)", res->contenttype); + ui_set(doc->info_type, type.ptr); + free(type.ptr); + } else { + ui_set(doc->info_type, "Resource"); + } + } + + char *keyprop = dav_get_string_property_ns( + res, + DAV_NS, + "crypto-key"); + if(keyprop) { + cxmutstr info_encrypted = cx_asprintf("Yes Key: %s", keyprop); + ui_set(doc->info_encrypted, info_encrypted.ptr); + free(info_encrypted.ptr); + } else { + ui_set(doc->info_encrypted, "No"); + } + + char *etag = dav_get_string_property_ns( + res, + "DAV:", + "getetag"); + ui_set(doc->info_etag, etag); + + if(res->contentlength > 0) { + char *sz = util_size_str(FALSE, res->contentlength); + cxmutstr size_str = cx_asprintf("%s (%" PRIu64 " bytes)", sz, res->contentlength); + ui_set(doc->info_size, size_str.ptr); + free(size_str.ptr); + } else { + ui_set(doc->info_size, "0"); + } + + + size_t count = 0; + DavPropName *properties = dav_get_property_names(res, &count); + for(int i=0;ictx, sizeof(DavPropertyList)); + prop->ns = properties[i].ns ? ui_strdup(doc->ctx, properties[i].ns) : NULL; + prop->name = ui_strdup(doc->ctx, properties[i].name); + + DavXmlNode *xval = dav_get_property_ns(res, prop->ns, prop->name); + if(xval) { + if(dav_xml_isstring(xval)) { + char *value = dav_xml_getstring(xval); + if(value) { + prop->value_simplified = NULL; + prop->value_full = ui_strdup(doc->ctx, value); + } + } else { + DavXmlNode *x = xval->type == DAV_XML_ELEMENT ? xval : dav_xml_nextelm(xval); + cxmutstr value = cx_asprintf_a(ui_allocator(doc->ctx), "<%s>...", x->name, x->name); + prop->value_simplified = value.ptr; + } + } + + ui_list_append(doc->properties, prop); + } + doc->properties->update(doc->properties, 0); + + if(res->contentlength < DAV_RESOURCEVIEWER_PREVIEW_MAX_SIZE) { if(doc->type == DAV_RESOURCE_VIEW_TEXT) { doc->text_content = cxBufferCreate(NULL, res->contentlength, cxDefaultAllocator, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS);