renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WebDAV: Handle non-self-closing tag for empty collection (#8121)

Browse Source 
Some servers serve <D:resourcetype></D:resourcetype> rather
than <D:resourcetype/>. So handle this case when deciding
if an item is not a collection.
This commit is contained in:
John Beard
2021-08-23 07:51:33 +01:00
committed by GitHub
parent c16d2712ef
commit 5d0ae3dde8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/apps/cloudstorage/webdavapi.lua
View File

@@ -116,6 +116,9 @@ function WebDavApi:listFolder(address, user, pass, folder_path)
end
local is_current_dir = self:isCurrentDirectory( item_fullpath, address, path )
local item_name = util.urlDecode( FFIUtil.basename( item_fullpath ) )
local is_not_collection = item:find("<[^:]*:resourcetype/>") or
item:find("<[^:]*:resourcetype></[^:]*:resourcetype>")
local item_path = path .. "/" .. item_name
if item:find("<[^:]*:collection/>") then
item_name = item_name .. "/"
@@ -126,7 +129,7 @@ function WebDavApi:listFolder(address, user, pass, folder_path)
type = "folder",
})
end
elseif item:find("<[^:]*:resourcetype/>") and (DocumentRegistry:hasProvider(item_name)
elseif is_not_collection and (DocumentRegistry:hasProvider(item_name)
or G_reader_settings:isTrue("show_unsupported")) then
table.insert(webdav_file, {
text = item_name,