mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-03-10 16:00:18 +00:00
Fixed Python plugin module discovery to search multiple valid install layouts before importing zoitechat, instead of assuming only one path. This includes:
existing sibling fallback (../python)
direct fallback (libdir/python)
AppImage-aware fallbacks under $APPDIR/usr/lib/zoitechat/python and $APPDIR/usr/lib/x86_64-linux-gnu/zoitechat/python.
Added guards so paths are appended only if the directory exists and is not already in sys.path, reducing duplicate/invalid entries while improving robustness across packaging layouts.
This commit is contained in:
@@ -538,8 +538,22 @@ def _on_plugin_init(plugin_name, plugin_desc, plugin_version, arg, libdir):
|
||||
|
||||
try:
|
||||
libdir = __decode(_cstr(libdir))
|
||||
modpath = os.path.join(libdir, '..', 'python')
|
||||
sys.path.append(os.path.abspath(modpath))
|
||||
modpaths = [
|
||||
os.path.abspath(os.path.join(libdir, '..', 'python')),
|
||||
os.path.abspath(os.path.join(libdir, 'python')),
|
||||
]
|
||||
|
||||
appdir = os.getenv('APPDIR')
|
||||
if appdir:
|
||||
modpaths.extend([
|
||||
os.path.join(appdir, 'usr', 'lib', 'zoitechat', 'python'),
|
||||
os.path.join(appdir, 'usr', 'lib', 'x86_64-linux-gnu', 'zoitechat', 'python'),
|
||||
])
|
||||
|
||||
for modpath in modpaths:
|
||||
if os.path.isdir(modpath) and modpath not in sys.path:
|
||||
sys.path.append(modpath)
|
||||
|
||||
zoitechat = importlib.import_module('zoitechat')
|
||||
|
||||
except (UnicodeDecodeError, ImportError) as e:
|
||||
|
||||
Reference in New Issue
Block a user