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

Use RAII in device.cpp

Browse Source
This commit is contained in:
Kovid Goyal 2021-04-21 11:17:45 +05:30
parent 2324812b13
commit 55f52e0e09
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 16 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/calibre/devices/mtp/windows/device.cpp
View File

@ -70,68 +70,41 @@ py_get_filesystem(Device *self, PyObject *args) {
// get_file() {{{
static PyObject*
py_get_file(Device *self, PyObject *args) {
PyObject *object_id, *stream, *callback = NULL, *ret;
wchar_t *object;
if (!PyArg_ParseTuple(args, "OO|O", &object_id, &stream, &callback)) return NULL;
object = unicode_to_wchar(object_id);
if (object == NULL) return NULL;
PyObject *stream, *callback = NULL;
wchar_raii object;
if (!PyArg_ParseTuple(args, "O&O|O", py_to_wchar, &object, &stream, &callback)) return NULL;
if (callback == NULL || !PyCallable_Check(callback)) callback = NULL;
ret = wpd::get_file(self->device, object, stream, callback);
free(object);
return ret;
return wpd::get_file(self->device, object.ptr(), stream, callback);
} // }}}
// create_folder() {{{
static PyObject*
py_create_folder(Device *self, PyObject *args) {
PyObject *pparent_id, *pname, *ret;
wchar_t *parent_id, *name;
if (!PyArg_ParseTuple(args, "OO", &pparent_id, &pname)) return NULL;
parent_id = unicode_to_wchar(pparent_id);
name = unicode_to_wchar(pname);
if (parent_id == NULL || name == NULL) return NULL;
ret = wpd::create_folder(self->device, parent_id, name);
free(parent_id); free(name);
return ret;
wchar_raii parent_id, name;
if (!PyArg_ParseTuple(args, "O&O&", py_to_wchar, &parent_id, py_to_wchar, &name)) return NULL;
return wpd::create_folder(self->device, parent_id.ptr(), name.ptr());
} // }}}
// delete_object() {{{
static PyObject*
py_delete_object(Device *self, PyObject *args) {
PyObject *pobject_id, *ret;
wchar_t *object_id;
wchar_raii object_id;
if (!PyArg_ParseTuple(args, "O", &pobject_id)) return NULL;
object_id = unicode_to_wchar(pobject_id);
if (object_id == NULL) return NULL;
ret = wpd::delete_object(self->device, object_id);
free(object_id);
return ret;
if (!PyArg_ParseTuple(args, "O&", py_to_wchar, &object_id)) return NULL;
return wpd::delete_object(self->device, object_id.ptr());
} // }}}
// get_file() {{{
// put_file() {{{
static PyObject*
py_put_file(Device *self, PyObject *args) {
PyObject *pparent_id, *pname, *stream, *callback = NULL, *ret;
wchar_t *parent_id, *name;
PyObject *stream, *callback = NULL;
wchar_raii parent_id, name;
unsigned long long size;
if (!PyArg_ParseTuple(args, "OOOK|O", &pparent_id, &pname, &stream, &size, &callback)) return NULL;
parent_id = unicode_to_wchar(pparent_id);
name = unicode_to_wchar(pname);
if (parent_id == NULL || name == NULL) return NULL;
if (!PyArg_ParseTuple(args, "O&O&OK|O", py_to_wchar, &parent_id, py_to_wchar, &name, &stream, &size, &callback)) return NULL;
if (callback == NULL || !PyCallable_Check(callback)) callback = NULL;
ret = wpd::put_file(self->device, parent_id, name, stream, size, callback);
free(parent_id); free(name);
return ret;
return wpd::put_file(self->device, parent_id.ptr(), name.ptr(), stream, size, callback);
} // }}}
static PyMethodDef Device_methods[] = {

2
src/calibre/utils/cpp_binding.h
View File

@ -48,7 +48,7 @@ typedef generic_raii<PyObject*, python_object_destructor> pyobject_raii;
static inline int
py_to_wchar(PyObject *obj, wchar_t **output) {
if (!PyUnicode_Check(obj)) {
if (obj == Py_None) { return 1; }
if (obj == Py_None) { *output = NULL; return 1; }
PyErr_SetString(PyExc_TypeError, "unicode object expected");
return 0;
}