saces/pygomx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

version the cli api part

Browse source
This commit is contained in:
saces 2026-03-12 10:00:46 +01:00
parent 2175ca16f2
commit a563bffec5
8 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libmxclient/mxclientlib.go
View file

@ -121,8 +121,8 @@ func FreeCString(s *C.char) {
cli tools cli tools
*/ */
//export cli_discoverhs //export cliv0_discoverhs
func cli_discoverhs(id *C.char) *C.char { func cliv0_discoverhs(id *C.char) *C.char {
mxid := C.GoString(id) mxid := C.GoString(id)
result, err := mxutils.DiscoverHS(mxid) result, err := mxutils.DiscoverHS(mxid)
if err != nil { if err != nil {
@ -131,40 +131,40 @@ func cli_discoverhs(id *C.char) *C.char {
return C.CString(result) return C.CString(result)
} }
//export cli_mkmxtoken //export cliv0_mkmxtoken
func cli_mkmxtoken(id *C.char, pw *C.char) *C.char { func cliv0_mkmxtoken(id *C.char, pw *C.char) *C.char {
mxid := C.GoString(id) mxid := C.GoString(id)
mxpw := C.GoString(pw) mxpw := C.GoString(pw)
result := mxutils.MkToken(mxid, mxpw) result := mxutils.MkToken(mxid, mxpw)
return C.CString(result) return C.CString(result)
} }
//export cli_whoami //export cliv0_whoami
func cli_whoami(hs *C.char, tk *C.char) *C.char { func cliv0_whoami(hs *C.char, tk *C.char) *C.char {
_hs := C.GoString(hs) _hs := C.GoString(hs)
_tk := C.GoString(tk) _tk := C.GoString(tk)
result := mxutils.Whoami(_hs, _tk) result := mxutils.Whoami(_hs, _tk)
return C.CString(result) return C.CString(result)
} }
//export cli_accountinfo //export cliv0_accountinfo
func cli_accountinfo(hs *C.char, tk *C.char) *C.char { func cliv0_accountinfo(hs *C.char, tk *C.char) *C.char {
_hs := C.GoString(hs) _hs := C.GoString(hs)
_tk := C.GoString(tk) _tk := C.GoString(tk)
result := mxutils.AccountInfo(_hs, _tk) result := mxutils.AccountInfo(_hs, _tk)
return C.CString(result) return C.CString(result)
} }
//export cli_clearaccount //export cliv0_clearaccount
func cli_clearaccount(hs *C.char, tk *C.char) *C.char { func cliv0_clearaccount(hs *C.char, tk *C.char) *C.char {
_hs := C.GoString(hs) _hs := C.GoString(hs)
_tk := C.GoString(tk) _tk := C.GoString(tk)
result := mxutils.ClearAccount(_hs, _tk) result := mxutils.ClearAccount(_hs, _tk)
return C.CString(result) return C.CString(result)
} }
//export cli_serverinfo //export cliv0_serverinfo
func cli_serverinfo(url *C.char) *C.char { func cliv0_serverinfo(url *C.char) *C.char {
_url := C.GoString(url) _url := C.GoString(url)
result := mxutils.ServerInfo(_url) result := mxutils.ServerInfo(_url)
return C.CString(result) return C.CString(result)

12
pygomx/build_ffi.py
View file

@ -35,12 +35,12 @@ ffibuilder.cdef(
typedef void (*on_message_handler_ptr) (char*, void*); typedef void (*on_message_handler_ptr) (char*, void*);
typedef void (*on_sys_handler_ptr) (char*, void*); typedef void (*on_sys_handler_ptr) (char*, void*);
extern void FreeCString(char* s); extern void FreeCString(char* s);
extern char* cli_discoverhs(char* mxid); extern char* cliv0_discoverhs(char* mxid);
extern char* cli_mkmxtoken(char* mxid, char* pw); extern char* cliv0_mkmxtoken(char* mxid, char* pw);
extern char* cli_whoami(char* hs, char* accessToken); extern char* cliv0_whoami(char* hs, char* accessToken);
extern char* cli_accountinfo(char* hs, char* accessToken); extern char* cliv0_accountinfo(char* hs, char* accessToken);
extern char* cli_clearaccount(char* hs, char* accessToken); extern char* cliv0_clearaccount(char* hs, char* accessToken);
extern char* cli_serverinfo(char* url); extern char* cliv0_serverinfo(char* url);
extern int apiv0_initialize(); extern int apiv0_initialize();
extern int apiv0_deinitialize(); extern int apiv0_deinitialize();
extern char* apiv0_discover(char* mxid); extern char* apiv0_discover(char* mxid);

2
smal/src/pymxutils/mxutils/accountinfo.py
View file

@ -12,7 +12,7 @@ def accountinfo():
url = sys.argv[1].encode(encoding="utf-8") url = sys.argv[1].encode(encoding="utf-8")
tk = sys.argv[2].encode(encoding="utf-8") tk = sys.argv[2].encode(encoding="utf-8")
r = lib.cli_accountinfo(url, tk) r = lib.cliv0_accountinfo(url, tk)
result = ffi.string(r) result = ffi.string(r)
lib.FreeCString(r) lib.FreeCString(r)
print(result) print(result)

2
smal/src/pymxutils/mxutils/clearaccount.py
View file

@ -12,7 +12,7 @@ def clearaccount():
url = sys.argv[1].encode(encoding="utf-8") url = sys.argv[1].encode(encoding="utf-8")
tk = sys.argv[2].encode(encoding="utf-8") tk = sys.argv[2].encode(encoding="utf-8")
r = lib.cli_clearaccount(url, tk) r = lib.cliv0_clearaccount(url, tk)
result = ffi.string(r) result = ffi.string(r)
lib.FreeCString(r) lib.FreeCString(r)
print(result) print(result)

2
smal/src/pymxutils/mxutils/discoverhs.py
View file

@ -15,7 +15,7 @@ def discoverhs(domain, show_json):
"""Attempts to discover the homeserver from the given string""" """Attempts to discover the homeserver from the given string"""
mxid = domain.encode(encoding="utf-8") mxid = domain.encode(encoding="utf-8")
r = lib.cli_discoverhs(mxid) r = lib.cliv0_discoverhs(mxid)
result = ffi.string(r).decode("utf-8") result = ffi.string(r).decode("utf-8")
lib.FreeCString(r) lib.FreeCString(r)
if result.startswith("ERR:"): if result.startswith("ERR:"):

2
smal/src/pymxutils/mxutils/mktoken.py
View file

@ -12,7 +12,7 @@ def mktoken():
mxid = sys.argv[1].encode(encoding="utf-8") mxid = sys.argv[1].encode(encoding="utf-8")
pw = sys.argv[2].encode(encoding="utf-8") pw = sys.argv[2].encode(encoding="utf-8")
r = lib.cli_mkmxtoken(mxid, pw) r = lib.cliv0_mkmxtoken(mxid, pw)
result = ffi.string(r) result = ffi.string(r)
lib.FreeCString(r) lib.FreeCString(r)
print(result) print(result)

4
smal/src/pymxutils/mxutils/serverinfo.py
View file

@ -11,7 +11,7 @@ def serverinfo():
mxdomain = sys.argv[1].encode(encoding="utf-8") mxdomain = sys.argv[1].encode(encoding="utf-8")
r = lib.cli_serverinfo(mxdomain) r = lib.cliv0_serverinfo(mxdomain)
result = ffi.string(r) result = ffi.string(r).decode("utf-8")
lib.FreeCString(r) lib.FreeCString(r)
print(result) print(result)

2
smal/src/pymxutils/mxutils/whoami.py
View file

@ -12,7 +12,7 @@ def whoami():
url = sys.argv[1].encode(encoding="utf-8") url = sys.argv[1].encode(encoding="utf-8")
tk = sys.argv[2].encode(encoding="utf-8") tk = sys.argv[2].encode(encoding="utf-8")
r = lib.cli_whoami(url, tk) r = lib.cliv0_whoami(url, tk)
result = ffi.string(r) result = ffi.string(r)
lib.FreeCString(r) lib.FreeCString(r)
print(result) print(result)