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

Allow detaching and creating handles in python

Browse Source
This commit is contained in:
Kovid Goyal 2020-10-15 21:55:07 +05:30
parent f5f7a44a47
commit 69cefbbb56
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/test_build.py
View File

@ -190,6 +190,12 @@ class BuildTest(unittest.TestCase):
sz = 23 sz = 23
data = os.urandom(sz) data = os.urandom(sz)
open(path, 'wb').write(data) open(path, 'wb').write(data)
h = winutil.Handle(0, winutil.ModuleHandle, 'moo')
r = repr(h)
h2 = winutil.Handle(h.detach(), winutil.ModuleHandle, 'moo')
self.assertEqual(r, repr(h2))
h2.close()
h = winutil.create_file( h = winutil.create_file(
path, winutil.GENERIC_READ | winutil.GENERIC_WRITE, 0, winutil.OPEN_ALWAYS, winutil.FILE_ATTRIBUTE_NORMAL) path, winutil.GENERIC_READ | winutil.GENERIC_WRITE, 0, winutil.OPEN_ALWAYS, winutil.FILE_ATTRIBUTE_NORMAL)
self.assertEqual(winutil.get_file_size(h), sz) self.assertEqual(winutil.get_file_size(h), sz)
@ -238,7 +244,7 @@ class BuildTest(unittest.TestCase):
t.start() t.start()
testp = os.path.join(dpath, 'test') testp = os.path.join(dpath, 'test')
open(testp, 'w').close() open(testp, 'w').close()
t.join(2) t.join(4)
self.assertTrue(events) self.assertTrue(events)
for actions, path in events: for actions, path in events:
self.assertEqual(os.path.join(dpath, path), testp) self.assertEqual(os.path.join(dpath, path), testp)

28
src/calibre/utils/windows/winutil.cpp
View File

@ -103,6 +103,29 @@ Handle_create(void *handle, WinHandleType handle_type = NormalHandle, PyObject *
return self; return self;
} }
static PyObject *
Handle_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
PyObject *h = NULL, *name = NULL;
int htype = NormalHandle;
if (!PyArg_ParseTuple(args, "|O!iU", &PyLong_Type, &h, &htype, &name)) return NULL;
switch(htype) {
case NormalHandle:
case IconHandle:
case ModuleHandle:
break;
default:
PyErr_Format(PyExc_TypeError, "unknown handle type: %d", type);
return NULL;
}
Handle *self = (Handle *) HandleType.tp_alloc(type, 0);
if (self) {
self->handle = h ? PyLong_AsVoidPtr(h) : NULL;
self->handle_type = static_cast<WinHandleType>(htype);
self->associated_name = name;
}
return (PyObject*)self;
}
static int static int
convert_handle(Handle *obj, void **output) { convert_handle(Handle *obj, void **output) {
if (Py_TYPE(obj) != &HandleType) { if (Py_TYPE(obj) != &HandleType) {
@ -1160,7 +1183,7 @@ CALIBRE_MODINIT_FUNC PyInit_winutil(void) {
HandleType.tp_repr = (reprfunc)Handle_repr; HandleType.tp_repr = (reprfunc)Handle_repr;
HandleType.tp_as_number = &HandleNumberMethods; HandleType.tp_as_number = &HandleNumberMethods;
HandleType.tp_str = (reprfunc)Handle_repr; HandleType.tp_str = (reprfunc)Handle_repr;
HandleType.tp_new = PyType_GenericNew; HandleType.tp_new = Handle_new;
HandleType.tp_methods = Handle_methods; HandleType.tp_methods = Handle_methods;
HandleType.tp_dealloc = (destructor)Handle_dealloc; HandleType.tp_dealloc = (destructor)Handle_dealloc;
if (PyType_Ready(&HandleType) < 0) return NULL; if (PyType_Ready(&HandleType) < 0) return NULL;
@ -1265,6 +1288,9 @@ CALIBRE_MODINIT_FUNC PyInit_winutil(void) {
PyModule_AddIntConstant(m, "ERROR_LOCK_VIOLATION", ERROR_LOCK_VIOLATION); PyModule_AddIntConstant(m, "ERROR_LOCK_VIOLATION", ERROR_LOCK_VIOLATION);
PyModule_AddIntConstant(m, "ERROR_ALREADY_EXISTS", ERROR_ALREADY_EXISTS); PyModule_AddIntConstant(m, "ERROR_ALREADY_EXISTS", ERROR_ALREADY_EXISTS);
PyModule_AddIntConstant(m, "ERROR_BROKEN_PIPE", ERROR_BROKEN_PIPE); PyModule_AddIntConstant(m, "ERROR_BROKEN_PIPE", ERROR_BROKEN_PIPE);
PyModule_AddIntConstant(m, "NormalHandle", NormalHandle);
PyModule_AddIntConstant(m, "ModuleHandle", ModuleHandle);
PyModule_AddIntConstant(m, "IconHandle", IconHandle);
return m; return m;
} }