From b569c69f5759188e674e4808a52b7d2dd633306e Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Tue, 29 Jul 2008 20:37:22 +0000 Subject: Add gio.FILE_ATTRIBUTE_* constants and update the examples to use them. 2008-07-29 Johan Dahlin * examples/gio/downloader.py: * gio/giomodule.c (init_gio): Add gio.FILE_ATTRIBUTE_* constants and update the examples to use them. svn path=/trunk/; revision=897 --- ChangeLog | 6 +++ examples/gio/downloader.py | 4 +- gio/giomodule.c | 131 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 039cafd..ea40989 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-29 Johan Dahlin + + * examples/gio/downloader.py: + * gio/giomodule.c (init_gio): + Add gio.FILE_ATTRIBUTE_* constants and update the examples to use them. + 2008-07-29 Johan Dahlin * examples/gio/downloader.py: diff --git a/examples/gio/downloader.py b/examples/gio/downloader.py index 9c41525..f04a0e4 100644 --- a/examples/gio/downloader.py +++ b/examples/gio/downloader.py @@ -37,8 +37,8 @@ class Downloader(object): print 'ERROR: %s' % (e.message,) self.stop() return - info = gfile.query_info('standard::size') - self.total = info.get_attribute_uint64('standard::size') + info = gfile.query_info(gio.FILE_ATTRIBUTE_STANDARD_SIZE) + self.total = info.get_attribute_uint64(gio.FILE_ATTRIBUTE_STANDARD_SIZE) stream.read_async(4096, self.stream_read_callback) def data_read(self, data): diff --git a/gio/giomodule.c b/gio/giomodule.c index 4da69ce..be3e587 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -60,6 +60,137 @@ init_gio(void) PyDict_SetItemString(d, "Error", e); Py_DECREF(e); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_TYPE", + G_FILE_ATTRIBUTE_STANDARD_TYPE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_IS_HIDDEN", + G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_IS_BACKUP", + G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_IS_SYMLINK", + G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL", + G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_NAME", + G_FILE_ATTRIBUTE_STANDARD_NAME); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME", + G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_EDIT_NAME", + G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_COPY_NAME", + G_FILE_ATTRIBUTE_STANDARD_COPY_NAME); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_DESCRIPTION", + G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_ICON", + G_FILE_ATTRIBUTE_STANDARD_ICON); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE", + G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE", + G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_SIZE", + G_FILE_ATTRIBUTE_STANDARD_SIZE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET", + G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_TARGET_URI", + G_FILE_ATTRIBUTE_STANDARD_TARGET_URI); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_STANDARD_SORT_ORDER", + G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_ETAG_VALUE", + G_FILE_ATTRIBUTE_ETAG_VALUE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_ID_FILE", + G_FILE_ATTRIBUTE_ID_FILE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_ID_FILESYSTEM", + G_FILE_ATTRIBUTE_ID_FILESYSTEM); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_ACCESS_CAN_READ", + G_FILE_ATTRIBUTE_ACCESS_CAN_READ); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_ACCESS_CAN_WRITE", + G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE", + G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_ACCESS_CAN_DELETE", + G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_ACCESS_CAN_TRASH", + G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_ACCESS_CAN_RENAME", + G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT", + G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT", + G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT", + G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE", + G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI", + G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_TIME_MODIFIED", + G_FILE_ATTRIBUTE_TIME_MODIFIED); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_TIME_MODIFIED_USEC", + G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_TIME_ACCESS", + G_FILE_ATTRIBUTE_TIME_ACCESS); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_TIME_ACCESS_USEC", + G_FILE_ATTRIBUTE_TIME_ACCESS_USEC); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_TIME_CHANGED", + G_FILE_ATTRIBUTE_TIME_CHANGED); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_TIME_CHANGED_USEC", + G_FILE_ATTRIBUTE_TIME_CHANGED_USEC); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_TIME_CREATED", + G_FILE_ATTRIBUTE_TIME_CREATED); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_TIME_CREATED_USEC", + G_FILE_ATTRIBUTE_TIME_CREATED_USEC); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_UNIX_DEVICE", + G_FILE_ATTRIBUTE_UNIX_DEVICE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_UNIX_INODE", + G_FILE_ATTRIBUTE_UNIX_INODE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_UNIX_MODE", + G_FILE_ATTRIBUTE_UNIX_MODE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_UNIX_NLINK", + G_FILE_ATTRIBUTE_UNIX_NLINK); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_UNIX_UID", + G_FILE_ATTRIBUTE_UNIX_UID); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_UNIX_GID", + G_FILE_ATTRIBUTE_UNIX_GID); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_UNIX_RDEV", + G_FILE_ATTRIBUTE_UNIX_RDEV); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_UNIX_BLOCK_SIZE", + G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_UNIX_BLOCKS", + G_FILE_ATTRIBUTE_UNIX_BLOCKS); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT", + G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_DOS_IS_ARCHIVE", + G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_DOS_IS_SYSTEM", + G_FILE_ATTRIBUTE_DOS_IS_SYSTEM); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_OWNER_USER", + G_FILE_ATTRIBUTE_OWNER_USER); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_OWNER_USER_REAL", + G_FILE_ATTRIBUTE_OWNER_USER_REAL); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_OWNER_GROUP", + G_FILE_ATTRIBUTE_OWNER_GROUP); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_THUMBNAIL_PATH", + G_FILE_ATTRIBUTE_THUMBNAIL_PATH); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_THUMBNAILING_FAILED", + G_FILE_ATTRIBUTE_THUMBNAILING_FAILED); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_FILESYSTEM_SIZE", + G_FILE_ATTRIBUTE_FILESYSTEM_SIZE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_FILESYSTEM_FREE", + G_FILE_ATTRIBUTE_FILESYSTEM_FREE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_FILESYSTEM_TYPE", + G_FILE_ATTRIBUTE_FILESYSTEM_TYPE); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_FILESYSTEM_READONLY", + G_FILE_ATTRIBUTE_FILESYSTEM_READONLY); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW", + G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_GVFS_BACKEND", + G_FILE_ATTRIBUTE_GVFS_BACKEND); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_SELINUX_CONTEXT", + G_FILE_ATTRIBUTE_SELINUX_CONTEXT); + PyModule_AddStringConstant(m, "FILE_ATTRIBUTE_TRASH_ITEM_COUNT", + G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT); + + PyModule_AddStringConstant(m, "ERROR", g_quark_to_string(G_IO_ERROR)); + /* pygio version */ tuple = Py_BuildValue ("(iii)", PYGIO_MAJOR_VERSION, -- cgit