mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-11-16 20:05:40 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
853a09774c |
No files matched your search
@@ -1,24 +0,0 @@
|
|||||||
# Optional plugin API additions (discussion #144)
|
|
||||||
|
|
||||||
Existing hooks, callbacks, return values, context lookup, strings and menu behaviour
|
|
||||||
remain unchanged. The C plugin function table gains four fixed append-only slots;
|
|
||||||
unused slots are NULL. Older binaries use the unchanged prefix. A plugin must check
|
|
||||||
the documented get_info() feature key before accessing a new slot on an older host.
|
|
||||||
New Python modules are installed by Meson and the existing Windows copy/installer
|
|
||||||
pipeline. Only modules present in the installation are exported; imports of
|
|
||||||
zoitechat, hexchat and xchat retain their compatibility aliases.
|
|
||||||
|
|
||||||
All APIs run on the client main thread unless explicitly documented otherwise.
|
|
||||||
New reserved flags must be zero. These changes do not make old API calls thread-safe.
|
|
||||||
|
|
||||||
Nested hook dispatch defers deleted-hook reclamation until its outermost return,
|
|
||||||
so new observers can safely emit events and unhook themselves or other hooks.
|
|
||||||
|
|
||||||
The optional asyncio module requires Python 3.7 or newer; older supported
|
|
||||||
interpreters skip that module and retain the existing scripting API.
|
|
||||||
|
|
||||||
Python reload drops the script/API modules while retaining the embedding module
|
|
||||||
so callback and lib.ph pointer types keep the same CFFI identity.
|
|
||||||
|
|
||||||
Server-hook insertion matches both raw and attrs hooks so documented priorities
|
|
||||||
are honoured for mixed registrations, including new filtered attrs callbacks.
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
# Connection and context navigation
|
|
||||||
|
|
||||||
`get_connections()` returns one Connection snapshot per live connection:
|
|
||||||
`id`, `network`, `server`, `context`. Connection IDs distinguish simultaneous
|
|
||||||
connections with identical names. Prefer its server-tab context where present.
|
|
||||||
`get_connection(context=None)` finds the owner of a live context.
|
|
||||||
|
|
||||||
`get_contexts(connection_id=None, types=None)` lists live contexts, optionally
|
|
||||||
filtered by connection ID (or a Connection object) and session types: server=1,
|
|
||||||
channel=2, query=3. `connection.contexts(types=None)` is a convenience method.
|
|
||||||
`find_context_by_id(connection_id, channel=None)` / `connection.find(channel)`
|
|
||||||
resolve using that connection's IRC comparator; no channel selects the server tab.
|
|
||||||
Missing/closed contexts return None. Existing find_context() remains unchanged.
|
|
||||||
|
|
||||||
These helpers use the existing channels list's ID/context fields, so no new C
|
|
||||||
context ABI is needed. Snapshots are not persistent IDs across client restarts;
|
|
||||||
refresh them after closing/recreating connections. Always check Context.set()
|
|
||||||
when explicitly selecting a context that might have closed.
|
|
||||||
|
|
||||||
```python
|
|
||||||
connection = zoitechat.get_connection()
|
|
||||||
for context in connection.contexts(types=(2,)):
|
|
||||||
context.prnt('A channel on this exact connection')
|
|
||||||
```
|
|
||||||
+1
-1
Submodule flatpak/shared-modules updated: d1ab132e64...785a5394b6.
@@ -383,24 +383,3 @@ def find_context(server=None, channel=None):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
return Context(ctx)
|
return Context(ctx)
|
||||||
|
|
||||||
|
|
||||||
# Optional additive APIs live in separate modules so builds can select features.
|
|
||||||
def __load_additive_features():
|
|
||||||
import importlib
|
|
||||||
import os
|
|
||||||
|
|
||||||
for suffix in ('fd', 'events', 'async', 'names', 'contexts',
|
|
||||||
'post', 'filters', 'caps'):
|
|
||||||
if suffix == 'async' and sys.version_info < (3, 7):
|
|
||||||
continue
|
|
||||||
name = '_zoitechat_' + suffix
|
|
||||||
if not os.path.isfile(os.path.join(os.path.dirname(__file__), name + '.py')):
|
|
||||||
continue
|
|
||||||
module = importlib.import_module(name)
|
|
||||||
for symbol in module.__all__:
|
|
||||||
globals()[symbol] = getattr(module, symbol)
|
|
||||||
__all__.append(symbol)
|
|
||||||
|
|
||||||
|
|
||||||
__load_additive_features()
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
"""Navigate live connections by ID instead of ambiguous server/network names."""
|
|
||||||
from collections import namedtuple
|
|
||||||
import operator
|
|
||||||
import _zoitechat as api
|
|
||||||
|
|
||||||
__all__ = ['Connection', 'get_connections', 'get_connection', 'get_contexts',
|
|
||||||
'find_context_by_id']
|
|
||||||
|
|
||||||
|
|
||||||
class Connection(namedtuple('_Connection', 'id network server context')):
|
|
||||||
__slots__ = ()
|
|
||||||
|
|
||||||
def contexts(self, types=None):
|
|
||||||
return get_contexts(self.id, types)
|
|
||||||
|
|
||||||
def find(self, channel=None):
|
|
||||||
return find_context_by_id(self.id, channel)
|
|
||||||
|
|
||||||
|
|
||||||
def _id(connection):
|
|
||||||
return operator.index(connection.id if isinstance(connection, Connection) else connection)
|
|
||||||
|
|
||||||
|
|
||||||
def get_connections():
|
|
||||||
"""Return one snapshot per live connection, including disconnected ones."""
|
|
||||||
entries = api.get_list('channels')
|
|
||||||
by_id = {}
|
|
||||||
order = []
|
|
||||||
for entry in entries:
|
|
||||||
if entry.id not in by_id:
|
|
||||||
order.append(entry.id)
|
|
||||||
if entry.id not in by_id or entry.type == 1:
|
|
||||||
by_id[entry.id] = Connection(entry.id, entry.network, entry.server,
|
|
||||||
entry.context)
|
|
||||||
return [by_id[connection_id] for connection_id in order]
|
|
||||||
|
|
||||||
|
|
||||||
def get_connection(context=None):
|
|
||||||
"""Find the owning connection of a Context; return None when it has closed."""
|
|
||||||
context = context or api.get_context()
|
|
||||||
for entry in api.get_list('channels'):
|
|
||||||
if entry.context == context:
|
|
||||||
for connection in get_connections():
|
|
||||||
if connection.id == entry.id:
|
|
||||||
return connection
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def get_contexts(connection_id=None, types=None):
|
|
||||||
"""Return contexts, optionally restricted to a connection and session types."""
|
|
||||||
if connection_id is not None:
|
|
||||||
connection_id = _id(connection_id)
|
|
||||||
if types is not None:
|
|
||||||
types = frozenset(types)
|
|
||||||
return [entry.context for entry in api.get_list('channels')
|
|
||||||
if (connection_id is None or entry.id == connection_id)
|
|
||||||
and (types is None or entry.type in types)]
|
|
||||||
|
|
||||||
|
|
||||||
def find_context_by_id(connection_id, channel=None):
|
|
||||||
"""Resolve a live context on exactly one connection; None selects its server tab."""
|
|
||||||
connection_id = _id(connection_id)
|
|
||||||
previous = api.get_context()
|
|
||||||
try:
|
|
||||||
for entry in api.get_list('channels'):
|
|
||||||
if entry.id != connection_id:
|
|
||||||
continue
|
|
||||||
if channel is None:
|
|
||||||
if entry.type == 1:
|
|
||||||
return entry.context
|
|
||||||
elif entry.context.set() and api.nickcmp(entry.channel, channel) == 0:
|
|
||||||
return entry.context
|
|
||||||
finally:
|
|
||||||
previous.set()
|
|
||||||
return None
|
|
||||||
@@ -27,11 +27,7 @@ python3_source = custom_target('python-bindings',
|
|||||||
command: [find_program('generate_plugin.py'), '@INPUT@', '@OUTPUT@']
|
command: [find_program('generate_plugin.py'), '@INPUT@', '@OUTPUT@']
|
||||||
)
|
)
|
||||||
|
|
||||||
# Include any selected additive API modules alongside the compatibility modules.
|
install_data(['_zoitechat.py', 'zoitechat.py', 'xchat.py', 'hexchat.py'],
|
||||||
python_api_files = run_command(python3, '-c',
|
|
||||||
'import glob,sys; print("\\n".join(sorted(glob.glob(sys.argv[1] + "/_zoitechat*.py"))))',
|
|
||||||
meson.current_source_dir(), check: true).stdout().strip().split('\n')
|
|
||||||
install_data(python_api_files + ['zoitechat.py', 'xchat.py', 'hexchat.py'],
|
|
||||||
install_dir: join_paths(get_option('libdir'), 'zoitechat/python')
|
install_dir: join_paths(get_option('libdir'), 'zoitechat/python')
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -590,12 +590,7 @@ def _on_plugin_deinit():
|
|||||||
sys.stderr = sys.__stderr__
|
sys.stderr = sys.__stderr__
|
||||||
pydoc.help = pydoc.Helper()
|
pydoc.help = pydoc.Helper()
|
||||||
|
|
||||||
# CFFI callbacks keep the embedding module's ffi/lib identity for the
|
for mod in ('_zoitechat', 'zoitechat', 'xchat', '_zoitechat_embedded'):
|
||||||
# process lifetime; deleting it creates incompatible types on reload.
|
|
||||||
for mod in ('_zoitechat', 'zoitechat', 'hexchat', 'xchat',
|
|
||||||
'_zoitechat_fd', '_zoitechat_events', '_zoitechat_async',
|
|
||||||
'_zoitechat_names', '_zoitechat_contexts', '_zoitechat_post',
|
|
||||||
'_zoitechat_filters', '_zoitechat_caps'):
|
|
||||||
try:
|
try:
|
||||||
del sys.modules[mod]
|
del sys.modules[mod]
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,6 @@
|
|||||||
<None Include="xchat.py" />
|
<None Include="xchat.py" />
|
||||||
<None Include="hexchat.py" />
|
<None Include="hexchat.py" />
|
||||||
<None Include="_zoitechat.py" />
|
<None Include="_zoitechat.py" />
|
||||||
<None Include="_zoitechat_*.py" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="$(IntDir)python.c" />
|
<ClCompile Include="$(IntDir)python.c" />
|
||||||
|
|||||||
@@ -52,7 +52,6 @@
|
|||||||
<None Include="xchat.py" />
|
<None Include="xchat.py" />
|
||||||
<None Include="hexchat.py" />
|
<None Include="hexchat.py" />
|
||||||
<None Include="_zoitechat.py" />
|
<None Include="_zoitechat.py" />
|
||||||
<None Include="_zoitechat_*.py" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="$(IntDir)python.c" />
|
<ClCompile Include="$(IntDir)python.c" />
|
||||||
|
|||||||
+2
-8
@@ -176,7 +176,6 @@ enum
|
|||||||
|
|
||||||
GSList *plugin_list = NULL; /* export for plugingui.c */
|
GSList *plugin_list = NULL; /* export for plugingui.c */
|
||||||
static GSList *hook_list = NULL;
|
static GSList *hook_list = NULL;
|
||||||
static unsigned int plugin_dispatch_depth;
|
|
||||||
|
|
||||||
extern const struct prefs vars[]; /* cfgfiles.c */
|
extern const struct prefs vars[]; /* cfgfiles.c */
|
||||||
|
|
||||||
@@ -244,7 +243,7 @@ plugin_list_add (zoitechat_context *ctx, char *filename, const char *name,
|
|||||||
{
|
{
|
||||||
zoitechat_plugin *pl;
|
zoitechat_plugin *pl;
|
||||||
|
|
||||||
pl = g_new0 (zoitechat_plugin, 1);
|
pl = g_new (zoitechat_plugin, 1);
|
||||||
pl->handle = handle;
|
pl->handle = handle;
|
||||||
pl->filename = filename;
|
pl->filename = filename;
|
||||||
pl->context = ctx;
|
pl->context = ctx;
|
||||||
@@ -611,7 +610,6 @@ plugin_hook_run (session *sess, char *name, char *word[], char *word_eol[],
|
|||||||
zoitechat_hook *hook;
|
zoitechat_hook *hook;
|
||||||
int ret, eat = 0;
|
int ret, eat = 0;
|
||||||
|
|
||||||
plugin_dispatch_depth++;
|
|
||||||
list = hook_list;
|
list = hook_list;
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
@@ -657,10 +655,6 @@ plugin_hook_run (session *sess, char *name, char *word[], char *word_eol[],
|
|||||||
}
|
}
|
||||||
|
|
||||||
xit:
|
xit:
|
||||||
/* Nested callbacks can unhook entries still used by an outer dispatch.
|
|
||||||
* Keep both hook objects and list links alive until the outermost return. */
|
|
||||||
if (--plugin_dispatch_depth != 0)
|
|
||||||
return eat;
|
|
||||||
/* really remove deleted hooks now */
|
/* really remove deleted hooks now */
|
||||||
list = hook_list;
|
list = hook_list;
|
||||||
while (list)
|
while (list)
|
||||||
@@ -812,7 +806,7 @@ plugin_insert_hook (zoitechat_hook *new_hook)
|
|||||||
break;
|
break;
|
||||||
case HOOK_SERVER:
|
case HOOK_SERVER:
|
||||||
case HOOK_SERVER_ATTRS:
|
case HOOK_SERVER_ATTRS:
|
||||||
new_hook_type = HOOK_SERVER | HOOK_SERVER_ATTRS;
|
new_hook_type = HOOK_SERVER | HOOK_PRINT_ATTRS;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
new_hook_type = new_hook->type;
|
new_hook_type = new_hook->type;
|
||||||
|
|||||||
@@ -150,15 +150,6 @@ struct _zoitechat_plugin
|
|||||||
void (*zoitechat_event_attrs_free) (zoitechat_plugin *ph,
|
void (*zoitechat_event_attrs_free) (zoitechat_plugin *ph,
|
||||||
zoitechat_event_attrs *attrs);
|
zoitechat_event_attrs *attrs);
|
||||||
|
|
||||||
/* Additive API slots: append only; old binary offsets are unchanged. */
|
|
||||||
zoitechat_hook *(*zoitechat_hook_print_after) (zoitechat_plugin *, const char *, int,
|
|
||||||
int, int (*)(char *[], zoitechat_event_attrs *, void *), void *);
|
|
||||||
zoitechat_hook *(*zoitechat_hook_server_filtered) (zoitechat_plugin *, const char *, int,
|
|
||||||
int, int, const char *, int (*)(char *[], char *[], zoitechat_event_attrs *, void *), void *);
|
|
||||||
zoitechat_hook *(*zoitechat_hook_print_filtered) (zoitechat_plugin *, const char *, int,
|
|
||||||
int, int, const char *, int (*)(char *[], zoitechat_event_attrs *, void *), void *);
|
|
||||||
zoitechat_hook *(*zoitechat_register_capability) (zoitechat_plugin *, const char *, int, int, void *);
|
|
||||||
|
|
||||||
/* PRIVATE FIELDS! */
|
/* PRIVATE FIELDS! */
|
||||||
void *handle; /* from dlopen */
|
void *handle; /* from dlopen */
|
||||||
char *filename; /* loaded from */
|
char *filename; /* loaded from */
|
||||||
|
|||||||
@@ -193,15 +193,6 @@ struct _zoitechat_plugin
|
|||||||
zoitechat_event_attrs *(*zoitechat_event_attrs_create) (zoitechat_plugin *ph);
|
zoitechat_event_attrs *(*zoitechat_event_attrs_create) (zoitechat_plugin *ph);
|
||||||
void (*zoitechat_event_attrs_free) (zoitechat_plugin *ph,
|
void (*zoitechat_event_attrs_free) (zoitechat_plugin *ph,
|
||||||
zoitechat_event_attrs *attrs);
|
zoitechat_event_attrs *attrs);
|
||||||
/* Additive API slots: append only; old binary offsets are unchanged. */
|
|
||||||
zoitechat_hook *(*zoitechat_hook_print_after) (zoitechat_plugin *, const char *, int,
|
|
||||||
int, int (*)(char *[], zoitechat_event_attrs *, void *), void *);
|
|
||||||
zoitechat_hook *(*zoitechat_hook_server_filtered) (zoitechat_plugin *, const char *, int,
|
|
||||||
int, int, const char *, int (*)(char *[], char *[], zoitechat_event_attrs *, void *), void *);
|
|
||||||
zoitechat_hook *(*zoitechat_hook_print_filtered) (zoitechat_plugin *, const char *, int,
|
|
||||||
int, int, const char *, int (*)(char *[], zoitechat_event_attrs *, void *), void *);
|
|
||||||
zoitechat_hook *(*zoitechat_register_capability) (zoitechat_plugin *, const char *, int, int, void *);
|
|
||||||
|
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -90,7 +90,6 @@
|
|||||||
<MSWindowsTheme Include="$(DepsRoot)\share\themes\MS-Windows\**\*" />
|
<MSWindowsTheme Include="$(DepsRoot)\share\themes\MS-Windows\**\*" />
|
||||||
<HicolorIcons Include="$(DepsRoot)\share\icons\hicolor\index.theme" />
|
<HicolorIcons Include="$(DepsRoot)\share\icons\hicolor\index.theme" />
|
||||||
<HicolorIcons Include="$(DepsRoot)\share\icons\hicolor\**\*.*" />
|
<HicolorIcons Include="$(DepsRoot)\share\icons\hicolor\**\*.*" />
|
||||||
<PythonAdditiveApis Include="..\..\plugins\python\_zoitechat_*.py" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Copy SourceFiles="@(None)" DestinationFolder="$(ZoiteChatRel)" />
|
<Copy SourceFiles="@(None)" DestinationFolder="$(ZoiteChatRel)" />
|
||||||
@@ -116,7 +115,6 @@
|
|||||||
<Copy SourceFiles="..\..\plugins\python\hexchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
|
<Copy SourceFiles="..\..\plugins\python\hexchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
|
||||||
<Copy SourceFiles="..\..\plugins\python\zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
|
<Copy SourceFiles="..\..\plugins\python\zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
|
||||||
<Copy SourceFiles="..\..\plugins\python\_zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
|
<Copy SourceFiles="..\..\plugins\python\_zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
|
||||||
<Copy SourceFiles="@(PythonAdditiveApis)" DestinationFolder="$(ZoiteChatRel)\python" Condition="('$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true') and '@(PythonAdditiveApis)' != ''" />
|
|
||||||
|
|
||||||
<WriteLinesToFile File="$(ZoiteChatRel)portable-mode" Lines="2" Overwrite="true" />
|
<WriteLinesToFile File="$(ZoiteChatRel)portable-mode" Lines="2" Overwrite="true" />
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user