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

When bulk get of properties fails retry with a single get

Browse Source
This commit is contained in:
Kovid Goyal 2025-01-25 10:19:06 +05:30
parent 4f01aa24e6
commit 0c4dae5e89
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,6 +210,7 @@ single_get_filesystem(unsigned int level, CComPtr<IPortableDeviceContent> &conte
if (!item) { if (!item) {
if (!get_properties_failed) return false; if (!get_properties_failed) return false;
fprintf(stderr, "Ignoring object with id: %ls because getting its properties failed.\n", pv.pwszVal); fprintf(stderr, "Ignoring object with id: %ls because getting its properties failed.\n", pv.pwszVal);
if (PyErr_Occurred()) PyErr_Clear();
} }
if (PyDict_SetItem(ans, PyDict_GetItemString(item.ptr(), "id"), item.ptr()) != 0) return false; if (PyDict_SetItem(ans, PyDict_GetItemString(item.ptr(), "id"), item.ptr()) != 0) return false;
if (callback) { if (callback) {
@ -341,8 +342,9 @@ static bool
bulk_get_filesystem( bulk_get_filesystem(
unsigned int level, IPortableDevice *device, IPortableDevicePropertiesBulk *bulk_properties, unsigned int level, IPortableDevice *device, IPortableDevicePropertiesBulk *bulk_properties,
CComPtr<IPortableDevicePropVariantCollection> &object_ids, CComPtr<IPortableDevicePropVariantCollection> &object_ids,
PyObject *pycallback, PyObject *ans, PyObject *subfolders PyObject *pycallback, PyObject *ans, PyObject *subfolders, bool *retry_with_single_get
) { ) {
*retry_with_single_get = false;
CComPtr<IPortableDeviceKeyCollection> properties(create_filesystem_properties_collection()); CComPtr<IPortableDeviceKeyCollection> properties(create_filesystem_properties_collection());
if (!properties) return false; if (!properties) return false;
@ -401,7 +403,7 @@ bulk_get_filesystem(
bulk_properties_callback->Release(); bulk_properties_callback->Release();
if (PyErr_Occurred()) return false; if (PyErr_Occurred()) return false;
if (FAILED(hr)) { if (FAILED(hr)) {
hresult_set_exc("Bulk get properties failed in OnEnd", hr); *retry_with_single_get = true;
return false; return false;
} }
return true; return true;
@ -512,11 +514,15 @@ list_folder(IPortableDevice *device, CComPtr<IPortableDeviceContent> &content, I
bool enum_failed = false; bool enum_failed = false;
if (!find_objects_in(content, object_ids, folder_id, &enum_failed)) return NULL; if (!find_objects_in(content, object_ids, folder_id, &enum_failed)) return NULL;
#define single_get if (!single_get_filesystem(0, content, object_ids, NULL, ans.ptr(), NULL)) return NULL;
if (bulk_properties) { if (bulk_properties) {
if (!bulk_get_filesystem(0, device, bulk_properties, object_ids, NULL, ans.ptr(), NULL)) return NULL; bool retry_with_single_get;
} else { if (!bulk_get_filesystem(0, device, bulk_properties, object_ids, NULL, ans.ptr(), NULL, &retry_with_single_get)) {
if (!single_get_filesystem(0, content, object_ids, NULL, ans.ptr(), NULL)) return NULL; if (retry_with_single_get) { single_get; }
} else return NULL;
}
} else { single_get; }
#undef single_get
return ans.detach(); return ans.detach();
} }
@ -591,11 +597,15 @@ get_files_and_folders(unsigned int level, IPortableDevice *device, CComPtr<IPort
return true; return true;
} }
#define single_get if (!single_get_filesystem(level, content, object_ids, callback, ans, subfolders.ptr())) return false;
if (bulk_properties != NULL) { if (bulk_properties != NULL) {
if (!bulk_get_filesystem(level, device, bulk_properties, object_ids, callback, ans, subfolders.ptr())) return false; bool retry_with_single_get;
} else { if (!bulk_get_filesystem(level, device, bulk_properties, object_ids, callback, ans, subfolders.ptr(), &retry_with_single_get)) {
if (!single_get_filesystem(level, content, object_ids, callback, ans, subfolders.ptr())) return false; if (retry_with_single_get) { single_get; }
} else return false;
}
} else { single_get; }
#undef single_get
for (Py_ssize_t i = 0; i < PyList_GET_SIZE(subfolders.ptr()); i++) { for (Py_ssize_t i = 0; i < PyList_GET_SIZE(subfolders.ptr()); i++) {
wchar_raii child_id(PyUnicode_AsWideCharString(PyList_GET_ITEM(subfolders.ptr(), i), NULL)); wchar_raii child_id(PyUnicode_AsWideCharString(PyList_GET_ITEM(subfolders.ptr(), i), NULL));