Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

WPD driver: Ignore failures to enum objects

Browse Source 
It should hopefully just mean that the directory sub-tree is not
traveresed, but the rest of the files are still scanned.
This commit is contained in:
Kovid Goyal 2021-05-22 06:20:02 +05:30
parent a2bb6f338e
commit 23c65a4de9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/devices/mtp/windows/content_enumeration.cpp
View File

@ -312,7 +312,7 @@ bulk_get_filesystem(
// find_objects_in() {{{
static bool
find_objects_in(CComPtr<IPortableDeviceContent> &content, CComPtr<IPortableDevicePropVariantCollection> &object_ids, const wchar_t *parent_id) {
find_objects_in(CComPtr<IPortableDeviceContent> &content, CComPtr<IPortableDevicePropVariantCollection> &object_ids, const wchar_t *parent_id, bool *enum_failed) {
/*
* Find all children of the object identified by parent_id.
* The child ids are put into object_ids. Returns False if any errors
@ -325,7 +325,8 @@ find_objects_in(CComPtr<IPortableDeviceContent> &content, CComPtr<IPortableDevic
hr = content->EnumObjects(0, parent_id, NULL, &children);
Py_END_ALLOW_THREADS;
if (FAILED(hr)) {hresult_set_exc("Failed to get children from device", hr); return false;}
if (FAILED(hr)) {hresult_set_exc("Failed to get children from device", hr); *enum_failed = true; return false;}
*enum_failed = false;
hr = S_OK;
@ -449,7 +450,13 @@ get_files_and_folders(unsigned int level, IPortableDevice *device, CComPtr<IPort
Py_END_ALLOW_THREADS;
if (FAILED(hr)) { hresult_set_exc("Failed to create propvariantcollection", hr); return false; }
if (!find_objects_in(content, object_ids, parent_id)) return false;
bool enum_failed = false;
if (!find_objects_in(content, object_ids, parent_id, &enum_failed)) {
if (!enum_failed) return false;
fwprintf(stderr, L"Failed to EnumObjects() for object id: %s\n", parent_id);
if (PyErr_Occurred()) PyErr_Print();
return true;
}
if (bulk_properties != NULL) {
if (!bulk_get_filesystem(level, device, bulk_properties, object_ids, callback, ans, subfolders.ptr())) return false;