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

Nicer error message when get_properties fails

Browse Source
This commit is contained in:
Kovid Goyal 2025-01-28 19:20:11 +05:30
parent 7d0bba4ca7
commit c8d9e0c24e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,15 +167,15 @@ get_object_filename(IPortableDeviceProperties *devprops, IPortableDeviceKeyColle
static PyObject* static PyObject*
get_object_properties(IPortableDeviceProperties *devprops, IPortableDeviceKeyCollection *properties, const wchar_t *object_id, bool *get_properties_failed) { get_object_properties(IPortableDeviceProperties *devprops, IPortableDeviceKeyCollection *properties, const wchar_t *object_id, HRESULT *get_properties_failed) {
CComPtr<IPortableDeviceValues> values; CComPtr<IPortableDeviceValues> values;
HRESULT hr; HRESULT hr;
*get_properties_failed = false; *get_properties_failed = S_OK;
Py_BEGIN_ALLOW_THREADS; Py_BEGIN_ALLOW_THREADS;
hr = devprops->GetValues(object_id, properties, &values); hr = devprops->GetValues(object_id, properties, &values);
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
if (FAILED(hr)) { hresult_set_exc("Failed to get properties for object", hr); *get_properties_failed = true; return NULL; } if (FAILED(hr)) { *get_properties_failed = hr; return NULL; }
pyobject_raii id(PyUnicode_FromWideChar(object_id, -1)); pyobject_raii id(PyUnicode_FromWideChar(object_id, -1));
if (!id) return NULL; if (!id) return NULL;
@ -205,12 +205,11 @@ single_get_filesystem(unsigned int level, CComPtr<IPortableDeviceContent> &conte
hr = object_ids->GetAt(i, &pv); hr = object_ids->GetAt(i, &pv);
pyobject_raii recurse; pyobject_raii recurse;
if (SUCCEEDED(hr) && pv.pwszVal != NULL) { if (SUCCEEDED(hr) && pv.pwszVal != NULL) {
bool get_properties_failed; HRESULT get_properties_failed;
pyobject_raii item(get_object_properties(devprops, properties, pv.pwszVal, &get_properties_failed)); pyobject_raii item(get_object_properties(devprops, properties, pv.pwszVal, &get_properties_failed));
if (!item) { if (!item) {
if (!get_properties_failed) return false; if (get_properties_failed == S_OK) return false;
fprintf(stderr, "Ignoring object with id: %ls because getting its properties failed with error:\n", pv.pwszVal); fflush(stderr); fprintf(stderr, "Ignoring object with id: %ls because getting its properties failed with error:\n", pv.pwszVal); fflush(stderr);
if (PyErr_Occurred()) PyErr_Print();
continue; continue;
} }
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;
@ -535,8 +534,14 @@ get_metadata(CComPtr<IPortableDeviceContent> &content, const wchar_t *object_id)
CComPtr<IPortableDeviceProperties> devprops; CComPtr<IPortableDeviceProperties> devprops;
HRESULT hr = content->Properties(&devprops); HRESULT hr = content->Properties(&devprops);
if (FAILED(hr)) { hresult_set_exc("Failed to get IPortableDeviceProperties interface", hr); return NULL; } if (FAILED(hr)) { hresult_set_exc("Failed to get IPortableDeviceProperties interface", hr); return NULL; }
bool get_properties_failed; HRESULT get_properties_failed;
return get_object_properties(devprops, properties, object_id, &get_properties_failed); PyObject *ans = get_object_properties(devprops, properties, object_id, &get_properties_failed);
if (ans) return ans;
if (get_properties_failed != S_OK) {
pyobject_raii name(PyUnicode_FromWideChar(object_id, -1));
hresult_set_exc("Getting properties in get_metadata() failed", get_properties_failed, name.ptr());
}
return NULL;
} }
PyObject* PyObject*
@ -751,8 +756,14 @@ create_folder(IPortableDevice *device, const wchar_t *parent_id, const wchar_t *
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
if (FAILED(hr) || !newid) { hresult_set_exc("Failed to create folder", hr); return NULL; } if (FAILED(hr) || !newid) { hresult_set_exc("Failed to create folder", hr); return NULL; }
bool get_properties_failed; HRESULT get_properties_failed;
return get_object_properties(devprops, properties, newid.ptr(), &get_properties_failed); PyObject *ans = get_object_properties(devprops, properties, newid.ptr(), &get_properties_failed);
if (ans) return ans;
if (get_properties_failed != S_OK) {
pyobject_raii n(PyUnicode_FromWideChar(name, -1));
hresult_set_exc("Getting properties failed for created folder", get_properties_failed, n.ptr());
}
return NULL;
} // }}} } // }}}
PyObject* PyObject*
@ -861,9 +872,14 @@ put_file(IPortableDevice *device, const wchar_t *parent_id, const wchar_t *name,
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
if (FAILED(hr)) { hresult_set_exc("Failed to get id of newly created file", hr); return NULL; } if (FAILED(hr)) { hresult_set_exc("Failed to get id of newly created file", hr); return NULL; }
bool get_properties_failed; HRESULT get_properties_failed;
return get_object_properties(devprops, properties, newid.ptr(), &get_properties_failed); PyObject *ans = get_object_properties(devprops, properties, newid.ptr(), &get_properties_failed);
if (ans) return ans;
if (get_properties_failed != S_OK) {
pyobject_raii n(PyUnicode_FromWideChar(name, -1));
hresult_set_exc("Get properties failed for written file", get_properties_failed, n.ptr());
}
return NULL;
} // }}} } // }}}
} // namespace wpd } // namespace wpd