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

Fix ICU py->UChar string conversion and add support for OS X

Browse Source
This commit is contained in:
Kovid Goyal 2010-12-04 00:06:49 -07:00
parent 74a801f4cc
commit 0b70f40709
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup/extensions.py
View File

@ -58,8 +58,13 @@ if iswindows:
pdfreflow_libs = ['advapi32', 'User32', 'Gdi32', 'zlib'] pdfreflow_libs = ['advapi32', 'User32', 'Gdi32', 'zlib']
icu_libs = ['icudata', 'icui18n', 'icuuc', 'icuio'] icu_libs = ['icudata', 'icui18n', 'icuuc', 'icuio']
icu_cflags = []
if iswindows: if iswindows:
icu_libs = ['icudt', 'icuin', 'icuuc', 'icuio'] icu_libs = ['icudt', 'icuin', 'icuuc', 'icuio']
if isosx:
icu_libs = ['icucore']
icu_cflags = ['-DU_DISABLE_RENAMING'] # Needed to use system libicucore.dylib
extensions = [ extensions = [
@ -68,6 +73,7 @@ extensions = [
libraries=icu_libs, libraries=icu_libs,
lib_dirs=icu_lib_dirs, lib_dirs=icu_lib_dirs,
inc_dirs=icu_inc_dirs, inc_dirs=icu_inc_dirs,
cflags=icu_cflags
), ),
Extension('sqlite_custom', Extension('sqlite_custom',

37
src/calibre/utils/icu.c
View File

@ -88,32 +88,34 @@ icu_Collator_actual_locale(icu_Collator *self, void *closure) {
// Collator.sort_key {{{ // Collator.sort_key {{{
static PyObject * static PyObject *
icu_Collator_sort_key(icu_Collator *self, PyObject *args, PyObject *kwargs) { icu_Collator_sort_key(icu_Collator *self, PyObject *args, PyObject *kwargs) {
PyObject *o; char *input;
Py_ssize_t sz; Py_ssize_t sz;
wchar_t *buf; UChar *buf;
UChar *buf2; uint8_t *buf2;
uint8_t *buf3;
PyObject *ans; PyObject *ans;
int32_t key_size;
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
if (!PyArg_ParseTuple(args, "U", &o)) return NULL; if (!PyArg_ParseTuple(args, "es", "UTF-8", &input)) return NULL;
sz = PyUnicode_GetSize(o); sz = strlen(input);
buf = (wchar_t*)calloc(sz*2 + 1, sizeof(wchar_t)); buf = (UChar*)calloc(sz*4 + 1, sizeof(UChar));
buf2 = (UChar*)calloc(sz*2 + 1, sizeof(UChar));
buf3 = (uint8_t*)calloc(sz*4 + 1, sizeof(uint8_t));
if (buf == NULL || buf2 == NULL || buf3 == NULL) return PyErr_NoMemory(); if (buf == NULL) return PyErr_NoMemory();
PyUnicode_AsWideChar((PyUnicodeObject *)o, buf, sz); u_strFromUTF8(buf, sz*4 + 1, &key_size, input, sz, &status);
u_strFromWCS(buf2, 2*sz+1, NULL, buf, -1, &status); if (U_SUCCESS(status)) {
if (U_SUCCESS(status)) key_size = ucol_getSortKey(self->collator, buf, -1, NULL, 0);
ucol_getSortKey(self->collator, buf2, -1, buf3, sz*4+1); buf2 = (uint8_t*)calloc(key_size + 1, sizeof(uint8_t));
if (buf2 == NULL) return PyErr_NoMemory();
ucol_getSortKey(self->collator, buf, -1, buf2, key_size+1);
ans = PyBytes_FromString((char *)buf2);
free(buf2);
} else ans = PyBytes_FromString("");
ans = PyBytes_FromString((char *)buf3); free(buf);
free(buf3); free(buf); free(buf2);
if (ans == NULL) return PyErr_NoMemory(); if (ans == NULL) return PyErr_NoMemory();
return ans; return ans;
@ -188,6 +190,7 @@ static PyTypeObject icu_CollatorType = { // {{{
// }}} // }}}
// }}}
// Module initialization {{{ // Module initialization {{{