debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

python: Update for changes to notmuch_database_get_directory

Browse source 
notmuch_database_get_directory now returns
NOTMUCH_STATUS_READ_ONLY_DATABASE on its own (rather than crashing) so
the workaround in Database.get_directory is no longer necessary.
This commit is contained in:
Austin Clements 2012-05-13 19:36:11 -04:00 committed by David Bremner
parent cdaf253c99
commit ed4f73a080
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bindings/python/notmuch/database.py
View file

@ -73,8 +73,8 @@ class Database(object):
"""notmuch_database_get_directory""" """notmuch_database_get_directory"""
_get_directory = nmlib.notmuch_database_get_directory _get_directory = nmlib.notmuch_database_get_directory
_get_directory.argtypes = [NotmuchDatabaseP, c_char_p] _get_directory.argtypes = [NotmuchDatabaseP, c_char_p, POINTER(NotmuchDirectoryP)]
_get_directory.restype = NotmuchDirectoryP _get_directory.restype = c_uint
"""notmuch_database_get_path""" """notmuch_database_get_path"""
_get_path = nmlib.notmuch_database_get_path _get_path = nmlib.notmuch_database_get_path
@ -359,13 +359,6 @@ class Database(object):
""" """
self._assert_db_is_initialized() self._assert_db_is_initialized()
# work around libnotmuch calling exit(3), see
# id:20120221002921.8534.57091@thinkbox.jade-hamburg.de
# TODO: remove once this issue is resolved
if self.mode != Database.MODE.READ_WRITE:
raise ReadOnlyDatabaseError('The database has to be opened in '
'read-write mode for get_directory')
# sanity checking if path is valid, and make path absolute # sanity checking if path is valid, and make path absolute
if path and path[0] == os.sep: if path and path[0] == os.sep:
# we got an absolute path # we got an absolute path
@ -378,7 +371,13 @@ class Database(object):
#we got a relative path, make it absolute #we got a relative path, make it absolute
abs_dirpath = os.path.abspath(os.path.join(self.get_path(), path)) abs_dirpath = os.path.abspath(os.path.join(self.get_path(), path))
dir_p = Database._get_directory(self._db, _str(path)) dir_p = NotmuchDirectoryP()
status = Database._get_directory(self._db, _str(path), byref(dir_p))
if status != STATUS.SUCCESS:
raise NotmuchError(status)
if not dir_p:
return None
# return the Directory, init it with the absolute path # return the Directory, init it with the absolute path
return Directory(abs_dirpath, dir_p, self) return Directory(abs_dirpath, dir_p, self)