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

Revert the change to ignore objects for which EnumObjects() fails

Browse Source 
Causing crashes elsewhere. Instead retry with a sleep. Also report the
object id for the failing object in the error message.
This commit is contained in:
Kovid Goyal 2021-05-29 09:59:02 +05:30
parent 89c9a48c2b
commit d6840d6d55
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,7 +325,19 @@ find_objects_in(CComPtr<IPortableDeviceContent> &content, CComPtr<IPortableDevic
hr = content->EnumObjects(0, parent_id, NULL, &children); hr = content->EnumObjects(0, parent_id, NULL, &children);
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
if (FAILED(hr)) {hresult_set_exc("Failed to get children from device", hr); *enum_failed = true; return false;} if (FAILED(hr)) {
fwprintf(stderr, L"Failed to EnumObjects() for object id: %s retrying with a sleep.\n", parent_id); fflush(stderr);
Py_BEGIN_ALLOW_THREADS;
Sleep(500);
hr = content->EnumObjects(0, parent_id, NULL, &children);
Py_END_ALLOW_THREADS;
if (FAILED(hr)) {
pyobject_raii parent_name(PyUnicode_FromWideChar(parent_id, -1));
set_error_from_hresult(wpd::WPDError, __FILE__, __LINE__, hr, "Failed to EnumObjects() of folder from device", parent_name.ptr());
*enum_failed = true;
return false;
}
}
*enum_failed = false; *enum_failed = false;
hr = S_OK; hr = S_OK;
@ -452,10 +464,7 @@ get_files_and_folders(unsigned int level, IPortableDevice *device, CComPtr<IPort
bool enum_failed = false; bool enum_failed = false;
if (!find_objects_in(content, object_ids, parent_id, &enum_failed)) { if (!find_objects_in(content, object_ids, parent_id, &enum_failed)) {
if (!enum_failed) return false; 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_properties != NULL) {

4
src/calibre/utils/windows/common.h
View File

@ -17,8 +17,8 @@ static inline PyObject*
set_error_from_hresult(PyObject *exc_type, const char *file, const int line, const HRESULT hr, const char *prefix="", PyObject *name=NULL) { set_error_from_hresult(PyObject *exc_type, const char *file, const int line, const HRESULT hr, const char *prefix="", PyObject *name=NULL) {
_com_error err(hr); _com_error err(hr);
PyObject *pmsg = PyUnicode_FromWideChar(err.ErrorMessage(), -1); PyObject *pmsg = PyUnicode_FromWideChar(err.ErrorMessage(), -1);
if (name) PyErr_Format(exc_type, "%s:%d:%s:[%li] %V: %S", file, line, prefix, hr, pmsg, "Out of memory", name); if (name) PyErr_Format(exc_type, "%s:%d:%s:[hr=0x%x wCode=%d] %V: %S", file, line, prefix, hr, err.WCode(), pmsg, "Out of memory", name);
else PyErr_Format(exc_type, "%s:%d:%s:[%li] %V", file, line, prefix, hr, pmsg, "Out of memory"); else PyErr_Format(exc_type, "%s:%d:%s:[hr=0x%x wCode=%d] %V", file, line, prefix, hr, err.WCode(), pmsg, "Out of memory");
Py_CLEAR(pmsg); Py_CLEAR(pmsg);
return NULL; return NULL;
} }