diff --git a/i18n/fr/LC_MESSAGES/sat.mo b/i18n/fr/LC_MESSAGES/libervia_backend.mo similarity index 100% rename from i18n/fr/LC_MESSAGES/sat.mo rename to i18n/fr/LC_MESSAGES/libervia_backend.mo diff --git a/i18n/fr/LC_MESSAGES/sat.po b/i18n/fr/LC_MESSAGES/libervia_backend.po similarity index 100% rename from i18n/fr/LC_MESSAGES/sat.po rename to i18n/fr/LC_MESSAGES/libervia_backend.po diff --git a/sat/VERSION b/libervia/backend/VERSION similarity index 100% rename from sat/VERSION rename to libervia/backend/VERSION diff --git a/sat/__init__.py b/libervia/backend/__init__.py similarity index 100% rename from sat/__init__.py rename to libervia/backend/__init__.py diff --git a/sat/bridge/__init__.py b/libervia/backend/bridge/__init__.py similarity index 100% rename from sat/bridge/__init__.py rename to libervia/backend/bridge/__init__.py diff --git a/sat/bridge/bridge_constructor/__init__.py b/libervia/backend/bridge/bridge_constructor/__init__.py similarity index 100% rename from sat/bridge/bridge_constructor/__init__.py rename to libervia/backend/bridge/bridge_constructor/__init__.py diff --git a/sat/bridge/bridge_constructor/base_constructor.py b/libervia/backend/bridge/bridge_constructor/base_constructor.py similarity index 99% rename from sat/bridge/bridge_constructor/base_constructor.py rename to libervia/backend/bridge/bridge_constructor/base_constructor.py index 95ece3e7..f3fb3e70 100644 --- a/sat/bridge/bridge_constructor/base_constructor.py +++ b/libervia/backend/bridge/bridge_constructor/base_constructor.py @@ -19,7 +19,7 @@ """base constructor class""" -from sat.bridge.bridge_constructor.constants import Const as C +from libervia.backend.bridge.bridge_constructor.constants import Const as C from configparser import NoOptionError import sys import os diff --git a/sat/bridge/bridge_constructor/bridge_constructor.py b/libervia/backend/bridge/bridge_constructor/bridge_constructor.py similarity index 93% rename from sat/bridge/bridge_constructor/bridge_constructor.py rename to libervia/backend/bridge/bridge_constructor/bridge_constructor.py index 224f8371..28afd701 100755 --- a/sat/bridge/bridge_constructor/bridge_constructor.py +++ b/libervia/backend/bridge/bridge_constructor/bridge_constructor.py @@ -18,9 +18,9 @@ # along with this program. If not, see . -from sat.bridge import bridge_constructor -from sat.bridge.bridge_constructor.constants import Const as C -from sat.bridge.bridge_constructor import constructors, base_constructor +from libervia.backend.bridge import bridge_constructor +from libervia.backend.bridge.bridge_constructor.constants import Const as C +from libervia.backend.bridge.bridge_constructor import constructors, base_constructor import argparse from configparser import ConfigParser as Parser from importlib import import_module @@ -38,7 +38,7 @@ class BridgeConstructor(object): for dir_ in os.listdir(constructors_dir): init_path = os.path.join(constructors_dir, dir_, "__init__.py") constructor_path = os.path.join(constructors_dir, dir_, "constructor.py") - module_path = "sat.bridge.bridge_constructor.constructors.{}.constructor".format( + module_path = "libervia.backend.bridge.bridge_constructor.constructors.{}.constructor".format( dir_ ) if os.path.isfile(init_path) and os.path.isfile(constructor_path): diff --git a/sat/bridge/bridge_constructor/bridge_template.ini b/libervia/backend/bridge/bridge_constructor/bridge_template.ini similarity index 100% rename from sat/bridge/bridge_constructor/bridge_template.ini rename to libervia/backend/bridge/bridge_constructor/bridge_template.ini diff --git a/sat/bridge/bridge_constructor/constants.py b/libervia/backend/bridge/bridge_constructor/constants.py similarity index 97% rename from sat/bridge/bridge_constructor/constants.py rename to libervia/backend/bridge/bridge_constructor/constants.py index 56b533e1..af8a1c72 100644 --- a/sat/bridge/bridge_constructor/constants.py +++ b/libervia/backend/bridge/bridge_constructor/constants.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core import constants +from libervia.backend.core import constants class Const(constants.Const): diff --git a/sat/bridge/bridge_constructor/constructors/__init__.py b/libervia/backend/bridge/bridge_constructor/constructors/__init__.py similarity index 100% rename from sat/bridge/bridge_constructor/constructors/__init__.py rename to libervia/backend/bridge/bridge_constructor/constructors/__init__.py diff --git a/sat/bridge/bridge_constructor/constructors/dbus-xml/__init__.py b/libervia/backend/bridge/bridge_constructor/constructors/dbus-xml/__init__.py similarity index 100% rename from sat/bridge/bridge_constructor/constructors/dbus-xml/__init__.py rename to libervia/backend/bridge/bridge_constructor/constructors/dbus-xml/__init__.py diff --git a/sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py b/libervia/backend/bridge/bridge_constructor/constructors/dbus-xml/constructor.py similarity index 98% rename from sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py rename to libervia/backend/bridge/bridge_constructor/constructors/dbus-xml/constructor.py index 87588a59..02798179 100644 --- a/sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py +++ b/libervia/backend/bridge/bridge_constructor/constructors/dbus-xml/constructor.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.bridge.bridge_constructor import base_constructor +from libervia.backend.bridge.bridge_constructor import base_constructor from xml.dom import minidom import sys diff --git a/sat/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml b/libervia/backend/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml similarity index 100% rename from sat/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml rename to libervia/backend/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml diff --git a/sat/bridge/bridge_constructor/constructors/dbus/__init__.py b/libervia/backend/bridge/bridge_constructor/constructors/dbus/__init__.py similarity index 100% rename from sat/bridge/bridge_constructor/constructors/dbus/__init__.py rename to libervia/backend/bridge/bridge_constructor/constructors/dbus/__init__.py diff --git a/sat/bridge/bridge_constructor/constructors/dbus/constructor.py b/libervia/backend/bridge/bridge_constructor/constructors/dbus/constructor.py similarity index 98% rename from sat/bridge/bridge_constructor/constructors/dbus/constructor.py rename to libervia/backend/bridge/bridge_constructor/constructors/dbus/constructor.py index 72b2d2b8..fc92ac47 100644 --- a/sat/bridge/bridge_constructor/constructors/dbus/constructor.py +++ b/libervia/backend/bridge/bridge_constructor/constructors/dbus/constructor.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.bridge.bridge_constructor import base_constructor +from libervia.backend.bridge.bridge_constructor import base_constructor class DbusConstructor(base_constructor.Constructor): diff --git a/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py b/libervia/backend/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py similarity index 96% rename from sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py rename to libervia/backend/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py index 93bbe2e1..ec31ef31 100644 --- a/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py +++ b/libervia/backend/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py @@ -19,10 +19,10 @@ from types import MethodType from functools import partialmethod from twisted.internet import defer, reactor -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.exceptions import BridgeInitError -from sat.tools import config +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.exceptions import BridgeInitError +from libervia.backend.tools import config from txdbus import client, objects, error from txdbus.interface import DBusInterface, Method, Signal diff --git a/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py b/libervia/backend/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py similarity index 97% rename from sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py rename to libervia/backend/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py index e66cfede..bdf896cc 100644 --- a/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py +++ b/libervia/backend/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py @@ -19,10 +19,10 @@ import asyncio import dbus import ast -from sat.core.i18n import _ -from sat.tools import config -from sat.core.log import getLogger -from sat.core.exceptions import BridgeExceptionNoService, BridgeInitError +from libervia.backend.core.i18n import _ +from libervia.backend.tools import config +from libervia.backend.core.log import getLogger +from libervia.backend.core.exceptions import BridgeExceptionNoService, BridgeInitError from dbus.mainloop.glib import DBusGMainLoop from .bridge_frontend import BridgeException diff --git a/sat/bridge/bridge_constructor/constructors/embedded/__init__.py b/libervia/backend/bridge/bridge_constructor/constructors/embedded/__init__.py similarity index 100% rename from sat/bridge/bridge_constructor/constructors/embedded/__init__.py rename to libervia/backend/bridge/bridge_constructor/constructors/embedded/__init__.py diff --git a/sat/bridge/bridge_constructor/constructors/embedded/constructor.py b/libervia/backend/bridge/bridge_constructor/constructors/embedded/constructor.py similarity index 97% rename from sat/bridge/bridge_constructor/constructors/embedded/constructor.py rename to libervia/backend/bridge/bridge_constructor/constructors/embedded/constructor.py index 0fac35ef..276be1c3 100644 --- a/sat/bridge/bridge_constructor/constructors/embedded/constructor.py +++ b/libervia/backend/bridge/bridge_constructor/constructors/embedded/constructor.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.bridge.bridge_constructor import base_constructor +from libervia.backend.bridge.bridge_constructor import base_constructor #  from textwraps import dedent diff --git a/sat/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py b/libervia/backend/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py similarity index 93% rename from sat/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py rename to libervia/backend/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py index 2ee5d1b2..bc8700bd 100644 --- a/sat/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py +++ b/libervia/backend/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py @@ -17,4 +17,4 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.bridge.embedded import bridge +from libervia.backend.bridge.embedded import bridge diff --git a/sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py b/libervia/backend/bridge/bridge_constructor/constructors/embedded/embedded_template.py similarity index 97% rename from sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py rename to libervia/backend/bridge/bridge_constructor/constructors/embedded/embedded_template.py index 47cb490f..8d1cf78c 100644 --- a/sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py +++ b/libervia/backend/bridge/bridge_constructor/constructors/embedded/embedded_template.py @@ -17,10 +17,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions +from libervia.backend.core import exceptions class _Bridge(object): diff --git a/sat/bridge/bridge_constructor/constructors/mediawiki/__init__.py b/libervia/backend/bridge/bridge_constructor/constructors/mediawiki/__init__.py similarity index 100% rename from sat/bridge/bridge_constructor/constructors/mediawiki/__init__.py rename to libervia/backend/bridge/bridge_constructor/constructors/mediawiki/__init__.py diff --git a/sat/bridge/bridge_constructor/constructors/mediawiki/constructor.py b/libervia/backend/bridge/bridge_constructor/constructors/mediawiki/constructor.py similarity index 98% rename from sat/bridge/bridge_constructor/constructors/mediawiki/constructor.py rename to libervia/backend/bridge/bridge_constructor/constructors/mediawiki/constructor.py index cbc07acc..864990a4 100644 --- a/sat/bridge/bridge_constructor/constructors/mediawiki/constructor.py +++ b/libervia/backend/bridge/bridge_constructor/constructors/mediawiki/constructor.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.bridge.bridge_constructor import base_constructor +from libervia.backend.bridge.bridge_constructor import base_constructor import sys from datetime import datetime import re diff --git a/sat/bridge/bridge_constructor/constructors/mediawiki/mediawiki_template.tpl b/libervia/backend/bridge/bridge_constructor/constructors/mediawiki/mediawiki_template.tpl similarity index 100% rename from sat/bridge/bridge_constructor/constructors/mediawiki/mediawiki_template.tpl rename to libervia/backend/bridge/bridge_constructor/constructors/mediawiki/mediawiki_template.tpl diff --git a/sat/bridge/bridge_constructor/constructors/pb/__init__.py b/libervia/backend/bridge/bridge_constructor/constructors/pb/__init__.py similarity index 100% rename from sat/bridge/bridge_constructor/constructors/pb/__init__.py rename to libervia/backend/bridge/bridge_constructor/constructors/pb/__init__.py diff --git a/sat/bridge/bridge_constructor/constructors/pb/constructor.py b/libervia/backend/bridge/bridge_constructor/constructors/pb/constructor.py similarity index 97% rename from sat/bridge/bridge_constructor/constructors/pb/constructor.py rename to libervia/backend/bridge/bridge_constructor/constructors/pb/constructor.py index 576bf847..fc1db348 100644 --- a/sat/bridge/bridge_constructor/constructors/pb/constructor.py +++ b/libervia/backend/bridge/bridge_constructor/constructors/pb/constructor.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.bridge.bridge_constructor import base_constructor +from libervia.backend.bridge.bridge_constructor import base_constructor class pbConstructor(base_constructor.Constructor): diff --git a/sat/bridge/bridge_constructor/constructors/pb/pb_core_template.py b/libervia/backend/bridge/bridge_constructor/constructors/pb/pb_core_template.py similarity index 98% rename from sat/bridge/bridge_constructor/constructors/pb/pb_core_template.py rename to libervia/backend/bridge/bridge_constructor/constructors/pb/pb_core_template.py index 992187fe..1350fa2c 100644 --- a/sat/bridge/bridge_constructor/constructors/pb/pb_core_template.py +++ b/libervia/backend/bridge/bridge_constructor/constructors/pb/pb_core_template.py @@ -23,8 +23,8 @@ from functools import partial from pathlib import Path from twisted.spread import jelly, pb from twisted.internet import reactor -from sat.core.log import getLogger -from sat.tools import config +from libervia.backend.core.log import getLogger +from libervia.backend.tools import config log = getLogger(__name__) diff --git a/sat/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py b/libervia/backend/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py similarity index 98% rename from sat/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py rename to libervia/backend/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py index 52d0ba7a..aac4815f 100644 --- a/sat/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py +++ b/libervia/backend/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py @@ -23,8 +23,8 @@ from pathlib import Path from twisted.spread import pb from twisted.internet import reactor, defer from twisted.internet.error import ConnectionRefusedError, ConnectError -from sat.core import exceptions -from sat.tools import config +from libervia.backend.core import exceptions +from libervia.backend.tools import config from sat_frontends.bridge.bridge_frontend import BridgeException log = getLogger(__name__) diff --git a/sat/bridge/dbus_bridge.py b/libervia/backend/bridge/dbus_bridge.py similarity index 99% rename from sat/bridge/dbus_bridge.py rename to libervia/backend/bridge/dbus_bridge.py index 8cac63b0..2550c822 100644 --- a/sat/bridge/dbus_bridge.py +++ b/libervia/backend/bridge/dbus_bridge.py @@ -19,10 +19,10 @@ from types import MethodType from functools import partialmethod from twisted.internet import defer, reactor -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.exceptions import BridgeInitError -from sat.tools import config +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.exceptions import BridgeInitError +from libervia.backend.tools import config from txdbus import client, objects, error from txdbus.interface import DBusInterface, Method, Signal diff --git a/sat/bridge/pb.py b/libervia/backend/bridge/pb.py similarity index 98% rename from sat/bridge/pb.py rename to libervia/backend/bridge/pb.py index 526d4f6c..3982fc33 100644 --- a/sat/bridge/pb.py +++ b/libervia/backend/bridge/pb.py @@ -23,8 +23,8 @@ from functools import partial from pathlib import Path from twisted.spread import jelly, pb from twisted.internet import reactor -from sat.core.log import getLogger -from sat.tools import config +from libervia.backend.core.log import getLogger +from libervia.backend.tools import config log = getLogger(__name__) diff --git a/sat/core/__init__.py b/libervia/backend/core/__init__.py similarity index 100% rename from sat/core/__init__.py rename to libervia/backend/core/__init__.py diff --git a/sat/core/constants.py b/libervia/backend/core/constants.py similarity index 99% rename from sat/core/constants.py rename to libervia/backend/core/constants.py index 8d9f7163..9a6346e6 100644 --- a/sat/core/constants.py +++ b/libervia/backend/core/constants.py @@ -23,7 +23,7 @@ except ImportError: BaseDirectory = None from os.path import dirname from typing import Final -import sat +from libervia import backend class Const(object): @@ -35,7 +35,7 @@ class Const(object): APP_NAME_FILE = "libervia" APP_NAME_FULL = f"{APP_NAME} ({APP_COMPONENT})" APP_VERSION = ( - sat.__version__ + backend.__version__ ) # Please add 'D' at the end of version in sat/VERSION for dev versions APP_RELEASE_NAME = "La Ruche" APP_URL = "https://libervia.org" @@ -487,7 +487,7 @@ if ( import os # we use parent of "sat" module dir as last config path, this is useful for # per instance configurations (e.g. a dev instance and a main instance) - root_dir = dirname(dirname(sat.__file__)) + '/' + root_dir = dirname(dirname(backend.__file__)) + '/' Const.CONFIG_PATHS = ( # /etc/_sat.conf is used for system-related settings (e.g. when media_dir # is set by the distribution and has not reason to change, or in a Docker diff --git a/sat/core/core_types.py b/libervia/backend/core/core_types.py similarity index 100% rename from sat/core/core_types.py rename to libervia/backend/core/core_types.py diff --git a/sat/core/exceptions.py b/libervia/backend/core/exceptions.py similarity index 100% rename from sat/core/exceptions.py rename to libervia/backend/core/exceptions.py diff --git a/sat/core/i18n.py b/libervia/backend/core/i18n.py similarity index 87% rename from sat/core/i18n.py rename to libervia/backend/core/i18n.py index d75c257d..bc0609ab 100644 --- a/sat/core/i18n.py +++ b/libervia/backend/core/i18n.py @@ -19,7 +19,7 @@ from typing import Callable, cast -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) @@ -27,13 +27,13 @@ try: import gettext - _ = gettext.translation("sat", "i18n", fallback=True).gettext + _ = gettext.translation("libervia_backend", "i18n", fallback=True).gettext _translators = {None: gettext.NullTranslations()} def language_switch(lang=None): if not lang in _translators: _translators[lang] = gettext.translation( - "sat", languages=[lang], fallback=True + "libervia_backendt", languages=[lang], fallback=True ) _translators[lang].install() diff --git a/sat/core/launcher.py b/libervia/backend/core/launcher.py similarity index 98% rename from sat/core/launcher.py rename to libervia/backend/core/launcher.py index ca04f190..89d9ebb1 100644 --- a/sat/core/launcher.py +++ b/libervia/backend/core/launcher.py @@ -25,10 +25,10 @@ from pathlib import Path from configparser import ConfigParser from twisted.application import app from twisted.python import usage -from sat.core.constants import Const as C +from libervia.backend.core.constants import Const as C -class SatLogger(app.AppLogger): +class LiberviaLogger(app.AppLogger): def start(self, application): # logging is initialised by sat.core.log_config via the Twisted plugin, nothing @@ -201,7 +201,7 @@ class Launcher: from twisted.scripts._twistd_unix import (ServerOptions, UnixApplicationRunner as app_runner) - app_runner.loggerFactory = SatLogger + app_runner.loggerFactory = LiberviaLogger server_options = ServerOptions() config = self.get_config() pid_file = self.get_pid_file(config) diff --git a/sat/core/log.py b/libervia/backend/core/log.py similarity index 98% rename from sat/core/log.py rename to libervia/backend/core/log.py index bd256623..c50dcc7c 100644 --- a/sat/core/log.py +++ b/libervia/backend/core/log.py @@ -28,9 +28,9 @@ if TYPE_CHECKING: else: _ExcInfoType = Any -from sat.core.constants import Const as C -from sat.tools.common.ansi import ANSI as A -from sat.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.tools.common.ansi import ANSI as A +from libervia.backend.core import exceptions import traceback backend = None diff --git a/sat/core/log_config.py b/libervia/backend/core/log_config.py similarity index 99% rename from sat/core/log_config.py rename to libervia/backend/core/log_config.py index 234952e7..ad194d6b 100644 --- a/sat/core/log_config.py +++ b/libervia/backend/core/log_config.py @@ -20,8 +20,8 @@ """High level logging functions""" # XXX: this module use standard logging module when possible, but as SàT can work in different cases where logging is not the best choice (twisted, pyjamas, etc), it is necessary to have a dedicated module. Additional feature like environment variables and colors are also managed. -from sat.core.constants import Const as C -from sat.core import log +from libervia.backend.core.constants import Const as C +from libervia.backend.core import log class TwistedLogger(log.Logger): @@ -392,7 +392,7 @@ def sat_configure(backend=C.LOG_BACKEND_STANDARD, const=None, backend_data=None) global C C = const log.C = const - from sat.tools import config + from libervia.backend.tools import config import os log_conf = {} diff --git a/sat/core/patches.py b/libervia/backend/core/patches.py similarity index 98% rename from sat/core/patches.py rename to libervia/backend/core/patches.py index 781c9bad..0508daf4 100644 --- a/sat/core/patches.py +++ b/libervia/backend/core/patches.py @@ -1,8 +1,8 @@ import copy from twisted.words.protocols.jabber import xmlstream, sasl, client as tclient, jid from wokkel import client -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/core/sat_main.py b/libervia/backend/core/sat_main.py similarity index 98% rename from sat/core/sat_main.py rename to libervia/backend/core/sat_main.py index d8e97c21..e44141e8 100644 --- a/sat/core/sat_main.py +++ b/libervia/backend/core/sat_main.py @@ -25,32 +25,32 @@ from pathlib import Path from typing import Optional, List, Tuple, Dict from wokkel.data_form import Option -import sat -from sat.core.i18n import _, D_, language_switch -from sat.core import patches +from libervia import backend +from libervia.backend.core.i18n import _, D_, language_switch +from libervia.backend.core import patches patches.apply() from twisted.application import service from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.internet import reactor from wokkel.xmppim import RosterItem -from sat.core import xmpp -from sat.core import exceptions -from sat.core.core_types import SatXMPPEntity -from sat.core.log import getLogger +from libervia.backend.core import xmpp +from libervia.backend.core import exceptions +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.log import getLogger -from sat.core.constants import Const as C -from sat.memory import memory -from sat.memory import cache -from sat.memory import encryption -from sat.tools import async_trigger as trigger -from sat.tools import utils -from sat.tools import image -from sat.tools.common import dynamic_import -from sat.tools.common import regex -from sat.tools.common import data_format -from sat.stdui import ui_contact_list, ui_profile_manager -import sat.plugins +from libervia.backend.core.constants import Const as C +from libervia.backend.memory import memory +from libervia.backend.memory import cache +from libervia.backend.memory import encryption +from libervia.backend.tools import async_trigger as trigger +from libervia.backend.tools import utils +from libervia.backend.tools import image +from libervia.backend.tools.common import dynamic_import +from libervia.backend.tools.common import regex +from libervia.backend.tools.common import data_format +from libervia.backend.stdui import ui_contact_list, ui_profile_manager +import libervia.backend.plugins log = getLogger(__name__) @@ -119,7 +119,7 @@ class SAT(service.Service): return self._version_cache except AttributeError: self._version_cache = "{} « {} » ({})".format( - version, C.APP_RELEASE_NAME, utils.get_repository_data(sat) + version, C.APP_RELEASE_NAME, utils.get_repository_data(backend) ) return self._version_cache else: @@ -283,8 +283,8 @@ class SAT(service.Service): # FIXME: should use imp # TODO: do not import all plugins if no needed: component plugins are not needed # if we just use a client, and plugin blacklisting should be possible in - # sat.conf - plugins_path = Path(sat.plugins.__file__).parent + # libervia.conf + plugins_path = Path(libervia.backend.plugins.__file__).parent plugins_to_import = {} # plugins we still have to import for plug_path in plugins_path.glob("plugin_*"): if plug_path.is_dir(): @@ -306,7 +306,7 @@ class SAT(service.Service): log.warning( f"{plug_name!r} is not a valid name for a plugin, ignoring it") continue - plugin_path = f"sat.plugins.{plug_name}" + plugin_path = f"libervia.backend.plugins.{plug_name}" try: __import__(plugin_path) except exceptions.MissingModule as e: diff --git a/sat/core/xmpp.py b/libervia/backend/core/xmpp.py similarity index 99% rename from sat/core/xmpp.py rename to libervia/backend/core/xmpp.py index 1e2eff2c..14137aee 100644 --- a/sat/core/xmpp.py +++ b/libervia/backend/core/xmpp.py @@ -41,17 +41,17 @@ from wokkel import component from wokkel import delay from zope.interface import implementer -from sat.core import exceptions -from sat.core import core_types -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.memory import cache -from sat.memory import encryption -from sat.memory import persistent -from sat.tools import xml_tools -from sat.tools import utils -from sat.tools.common import data_format +from libervia.backend.core import exceptions +from libervia.backend.core import core_types +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.memory import cache +from libervia.backend.memory import encryption +from libervia.backend.memory import persistent +from libervia.backend.tools import xml_tools +from libervia.backend.tools import utils +from libervia.backend.tools.common import data_format log = getLogger(__name__) diff --git a/sat/memory/__init__.py b/libervia/backend/memory/__init__.py similarity index 100% rename from sat/memory/__init__.py rename to libervia/backend/memory/__init__.py diff --git a/sat/memory/cache.py b/libervia/backend/memory/cache.py similarity index 97% rename from sat/memory/cache.py rename to libervia/backend/memory/cache.py index 15be5e2c..f7a39a69 100644 --- a/sat/memory/cache.py +++ b/libervia/backend/memory/cache.py @@ -24,11 +24,11 @@ import pickle as pickle import time from typing import Any, Dict, Optional -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.tools.common import regex +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools.common import regex log = getLogger(__name__) diff --git a/sat/memory/crypto.py b/libervia/backend/memory/crypto.py similarity index 100% rename from sat/memory/crypto.py rename to libervia/backend/memory/crypto.py diff --git a/sat/memory/disco.py b/libervia/backend/memory/disco.py similarity index 98% rename from sat/memory/disco.py rename to libervia/backend/memory/disco.py index a77b1348..aa5eb0c8 100755 --- a/sat/memory/disco.py +++ b/libervia/backend/memory/disco.py @@ -18,19 +18,19 @@ # along with this program. If not, see . from typing import Optional -from sat.core.i18n import _ -from sat.core import exceptions -from sat.core.log import getLogger -from sat.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.core.core_types import SatXMPPEntity from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.error import StanzaError from twisted.internet import defer from twisted.internet import reactor from twisted.python import failure -from sat.core.constants import Const as C -from sat.tools import xml_tools -from sat.memory import persistent +from libervia.backend.core.constants import Const as C +from libervia.backend.tools import xml_tools +from libervia.backend.memory import persistent from wokkel import disco from base64 import b64encode from hashlib import sha1 diff --git a/sat/memory/encryption.py b/libervia/backend/memory/encryption.py similarity index 98% rename from sat/memory/encryption.py rename to libervia/backend/memory/encryption.py index ad274a34..73291069 100644 --- a/sat/memory/encryption.py +++ b/libervia/backend/memory/encryption.py @@ -23,14 +23,14 @@ from typing import Optional from twisted.words.protocols.jabber import jid from twisted.internet import defer from twisted.python import failure -from sat.core.core_types import EncryptionPlugin, EncryptionSession, MessageData -from sat.core.i18n import D_, _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger -from sat.tools.common import data_format -from sat.tools import utils -from sat.memory import persistent +from libervia.backend.core.core_types import EncryptionPlugin, EncryptionSession, MessageData +from libervia.backend.core.i18n import D_, _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.tools.common import data_format +from libervia.backend.tools import utils +from libervia.backend.memory import persistent log = getLogger(__name__) diff --git a/sat/memory/memory.py b/libervia/backend/memory/memory.py similarity index 99% rename from sat/memory/memory.py rename to libervia/backend/memory/memory.py index c7b17eb9..30fab5d5 100644 --- a/sat/memory/memory.py +++ b/libervia/backend/memory/memory.py @@ -29,19 +29,19 @@ from collections import namedtuple from twisted.python import failure from twisted.internet import defer, reactor, error from twisted.words.protocols.jabber import jid -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.memory.sqla import Storage -from sat.memory.persistent import PersistentDict -from sat.memory.params import Params -from sat.memory.disco import Discovery -from sat.memory.crypto import BlockCipher -from sat.memory.crypto import PasswordHasher -from sat.tools import config as tools_config -from sat.tools.common import data_format -from sat.tools.common import regex +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.memory.sqla import Storage +from libervia.backend.memory.persistent import PersistentDict +from libervia.backend.memory.params import Params +from libervia.backend.memory.disco import Discovery +from libervia.backend.memory.crypto import BlockCipher +from libervia.backend.memory.crypto import PasswordHasher +from libervia.backend.tools import config as tools_config +from libervia.backend.tools.common import data_format +from libervia.backend.tools.common import regex log = getLogger(__name__) diff --git a/sat/memory/migration/README b/libervia/backend/memory/migration/README similarity index 100% rename from sat/memory/migration/README rename to libervia/backend/memory/migration/README diff --git a/sat/memory/migration/__init__.py b/libervia/backend/memory/migration/__init__.py similarity index 100% rename from sat/memory/migration/__init__.py rename to libervia/backend/memory/migration/__init__.py diff --git a/sat/memory/migration/alembic.ini b/libervia/backend/memory/migration/alembic.ini similarity index 100% rename from sat/memory/migration/alembic.ini rename to libervia/backend/memory/migration/alembic.ini diff --git a/sat/memory/migration/env.py b/libervia/backend/memory/migration/env.py similarity index 95% rename from sat/memory/migration/env.py rename to libervia/backend/memory/migration/env.py index a144571d..83b95cfb 100644 --- a/sat/memory/migration/env.py +++ b/libervia/backend/memory/migration/env.py @@ -3,8 +3,8 @@ from logging.config import fileConfig from sqlalchemy import pool from sqlalchemy.ext.asyncio import create_async_engine from alembic import context -from sat.memory import sqla_config -from sat.memory.sqla_mapping import Base +from libervia.backend.memory import sqla_config +from libervia.backend.memory.sqla_mapping import Base # this is the Alembic Config object, which provides # access to the values within the .ini file in use. diff --git a/sat/memory/migration/script.py.mako b/libervia/backend/memory/migration/script.py.mako similarity index 100% rename from sat/memory/migration/script.py.mako rename to libervia/backend/memory/migration/script.py.mako diff --git a/sat/memory/migration/versions/129ac51807e4_create_virtual_table_for_full_text_.py b/libervia/backend/memory/migration/versions/129ac51807e4_create_virtual_table_for_full_text_.py similarity index 100% rename from sat/memory/migration/versions/129ac51807e4_create_virtual_table_for_full_text_.py rename to libervia/backend/memory/migration/versions/129ac51807e4_create_virtual_table_for_full_text_.py diff --git a/sat/memory/migration/versions/4b002773cf92_add_origin_id_column_to_history_and_.py b/libervia/backend/memory/migration/versions/4b002773cf92_add_origin_id_column_to_history_and_.py similarity index 100% rename from sat/memory/migration/versions/4b002773cf92_add_origin_id_column_to_history_and_.py rename to libervia/backend/memory/migration/versions/4b002773cf92_add_origin_id_column_to_history_and_.py diff --git a/sat/memory/migration/versions/602caf848068_drop_message_types_table_fix_nullable.py b/libervia/backend/memory/migration/versions/602caf848068_drop_message_types_table_fix_nullable.py similarity index 100% rename from sat/memory/migration/versions/602caf848068_drop_message_types_table_fix_nullable.py rename to libervia/backend/memory/migration/versions/602caf848068_drop_message_types_table_fix_nullable.py diff --git a/sat/memory/migration/versions/79e5f3313fa4_create_table_for_pubsub_subscriptions.py b/libervia/backend/memory/migration/versions/79e5f3313fa4_create_table_for_pubsub_subscriptions.py similarity index 94% rename from sat/memory/migration/versions/79e5f3313fa4_create_table_for_pubsub_subscriptions.py rename to libervia/backend/memory/migration/versions/79e5f3313fa4_create_table_for_pubsub_subscriptions.py index 4bca23b8..3df7a4ff 100644 --- a/sat/memory/migration/versions/79e5f3313fa4_create_table_for_pubsub_subscriptions.py +++ b/libervia/backend/memory/migration/versions/79e5f3313fa4_create_table_for_pubsub_subscriptions.py @@ -7,7 +7,7 @@ Create Date: 2022-03-14 17:15:00.689871 """ from alembic import op import sqlalchemy as sa -from sat.memory.sqla_mapping import JID +from libervia.backend.memory.sqla_mapping import JID # revision identifiers, used by Alembic. diff --git a/sat/memory/migration/versions/8974efc51d22_create_tables_for_pubsub_caching.py b/libervia/backend/memory/migration/versions/8974efc51d22_create_tables_for_pubsub_caching.py similarity index 97% rename from sat/memory/migration/versions/8974efc51d22_create_tables_for_pubsub_caching.py rename to libervia/backend/memory/migration/versions/8974efc51d22_create_tables_for_pubsub_caching.py index 51c3cb29..5497d264 100644 --- a/sat/memory/migration/versions/8974efc51d22_create_tables_for_pubsub_caching.py +++ b/libervia/backend/memory/migration/versions/8974efc51d22_create_tables_for_pubsub_caching.py @@ -7,7 +7,7 @@ Create Date: 2021-07-27 16:38:54.658212 """ from alembic import op import sqlalchemy as sa -from sat.memory.sqla_mapping import JID, Xml +from libervia.backend.memory.sqla_mapping import JID, Xml # revision identifiers, used by Alembic. diff --git a/sat/memory/migration/versions/__init__.py b/libervia/backend/memory/migration/versions/__init__.py similarity index 100% rename from sat/memory/migration/versions/__init__.py rename to libervia/backend/memory/migration/versions/__init__.py diff --git a/sat/memory/params.py b/libervia/backend/memory/params.py similarity index 99% rename from sat/memory/params.py rename to libervia/backend/memory/params.py index 5e124e8b..83c70017 100644 --- a/sat/memory/params.py +++ b/libervia/backend/memory/params.py @@ -16,21 +16,21 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ +from libervia.backend.core.i18n import _, D_ -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.memory.crypto import BlockCipher, PasswordHasher +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.memory.crypto import BlockCipher, PasswordHasher from xml.dom import minidom, NotFoundErr -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.internet import defer from twisted.python.failure import Failure from twisted.words.xish import domish from twisted.words.protocols.jabber import jid -from sat.tools.xml_tools import params_xml_2_xmlui, get_text -from sat.tools.common import data_format +from libervia.backend.tools.xml_tools import params_xml_2_xmlui, get_text +from libervia.backend.tools.common import data_format from xml.sax.saxutils import quoteattr # TODO: params should be rewritten using Twisted directly instead of minidom diff --git a/sat/memory/persistent.py b/libervia/backend/memory/persistent.py similarity index 99% rename from sat/memory/persistent.py rename to libervia/backend/memory/persistent.py index 83f22d60..23f48fce 100644 --- a/sat/memory/persistent.py +++ b/libervia/backend/memory/persistent.py @@ -19,8 +19,8 @@ from twisted.internet import defer from twisted.python import failure -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/memory/sqla.py b/libervia/backend/memory/sqla.py similarity index 99% rename from sat/memory/sqla.py rename to libervia/backend/memory/sqla.py index 3bcb5779..618746c5 100644 --- a/sat/memory/sqla.py +++ b/libervia/backend/memory/sqla.py @@ -48,14 +48,14 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.xish import domish -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.memory import migration -from sat.memory import sqla_config -from sat.memory.sqla_mapping import ( +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.memory import migration +from libervia.backend.memory import sqla_config +from libervia.backend.memory.sqla_mapping import ( Base, Component, File, @@ -75,8 +75,8 @@ from sat.memory.sqla_mapping import ( SyncState, Thread, ) -from sat.tools.common import uri -from sat.tools.utils import aio, as_future +from libervia.backend.tools.common import uri +from libervia.backend.tools.utils import aio, as_future log = getLogger(__name__) diff --git a/sat/memory/sqla_config.py b/libervia/backend/memory/sqla_config.py similarity index 93% rename from sat/memory/sqla_config.py rename to libervia/backend/memory/sqla_config.py index 3fef9783..9e2f2e9e 100644 --- a/sat/memory/sqla_config.py +++ b/libervia/backend/memory/sqla_config.py @@ -18,8 +18,8 @@ from pathlib import Path from urllib.parse import quote -from sat.core.constants import Const as C -from sat.tools import config +from libervia.backend.core.constants import Const as C +from libervia.backend.tools import config def get_db_config() -> dict: diff --git a/sat/memory/sqla_mapping.py b/libervia/backend/memory/sqla_mapping.py similarity index 100% rename from sat/memory/sqla_mapping.py rename to libervia/backend/memory/sqla_mapping.py diff --git a/sat/plugins/__init__.py b/libervia/backend/plugins/__init__.py similarity index 100% rename from sat/plugins/__init__.py rename to libervia/backend/plugins/__init__.py diff --git a/sat/plugins/plugin_adhoc_dbus.py b/libervia/backend/plugins/plugin_adhoc_dbus.py similarity index 99% rename from sat/plugins/plugin_adhoc_dbus.py rename to libervia/backend/plugins/plugin_adhoc_dbus.py index 40eba1ac..58ac0ce1 100644 --- a/sat/plugins/plugin_adhoc_dbus.py +++ b/libervia/backend/plugins/plugin_adhoc_dbus.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import D_, _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import D_, _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.internet import defer diff --git a/sat/plugins/plugin_app_manager_docker/__init__.py b/libervia/backend/plugins/plugin_app_manager_docker/__init__.py similarity index 93% rename from sat/plugins/plugin_app_manager_docker/__init__.py rename to libervia/backend/plugins/plugin_app_manager_docker/__init__.py index 349adac0..14ee9ee6 100644 --- a/sat/plugins/plugin_app_manager_docker/__init__.py +++ b/libervia/backend/plugins/plugin_app_manager_docker/__init__.py @@ -18,11 +18,11 @@ from pathlib import Path from twisted.python.procutils import which -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger -from sat.tools.common import async_process +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.tools.common import async_process log = getLogger(__name__) diff --git a/sat/plugins/plugin_app_manager_docker/sat_app_weblate.yaml b/libervia/backend/plugins/plugin_app_manager_docker/sat_app_weblate.yaml similarity index 100% rename from sat/plugins/plugin_app_manager_docker/sat_app_weblate.yaml rename to libervia/backend/plugins/plugin_app_manager_docker/sat_app_weblate.yaml diff --git a/sat/plugins/plugin_blog_import.py b/libervia/backend/plugins/plugin_blog_import.py similarity index 98% rename from sat/plugins/plugin_blog_import.py rename to libervia/backend/plugins/plugin_blog_import.py index b47b9b32..f6564ade 100644 --- a/sat/plugins/plugin_blog_import.py +++ b/libervia/backend/plugins/plugin_blog_import.py @@ -18,16 +18,16 @@ # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.internet import defer from twisted.web import client as web_client from twisted.words.xish import domish -from sat.core import exceptions -from sat.tools import xml_tools +from libervia.backend.core import exceptions +from libervia.backend.tools import xml_tools import os import os.path import tempfile diff --git a/sat/plugins/plugin_blog_import_dokuwiki.py b/libervia/backend/plugins/plugin_blog_import_dokuwiki.py similarity index 98% rename from sat/plugins/plugin_blog_import_dokuwiki.py rename to libervia/backend/plugins/plugin_blog_import_dokuwiki.py index 838823d4..052437bc 100644 --- a/sat/plugins/plugin_blog_import_dokuwiki.py +++ b/libervia/backend/plugins/plugin_blog_import_dokuwiki.py @@ -18,13 +18,13 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions -from sat.tools import xml_tools +from libervia.backend.core import exceptions +from libervia.backend.tools import xml_tools from twisted.internet import threads from collections import OrderedDict import calendar diff --git a/sat/plugins/plugin_blog_import_dotclear.py b/libervia/backend/plugins/plugin_blog_import_dotclear.py similarity index 97% rename from sat/plugins/plugin_blog_import_dotclear.py rename to libervia/backend/plugins/plugin_blog_import_dotclear.py index 8d28aba4..1d823635 100644 --- a/sat/plugins/plugin_blog_import_dotclear.py +++ b/libervia/backend/plugins/plugin_blog_import_dotclear.py @@ -17,13 +17,13 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions -from sat.tools.common import data_format +from libervia.backend.core import exceptions +from libervia.backend.tools.common import data_format from twisted.internet import threads from collections import OrderedDict import itertools diff --git a/sat/plugins/plugin_comp_ap_gateway/__init__.py b/libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py similarity index 99% rename from sat/plugins/plugin_comp_ap_gateway/__init__.py rename to libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py index 4aae33f4..58612a72 100644 --- a/sat/plugins/plugin_comp_ap_gateway/__init__.py +++ b/libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py @@ -54,16 +54,16 @@ from twisted.words.protocols.jabber import error, jid from twisted.words.xish import domish from wokkel import pubsub, rsm -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.memory import persistent -from sat.memory.sqla_mapping import History, SubscriptionState -from sat.tools import utils -from sat.tools.common import data_format, date_utils, tls, uri -from sat.tools.common.async_utils import async_lru +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.memory import persistent +from libervia.backend.memory.sqla_mapping import History, SubscriptionState +from libervia.backend.tools import utils +from libervia.backend.tools.common import data_format, date_utils, tls, uri +from libervia.backend.tools.common.async_utils import async_lru from .ad_hoc import APAdHocService from .events import APEvents @@ -2463,7 +2463,7 @@ class APGateway: comment_node = parent_item_parsed["comments"][0]["node"] except (KeyError, IndexError): # we don't have a comment node set for this item - from sat.tools.xml_tools import pp_elt + from libervia.backend.tools.xml_tools import pp_elt log.info(f"{pp_elt(parent_item_elt.toXml())}") raise NotImplementedError() else: diff --git a/sat/plugins/plugin_comp_ap_gateway/ad_hoc.py b/libervia/backend/plugins/plugin_comp_ap_gateway/ad_hoc.py similarity index 93% rename from sat/plugins/plugin_comp_ap_gateway/ad_hoc.py rename to libervia/backend/plugins/plugin_comp_ap_gateway/ad_hoc.py index 7e217578..96b93668 100644 --- a/sat/plugins/plugin_comp_ap_gateway/ad_hoc.py +++ b/libervia/backend/plugins/plugin_comp_ap_gateway/ad_hoc.py @@ -20,10 +20,10 @@ from twisted.words.protocols.jabber import jid from twisted.words.xish import domish from wokkel import data_form -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_comp_ap_gateway/constants.py b/libervia/backend/plugins/plugin_comp_ap_gateway/constants.py similarity index 100% rename from sat/plugins/plugin_comp_ap_gateway/constants.py rename to libervia/backend/plugins/plugin_comp_ap_gateway/constants.py diff --git a/sat/plugins/plugin_comp_ap_gateway/events.py b/libervia/backend/plugins/plugin_comp_ap_gateway/events.py similarity index 98% rename from sat/plugins/plugin_comp_ap_gateway/events.py rename to libervia/backend/plugins/plugin_comp_ap_gateway/events.py index 6a57ed52..ee7a14cd 100644 --- a/sat/plugins/plugin_comp_ap_gateway/events.py +++ b/libervia/backend/plugins/plugin_comp_ap_gateway/events.py @@ -25,10 +25,10 @@ import shortuuid from twisted.words.xish import domish from twisted.words.protocols.jabber import jid -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core import exceptions -from sat.tools.common import date_utils, uri +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.tools.common import date_utils, uri from .constants import NS_AP_PUBLIC, TYPE_ACTOR, TYPE_EVENT, TYPE_ITEM diff --git a/sat/plugins/plugin_comp_ap_gateway/http_server.py b/libervia/backend/plugins/plugin_comp_ap_gateway/http_server.py similarity index 99% rename from sat/plugins/plugin_comp_ap_gateway/http_server.py rename to libervia/backend/plugins/plugin_comp_ap_gateway/http_server.py index e90febba..771a4396 100644 --- a/sat/plugins/plugin_comp_ap_gateway/http_server.py +++ b/libervia/backend/plugins/plugin_comp_ap_gateway/http_server.py @@ -32,13 +32,13 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid, error from wokkel import pubsub, rsm -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.core_types import SatXMPPEntity -from sat.core.log import getLogger -from sat.tools.common import date_utils, uri -from sat.memory.sqla_mapping import SubscriptionState +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.log import getLogger +from libervia.backend.tools.common import date_utils, uri +from libervia.backend.memory.sqla_mapping import SubscriptionState from .constants import ( NS_AP, MEDIA_TYPE_AP, CONTENT_TYPE_AP, TYPE_ACTOR, TYPE_INBOX, TYPE_SHARED_INBOX, diff --git a/sat/plugins/plugin_comp_ap_gateway/pubsub_service.py b/libervia/backend/plugins/plugin_comp_ap_gateway/pubsub_service.py similarity index 97% rename from sat/plugins/plugin_comp_ap_gateway/pubsub_service.py rename to libervia/backend/plugins/plugin_comp_ap_gateway/pubsub_service.py index ccf22824..4dcb0de8 100644 --- a/sat/plugins/plugin_comp_ap_gateway/pubsub_service.py +++ b/libervia/backend/plugins/plugin_comp_ap_gateway/pubsub_service.py @@ -27,15 +27,15 @@ from twisted.words.protocols.jabber import jid, error from twisted.words.xish import domish from wokkel import rsm, pubsub, disco -from sat.core.i18n import _ -from sat.core import exceptions -from sat.core.core_types import SatXMPPEntity -from sat.core.log import getLogger -from sat.core.constants import Const as C -from sat.tools import image -from sat.tools.utils import ensure_deferred -from sat.tools.web import download_file -from sat.memory.sqla_mapping import PubsubSub, SubscriptionState +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.tools import image +from libervia.backend.tools.utils import ensure_deferred +from libervia.backend.tools.web import download_file +from libervia.backend.memory.sqla_mapping import PubsubSub, SubscriptionState from .constants import ( TYPE_ACTOR, diff --git a/sat/plugins/plugin_comp_ap_gateway/regex.py b/libervia/backend/plugins/plugin_comp_ap_gateway/regex.py similarity index 100% rename from sat/plugins/plugin_comp_ap_gateway/regex.py rename to libervia/backend/plugins/plugin_comp_ap_gateway/regex.py diff --git a/sat/plugins/plugin_comp_file_sharing.py b/libervia/backend/plugins/plugin_comp_file_sharing.py similarity index 98% rename from sat/plugins/plugin_comp_file_sharing.py rename to libervia/backend/plugins/plugin_comp_file_sharing.py index ec4f7e91..f6905e27 100644 --- a/sat/plugins/plugin_comp_file_sharing.py +++ b/libervia/backend/plugins/plugin_comp_file_sharing.py @@ -25,18 +25,18 @@ import shortuuid import unicodedata from urllib.parse import urljoin, urlparse, quote, unquote from pathlib import Path -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger -from sat.tools import stream -from sat.tools import video -from sat.tools.utils import ensure_deferred -from sat.tools.common import regex -from sat.tools.common import uri -from sat.tools.common import files_utils -from sat.tools.common import utils -from sat.tools.common import tls +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.tools import stream +from libervia.backend.tools import video +from libervia.backend.tools.utils import ensure_deferred +from libervia.backend.tools.common import regex +from libervia.backend.tools.common import uri +from libervia.backend.tools.common import files_utils +from libervia.backend.tools.common import utils +from libervia.backend.tools.common import tls from twisted.internet import defer, reactor from twisted.words.protocols.jabber import error from twisted.web import server, resource, static, http diff --git a/sat/plugins/plugin_comp_file_sharing_management.py b/libervia/backend/plugins/plugin_comp_file_sharing_management.py similarity index 98% rename from sat/plugins/plugin_comp_file_sharing_management.py rename to libervia/backend/plugins/plugin_comp_file_sharing_management.py index 4e6b4ceb..10306cd3 100644 --- a/sat/plugins/plugin_comp_file_sharing_management.py +++ b/libervia/backend/plugins/plugin_comp_file_sharing_management.py @@ -21,11 +21,11 @@ from functools import partial from wokkel import data_form from twisted.internet import defer from twisted.words.protocols.jabber import jid -from sat.core.i18n import _, D_ -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.tools.common import utils +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.tools.common import utils log = getLogger(__name__) diff --git a/sat/plugins/plugin_dbg_manhole.py b/libervia/backend/plugins/plugin_dbg_manhole.py similarity index 94% rename from sat/plugins/plugin_dbg_manhole.py rename to libervia/backend/plugins/plugin_dbg_manhole.py index b47ca472..6b8d6857 100644 --- a/sat/plugins/plugin_dbg_manhole.py +++ b/libervia/backend/plugins/plugin_dbg_manhole.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger from twisted.conch.insults import insults from twisted.conch.telnet import TelnetTransport, TelnetBootstrapProtocol from twisted.internet import reactor, protocol, defer diff --git a/sat/plugins/plugin_exp_command_export.py b/libervia/backend/plugins/plugin_exp_command_export.py similarity index 96% rename from sat/plugins/plugin_exp_command_export.py rename to libervia/backend/plugins/plugin_exp_command_export.py index 2f480e83..7aaae5a4 100644 --- a/sat/plugins/plugin_exp_command_export.py +++ b/libervia/backend/plugins/plugin_exp_command_export.py @@ -17,16 +17,16 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.words.protocols.jabber import jid from twisted.internet import reactor, protocol -from sat.tools import trigger -from sat.tools.utils import clean_ustr +from libervia.backend.tools import trigger +from libervia.backend.tools.utils import clean_ustr PLUGIN_INFO = { C.PI_NAME: "Command export plugin", diff --git a/sat/plugins/plugin_exp_invitation.py b/libervia/backend/plugins/plugin_exp_invitation.py similarity index 97% rename from sat/plugins/plugin_exp_invitation.py rename to libervia/backend/plugins/plugin_exp_invitation.py index 7b117b4e..5417f6fa 100644 --- a/sat/plugins/plugin_exp_invitation.py +++ b/libervia/backend/plugins/plugin_exp_invitation.py @@ -22,12 +22,12 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from wokkel import disco, iwokkel -from sat.core.i18n import _ -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.core.xmpp import SatXMPPEntity -from sat.tools import utils +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.tools import utils log = getLogger(__name__) diff --git a/sat/plugins/plugin_exp_invitation_file.py b/libervia/backend/plugins/plugin_exp_invitation_file.py similarity index 93% rename from sat/plugins/plugin_exp_invitation_file.py rename to libervia/backend/plugins/plugin_exp_invitation_file.py index 993a8360..80f0f711 100644 --- a/sat/plugins/plugin_exp_invitation_file.py +++ b/libervia/backend/plugins/plugin_exp_invitation_file.py @@ -16,11 +16,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.core.xmpp import SatXMPPEntity -from sat.tools.common import data_format +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.tools.common import data_format from twisted.internet import defer from twisted.words.protocols.jabber import jid diff --git a/sat/plugins/plugin_exp_invitation_pubsub.py b/libervia/backend/plugins/plugin_exp_invitation_pubsub.py similarity index 94% rename from sat/plugins/plugin_exp_invitation_pubsub.py rename to libervia/backend/plugins/plugin_exp_invitation_pubsub.py index b8739269..0a9718f8 100644 --- a/sat/plugins/plugin_exp_invitation_pubsub.py +++ b/libervia/backend/plugins/plugin_exp_invitation_pubsub.py @@ -20,12 +20,12 @@ from typing import Optional from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.xish import domish -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.core.xmpp import SatXMPPEntity -from sat.tools import utils -from sat.tools.common import data_format +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.tools import utils +from libervia.backend.tools.common import data_format log = getLogger(__name__) diff --git a/sat/plugins/plugin_exp_jingle_stream.py b/libervia/backend/plugins/plugin_exp_jingle_stream.py similarity index 97% rename from sat/plugins/plugin_exp_jingle_stream.py rename to libervia/backend/plugins/plugin_exp_jingle_stream.py index 1066185a..fce3ccc9 100644 --- a/sat/plugins/plugin_exp_jingle_stream.py +++ b/libervia/backend/plugins/plugin_exp_jingle_stream.py @@ -27,12 +27,12 @@ from twisted.internet import endpoints from twisted.internet import reactor from twisted.internet import error from twisted.internet import interfaces -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger -from sat.tools import xml_tools -from sat.tools import stream +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xml_tools +from libervia.backend.tools import stream log = getLogger(__name__) diff --git a/sat/plugins/plugin_exp_lang_detect.py b/libervia/backend/plugins/plugin_exp_lang_detect.py similarity index 94% rename from sat/plugins/plugin_exp_lang_detect.py rename to libervia/backend/plugins/plugin_exp_lang_detect.py index 6bc244ba..8011cd19 100644 --- a/sat/plugins/plugin_exp_lang_detect.py +++ b/libervia/backend/plugins/plugin_exp_lang_detect.py @@ -17,12 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions +from libervia.backend.core import exceptions try: from langid.langid import LanguageIdentifier, model diff --git a/sat/plugins/plugin_exp_list_of_interest.py b/libervia/backend/plugins/plugin_exp_list_of_interest.py similarity index 97% rename from sat/plugins/plugin_exp_list_of_interest.py rename to libervia/backend/plugins/plugin_exp_list_of_interest.py index da4afbdd..3b8a8e4d 100644 --- a/sat/plugins/plugin_exp_list_of_interest.py +++ b/libervia/backend/plugins/plugin_exp_list_of_interest.py @@ -17,13 +17,13 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.xmpp import SatXMPPEntity -from sat.core import exceptions -from sat.core.log import getLogger -from sat.tools.common import data_format -from sat.tools.common import uri +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.tools.common import data_format +from libervia.backend.tools.common import uri from wokkel import disco, iwokkel, pubsub from zope.interface import implementer from twisted.internet import defer diff --git a/sat/plugins/plugin_exp_parrot.py b/libervia/backend/plugins/plugin_exp_parrot.py similarity index 97% rename from sat/plugins/plugin_exp_parrot.py rename to libervia/backend/plugins/plugin_exp_parrot.py index 4d7387ba..43b5af32 100644 --- a/sat/plugins/plugin_exp_parrot.py +++ b/libervia/backend/plugins/plugin_exp_parrot.py @@ -17,14 +17,14 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.words.protocols.jabber import jid -from sat.core.exceptions import UnknownEntityError +from libervia.backend.core.exceptions import UnknownEntityError # from sat.tools import trigger diff --git a/sat/plugins/plugin_exp_pubsub_admin.py b/libervia/backend/plugins/plugin_exp_pubsub_admin.py similarity index 93% rename from sat/plugins/plugin_exp_pubsub_admin.py rename to libervia/backend/plugins/plugin_exp_pubsub_admin.py index 1737bb5f..43428400 100644 --- a/sat/plugins/plugin_exp_pubsub_admin.py +++ b/libervia/backend/plugins/plugin_exp_pubsub_admin.py @@ -17,11 +17,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.tools.common import data_format +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.tools.common import data_format from twisted.words.protocols.jabber import jid from wokkel import pubsub from wokkel import generic diff --git a/sat/plugins/plugin_exp_pubsub_hook.py b/libervia/backend/plugins/plugin_exp_pubsub_hook.py similarity index 97% rename from sat/plugins/plugin_exp_pubsub_hook.py rename to libervia/backend/plugins/plugin_exp_pubsub_hook.py index 2654aad1..8e6da70d 100644 --- a/sat/plugins/plugin_exp_pubsub_hook.py +++ b/libervia/backend/plugins/plugin_exp_pubsub_hook.py @@ -17,11 +17,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger -from sat.memory import persistent +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.memory import persistent from twisted.words.protocols.jabber import jid from twisted.internet import defer diff --git a/sat/plugins/plugin_import.py b/libervia/backend/plugins/plugin_import.py similarity index 98% rename from sat/plugins/plugin_import.py rename to libervia/backend/plugins/plugin_import.py index 18e5a35a..10952e19 100644 --- a/sat/plugins/plugin_import.py +++ b/libervia/backend/plugins/plugin_import.py @@ -17,13 +17,13 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.internet import defer -from sat.core import exceptions +from libervia.backend.core import exceptions from twisted.words.protocols.jabber import jid from functools import partial import collections diff --git a/sat/plugins/plugin_merge_req_mercurial.py b/libervia/backend/plugins/plugin_merge_req_mercurial.py similarity index 95% rename from sat/plugins/plugin_merge_req_mercurial.py rename to libervia/backend/plugins/plugin_merge_req_mercurial.py index 3b7f193a..e58f9d41 100644 --- a/sat/plugins/plugin_merge_req_mercurial.py +++ b/libervia/backend/plugins/plugin_merge_req_mercurial.py @@ -18,12 +18,12 @@ import re from twisted.python.procutils import which -from sat.tools.common import async_process -from sat.tools import utils -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger +from libervia.backend.tools.common import async_process +from libervia.backend.tools import utils +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_account.py b/libervia/backend/plugins/plugin_misc_account.py similarity index 98% rename from sat/plugins/plugin_misc_account.py rename to libervia/backend/plugins/plugin_misc_account.py index 2243a9be..c44cb4a4 100644 --- a/sat/plugins/plugin_misc_account.py +++ b/libervia/backend/plugins/plugin_misc_account.py @@ -16,19 +16,19 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.log import getLogger -from sat.core import exceptions -from sat.tools import xml_tools -from sat.memory.memory import Sessions -from sat.memory.crypto import PasswordHasher -from sat.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.tools import xml_tools +from libervia.backend.memory.memory import Sessions +from libervia.backend.memory.crypto import PasswordHasher +from libervia.backend.core.constants import Const as C import configparser from twisted.internet import defer from twisted.python.failure import Failure from twisted.words.protocols.jabber import jid -from sat.tools.common import email as sat_email +from libervia.backend.tools.common import email as sat_email log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_android.py b/libervia/backend/plugins/plugin_misc_android.py similarity index 98% rename from sat/plugins/plugin_misc_android.py rename to libervia/backend/plugins/plugin_misc_android.py index 8f8137cc..e3e1f932 100644 --- a/sat/plugins/plugin_misc_android.py +++ b/libervia/backend/plugins/plugin_misc_android.py @@ -30,12 +30,12 @@ from twisted.internet import protocol from twisted.internet import abstract from twisted.internet import error as int_error from twisted.internet import _sslverify -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.core import exceptions -from sat.tools.common import async_process -from sat.memory import params +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.tools.common import async_process +from libervia.backend.memory import params log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_app_manager.py b/libervia/backend/plugins/plugin_misc_app_manager.py similarity index 98% rename from sat/plugins/plugin_misc_app_manager.py rename to libervia/backend/plugins/plugin_misc_app_manager.py index dc91ebb5..f72e4da0 100644 --- a/sat/plugins/plugin_misc_app_manager.py +++ b/libervia/backend/plugins/plugin_misc_app_manager.py @@ -25,12 +25,12 @@ import string import shortuuid from twisted.internet import defer from twisted.python.procutils import which -from sat.core.i18n import _ -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.tools.common import data_format -from sat.tools.common import async_process +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.tools.common import data_format +from libervia.backend.tools.common import async_process log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_attach.py b/libervia/backend/plugins/plugin_misc_attach.py similarity index 96% rename from sat/plugins/plugin_misc_attach.py rename to libervia/backend/plugins/plugin_misc_attach.py index 3117ff1a..dfcd9c52 100644 --- a/sat/plugins/plugin_misc_attach.py +++ b/libervia/backend/plugins/plugin_misc_attach.py @@ -25,13 +25,13 @@ from typing import Callable, Optional from twisted.internet import defer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.tools import utils -from sat.tools import image +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import utils +from libervia.backend.tools import image log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_debug.py b/libervia/backend/plugins/plugin_misc_debug.py similarity index 93% rename from sat/plugins/plugin_misc_debug.py rename to libervia/backend/plugins/plugin_misc_debug.py index 8c208328..d5c83b35 100644 --- a/sat/plugins/plugin_misc_debug.py +++ b/libervia/backend/plugins/plugin_misc_debug.py @@ -17,9 +17,9 @@ # along with this program. If not, see . import json -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.constants import Const as C log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_download.py b/libervia/backend/plugins/plugin_misc_download.py similarity index 96% rename from sat/plugins/plugin_misc_download.py rename to libervia/backend/plugins/plugin_misc_download.py index fce330a7..a80f7a2e 100644 --- a/sat/plugins/plugin_misc_download.py +++ b/libervia/backend/plugins/plugin_misc_download.py @@ -25,15 +25,15 @@ import treq from twisted.internet import defer from twisted.words.protocols.jabber import error as jabber_error -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import D_, _ -from sat.core.log import getLogger -from sat.tools import xml_tools -from sat.tools import stream -from sat.tools.common import data_format -from sat.tools.web import treq_client_no_ssl +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import D_, _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xml_tools +from libervia.backend.tools import stream +from libervia.backend.tools.common import data_format +from libervia.backend.tools.web import treq_client_no_ssl log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_email_invitation.py b/libervia/backend/plugins/plugin_misc_email_invitation.py similarity index 98% rename from sat/plugins/plugin_misc_email_invitation.py rename to libervia/backend/plugins/plugin_misc_email_invitation.py index 1316041a..1f08b55f 100644 --- a/sat/plugins/plugin_misc_email_invitation.py +++ b/libervia/backend/plugins/plugin_misc_email_invitation.py @@ -22,14 +22,14 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import error from twisted.words.protocols.jabber import sasl -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger -from sat.tools import utils -from sat.tools.common import data_format -from sat.memory import persistent -from sat.tools.common import email as sat_email +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.tools import utils +from libervia.backend.tools.common import data_format +from libervia.backend.memory import persistent +from libervia.backend.tools.common import email as sat_email log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_extra_pep.py b/libervia/backend/plugins/plugin_misc_extra_pep.py similarity index 92% rename from sat/plugins/plugin_misc_extra_pep.py rename to libervia/backend/plugins/plugin_misc_extra_pep.py index fd12e9d0..7ff3ea0b 100644 --- a/sat/plugins/plugin_misc_extra_pep.py +++ b/libervia/backend/plugins/plugin_misc_extra_pep.py @@ -17,12 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.memory import params +from libervia.backend.memory import params from twisted.words.protocols.jabber import jid diff --git a/sat/plugins/plugin_misc_file.py b/libervia/backend/plugins/plugin_misc_file.py similarity index 97% rename from sat/plugins/plugin_misc_file.py rename to libervia/backend/plugins/plugin_misc_file.py index ebaa8ed4..c7246f66 100644 --- a/sat/plugins/plugin_misc_file.py +++ b/libervia/backend/plugins/plugin_misc_file.py @@ -22,14 +22,14 @@ import os.path from functools import partial from twisted.internet import defer from twisted.words.protocols.jabber import jid -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.core import exceptions -from sat.tools import xml_tools -from sat.tools import stream -from sat.tools import utils -from sat.tools.common import data_format, utils as common_utils +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.tools import xml_tools +from libervia.backend.tools import stream +from libervia.backend.tools import utils +from libervia.backend.tools.common import data_format, utils as common_utils log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_forums.py b/libervia/backend/plugins/plugin_misc_forums.py similarity index 98% rename from sat/plugins/plugin_misc_forums.py rename to libervia/backend/plugins/plugin_misc_forums.py index 0c2288c9..252f4bd6 100644 --- a/sat/plugins/plugin_misc_forums.py +++ b/libervia/backend/plugins/plugin_misc_forums.py @@ -17,11 +17,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger -from sat.tools.common import uri, data_format +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.tools.common import uri, data_format from twisted.words.protocols.jabber import jid from twisted.words.xish import domish from twisted.internet import defer diff --git a/sat/plugins/plugin_misc_groupblog.py b/libervia/backend/plugins/plugin_misc_groupblog.py similarity index 96% rename from sat/plugins/plugin_misc_groupblog.py rename to libervia/backend/plugins/plugin_misc_groupblog.py index 8cab2f53..f86bced1 100644 --- a/sat/plugins/plugin_misc_groupblog.py +++ b/libervia/backend/plugins/plugin_misc_groupblog.py @@ -17,13 +17,13 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.internet import defer -from sat.core import exceptions +from libervia.backend.core import exceptions from wokkel import disco, data_form, iwokkel from zope.interface import implementer diff --git a/sat/plugins/plugin_misc_identity.py b/libervia/backend/plugins/plugin_misc_identity.py similarity index 98% rename from sat/plugins/plugin_misc_identity.py rename to libervia/backend/plugins/plugin_misc_identity.py index 4ed2d477..99841eb1 100644 --- a/sat/plugins/plugin_misc_identity.py +++ b/libervia/backend/plugins/plugin_misc_identity.py @@ -25,15 +25,15 @@ from typing import Any, Coroutine, Dict, List, Optional, Union from twisted.internet import defer, threads from twisted.words.protocols.jabber import jid -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.xmpp import SatXMPPEntity -from sat.memory import persistent -from sat.tools import image -from sat.tools import utils -from sat.tools.common import data_format +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.memory import persistent +from libervia.backend.tools import image +from libervia.backend.tools import utils +from libervia.backend.tools.common import data_format try: from PIL import Image diff --git a/sat/plugins/plugin_misc_ip.py b/libervia/backend/plugins/plugin_misc_ip.py similarity index 98% rename from sat/plugins/plugin_misc_ip.py rename to libervia/backend/plugins/plugin_misc_ip.py index c20c2760..26197bbb 100644 --- a/sat/plugins/plugin_misc_ip.py +++ b/libervia/backend/plugins/plugin_misc_ip.py @@ -18,10 +18,10 @@ # along with this program. If not, see . import urllib.parse -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.tools import xml_tools +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xml_tools from wokkel import disco, iwokkel from twisted.web import client as webclient from twisted.web import error as web_error diff --git a/sat/plugins/plugin_misc_lists.py b/libervia/backend/plugins/plugin_misc_lists.py similarity index 98% rename from sat/plugins/plugin_misc_lists.py rename to libervia/backend/plugins/plugin_misc_lists.py index 9526ffb9..1ee86ab8 100644 --- a/sat/plugins/plugin_misc_lists.py +++ b/libervia/backend/plugins/plugin_misc_lists.py @@ -20,13 +20,13 @@ from typing import List, Tuple, Optional from twisted.internet import defer from twisted.words.xish import domish from twisted.words.protocols.jabber import jid -from sat.core.i18n import _, D_ -from sat.core.xmpp import SatXMPPEntity -from sat.core.constants import Const as C -from sat.tools import xml_tools -from sat.tools.common import uri -from sat.tools.common import data_format -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.core.constants import Const as C +from libervia.backend.tools import xml_tools +from libervia.backend.tools.common import uri +from libervia.backend.tools.common import data_format +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_merge_requests.py b/libervia/backend/plugins/plugin_misc_merge_requests.py similarity index 98% rename from sat/plugins/plugin_misc_merge_requests.py rename to libervia/backend/plugins/plugin_misc_merge_requests.py index a6ed4159..7e13537c 100644 --- a/sat/plugins/plugin_misc_merge_requests.py +++ b/libervia/backend/plugins/plugin_misc_merge_requests.py @@ -20,11 +20,11 @@ from collections import namedtuple from twisted.internet import defer from twisted.words.protocols.jabber import jid -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.tools.common import data_format -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.tools.common import data_format +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_nat_port.py b/libervia/backend/plugins/plugin_misc_nat_port.py similarity index 97% rename from sat/plugins/plugin_misc_nat_port.py rename to libervia/backend/plugins/plugin_misc_nat_port.py index 926d6853..10aac421 100644 --- a/sat/plugins/plugin_misc_nat_port.py +++ b/libervia/backend/plugins/plugin_misc_nat_port.py @@ -17,12 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions +from libervia.backend.core import exceptions from twisted.internet import threads from twisted.internet import defer from twisted.python import failure diff --git a/sat/plugins/plugin_misc_quiz.py b/libervia/backend/plugins/plugin_misc_quiz.py similarity index 99% rename from sat/plugins/plugin_misc_quiz.py rename to libervia/backend/plugins/plugin_misc_quiz.py index e87b8acc..841833fa 100644 --- a/sat/plugins/plugin_misc_quiz.py +++ b/libervia/backend/plugins/plugin_misc_quiz.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.words.xish import domish diff --git a/sat/plugins/plugin_misc_radiocol.py b/libervia/backend/plugins/plugin_misc_radiocol.py similarity index 98% rename from sat/plugins/plugin_misc_radiocol.py rename to libervia/backend/plugins/plugin_misc_radiocol.py index 81ba48e0..5de7e06d 100644 --- a/sat/plugins/plugin_misc_radiocol.py +++ b/libervia/backend/plugins/plugin_misc_radiocol.py @@ -17,16 +17,16 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.words.xish import domish from twisted.internet import reactor from twisted.words.protocols.jabber import jid from twisted.internet import defer -from sat.core import exceptions +from libervia.backend.core import exceptions import os.path import copy import time diff --git a/sat/plugins/plugin_misc_register_account.py b/libervia/backend/plugins/plugin_misc_register_account.py similarity index 94% rename from sat/plugins/plugin_misc_register_account.py rename to libervia/backend/plugins/plugin_misc_register_account.py index 971ca071..00731cc3 100644 --- a/sat/plugins/plugin_misc_register_account.py +++ b/libervia/backend/plugins/plugin_misc_register_account.py @@ -18,15 +18,15 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core.constants import Const as C +from libervia.backend.core.constants import Const as C from twisted.words.protocols.jabber import jid -from sat.memory.memory import Sessions -from sat.tools import xml_tools -from sat.tools.xml_tools import SAT_FORM_PREFIX, SAT_PARAM_SEPARATOR +from libervia.backend.memory.memory import Sessions +from libervia.backend.tools import xml_tools +from libervia.backend.tools.xml_tools import SAT_FORM_PREFIX, SAT_PARAM_SEPARATOR PLUGIN_INFO = { diff --git a/sat/plugins/plugin_misc_room_game.py b/libervia/backend/plugins/plugin_misc_room_game.py similarity index 99% rename from sat/plugins/plugin_misc_room_game.py rename to libervia/backend/plugins/plugin_misc_room_game.py index 1a0ec81f..f719bfb0 100644 --- a/sat/plugins/plugin_misc_room_game.py +++ b/libervia/backend/plugins/plugin_misc_room_game.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.words.protocols.jabber import jid diff --git a/sat/plugins/plugin_misc_static_blog.py b/libervia/backend/plugins/plugin_misc_static_blog.py similarity index 94% rename from sat/plugins/plugin_misc_static_blog.py rename to libervia/backend/plugins/plugin_misc_static_blog.py index 2e5986a3..6c5f8311 100644 --- a/sat/plugins/plugin_misc_static_blog.py +++ b/libervia/backend/plugins/plugin_misc_static_blog.py @@ -17,14 +17,14 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.tools import xml_tools +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.tools import xml_tools from twisted.internet import defer from twisted.words.protocols.jabber import jid diff --git a/sat/plugins/plugin_misc_tarot.py b/libervia/backend/plugins/plugin_misc_tarot.py similarity index 99% rename from sat/plugins/plugin_misc_tarot.py rename to libervia/backend/plugins/plugin_misc_tarot.py index d662c892..73c26892 100644 --- a/sat/plugins/plugin_misc_tarot.py +++ b/libervia/backend/plugins/plugin_misc_tarot.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.words.xish import domish @@ -27,8 +27,8 @@ from twisted.words.protocols.jabber import jid from twisted.internet import defer from wokkel import data_form -from sat.memory import memory -from sat.tools import xml_tools +from libervia.backend.memory import memory +from libervia.backend.tools import xml_tools from sat_frontends.tools.games import TarotCard import random diff --git a/sat/plugins/plugin_misc_text_commands.py b/libervia/backend/plugins/plugin_misc_text_commands.py similarity index 98% rename from sat/plugins/plugin_misc_text_commands.py rename to libervia/backend/plugins/plugin_misc_text_commands.py index 2d0ff040..2223b63d 100644 --- a/sat/plugins/plugin_misc_text_commands.py +++ b/libervia/backend/plugins/plugin_misc_text_commands.py @@ -20,11 +20,11 @@ from twisted.words.protocols.jabber import jid from twisted.internet import defer from twisted.python import failure -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger -from sat.tools import utils +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.tools import utils log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_text_syntaxes.py b/libervia/backend/plugins/plugin_misc_text_syntaxes.py similarity index 98% rename from sat/plugins/plugin_misc_text_syntaxes.py rename to libervia/backend/plugins/plugin_misc_text_syntaxes.py index 65fbabe5..4bb52a01 100644 --- a/sat/plugins/plugin_misc_text_syntaxes.py +++ b/libervia/backend/plugins/plugin_misc_text_syntaxes.py @@ -25,11 +25,11 @@ from typing import Set from twisted.internet import defer from twisted.internet.threads import deferToThread -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.i18n import D_, _ -from sat.core.log import getLogger -from sat.tools import xml_tools +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import D_, _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xml_tools try: from lxml import html diff --git a/sat/plugins/plugin_misc_upload.py b/libervia/backend/plugins/plugin_misc_upload.py similarity index 95% rename from sat/plugins/plugin_misc_upload.py rename to libervia/backend/plugins/plugin_misc_upload.py index 61ca3c7e..401c0f60 100644 --- a/sat/plugins/plugin_misc_upload.py +++ b/libervia/backend/plugins/plugin_misc_upload.py @@ -25,13 +25,13 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import error as jabber_error -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import D_, _ -from sat.core.log import getLogger -from sat.tools import xml_tools -from sat.tools.common import data_format +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import D_, _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xml_tools +from libervia.backend.tools.common import data_format log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_uri_finder.py b/libervia/backend/plugins/plugin_misc_uri_finder.py similarity index 96% rename from sat/plugins/plugin_misc_uri_finder.py rename to libervia/backend/plugins/plugin_misc_uri_finder.py index 89aa0046..1a82ebd9 100644 --- a/sat/plugins/plugin_misc_uri_finder.py +++ b/libervia/backend/plugins/plugin_misc_uri_finder.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger from twisted.internet import defer import textwrap log = getLogger(__name__) diff --git a/sat/plugins/plugin_misc_watched.py b/libervia/backend/plugins/plugin_misc_watched.py similarity index 92% rename from sat/plugins/plugin_misc_watched.py rename to libervia/backend/plugins/plugin_misc_watched.py index 18d30844..9b938669 100644 --- a/sat/plugins/plugin_misc_watched.py +++ b/libervia/backend/plugins/plugin_misc_watched.py @@ -17,13 +17,13 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions -from sat.tools import xml_tools +from libervia.backend.core import exceptions +from libervia.backend.tools import xml_tools PLUGIN_INFO = { diff --git a/sat/plugins/plugin_misc_welcome.py b/libervia/backend/plugins/plugin_misc_welcome.py similarity index 94% rename from sat/plugins/plugin_misc_welcome.py rename to libervia/backend/plugins/plugin_misc_welcome.py index fc235dd2..1ea37d54 100644 --- a/sat/plugins/plugin_misc_welcome.py +++ b/libervia/backend/plugins/plugin_misc_welcome.py @@ -17,12 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.tools import xml_tools +from libervia.backend.tools import xml_tools PLUGIN_INFO = { diff --git a/sat/plugins/plugin_misc_xmllog.py b/libervia/backend/plugins/plugin_misc_xmllog.py similarity index 94% rename from sat/plugins/plugin_misc_xmllog.py rename to libervia/backend/plugins/plugin_misc_xmllog.py index c244a4aa..ffbd6d42 100644 --- a/sat/plugins/plugin_misc_xmllog.py +++ b/libervia/backend/plugins/plugin_misc_xmllog.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger from twisted.words.xish import domish from functools import partial diff --git a/sat/plugins/plugin_pubsub_cache.py b/libervia/backend/plugins/plugin_pubsub_cache.py similarity index 98% rename from sat/plugins/plugin_pubsub_cache.py rename to libervia/backend/plugins/plugin_pubsub_cache.py index e4b504e4..656609c4 100644 --- a/sat/plugins/plugin_pubsub_cache.py +++ b/libervia/backend/plugins/plugin_pubsub_cache.py @@ -23,14 +23,14 @@ from twisted.words.protocols.jabber import jid, error from twisted.words.xish import domish from twisted.internet import defer from wokkel import pubsub, rsm -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger -from sat.core.core_types import SatXMPPEntity -from sat.tools import xml_tools, utils -from sat.tools.common import data_format -from sat.memory.sqla import PubsubNode, PubsubItem, SyncState, IntegrityError +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.tools import xml_tools, utils +from libervia.backend.tools.common import data_format +from libervia.backend.memory.sqla import PubsubNode, PubsubItem, SyncState, IntegrityError log = getLogger(__name__) diff --git a/sat/plugins/plugin_sec_aesgcm.py b/libervia/backend/plugins/plugin_sec_aesgcm.py similarity index 97% rename from sat/plugins/plugin_sec_aesgcm.py rename to libervia/backend/plugins/plugin_sec_aesgcm.py index f8172490..e0e50c57 100644 --- a/sat/plugins/plugin_sec_aesgcm.py +++ b/libervia/backend/plugins/plugin_sec_aesgcm.py @@ -28,12 +28,12 @@ from cryptography.hazmat import backends from cryptography.exceptions import AlreadyFinalized import treq from twisted.internet import defer -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.tools import stream -from sat.core.log import getLogger -from sat.tools.web import treq_client_no_ssl +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.tools import stream +from libervia.backend.core.log import getLogger +from libervia.backend.tools.web import treq_client_no_ssl log = getLogger(__name__) diff --git a/sat/plugins/plugin_sec_otr.py b/libervia/backend/plugins/plugin_sec_otr.py similarity index 99% rename from sat/plugins/plugin_sec_otr.py rename to libervia/backend/plugins/plugin_sec_otr.py index e8393d9e..f959f62e 100644 --- a/sat/plugins/plugin_sec_otr.py +++ b/libervia/backend/plugins/plugin_sec_otr.py @@ -25,15 +25,15 @@ import copy import time import uuid from binascii import hexlify, unhexlify -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.core import exceptions -from sat.tools import xml_tools +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.tools import xml_tools from twisted.words.protocols.jabber import jid from twisted.python import failure from twisted.internet import defer -from sat.memory import persistent +from libervia.backend.memory import persistent import potr log = getLogger(__name__) diff --git a/sat/plugins/plugin_sec_oxps.py b/libervia/backend/plugins/plugin_sec_oxps.py similarity index 98% rename from sat/plugins/plugin_sec_oxps.py rename to libervia/backend/plugins/plugin_sec_oxps.py index a3b47a4e..04373e82 100644 --- a/sat/plugins/plugin_sec_oxps.py +++ b/libervia/backend/plugins/plugin_sec_oxps.py @@ -31,17 +31,17 @@ from wokkel import disco, iwokkel from wokkel import rsm from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.memory import persistent -from sat.tools import utils -from sat.tools import xml_tools -from sat.tools.common import data_format -from sat.tools.common import uri -from sat.tools.common.async_utils import async_lru +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.memory import persistent +from libervia.backend.tools import utils +from libervia.backend.tools import xml_tools +from libervia.backend.tools.common import data_format +from libervia.backend.tools.common import uri +from libervia.backend.tools.common.async_utils import async_lru from .plugin_xep_0373 import NS_OX, get_gpg_provider diff --git a/sat/plugins/plugin_sec_pte.py b/libervia/backend/plugins/plugin_sec_pte.py similarity index 96% rename from sat/plugins/plugin_sec_pte.py rename to libervia/backend/plugins/plugin_sec_pte.py index 7b3fbfa1..4889f656 100644 --- a/sat/plugins/plugin_sec_pte.py +++ b/libervia/backend/plugins/plugin_sec_pte.py @@ -25,11 +25,11 @@ from wokkel import disco, iwokkel from wokkel import rsm from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_sec_pubsub_signing.py b/libervia/backend/plugins/plugin_sec_pubsub_signing.py similarity index 97% rename from sat/plugins/plugin_sec_pubsub_signing.py rename to libervia/backend/plugins/plugin_sec_pubsub_signing.py index e23b09c5..c8bd41f1 100644 --- a/sat/plugins/plugin_sec_pubsub_signing.py +++ b/libervia/backend/plugins/plugin_sec_pubsub_signing.py @@ -29,13 +29,13 @@ from wokkel import disco, iwokkel from wokkel import pubsub from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.tools import utils -from sat.tools.common import data_format +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import utils +from libervia.backend.tools.common import data_format from .plugin_xep_0373 import VerificationFailed diff --git a/sat/plugins/plugin_syntax_wiki_dotclear.py b/libervia/backend/plugins/plugin_syntax_wiki_dotclear.py similarity index 98% rename from sat/plugins/plugin_syntax_wiki_dotclear.py rename to libervia/backend/plugins/plugin_syntax_wiki_dotclear.py index ff512084..aa988133 100644 --- a/sat/plugins/plugin_syntax_wiki_dotclear.py +++ b/libervia/backend/plugins/plugin_syntax_wiki_dotclear.py @@ -19,14 +19,14 @@ # XXX: ref used: http://dotclear.org/documentation/2.0/usage/syntaxes#wiki-syntax-and-xhtml-equivalent -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core.constants import Const as C -from sat.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions from twisted.words.xish import domish -from sat.tools import xml_tools +from libervia.backend.tools import xml_tools import copy import re diff --git a/sat/plugins/plugin_tickets_import.py b/libervia/backend/plugins/plugin_tickets_import.py similarity index 96% rename from sat/plugins/plugin_tickets_import.py rename to libervia/backend/plugins/plugin_tickets_import.py index ed4837ed..0e8e672a 100644 --- a/sat/plugins/plugin_tickets_import.py +++ b/libervia/backend/plugins/plugin_tickets_import.py @@ -17,15 +17,15 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.internet import defer -from sat.tools.common import uri -from sat.tools import utils +from libervia.backend.tools.common import uri +from libervia.backend.tools import utils PLUGIN_INFO = { diff --git a/sat/plugins/plugin_tickets_import_bugzilla.py b/libervia/backend/plugins/plugin_tickets_import_bugzilla.py similarity index 95% rename from sat/plugins/plugin_tickets_import_bugzilla.py rename to libervia/backend/plugins/plugin_tickets_import_bugzilla.py index 49bb44ad..6a695414 100644 --- a/sat/plugins/plugin_tickets_import_bugzilla.py +++ b/libervia/backend/plugins/plugin_tickets_import_bugzilla.py @@ -17,18 +17,18 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions +from libervia.backend.core import exceptions # from twisted.internet import threads from twisted.internet import defer import os.path from lxml import etree -from sat.tools.common import date_utils +from libervia.backend.tools.common import date_utils PLUGIN_INFO = { diff --git a/sat/plugins/plugin_tmp_directory_subscription.py b/libervia/backend/plugins/plugin_tmp_directory_subscription.py similarity index 94% rename from sat/plugins/plugin_tmp_directory_subscription.py rename to libervia/backend/plugins/plugin_tmp_directory_subscription.py index b3f19c06..d9188d88 100644 --- a/sat/plugins/plugin_tmp_directory_subscription.py +++ b/libervia/backend/plugins/plugin_tmp_directory_subscription.py @@ -18,9 +18,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0020.py b/libervia/backend/plugins/plugin_xep_0020.py similarity index 96% rename from sat/plugins/plugin_xep_0020.py rename to libervia/backend/plugins/plugin_xep_0020.py index f8874161..02b818bd 100644 --- a/sat/plugins/plugin_xep_0020.py +++ b/libervia/backend/plugins/plugin_xep_0020.py @@ -17,12 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions +from libervia.backend.core import exceptions from twisted.words.xish import domish from zope.interface import implementer diff --git a/sat/plugins/plugin_xep_0033.py b/libervia/backend/plugins/plugin_xep_0033.py similarity index 97% rename from sat/plugins/plugin_xep_0033.py rename to libervia/backend/plugins/plugin_xep_0033.py index 426a6b8c..f2480be6 100644 --- a/sat/plugins/plugin_xep_0033.py +++ b/libervia/backend/plugins/plugin_xep_0033.py @@ -17,12 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions +from libervia.backend.core import exceptions from wokkel import disco, iwokkel from zope.interface import implementer from twisted.words.protocols.jabber.jid import JID @@ -36,7 +36,7 @@ except ImportError: from twisted.words.xish import domish from twisted.internet import defer -from sat.tools import trigger +from libervia.backend.tools import trigger from time import time # TODO: fix Prosody "addressing" plugin to leave the concerned bcc according to the spec: diff --git a/sat/plugins/plugin_xep_0045.py b/libervia/backend/plugins/plugin_xep_0045.py similarity index 99% rename from sat/plugins/plugin_xep_0045.py rename to libervia/backend/plugins/plugin_xep_0045.py index 3406cae1..616fd1a9 100644 --- a/sat/plugins/plugin_xep_0045.py +++ b/libervia/backend/plugins/plugin_xep_0045.py @@ -30,13 +30,13 @@ from wokkel import rsm from wokkel import mam from zope.interface import implementer -from sat.core import exceptions -from sat.core.core_types import SatXMPPEntity -from sat.core.constants import Const as C -from sat.core.i18n import D_, _ -from sat.core.log import getLogger -from sat.memory import memory -from sat.tools import xml_tools, utils +from libervia.backend.core import exceptions +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import D_, _ +from libervia.backend.core.log import getLogger +from libervia.backend.memory import memory +from libervia.backend.tools import xml_tools, utils log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0047.py b/libervia/backend/plugins/plugin_xep_0047.py similarity index 98% rename from sat/plugins/plugin_xep_0047.py rename to libervia/backend/plugins/plugin_xep_0047.py index 948e3fec..1d072bb6 100644 --- a/sat/plugins/plugin_xep_0047.py +++ b/libervia/backend/plugins/plugin_xep_0047.py @@ -17,12 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core.constants import Const as C -from sat.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import xmlstream from twisted.words.protocols.jabber import error diff --git a/sat/plugins/plugin_xep_0048.py b/libervia/backend/plugins/plugin_xep_0048.py similarity index 98% rename from sat/plugins/plugin_xep_0048.py rename to libervia/backend/plugins/plugin_xep_0048.py index 476e3be9..bc2bb627 100644 --- a/sat/plugins/plugin_xep_0048.py +++ b/libervia/backend/plugins/plugin_xep_0048.py @@ -17,12 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.memory.persistent import PersistentBinaryDict -from sat.tools import xml_tools -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.memory.persistent import PersistentBinaryDict +from libervia.backend.tools import xml_tools +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.words.xish import domish diff --git a/sat/plugins/plugin_xep_0049.py b/libervia/backend/plugins/plugin_xep_0049.py similarity index 95% rename from sat/plugins/plugin_xep_0049.py rename to libervia/backend/plugins/plugin_xep_0049.py index 58c8664f..87ea41d2 100644 --- a/sat/plugins/plugin_xep_0049.py +++ b/libervia/backend/plugins/plugin_xep_0049.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from wokkel import compat diff --git a/sat/plugins/plugin_xep_0050.py b/libervia/backend/plugins/plugin_xep_0050.py similarity index 98% rename from sat/plugins/plugin_xep_0050.py rename to libervia/backend/plugins/plugin_xep_0050.py index 011ab236..6a2bc2c9 100644 --- a/sat/plugins/plugin_xep_0050.py +++ b/libervia/backend/plugins/plugin_xep_0050.py @@ -28,14 +28,14 @@ from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish from twisted.internet import defer from wokkel import disco, iwokkel, data_form -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.core.xmpp import SatXMPPEntity -from sat.core import exceptions -from sat.memory.memory import Sessions -from sat.tools import xml_tools, utils -from sat.tools.common import data_format +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.core import exceptions +from libervia.backend.memory.memory import Sessions +from libervia.backend.tools import xml_tools, utils +from libervia.backend.tools.common import data_format log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0054.py b/libervia/backend/plugins/plugin_xep_0054.py similarity index 98% rename from sat/plugins/plugin_xep_0054.py rename to libervia/backend/plugins/plugin_xep_0054.py index 907d478c..e308260d 100644 --- a/sat/plugins/plugin_xep_0054.py +++ b/libervia/backend/plugins/plugin_xep_0054.py @@ -28,13 +28,13 @@ from twisted.words.protocols.jabber import jid, error from twisted.words.xish import domish from twisted.python.failure import Failure from wokkel import disco, iwokkel -from sat.core import exceptions -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.core.xmpp import SatXMPPEntity -from sat.memory import persistent -from sat.tools import image +from libervia.backend.core import exceptions +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.memory import persistent +from libervia.backend.tools import image log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0055.py b/libervia/backend/plugins/plugin_xep_0055.py similarity index 98% rename from sat/plugins/plugin_xep_0055.py rename to libervia/backend/plugins/plugin_xep_0055.py index 21223ad8..fe15d0dd 100644 --- a/sat/plugins/plugin_xep_0055.py +++ b/libervia/backend/plugins/plugin_xep_0055.py @@ -17,8 +17,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.log import getLogger log = getLogger(__name__) @@ -26,9 +26,9 @@ from twisted.words.protocols.jabber.xmlstream import IQ from twisted.words.protocols.jabber import jid from twisted.internet import defer from wokkel import data_form -from sat.core.constants import Const as C -from sat.core.exceptions import DataError -from sat.tools import xml_tools +from libervia.backend.core.constants import Const as C +from libervia.backend.core.exceptions import DataError +from libervia.backend.tools import xml_tools from wokkel import disco, iwokkel diff --git a/sat/plugins/plugin_xep_0059.py b/libervia/backend/plugins/plugin_xep_0059.py similarity index 97% rename from sat/plugins/plugin_xep_0059.py rename to libervia/backend/plugins/plugin_xep_0059.py index 9c167f98..5579db1c 100644 --- a/sat/plugins/plugin_xep_0059.py +++ b/libervia/backend/plugins/plugin_xep_0059.py @@ -23,9 +23,9 @@ from twisted.words.protocols.jabber import xmlstream from wokkel import disco from wokkel import iwokkel from wokkel import rsm -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0060.py b/libervia/backend/plugins/plugin_xep_0060.py similarity index 99% rename from sat/plugins/plugin_xep_0060.py rename to libervia/backend/plugins/plugin_xep_0060.py index 7f1453fc..0176372f 100644 --- a/sat/plugins/plugin_xep_0060.py +++ b/libervia/backend/plugins/plugin_xep_0060.py @@ -34,16 +34,16 @@ from wokkel import rsm from wokkel import mam from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.xmpp import SatXMPPClient -from sat.tools import utils -from sat.tools import sat_defer -from sat.tools import xml_tools -from sat.tools.common import data_format +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.xmpp import SatXMPPClient +from libervia.backend.tools import utils +from libervia.backend.tools import sat_defer +from libervia.backend.tools import xml_tools +from libervia.backend.tools.common import data_format log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0065.py b/libervia/backend/plugins/plugin_xep_0065.py similarity index 99% rename from sat/plugins/plugin_xep_0065.py rename to libervia/backend/plugins/plugin_xep_0065.py index 0240615f..9d3107f7 100644 --- a/sat/plugins/plugin_xep_0065.py +++ b/libervia/backend/plugins/plugin_xep_0065.py @@ -67,11 +67,11 @@ from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import xmlstream from twisted.internet import defer from wokkel import disco, iwokkel -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.tools import sat_defer +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.tools import sat_defer log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0070.py b/libervia/backend/plugins/plugin_xep_0070.py similarity index 96% rename from sat/plugins/plugin_xep_0070.py rename to libervia/backend/plugins/plugin_xep_0070.py index bc26ef73..fa7ba1ba 100644 --- a/sat/plugins/plugin_xep_0070.py +++ b/libervia/backend/plugins/plugin_xep_0070.py @@ -16,14 +16,14 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger from twisted.words.protocols.jabber import xmlstream from twisted.words.protocols import jabber log = getLogger(__name__) -from sat.tools import xml_tools +from libervia.backend.tools import xml_tools from wokkel import disco, iwokkel from zope.interface import implementer diff --git a/sat/plugins/plugin_xep_0071.py b/libervia/backend/plugins/plugin_xep_0071.py similarity index 97% rename from sat/plugins/plugin_xep_0071.py rename to libervia/backend/plugins/plugin_xep_0071.py index 4fca4618..eab577b2 100644 --- a/sat/plugins/plugin_xep_0071.py +++ b/libervia/backend/plugins/plugin_xep_0071.py @@ -17,13 +17,13 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.tools.common import data_format +from libervia.backend.tools.common import data_format from twisted.internet import defer from wokkel import disco, iwokkel diff --git a/sat/plugins/plugin_xep_0077.py b/libervia/backend/plugins/plugin_xep_0077.py similarity index 97% rename from sat/plugins/plugin_xep_0077.py rename to libervia/backend/plugins/plugin_xep_0077.py index 968444b1..ad804b3d 100644 --- a/sat/plugins/plugin_xep_0077.py +++ b/libervia/backend/plugins/plugin_xep_0077.py @@ -20,12 +20,12 @@ from twisted.words.protocols.jabber import jid, xmlstream, client, error as jabber_error from twisted.internet import defer, reactor, ssl from wokkel import data_form -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger -from sat.core.xmpp import SatXMPPEntity -from sat.tools import xml_tools +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.tools import xml_tools log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0080.py b/libervia/backend/plugins/plugin_xep_0080.py similarity index 95% rename from sat/plugins/plugin_xep_0080.py rename to libervia/backend/plugins/plugin_xep_0080.py index f730c6ef..afd63809 100644 --- a/sat/plugins/plugin_xep_0080.py +++ b/libervia/backend/plugins/plugin_xep_0080.py @@ -19,11 +19,11 @@ from typing import Dict, Any from twisted.words.xish import domish -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core import exceptions -from sat.tools import utils +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.tools import utils log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0082.py b/libervia/backend/plugins/plugin_xep_0082.py similarity index 91% rename from sat/plugins/plugin_xep_0082.py rename to libervia/backend/plugins/plugin_xep_0082.py index d062df37..70490beb 100644 --- a/sat/plugins/plugin_xep_0082.py +++ b/libervia/backend/plugins/plugin_xep_0082.py @@ -17,10 +17,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.constants import Const as C -from sat.core.i18n import D_ -from sat.core.sat_main import SAT -from sat.tools import xmpp_datetime +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import D_ +from libervia.backend.core.sat_main import SAT +from libervia.backend.tools import xmpp_datetime __all__ = [ # pylint: disable=unused-variable diff --git a/sat/plugins/plugin_xep_0084.py b/libervia/backend/plugins/plugin_xep_0084.py similarity index 97% rename from sat/plugins/plugin_xep_0084.py rename to libervia/backend/plugins/plugin_xep_0084.py index d5bf96ee..c49d0b2e 100644 --- a/sat/plugins/plugin_xep_0084.py +++ b/libervia/backend/plugins/plugin_xep_0084.py @@ -27,11 +27,11 @@ from twisted.words.xish import domish from zope.interface import implementer from wokkel import disco, iwokkel, pubsub -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.core_types import SatXMPPEntity -from sat.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core import exceptions log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0085.py b/libervia/backend/plugins/plugin_xep_0085.py similarity index 98% rename from sat/plugins/plugin_xep_0085.py rename to libervia/backend/plugins/plugin_xep_0085.py index 141f40eb..3d743dcb 100644 --- a/sat/plugins/plugin_xep_0085.py +++ b/libervia/backend/plugins/plugin_xep_0085.py @@ -17,10 +17,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger log = getLogger(__name__) from wokkel import disco, iwokkel diff --git a/sat/plugins/plugin_xep_0092.py b/libervia/backend/plugins/plugin_xep_0092.py similarity index 94% rename from sat/plugins/plugin_xep_0092.py rename to libervia/backend/plugins/plugin_xep_0092.py index 59c03c62..0aa4b7c3 100644 --- a/sat/plugins/plugin_xep_0092.py +++ b/libervia/backend/plugins/plugin_xep_0092.py @@ -23,11 +23,11 @@ from twisted.internet import defer, reactor from twisted.words.protocols.jabber import jid from wokkel import compat -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0095.py b/libervia/backend/plugins/plugin_xep_0095.py similarity index 97% rename from sat/plugins/plugin_xep_0095.py rename to libervia/backend/plugins/plugin_xep_0095.py index 6e253d13..4ac227b1 100644 --- a/sat/plugins/plugin_xep_0095.py +++ b/libervia/backend/plugins/plugin_xep_0095.py @@ -17,12 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions +from libervia.backend.core import exceptions from twisted.words.protocols.jabber import xmlstream from twisted.words.protocols.jabber import error from zope.interface import implementer diff --git a/sat/plugins/plugin_xep_0096.py b/libervia/backend/plugins/plugin_xep_0096.py similarity index 98% rename from sat/plugins/plugin_xep_0096.py rename to libervia/backend/plugins/plugin_xep_0096.py index 49737b43..bba54fe1 100644 --- a/sat/plugins/plugin_xep_0096.py +++ b/libervia/backend/plugins/plugin_xep_0096.py @@ -22,12 +22,12 @@ from twisted.words.xish import domish from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import error from twisted.internet import defer -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.core import exceptions -from sat.tools import xml_tools -from sat.tools import stream +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.tools import xml_tools +from libervia.backend.tools import stream log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0100.py b/libervia/backend/plugins/plugin_xep_0100.py similarity index 97% rename from sat/plugins/plugin_xep_0100.py rename to libervia/backend/plugins/plugin_xep_0100.py index ff5ece30..fafc1947 100644 --- a/sat/plugins/plugin_xep_0100.py +++ b/libervia/backend/plugins/plugin_xep_0100.py @@ -17,11 +17,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.tools import xml_tools -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.tools import xml_tools +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.words.protocols.jabber import jid diff --git a/sat/plugins/plugin_xep_0103.py b/libervia/backend/plugins/plugin_xep_0103.py similarity index 93% rename from sat/plugins/plugin_xep_0103.py rename to libervia/backend/plugins/plugin_xep_0103.py index 6a326879..f3352bfd 100644 --- a/sat/plugins/plugin_xep_0103.py +++ b/libervia/backend/plugins/plugin_xep_0103.py @@ -19,10 +19,10 @@ from typing import Dict, Any from twisted.words.xish import domish -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0106.py b/libervia/backend/plugins/plugin_xep_0106.py similarity index 95% rename from sat/plugins/plugin_xep_0106.py rename to libervia/backend/plugins/plugin_xep_0106.py index 8791a00a..071595f3 100644 --- a/sat/plugins/plugin_xep_0106.py +++ b/libervia/backend/plugins/plugin_xep_0106.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger from twisted.words.protocols.jabber import xmlstream from zope.interface import implementer from wokkel import disco diff --git a/sat/plugins/plugin_xep_0115.py b/libervia/backend/plugins/plugin_xep_0115.py similarity index 98% rename from sat/plugins/plugin_xep_0115.py rename to libervia/backend/plugins/plugin_xep_0115.py index 87fd07e7..0b5696ca 100644 --- a/sat/plugins/plugin_xep_0115.py +++ b/libervia/backend/plugins/plugin_xep_0115.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.words.xish import domish diff --git a/sat/plugins/plugin_xep_0163.py b/libervia/backend/plugins/plugin_xep_0163.py similarity index 96% rename from sat/plugins/plugin_xep_0163.py rename to libervia/backend/plugins/plugin_xep_0163.py index f3a60654..7f63b2ee 100644 --- a/sat/plugins/plugin_xep_0163.py +++ b/libervia/backend/plugins/plugin_xep_0163.py @@ -18,16 +18,16 @@ # along with this program. If not, see . from typing import Optional, Callable -from sat.core.i18n import _ -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger from twisted.words.xish import domish from wokkel import disco, pubsub from wokkel.formats import Mood -from sat.tools.common import data_format +from libervia.backend.tools.common import data_format log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0166/__init__.py b/libervia/backend/plugins/plugin_xep_0166/__init__.py similarity index 99% rename from sat/plugins/plugin_xep_0166/__init__.py rename to libervia/backend/plugins/plugin_xep_0166/__init__.py index 45ba491b..3377bcb2 100644 --- a/sat/plugins/plugin_xep_0166/__init__.py +++ b/libervia/backend/plugins/plugin_xep_0166/__init__.py @@ -31,13 +31,13 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import D_, _ -from sat.core.log import getLogger -from sat.tools import xml_tools -from sat.tools import utils +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import D_, _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xml_tools +from libervia.backend.tools import utils from .models import ( ApplicationData, diff --git a/sat/plugins/plugin_xep_0166/models.py b/libervia/backend/plugins/plugin_xep_0166/models.py similarity index 98% rename from sat/plugins/plugin_xep_0166/models.py rename to libervia/backend/plugins/plugin_xep_0166/models.py index dff65b92..51f2a4ff 100644 --- a/sat/plugins/plugin_xep_0166/models.py +++ b/libervia/backend/plugins/plugin_xep_0166/models.py @@ -24,8 +24,8 @@ from typing import Awaitable, Callable, Union from twisted.internet import defer from twisted.words.xish import domish -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ class BaseApplicationHandler(abc.ABC): diff --git a/sat/plugins/plugin_xep_0167/__init__.py b/libervia/backend/plugins/plugin_xep_0167/__init__.py similarity index 97% rename from sat/plugins/plugin_xep_0167/__init__.py rename to libervia/backend/plugins/plugin_xep_0167/__init__.py index 7c927dd8..09d8d396 100644 --- a/sat/plugins/plugin_xep_0167/__init__.py +++ b/libervia/backend/plugins/plugin_xep_0167/__init__.py @@ -25,13 +25,13 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import D_, _ -from sat.core.log import getLogger -from sat.tools import xml_tools -from sat.tools.common import data_format +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import D_, _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xml_tools +from libervia.backend.tools.common import data_format from . import mapping from ..plugin_xep_0166 import BaseApplicationHandler diff --git a/sat/plugins/plugin_xep_0167/constants.py b/libervia/backend/plugins/plugin_xep_0167/constants.py similarity index 100% rename from sat/plugins/plugin_xep_0167/constants.py rename to libervia/backend/plugins/plugin_xep_0167/constants.py diff --git a/sat/plugins/plugin_xep_0167/mapping.py b/libervia/backend/plugins/plugin_xep_0167/mapping.py similarity index 99% rename from sat/plugins/plugin_xep_0167/mapping.py rename to libervia/backend/plugins/plugin_xep_0167/mapping.py index eb6ed360..b343a32e 100644 --- a/sat/plugins/plugin_xep_0167/mapping.py +++ b/libervia/backend/plugins/plugin_xep_0167/mapping.py @@ -21,8 +21,8 @@ from typing import Any, Dict, Optional from twisted.words.xish import domish -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger from .constants import NS_JINGLE_RTP diff --git a/sat/plugins/plugin_xep_0176.py b/libervia/backend/plugins/plugin_xep_0176.py similarity index 98% rename from sat/plugins/plugin_xep_0176.py rename to libervia/backend/plugins/plugin_xep_0176.py index 9378e963..69c52210 100644 --- a/sat/plugins/plugin_xep_0176.py +++ b/libervia/backend/plugins/plugin_xep_0176.py @@ -25,12 +25,12 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.tools.common import data_format +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools.common import data_format from .plugin_xep_0166 import BaseTransportHandler diff --git a/sat/plugins/plugin_xep_0184.py b/libervia/backend/plugins/plugin_xep_0184.py similarity index 98% rename from sat/plugins/plugin_xep_0184.py rename to libervia/backend/plugins/plugin_xep_0184.py index b15dc0b4..9dc48027 100644 --- a/sat/plugins/plugin_xep_0184.py +++ b/libervia/backend/plugins/plugin_xep_0184.py @@ -16,9 +16,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger from twisted.internet import reactor from twisted.words.protocols.jabber import xmlstream, jid from twisted.words.xish import domish diff --git a/sat/plugins/plugin_xep_0191.py b/libervia/backend/plugins/plugin_xep_0191.py similarity index 96% rename from sat/plugins/plugin_xep_0191.py rename to libervia/backend/plugins/plugin_xep_0191.py index f067c942..cc0fc099 100644 --- a/sat/plugins/plugin_xep_0191.py +++ b/libervia/backend/plugins/plugin_xep_0191.py @@ -24,11 +24,11 @@ from twisted.internet import defer from zope.interface import implementer from wokkel import disco, iwokkel -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.core_types import SatXMPPEntity -from sat.tools.utils import ensure_deferred +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.tools.utils import ensure_deferred log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0198.py b/libervia/backend/plugins/plugin_xep_0198.py similarity index 99% rename from sat/plugins/plugin_xep_0198.py rename to libervia/backend/plugins/plugin_xep_0198.py index d2c12a99..9f28c96d 100644 --- a/sat/plugins/plugin_xep_0198.py +++ b/libervia/backend/plugins/plugin_xep_0198.py @@ -16,10 +16,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger from twisted.words.protocols.jabber import client as jabber_client from twisted.words.protocols.jabber import xmlstream from twisted.words.xish import domish diff --git a/sat/plugins/plugin_xep_0199.py b/libervia/backend/plugins/plugin_xep_0199.py similarity index 97% rename from sat/plugins/plugin_xep_0199.py rename to libervia/backend/plugins/plugin_xep_0199.py index e68cf2a5..f34fab12 100644 --- a/sat/plugins/plugin_xep_0199.py +++ b/libervia/backend/plugins/plugin_xep_0199.py @@ -18,11 +18,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core.constants import Const as C +from libervia.backend.core.constants import Const as C from wokkel import disco, iwokkel from twisted.words.protocols.jabber import xmlstream, jid from zope.interface import implementer diff --git a/sat/plugins/plugin_xep_0203.py b/libervia/backend/plugins/plugin_xep_0203.py similarity index 95% rename from sat/plugins/plugin_xep_0203.py rename to libervia/backend/plugins/plugin_xep_0203.py index cb774393..7902e77b 100644 --- a/sat/plugins/plugin_xep_0203.py +++ b/libervia/backend/plugins/plugin_xep_0203.py @@ -18,9 +18,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0215.py b/libervia/backend/plugins/plugin_xep_0215.py similarity index 96% rename from sat/plugins/plugin_xep_0215.py rename to libervia/backend/plugins/plugin_xep_0215.py index 64b1fc41..f5d07042 100644 --- a/sat/plugins/plugin_xep_0215.py +++ b/libervia/backend/plugins/plugin_xep_0215.py @@ -25,14 +25,14 @@ from twisted.words.xish import domish from wokkel import data_form, disco, iwokkel from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.tools import xml_tools -from sat.tools import utils -from sat.tools.common import data_format +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xml_tools +from libervia.backend.tools import utils +from libervia.backend.tools.common import data_format log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0231.py b/libervia/backend/plugins/plugin_xep_0231.py similarity index 97% rename from sat/plugins/plugin_xep_0231.py rename to libervia/backend/plugins/plugin_xep_0231.py index 76ba6bb4..a3b7687c 100644 --- a/sat/plugins/plugin_xep_0231.py +++ b/libervia/backend/plugins/plugin_xep_0231.py @@ -28,11 +28,11 @@ from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import error as jabber_error from twisted.internet import defer from wokkel import disco, iwokkel -from sat.tools import xml_tools -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.log import getLogger +from libervia.backend.tools import xml_tools +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0234.py b/libervia/backend/plugins/plugin_xep_0234.py similarity index 98% rename from sat/plugins/plugin_xep_0234.py rename to libervia/backend/plugins/plugin_xep_0234.py index 2917b07c..16a04e49 100644 --- a/sat/plugins/plugin_xep_0234.py +++ b/libervia/backend/plugins/plugin_xep_0234.py @@ -30,14 +30,14 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.i18n import D_, _ -from sat.core.log import getLogger -from sat.tools import utils -from sat.tools import stream -from sat.tools.common import date_utils -from sat.tools.common import regex +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import D_, _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import utils +from libervia.backend.tools import stream +from libervia.backend.tools.common import date_utils +from libervia.backend.tools.common import regex log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0249.py b/libervia/backend/plugins/plugin_xep_0249.py similarity index 97% rename from sat/plugins/plugin_xep_0249.py rename to libervia/backend/plugins/plugin_xep_0249.py index e3032652..32f4ba05 100644 --- a/sat/plugins/plugin_xep_0249.py +++ b/libervia/backend/plugins/plugin_xep_0249.py @@ -23,11 +23,11 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.i18n import D_, _ -from sat.core.log import getLogger -from sat.tools import xml_tools +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import D_, _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xml_tools log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0260.py b/libervia/backend/plugins/plugin_xep_0260.py similarity index 99% rename from sat/plugins/plugin_xep_0260.py rename to libervia/backend/plugins/plugin_xep_0260.py index a2e8f350..e428c24d 100644 --- a/sat/plugins/plugin_xep_0260.py +++ b/libervia/backend/plugins/plugin_xep_0260.py @@ -17,12 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions +from libervia.backend.core import exceptions from wokkel import disco, iwokkel from zope.interface import implementer from twisted.words.xish import domish diff --git a/sat/plugins/plugin_xep_0261.py b/libervia/backend/plugins/plugin_xep_0261.py similarity index 96% rename from sat/plugins/plugin_xep_0261.py rename to libervia/backend/plugins/plugin_xep_0261.py index 1482f1a4..3fd15661 100644 --- a/sat/plugins/plugin_xep_0261.py +++ b/libervia/backend/plugins/plugin_xep_0261.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from wokkel import disco, iwokkel diff --git a/sat/plugins/plugin_xep_0264.py b/libervia/backend/plugins/plugin_xep_0264.py similarity index 97% rename from sat/plugins/plugin_xep_0264.py rename to libervia/backend/plugins/plugin_xep_0264.py index 8e8a6122..48976c15 100644 --- a/sat/plugins/plugin_xep_0264.py +++ b/libervia/backend/plugins/plugin_xep_0264.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) from twisted.internet import threads @@ -29,7 +29,7 @@ from zope.interface import implementer from wokkel import disco, iwokkel -from sat.core import exceptions +from libervia.backend.core import exceptions import hashlib try: diff --git a/sat/plugins/plugin_xep_0277.py b/libervia/backend/plugins/plugin_xep_0277.py similarity index 99% rename from sat/plugins/plugin_xep_0277.py rename to libervia/backend/plugins/plugin_xep_0277.py index fae44161..ae17ec5d 100644 --- a/sat/plugins/plugin_xep_0277.py +++ b/libervia/backend/plugins/plugin_xep_0277.py @@ -37,17 +37,17 @@ from wokkel import pubsub from wokkel import disco, iwokkel, rsm from zope.interface import implementer -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.core import exceptions -from sat.core.core_types import SatXMPPEntity -from sat.tools import xml_tools -from sat.tools import sat_defer -from sat.tools import utils -from sat.tools.common import data_format -from sat.tools.common import uri as xmpp_uri -from sat.tools.common import regex +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.tools import xml_tools +from libervia.backend.tools import sat_defer +from libervia.backend.tools import utils +from libervia.backend.tools.common import data_format +from libervia.backend.tools.common import uri as xmpp_uri +from libervia.backend.tools.common import regex log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0280.py b/libervia/backend/plugins/plugin_xep_0280.py similarity index 96% rename from sat/plugins/plugin_xep_0280.py rename to libervia/backend/plugins/plugin_xep_0280.py index 339b7acb..7495947a 100644 --- a/sat/plugins/plugin_xep_0280.py +++ b/libervia/backend/plugins/plugin_xep_0280.py @@ -17,12 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions -from sat.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C from twisted.words.protocols.jabber.error import StanzaError from twisted.internet import defer from wokkel import disco, iwokkel diff --git a/sat/plugins/plugin_xep_0292.py b/libervia/backend/plugins/plugin_xep_0292.py similarity index 96% rename from sat/plugins/plugin_xep_0292.py rename to libervia/backend/plugins/plugin_xep_0292.py index a9307379..6117a006 100644 --- a/sat/plugins/plugin_xep_0292.py +++ b/libervia/backend/plugins/plugin_xep_0292.py @@ -25,12 +25,12 @@ from twisted.words.xish import domish from zope.interface import implementer from wokkel import disco, iwokkel -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.core_types import SatXMPPEntity -from sat.core import exceptions -from sat.tools.common.async_utils import async_lru +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core import exceptions +from libervia.backend.tools.common.async_utils import async_lru log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0293.py b/libervia/backend/plugins/plugin_xep_0293.py similarity index 98% rename from sat/plugins/plugin_xep_0293.py rename to libervia/backend/plugins/plugin_xep_0293.py index a0720cdd..df2c51a9 100644 --- a/sat/plugins/plugin_xep_0293.py +++ b/libervia/backend/plugins/plugin_xep_0293.py @@ -23,9 +23,9 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0294.py b/libervia/backend/plugins/plugin_xep_0294.py similarity index 98% rename from sat/plugins/plugin_xep_0294.py rename to libervia/backend/plugins/plugin_xep_0294.py index 03e1f289..e4ab74ab 100644 --- a/sat/plugins/plugin_xep_0294.py +++ b/libervia/backend/plugins/plugin_xep_0294.py @@ -23,10 +23,10 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0297.py b/libervia/backend/plugins/plugin_xep_0297.py similarity index 96% rename from sat/plugins/plugin_xep_0297.py rename to libervia/backend/plugins/plugin_xep_0297.py index 7529e399..65bba028 100644 --- a/sat/plugins/plugin_xep_0297.py +++ b/libervia/backend/plugins/plugin_xep_0297.py @@ -18,9 +18,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.constants import Const as C -from sat.core.i18n import _, D_ -from sat.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.log import getLogger from twisted.internet import defer diff --git a/sat/plugins/plugin_xep_0300.py b/libervia/backend/plugins/plugin_xep_0300.py similarity index 97% rename from sat/plugins/plugin_xep_0300.py rename to libervia/backend/plugins/plugin_xep_0300.py index bd59392e..e98eaa2e 100644 --- a/sat/plugins/plugin_xep_0300.py +++ b/libervia/backend/plugins/plugin_xep_0300.py @@ -29,10 +29,10 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0313.py b/libervia/backend/plugins/plugin_xep_0313.py similarity index 98% rename from sat/plugins/plugin_xep_0313.py rename to libervia/backend/plugins/plugin_xep_0313.py index d31efc33..70c649bf 100644 --- a/sat/plugins/plugin_xep_0313.py +++ b/libervia/backend/plugins/plugin_xep_0313.py @@ -18,11 +18,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core import exceptions -from sat.tools.common import data_format +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.tools.common import data_format from twisted.words.protocols.jabber import jid from twisted.internet import defer from zope.interface import implementer diff --git a/sat/plugins/plugin_xep_0320.py b/libervia/backend/plugins/plugin_xep_0320.py similarity index 96% rename from sat/plugins/plugin_xep_0320.py rename to libervia/backend/plugins/plugin_xep_0320.py index a05ca551..a663a5da 100644 --- a/sat/plugins/plugin_xep_0320.py +++ b/libervia/backend/plugins/plugin_xep_0320.py @@ -21,9 +21,9 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0329.py b/libervia/backend/plugins/plugin_xep_0329.py similarity index 99% rename from sat/plugins/plugin_xep_0329.py rename to libervia/backend/plugins/plugin_xep_0329.py index ec0d0631..bed2e705 100644 --- a/sat/plugins/plugin_xep_0329.py +++ b/libervia/backend/plugins/plugin_xep_0329.py @@ -28,14 +28,14 @@ from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import error as jabber_error from twisted.internet import defer from wokkel import disco, iwokkel, data_form -from sat.core.i18n import _ -from sat.core.xmpp import SatXMPPEntity -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.tools import stream -from sat.tools import utils -from sat.tools.common import regex +from libervia.backend.core.i18n import _ +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.tools import stream +from libervia.backend.tools import utils +from libervia.backend.tools.common import regex log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0334.py b/libervia/backend/plugins/plugin_xep_0334.py similarity index 96% rename from sat/plugins/plugin_xep_0334.py rename to libervia/backend/plugins/plugin_xep_0334.py index e7c4200f..19b2d49d 100644 --- a/sat/plugins/plugin_xep_0334.py +++ b/libervia/backend/plugins/plugin_xep_0334.py @@ -19,13 +19,13 @@ # along with this program. If not, see . from typing import Iterable -from sat.core.i18n import _, D_ -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core.constants import Const as C +from libervia.backend.core.constants import Const as C -from sat.tools.common import data_format +from libervia.backend.tools.common import data_format from wokkel import disco, iwokkel diff --git a/sat/plugins/plugin_xep_0338.py b/libervia/backend/plugins/plugin_xep_0338.py similarity index 96% rename from sat/plugins/plugin_xep_0338.py rename to libervia/backend/plugins/plugin_xep_0338.py index 2a311a80..f9f4855b 100644 --- a/sat/plugins/plugin_xep_0338.py +++ b/libervia/backend/plugins/plugin_xep_0338.py @@ -23,10 +23,10 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.core_types import SatXMPPEntity +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.core_types import SatXMPPEntity log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0339.py b/libervia/backend/plugins/plugin_xep_0339.py similarity index 96% rename from sat/plugins/plugin_xep_0339.py rename to libervia/backend/plugins/plugin_xep_0339.py index 37f54f2a..9781e66c 100644 --- a/sat/plugins/plugin_xep_0339.py +++ b/libervia/backend/plugins/plugin_xep_0339.py @@ -23,12 +23,12 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.tools import xml_tools +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xml_tools log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0346.py b/libervia/backend/plugins/plugin_xep_0346.py similarity index 98% rename from sat/plugins/plugin_xep_0346.py rename to libervia/backend/plugins/plugin_xep_0346.py index 69d8c27a..3f07f8da 100644 --- a/sat/plugins/plugin_xep_0346.py +++ b/libervia/backend/plugins/plugin_xep_0346.py @@ -27,15 +27,15 @@ from twisted.internet import defer from wokkel import disco, iwokkel from wokkel import data_form from wokkel import generic -from sat.core.i18n import _ -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.xmpp import SatXMPPEntity -from sat.tools import xml_tools -from sat.tools import utils -from sat.tools.common import date_utils -from sat.tools.common import data_format -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.tools import xml_tools +from libervia.backend.tools import utils +from libervia.backend.tools.common import date_utils +from libervia.backend.tools.common import data_format +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0352.py b/libervia/backend/plugins/plugin_xep_0352.py similarity index 95% rename from sat/plugins/plugin_xep_0352.py rename to libervia/backend/plugins/plugin_xep_0352.py index 2aebe2e2..eff097ab 100644 --- a/sat/plugins/plugin_xep_0352.py +++ b/libervia/backend/plugins/plugin_xep_0352.py @@ -18,9 +18,9 @@ # along with this program. If not, see . from twisted.words.xish import domish -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0353.py b/libervia/backend/plugins/plugin_xep_0353.py similarity index 97% rename from sat/plugins/plugin_xep_0353.py rename to libervia/backend/plugins/plugin_xep_0353.py index 8cc4986b..540e73e7 100644 --- a/sat/plugins/plugin_xep_0353.py +++ b/libervia/backend/plugins/plugin_xep_0353.py @@ -24,12 +24,12 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import D_, _ -from sat.core.log import getLogger -from sat.tools import xml_tools +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import D_, _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xml_tools log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0359.py b/libervia/backend/plugins/plugin_xep_0359.py similarity index 96% rename from sat/plugins/plugin_xep_0359.py rename to libervia/backend/plugins/plugin_xep_0359.py index 3158e333..88356907 100644 --- a/sat/plugins/plugin_xep_0359.py +++ b/libervia/backend/plugins/plugin_xep_0359.py @@ -23,10 +23,10 @@ import uuid from zope.interface import implementer from twisted.words.protocols.jabber import xmlstream from wokkel import disco -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger from twisted.words.xish import domish log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0363.py b/libervia/backend/plugins/plugin_xep_0363.py similarity index 97% rename from sat/plugins/plugin_xep_0363.py rename to libervia/backend/plugins/plugin_xep_0363.py index 6bf0ffe7..3c82eabb 100644 --- a/sat/plugins/plugin_xep_0363.py +++ b/libervia/backend/plugins/plugin_xep_0363.py @@ -32,13 +32,13 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.xmpp import SatXMPPComponent -from sat.tools import utils, web as sat_web +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.xmpp import SatXMPPComponent +from libervia.backend.tools import utils, web as sat_web log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0372.py b/libervia/backend/plugins/plugin_xep_0372.py similarity index 95% rename from sat/plugins/plugin_xep_0372.py rename to libervia/backend/plugins/plugin_xep_0372.py index 652e19f3..8cb5a3cd 100644 --- a/sat/plugins/plugin_xep_0372.py +++ b/libervia/backend/plugins/plugin_xep_0372.py @@ -18,8 +18,8 @@ from typing import Optional, Dict, Union from textwrap import dedent -from sat.core import exceptions -from sat.tools.common import uri as xmpp_uri +from libervia.backend.core import exceptions +from libervia.backend.tools.common import uri as xmpp_uri from twisted.internet import defer from twisted.words.protocols.jabber import jid @@ -28,11 +28,11 @@ from twisted.words.xish import domish from zope.interface import implementer from wokkel import disco, iwokkel -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.core_types import SatXMPPEntity -from sat.tools.common import data_format +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.tools.common import data_format log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0373.py b/libervia/backend/plugins/plugin_xep_0373.py similarity index 99% rename from sat/plugins/plugin_xep_0373.py rename to libervia/backend/plugins/plugin_xep_0373.py index 18de13d3..9da8074c 100644 --- a/sat/plugins/plugin_xep_0373.py +++ b/libervia/backend/plugins/plugin_xep_0373.py @@ -30,19 +30,19 @@ from wokkel import muc, pubsub from wokkel.disco import DiscoFeature, DiscoInfo import xmlschema -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _, D_ -from sat.core.log import getLogger, Logger -from sat.core.sat_main import SAT -from sat.core.xmpp import SatXMPPClient -from sat.memory import persistent -from sat.plugins.plugin_xep_0045 import XEP_0045 -from sat.plugins.plugin_xep_0060 import XEP_0060 -from sat.plugins.plugin_xep_0163 import XEP_0163 -from sat.tools.xmpp_datetime import format_datetime, parse_datetime -from sat.tools import xml_tools +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.log import getLogger, Logger +from libervia.backend.core.sat_main import SAT +from libervia.backend.core.xmpp import SatXMPPClient +from libervia.backend.memory import persistent +from libervia.backend.plugins.plugin_xep_0045 import XEP_0045 +from libervia.backend.plugins.plugin_xep_0060 import XEP_0060 +from libervia.backend.plugins.plugin_xep_0163 import XEP_0163 +from libervia.backend.tools.xmpp_datetime import format_datetime, parse_datetime +from libervia.backend.tools import xml_tools from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.xish import domish diff --git a/sat/plugins/plugin_xep_0374.py b/libervia/backend/plugins/plugin_xep_0374.py similarity index 96% rename from sat/plugins/plugin_xep_0374.py rename to libervia/backend/plugins/plugin_xep_0374.py index 2511257a..70263036 100644 --- a/sat/plugins/plugin_xep_0374.py +++ b/libervia/backend/plugins/plugin_xep_0374.py @@ -21,17 +21,17 @@ from typing import Dict, Optional, Set, cast from typing_extensions import Final from wokkel import muc # type: ignore[import] -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _, D_ -from sat.core.log import getLogger, Logger -from sat.core.sat_main import SAT -from sat.core.xmpp import SatXMPPClient -from sat.plugins.plugin_xep_0045 import XEP_0045 -from sat.plugins.plugin_xep_0334 import XEP_0334 -from sat.plugins.plugin_xep_0373 import NS_OX, XEP_0373, TrustLevel -from sat.tools import xml_tools +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.log import getLogger, Logger +from libervia.backend.core.sat_main import SAT +from libervia.backend.core.xmpp import SatXMPPClient +from libervia.backend.plugins.plugin_xep_0045 import XEP_0045 +from libervia.backend.plugins.plugin_xep_0334 import XEP_0334 +from libervia.backend.plugins.plugin_xep_0373 import NS_OX, XEP_0373, TrustLevel +from libervia.backend.tools import xml_tools from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.xish import domish diff --git a/sat/plugins/plugin_xep_0376.py b/libervia/backend/plugins/plugin_xep_0376.py similarity index 96% rename from sat/plugins/plugin_xep_0376.py rename to libervia/backend/plugins/plugin_xep_0376.py index c9cf30f6..6fd3d7c8 100644 --- a/sat/plugins/plugin_xep_0376.py +++ b/libervia/backend/plugins/plugin_xep_0376.py @@ -21,11 +21,11 @@ from zope.interface import implementer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from wokkel import disco, iwokkel, pubsub, data_form -from sat.core.i18n import _ -from sat.core.constants import Const as C -from sat.core import exceptions -from sat.core.xmpp import SatXMPPEntity -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core import exceptions +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0380.py b/libervia/backend/plugins/plugin_xep_0380.py similarity index 96% rename from sat/plugins/plugin_xep_0380.py rename to libervia/backend/plugins/plugin_xep_0380.py index 4f237818..a12d409e 100644 --- a/sat/plugins/plugin_xep_0380.py +++ b/libervia/backend/plugins/plugin_xep_0380.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger from twisted.words.protocols.jabber import jid log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0384.py b/libervia/backend/plugins/plugin_xep_0384.py similarity index 99% rename from sat/plugins/plugin_xep_0384.py rename to libervia/backend/plugins/plugin_xep_0384.py index 80733bdb..98fdd7f4 100644 --- a/sat/plugins/plugin_xep_0384.py +++ b/libervia/backend/plugins/plugin_xep_0384.py @@ -31,23 +31,23 @@ from typing_extensions import Final, Never, assert_never from wokkel import muc, pubsub # type: ignore[import] import xmlschema -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import MessageData, SatXMPPEntity -from sat.core.i18n import _, D_ -from sat.core.log import getLogger, Logger -from sat.core.sat_main import SAT -from sat.core.xmpp import SatXMPPClient -from sat.memory import persistent -from sat.plugins.plugin_misc_text_commands import TextCommands -from sat.plugins.plugin_xep_0045 import XEP_0045 -from sat.plugins.plugin_xep_0060 import XEP_0060 -from sat.plugins.plugin_xep_0163 import XEP_0163 -from sat.plugins.plugin_xep_0334 import XEP_0334 -from sat.plugins.plugin_xep_0359 import XEP_0359 -from sat.plugins.plugin_xep_0420 import \ +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import MessageData, SatXMPPEntity +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.log import getLogger, Logger +from libervia.backend.core.sat_main import SAT +from libervia.backend.core.xmpp import SatXMPPClient +from libervia.backend.memory import persistent +from libervia.backend.plugins.plugin_misc_text_commands import TextCommands +from libervia.backend.plugins.plugin_xep_0045 import XEP_0045 +from libervia.backend.plugins.plugin_xep_0060 import XEP_0060 +from libervia.backend.plugins.plugin_xep_0163 import XEP_0163 +from libervia.backend.plugins.plugin_xep_0334 import XEP_0334 +from libervia.backend.plugins.plugin_xep_0359 import XEP_0359 +from libervia.backend.plugins.plugin_xep_0420 import \ XEP_0420, SCEAffixPolicy, SCEAffixValues, SCEProfile -from sat.tools import xml_tools +from libervia.backend.tools import xml_tools from twisted.internet import defer from twisted.words.protocols.jabber import error, jid from twisted.words.xish import domish diff --git a/sat/plugins/plugin_xep_0391.py b/libervia/backend/plugins/plugin_xep_0391.py similarity index 97% rename from sat/plugins/plugin_xep_0391.py rename to libervia/backend/plugins/plugin_xep_0391.py index ac7a2c6b..45513a03 100644 --- a/sat/plugins/plugin_xep_0391.py +++ b/libervia/backend/plugins/plugin_xep_0391.py @@ -31,12 +31,12 @@ from cryptography.hazmat.primitives import ciphers from cryptography.hazmat.primitives.ciphers import Cipher, CipherContext, modes from cryptography.hazmat.primitives.padding import PKCS7, PaddingContext -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.tools import xml_tools +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xml_tools try: import oldmemo diff --git a/sat/plugins/plugin_xep_0420.py b/libervia/backend/plugins/plugin_xep_0420.py similarity index 97% rename from sat/plugins/plugin_xep_0420.py rename to libervia/backend/plugins/plugin_xep_0420.py index 7bb1c378..9ab029c9 100644 --- a/sat/plugins/plugin_xep_0420.py +++ b/libervia/backend/plugins/plugin_xep_0420.py @@ -25,18 +25,18 @@ from typing import Dict, NamedTuple, Optional, Set, Tuple, cast from typing_extensions import Final from lxml import etree -from sat.core import exceptions +from libervia.backend.core import exceptions -from sat.core.constants import Const as C -from sat.core.i18n import D_ -from sat.core.log import Logger, getLogger -from sat.core.sat_main import SAT -from sat.tools.xml_tools import ElementParser -from sat.plugins.plugin_xep_0033 import NS_ADDRESS -from sat.plugins.plugin_xep_0082 import XEP_0082 -from sat.plugins.plugin_xep_0334 import NS_HINTS -from sat.plugins.plugin_xep_0359 import NS_SID -from sat.plugins.plugin_xep_0380 import NS_EME +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import D_ +from libervia.backend.core.log import Logger, getLogger +from libervia.backend.core.sat_main import SAT +from libervia.backend.tools.xml_tools import ElementParser +from libervia.backend.plugins.plugin_xep_0033 import NS_ADDRESS +from libervia.backend.plugins.plugin_xep_0082 import XEP_0082 +from libervia.backend.plugins.plugin_xep_0334 import NS_HINTS +from libervia.backend.plugins.plugin_xep_0359 import NS_SID +from libervia.backend.plugins.plugin_xep_0380 import NS_EME from twisted.words.protocols.jabber import jid from twisted.words.xish import domish diff --git a/sat/plugins/plugin_xep_0422.py b/libervia/backend/plugins/plugin_xep_0422.py similarity index 94% rename from sat/plugins/plugin_xep_0422.py rename to libervia/backend/plugins/plugin_xep_0422.py index 252a613b..fcc3dd6f 100644 --- a/sat/plugins/plugin_xep_0422.py +++ b/libervia/backend/plugins/plugin_xep_0422.py @@ -23,12 +23,12 @@ from twisted.words.xish import domish from wokkel import disco from zope.interface import implementer -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.core_types import SatXMPPEntity -from sat.memory.sqla_mapping import History -from sat.tools.common.async_utils import async_lru +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.memory.sqla_mapping import History +from libervia.backend.tools.common.async_utils import async_lru log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0424.py b/libervia/backend/plugins/plugin_xep_0424.py similarity index 96% rename from sat/plugins/plugin_xep_0424.py rename to libervia/backend/plugins/plugin_xep_0424.py index 8b2c463c..a7e16ee9 100644 --- a/sat/plugins/plugin_xep_0424.py +++ b/libervia/backend/plugins/plugin_xep_0424.py @@ -25,12 +25,12 @@ from twisted.internet import defer from wokkel import disco from zope.interface import implementer -from sat.core.constants import Const as C -from sat.core.i18n import _, D_ -from sat.core import exceptions -from sat.core.core_types import SatXMPPEntity -from sat.core.log import getLogger -from sat.memory.sqla_mapping import History +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core import exceptions +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.log import getLogger +from libervia.backend.memory.sqla_mapping import History log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0428.py b/libervia/backend/plugins/plugin_xep_0428.py similarity index 94% rename from sat/plugins/plugin_xep_0428.py rename to libervia/backend/plugins/plugin_xep_0428.py index 8e2bce47..aa36d7cb 100644 --- a/sat/plugins/plugin_xep_0428.py +++ b/libervia/backend/plugins/plugin_xep_0428.py @@ -22,9 +22,9 @@ from twisted.words.xish import domish from wokkel import disco from zope.interface import implementer -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0444.py b/libervia/backend/plugins/plugin_xep_0444.py similarity index 95% rename from sat/plugins/plugin_xep_0444.py rename to libervia/backend/plugins/plugin_xep_0444.py index 40d9fee1..0b98a1ca 100644 --- a/sat/plugins/plugin_xep_0444.py +++ b/libervia/backend/plugins/plugin_xep_0444.py @@ -25,12 +25,12 @@ from twisted.internet import defer from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core import exceptions -from sat.core.core_types import SatXMPPEntity -from sat.memory.sqla_mapping import History +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.memory.sqla_mapping import History log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0446.py b/libervia/backend/plugins/plugin_xep_0446.py similarity index 94% rename from sat/plugins/plugin_xep_0446.py rename to libervia/backend/plugins/plugin_xep_0446.py index b4cea6be..962b97d7 100644 --- a/sat/plugins/plugin_xep_0446.py +++ b/libervia/backend/plugins/plugin_xep_0446.py @@ -21,11 +21,11 @@ from pathlib import Path from twisted.words.xish import domish -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core import exceptions -from sat.tools import utils +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.tools import utils log = getLogger(__name__) @@ -155,7 +155,7 @@ class XEP_0446: except exceptions.NotFound: pass except exceptions.DataError: - from sat.tools.xml_tools import p_fmt_elt + from libervia.backend.tools.xml_tools import p_fmt_elt log.warning("invalid element:\n{p_fmt_elt(file_metadata_elt)}") else: data["file_hash"] = (algo, hash_) diff --git a/sat/plugins/plugin_xep_0447.py b/libervia/backend/plugins/plugin_xep_0447.py similarity index 97% rename from sat/plugins/plugin_xep_0447.py rename to libervia/backend/plugins/plugin_xep_0447.py index 81440110..b6d1db23 100644 --- a/sat/plugins/plugin_xep_0447.py +++ b/libervia/backend/plugins/plugin_xep_0447.py @@ -25,13 +25,13 @@ import treq from twisted.internet import defer from twisted.words.xish import domish -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.tools import stream -from sat.tools.web import treq_client_no_ssl +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import stream +from libervia.backend.tools.web import treq_client_no_ssl log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0448.py b/libervia/backend/plugins/plugin_xep_0448.py similarity index 98% rename from sat/plugins/plugin_xep_0448.py rename to libervia/backend/plugins/plugin_xep_0448.py index 12c2b905..0412d2fe 100644 --- a/sat/plugins/plugin_xep_0448.py +++ b/libervia/backend/plugins/plugin_xep_0448.py @@ -35,13 +35,13 @@ from twisted.words.xish import domish from wokkel import disco, iwokkel from zope.interface import implementer -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.tools import stream -from sat.tools.web import treq_client_no_ssl +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools import stream +from libervia.backend.tools.web import treq_client_no_ssl log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0465.py b/libervia/backend/plugins/plugin_xep_0465.py similarity index 96% rename from sat/plugins/plugin_xep_0465.py rename to libervia/backend/plugins/plugin_xep_0465.py index 04761d58..8078239d 100644 --- a/sat/plugins/plugin_xep_0465.py +++ b/libervia/backend/plugins/plugin_xep_0465.py @@ -25,13 +25,13 @@ from twisted.words.xish import domish from zope.interface import implementer from wokkel import disco, iwokkel -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core import exceptions -from sat.core.core_types import SatXMPPEntity -from sat.tools import utils -from sat.tools.common import data_format +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.tools import utils +from libervia.backend.tools.common import data_format log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0470.py b/libervia/backend/plugins/plugin_xep_0470.py similarity index 98% rename from sat/plugins/plugin_xep_0470.py rename to libervia/backend/plugins/plugin_xep_0470.py index 243ccc14..777355c5 100644 --- a/sat/plugins/plugin_xep_0470.py +++ b/libervia/backend/plugins/plugin_xep_0470.py @@ -24,13 +24,13 @@ from twisted.internet import defer from zope.interface import implementer from wokkel import pubsub, disco, iwokkel -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core.core_types import SatXMPPEntity -from sat.core import exceptions -from sat.tools.common import uri, data_format, date_utils -from sat.tools.utils import as_deferred, xmpp_date +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core import exceptions +from libervia.backend.tools.common import uri, data_format, date_utils +from libervia.backend.tools.utils import as_deferred, xmpp_date log = getLogger(__name__) diff --git a/sat/plugins/plugin_xep_0471.py b/libervia/backend/plugins/plugin_xep_0471.py similarity index 98% rename from sat/plugins/plugin_xep_0471.py rename to libervia/backend/plugins/plugin_xep_0471.py index 9c1b936e..6d572737 100644 --- a/sat/plugins/plugin_xep_0471.py +++ b/libervia/backend/plugins/plugin_xep_0471.py @@ -23,18 +23,18 @@ from attr import attr import shortuuid from sqlalchemy.orm.events import event -from sat.core.xmpp import SatXMPPClient -from sat.core.i18n import _ -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.core.xmpp import SatXMPPEntity -from sat.core.core_types import SatXMPPEntity -from sat.tools import utils -from sat.tools import xml_tools -from sat.tools.common import uri as xmpp_uri -from sat.tools.common import date_utils -from sat.tools.common import data_format +from libervia.backend.core.xmpp import SatXMPPClient +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.core.xmpp import SatXMPPEntity +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.tools import utils +from libervia.backend.tools import xml_tools +from libervia.backend.tools.common import uri as xmpp_uri +from libervia.backend.tools.common import date_utils +from libervia.backend.tools.common import data_format from twisted.internet import defer from twisted.words.protocols.jabber import jid, error from twisted.words.xish import domish diff --git a/sat/stdui/__init__.py b/libervia/backend/stdui/__init__.py similarity index 100% rename from sat/stdui/__init__.py rename to libervia/backend/stdui/__init__.py diff --git a/sat/stdui/ui_contact_list.py b/libervia/backend/stdui/ui_contact_list.py similarity index 98% rename from sat/stdui/ui_contact_list.py rename to libervia/backend/stdui/ui_contact_list.py index 86f87414..23a4319f 100644 --- a/sat/stdui/ui_contact_list.py +++ b/libervia/backend/stdui/ui_contact_list.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ -from sat.core.constants import Const as C -from sat.tools import xml_tools +from libervia.backend.core.i18n import _, D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.tools import xml_tools from twisted.words.protocols.jabber import jid from xml.dom.minidom import Element diff --git a/sat/stdui/ui_profile_manager.py b/libervia/backend/stdui/ui_profile_manager.py similarity index 95% rename from sat/stdui/ui_profile_manager.py rename to libervia/backend/stdui/ui_profile_manager.py index 2c4c5efd..91e0551b 100644 --- a/sat/stdui/ui_profile_manager.py +++ b/libervia/backend/stdui/ui_profile_manager.py @@ -18,12 +18,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import D_ -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.core import exceptions -from sat.tools import xml_tools -from sat.memory.memory import ProfileSessions +from libervia.backend.core.i18n import D_ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.tools import xml_tools +from libervia.backend.memory.memory import ProfileSessions from twisted.internet import defer from twisted.words.protocols.jabber import jid diff --git a/sat/test/__init__.py b/libervia/backend/test/__init__.py similarity index 100% rename from sat/test/__init__.py rename to libervia/backend/test/__init__.py diff --git a/sat/test/constants.py b/libervia/backend/test/constants.py similarity index 97% rename from sat/test/constants.py rename to libervia/backend/test/constants.py index 658d8d88..5a37d123 100644 --- a/sat/test/constants.py +++ b/libervia/backend/test/constants.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _, D_ +from libervia.backend.core.i18n import _, D_ from twisted.words.protocols.jabber import jid diff --git a/sat/test/helpers.py b/libervia/backend/test/helpers.py similarity index 98% rename from sat/test/helpers.py rename to libervia/backend/test/helpers.py index 36a44740..d5db50ee 100644 --- a/sat/test/helpers.py +++ b/libervia/backend/test/helpers.py @@ -19,20 +19,20 @@ ## logging configuration for tests ## -from sat.core import log_config +from libervia.backend.core import log_config log_config.sat_configure() import logging -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger getLogger().setLevel(logging.WARNING) # put this to DEBUG when needed -from sat.core import exceptions -from sat.tools import config as tools_config +from libervia.backend.core import exceptions +from libervia.backend.tools import config as tools_config from .constants import Const as C from wokkel.xmppim import RosterItem from wokkel.generic import parseXml -from sat.core.xmpp import SatRosterProtocol -from sat.memory.memory import Params, Memory +from libervia.backend.core.xmpp import SatRosterProtocol +from libervia.backend.memory.memory import Params, Memory from twisted.trial.unittest import FailTest from twisted.trial import unittest from twisted.internet import defer diff --git a/sat/test/helpers_plugins.py b/libervia/backend/test/helpers_plugins.py similarity index 99% rename from sat/test/helpers_plugins.py rename to libervia/backend/test/helpers_plugins.py index c619a3ae..c6a9f0d9 100644 --- a/sat/test/helpers_plugins.py +++ b/libervia/backend/test/helpers_plugins.py @@ -30,7 +30,7 @@ from wokkel.disco import DiscoItem, DiscoItems from sat_tmp.wokkel.rsm import RSMResponse from .constants import Const as C -from sat.plugins import plugin_xep_0045 +from libervia.backend.plugins import plugin_xep_0045 from collections import OrderedDict diff --git a/sat/test/test_core_xmpp.py b/libervia/backend/test/test_core_xmpp.py similarity index 98% rename from sat/test/test_core_xmpp.py rename to libervia/backend/test/test_core_xmpp.py index c11bb127..8bcd87c2 100644 --- a/sat/test/test_core_xmpp.py +++ b/libervia/backend/test/test_core_xmpp.py @@ -17,10 +17,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.test import helpers +from libervia.backend.test import helpers from .constants import Const from twisted.trial import unittest -from sat.core import xmpp +from libervia.backend.core import xmpp from twisted.words.protocols.jabber.jid import JID from wokkel.generic import parseXml from wokkel.xmppim import RosterItem diff --git a/sat/test/test_helpers_plugins.py b/libervia/backend/test/test_helpers_plugins.py similarity index 98% rename from sat/test/test_helpers_plugins.py rename to libervia/backend/test/test_helpers_plugins.py index 8a8b34e9..754ea45f 100644 --- a/sat/test/test_helpers_plugins.py +++ b/libervia/backend/test/test_helpers_plugins.py @@ -20,8 +20,8 @@ """ Test the helper classes to see if they behave well""" -from sat.test import helpers -from sat.test import helpers_plugins +from libervia.backend.test import helpers +from libervia.backend.test import helpers_plugins class FakeXEP_0045Test(helpers.SatTestCase): diff --git a/sat/test/test_memory.py b/libervia/backend/test/test_memory.py similarity index 99% rename from sat/test/test_memory.py rename to libervia/backend/test/test_memory.py index 7425c131..a7652f91 100644 --- a/sat/test/test_memory.py +++ b/libervia/backend/test/test_memory.py @@ -17,8 +17,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.test import helpers +from libervia.backend.core.i18n import _ +from libervia.backend.test import helpers from twisted.trial import unittest import traceback from .constants import Const diff --git a/sat/test/test_memory_crypto.py b/libervia/backend/test/test_memory_crypto.py similarity index 95% rename from sat/test/test_memory_crypto.py rename to libervia/backend/test/test_memory_crypto.py index 2ec8e124..9e306a67 100644 --- a/sat/test/test_memory_crypto.py +++ b/libervia/backend/test/test_memory_crypto.py @@ -21,8 +21,8 @@ """ Tests for the plugin radiocol """ -from sat.test import helpers -from sat.memory.crypto import BlockCipher, PasswordHasher +from libervia.backend.test import helpers +from libervia.backend.memory.crypto import BlockCipher, PasswordHasher import random import string from twisted.internet import defer diff --git a/sat/test/test_plugin_misc_groupblog.py b/libervia/backend/test/test_plugin_misc_groupblog.py similarity index 98% rename from sat/test/test_plugin_misc_groupblog.py rename to libervia/backend/test/test_plugin_misc_groupblog.py index e41758ac..442de3b4 100644 --- a/sat/test/test_plugin_misc_groupblog.py +++ b/libervia/backend/test/test_plugin_misc_groupblog.py @@ -21,12 +21,12 @@ """ Plugin groupblogs """ from .constants import Const as C -from sat.test import helpers, helpers_plugins -from sat.plugins import plugin_misc_groupblog -from sat.plugins import plugin_xep_0060 -from sat.plugins import plugin_xep_0277 -from sat.plugins import plugin_xep_0163 -from sat.plugins import plugin_misc_text_syntaxes +from libervia.backend.test import helpers, helpers_plugins +from libervia.backend.plugins import plugin_misc_groupblog +from libervia.backend.plugins import plugin_xep_0060 +from libervia.backend.plugins import plugin_xep_0277 +from libervia.backend.plugins import plugin_xep_0163 +from libervia.backend.plugins import plugin_misc_text_syntaxes from twisted.internet import defer from twisted.words.protocols.jabber import jid import importlib diff --git a/sat/test/test_plugin_misc_radiocol.py b/libervia/backend/test/test_plugin_misc_radiocol.py similarity index 98% rename from sat/test/test_plugin_misc_radiocol.py rename to libervia/backend/test/test_plugin_misc_radiocol.py index 85efa3b0..759753b3 100644 --- a/sat/test/test_plugin_misc_radiocol.py +++ b/libervia/backend/test/test_plugin_misc_radiocol.py @@ -20,10 +20,10 @@ """ Tests for the plugin radiocol """ -from sat.core import exceptions -from sat.test import helpers, helpers_plugins -from sat.plugins import plugin_misc_radiocol as plugin -from sat.plugins import plugin_misc_room_game as plugin_room_game +from libervia.backend.core import exceptions +from libervia.backend.test import helpers, helpers_plugins +from libervia.backend.plugins import plugin_misc_radiocol as plugin +from libervia.backend.plugins import plugin_misc_room_game as plugin_room_game from .constants import Const from twisted.words.protocols.jabber.jid import JID diff --git a/sat/test/test_plugin_misc_room_game.py b/libervia/backend/test/test_plugin_misc_room_game.py similarity index 99% rename from sat/test/test_plugin_misc_room_game.py rename to libervia/backend/test/test_plugin_misc_room_game.py index b7aaa564..78b72397 100644 --- a/sat/test/test_plugin_misc_room_game.py +++ b/libervia/backend/test/test_plugin_misc_room_game.py @@ -20,10 +20,10 @@ """ Tests for the plugin room game (base class for MUC games) """ -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from .constants import Const -from sat.test import helpers, helpers_plugins -from sat.plugins import plugin_misc_room_game as plugin +from libervia.backend.test import helpers, helpers_plugins +from libervia.backend.plugins import plugin_misc_room_game as plugin from twisted.words.protocols.jabber.jid import JID from wokkel.muc import User diff --git a/sat/test/test_plugin_misc_text_syntaxes.py b/libervia/backend/test/test_plugin_misc_text_syntaxes.py similarity index 98% rename from sat/test/test_plugin_misc_text_syntaxes.py rename to libervia/backend/test/test_plugin_misc_text_syntaxes.py index c25d015a..efa7029a 100644 --- a/sat/test/test_plugin_misc_text_syntaxes.py +++ b/libervia/backend/test/test_plugin_misc_text_syntaxes.py @@ -19,8 +19,8 @@ """ Plugin text syntaxes tests """ -from sat.test import helpers -from sat.plugins import plugin_misc_text_syntaxes +from libervia.backend.test import helpers +from libervia.backend.plugins import plugin_misc_text_syntaxes from twisted.trial.unittest import SkipTest import re import importlib diff --git a/sat/test/test_plugin_xep_0033.py b/libervia/backend/test/test_plugin_xep_0033.py similarity index 98% rename from sat/test/test_plugin_xep_0033.py rename to libervia/backend/test/test_plugin_xep_0033.py index 085f7884..d499e6cf 100644 --- a/sat/test/test_plugin_xep_0033.py +++ b/libervia/backend/test/test_plugin_xep_0033.py @@ -21,9 +21,9 @@ """ Plugin extended addressing stanzas """ from .constants import Const -from sat.test import helpers -from sat.plugins import plugin_xep_0033 as plugin -from sat.core.exceptions import CancelError +from libervia.backend.test import helpers +from libervia.backend.plugins import plugin_xep_0033 as plugin +from libervia.backend.core.exceptions import CancelError from twisted.internet import defer from wokkel.generic import parseXml from twisted.words.protocols.jabber.jid import JID diff --git a/sat/test/test_plugin_xep_0085.py b/libervia/backend/test/test_plugin_xep_0085.py similarity index 95% rename from sat/test/test_plugin_xep_0085.py rename to libervia/backend/test/test_plugin_xep_0085.py index 7c063016..32356294 100644 --- a/sat/test/test_plugin_xep_0085.py +++ b/libervia/backend/test/test_plugin_xep_0085.py @@ -21,9 +21,9 @@ """ Plugin chat states notification tests """ from .constants import Const -from sat.test import helpers -from sat.core.constants import Const as C -from sat.plugins import plugin_xep_0085 as plugin +from libervia.backend.test import helpers +from libervia.backend.core.constants import Const as C +from libervia.backend.plugins import plugin_xep_0085 as plugin from copy import deepcopy from twisted.internet import defer from wokkel.generic import parseXml diff --git a/sat/test/test_plugin_xep_0203.py b/libervia/backend/test/test_plugin_xep_0203.py similarity index 95% rename from sat/test/test_plugin_xep_0203.py rename to libervia/backend/test/test_plugin_xep_0203.py index 462cbbf1..1493dc06 100644 --- a/sat/test/test_plugin_xep_0203.py +++ b/libervia/backend/test/test_plugin_xep_0203.py @@ -20,8 +20,8 @@ """ Plugin XEP-0203 """ -from sat.test import helpers -from sat.plugins.plugin_xep_0203 import XEP_0203 +from libervia.backend.test import helpers +from libervia.backend.plugins.plugin_xep_0203 import XEP_0203 from twisted.words.xish import domish from twisted.words.protocols.jabber.jid import JID from dateutil.tz import tzutc diff --git a/sat/test/test_plugin_xep_0277.py b/libervia/backend/test/test_plugin_xep_0277.py similarity index 94% rename from sat/test/test_plugin_xep_0277.py rename to libervia/backend/test/test_plugin_xep_0277.py index afd5c75d..cfe999c1 100644 --- a/sat/test/test_plugin_xep_0277.py +++ b/libervia/backend/test/test_plugin_xep_0277.py @@ -19,11 +19,11 @@ """ Plugin XEP-0277 tests """ -from sat.test import helpers -from sat.plugins import plugin_xep_0277 -from sat.plugins import plugin_xep_0060 -from sat.plugins import plugin_misc_text_syntaxes -from sat.tools.xml_tools import ElementParser +from libervia.backend.test import helpers +from libervia.backend.plugins import plugin_xep_0277 +from libervia.backend.plugins import plugin_xep_0060 +from libervia.backend.plugins import plugin_misc_text_syntaxes +from libervia.backend.tools.xml_tools import ElementParser from wokkel.pubsub import NS_PUBSUB import importlib diff --git a/sat/test/test_plugin_xep_0297.py b/libervia/backend/test/test_plugin_xep_0297.py similarity index 94% rename from sat/test/test_plugin_xep_0297.py rename to libervia/backend/test/test_plugin_xep_0297.py index 2b8d221a..30d33c99 100644 --- a/sat/test/test_plugin_xep_0297.py +++ b/libervia/backend/test/test_plugin_xep_0297.py @@ -21,9 +21,9 @@ """ Plugin XEP-0297 """ from .constants import Const as C -from sat.test import helpers -from sat.plugins.plugin_xep_0203 import XEP_0203 -from sat.plugins.plugin_xep_0297 import XEP_0297 +from libervia.backend.test import helpers +from libervia.backend.plugins.plugin_xep_0203 import XEP_0203 +from libervia.backend.plugins.plugin_xep_0297 import XEP_0297 from twisted.words.protocols.jabber.jid import JID from dateutil.tz import tzutc import datetime diff --git a/sat/test/test_plugin_xep_0313.py b/libervia/backend/test/test_plugin_xep_0313.py similarity index 99% rename from sat/test/test_plugin_xep_0313.py rename to libervia/backend/test/test_plugin_xep_0313.py index 5e708c87..140558eb 100644 --- a/sat/test/test_plugin_xep_0313.py +++ b/libervia/backend/test/test_plugin_xep_0313.py @@ -21,8 +21,8 @@ """ Plugin XEP-0313 """ from .constants import Const as C -from sat.test import helpers -from sat.plugins.plugin_xep_0313 import XEP_0313 +from libervia.backend.test import helpers +from libervia.backend.plugins.plugin_xep_0313 import XEP_0313 from twisted.words.protocols.jabber.jid import JID from twisted.words.xish import domish from wokkel.data_form import Field diff --git a/sat/test/test_plugin_xep_0334.py b/libervia/backend/test/test_plugin_xep_0334.py similarity index 95% rename from sat/test/test_plugin_xep_0334.py rename to libervia/backend/test/test_plugin_xep_0334.py index 19fca4c3..c305efb9 100644 --- a/sat/test/test_plugin_xep_0334.py +++ b/libervia/backend/test/test_plugin_xep_0334.py @@ -21,11 +21,11 @@ """ Plugin XEP-0334 """ from .constants import Const as C -from sat.test import helpers -from sat.plugins.plugin_xep_0334 import XEP_0334 +from libervia.backend.test import helpers +from libervia.backend.plugins.plugin_xep_0334 import XEP_0334 from twisted.internet import defer from wokkel.generic import parseXml -from sat.core import exceptions +from libervia.backend.core import exceptions HINTS = ("no-permanent-storage", "no-storage", "no-copy") diff --git a/sat/tools/__init__.py b/libervia/backend/tools/__init__.py similarity index 100% rename from sat/tools/__init__.py rename to libervia/backend/tools/__init__.py diff --git a/sat/tools/async_trigger.py b/libervia/backend/tools/async_trigger.py similarity index 100% rename from sat/tools/async_trigger.py rename to libervia/backend/tools/async_trigger.py diff --git a/sat/tools/common/__init__.py b/libervia/backend/tools/common/__init__.py similarity index 100% rename from sat/tools/common/__init__.py rename to libervia/backend/tools/common/__init__.py diff --git a/sat/tools/common/ansi.py b/libervia/backend/tools/common/ansi.py similarity index 100% rename from sat/tools/common/ansi.py rename to libervia/backend/tools/common/ansi.py diff --git a/sat/tools/common/async_process.py b/libervia/backend/tools/common/async_process.py similarity index 97% rename from sat/tools/common/async_process.py rename to libervia/backend/tools/common/async_process.py index ad69a461..83a49450 100644 --- a/sat/tools/common/async_process.py +++ b/libervia/backend/tools/common/async_process.py @@ -22,9 +22,9 @@ import os.path from twisted.internet import defer, reactor, protocol from twisted.python.failure import Failure -from sat.core.i18n import _ -from sat.core import exceptions -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/tools/common/async_utils.py b/libervia/backend/tools/common/async_utils.py similarity index 97% rename from sat/tools/common/async_utils.py rename to libervia/backend/tools/common/async_utils.py index bf14c594..07857122 100644 --- a/sat/tools/common/async_utils.py +++ b/libervia/backend/tools/common/async_utils.py @@ -21,7 +21,7 @@ from collections import OrderedDict from typing import Optional, Callable, Awaitable -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/tools/common/data_format.py b/libervia/backend/tools/common/data_format.py similarity index 99% rename from sat/tools/common/data_format.py rename to libervia/backend/tools/common/data_format.py index 307baab5..712a1b2f 100644 --- a/sat/tools/common/data_format.py +++ b/libervia/backend/tools/common/data_format.py @@ -22,7 +22,7 @@ from typing import Any -from sat.core import exceptions +from libervia.backend.core import exceptions import json diff --git a/sat/tools/common/data_objects.py b/libervia/backend/tools/common/data_objects.py similarity index 96% rename from sat/tools/common/data_objects.py rename to libervia/backend/tools/common/data_objects.py index abb6883b..f7c50365 100644 --- a/sat/tools/common/data_objects.py +++ b/libervia/backend/tools/common/data_objects.py @@ -18,8 +18,8 @@ """Objects handling bridge data, with jinja2 safe markup handling""" -from sat.core.constants import Const as C -from sat.tools.common import data_format +from libervia.backend.core.constants import Const as C +from libervia.backend.tools.common import data_format from os.path import basename try: @@ -27,7 +27,7 @@ try: except ImportError: safe = str -from sat.tools.common import uri as xmpp_uri +from libervia.backend.tools.common import uri as xmpp_uri import urllib.request, urllib.parse, urllib.error q = lambda value: urllib.parse.quote(value.encode("utf-8"), safe="@") diff --git a/sat/tools/common/date_utils.py b/libervia/backend/tools/common/date_utils.py similarity index 98% rename from sat/tools/common/date_utils.py rename to libervia/backend/tools/common/date_utils.py index 03c556d3..26452421 100644 --- a/sat/tools/common/date_utils.py +++ b/libervia/backend/tools/common/date_utils.py @@ -31,9 +31,9 @@ from dateutil.parser import ParserError from dateutil.relativedelta import relativedelta from dateutil.utils import default_tzinfo -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ RELATIVE_RE = re.compile( r"\s*(?P\bin\b)?" diff --git a/sat/tools/common/dynamic_import.py b/libervia/backend/tools/common/dynamic_import.py similarity index 93% rename from sat/tools/common/dynamic_import.py rename to libervia/backend/tools/common/dynamic_import.py index 1b0ac393..68cc50bc 100644 --- a/sat/tools/common/dynamic_import.py +++ b/libervia/backend/tools/common/dynamic_import.py @@ -19,13 +19,13 @@ """ tools dynamic import """ from importlib import import_module -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) -def bridge(name, module_path="sat.bridge"): +def bridge(name, module_path="libervia.backend.bridge"): """import bridge module @param module_path(str): path of the module to import diff --git a/sat/tools/common/email.py b/libervia/backend/tools/common/email.py similarity index 95% rename from sat/tools/common/email.py rename to libervia/backend/tools/common/email.py index 71f3e803..fba84d29 100644 --- a/sat/tools/common/email.py +++ b/libervia/backend/tools/common/email.py @@ -22,9 +22,9 @@ from email.mime.text import MIMEText from twisted.mail import smtp -from sat.core.constants import Const as C -from sat.tools import config as tools_config -from sat.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.tools import config as tools_config +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/tools/common/files_utils.py b/libervia/backend/tools/common/files_utils.py similarity index 100% rename from sat/tools/common/files_utils.py rename to libervia/backend/tools/common/files_utils.py diff --git a/sat/tools/common/regex.py b/libervia/backend/tools/common/regex.py similarity index 100% rename from sat/tools/common/regex.py rename to libervia/backend/tools/common/regex.py diff --git a/sat/tools/common/template.py b/libervia/backend/tools/common/template.py similarity index 99% rename from sat/tools/common/template.py rename to libervia/backend/tools/common/template.py index 5f8166c4..8cc8b129 100644 --- a/sat/tools/common/template.py +++ b/libervia/backend/tools/common/template.py @@ -33,12 +33,12 @@ from babel.core import UnknownLocaleError import pygments from pygments import lexers from pygments import formatters -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core import exceptions -from sat.tools import config -from sat.tools.common import date_utils -from sat.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.tools import config +from libervia.backend.tools.common import date_utils +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/tools/common/template_xmlui.py b/libervia/backend/tools/common/template_xmlui.py similarity index 99% rename from sat/tools/common/template_xmlui.py rename to libervia/backend/tools/common/template_xmlui.py index 0cdf7c1f..c4c4fe3a 100644 --- a/sat/tools/common/template_xmlui.py +++ b/libervia/backend/tools/common/template_xmlui.py @@ -23,7 +23,7 @@ XMLUI classes from this modules can then be iterated to create the template """ from functools import partial -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger from sat_frontends.tools import xmlui from sat_frontends.tools import jid try: diff --git a/sat/tools/common/tls.py b/libervia/backend/tools/common/tls.py similarity index 96% rename from sat/tools/common/tls.py rename to libervia/backend/tools/common/tls.py index febc06b4..21af2ffa 100644 --- a/sat/tools/common/tls.py +++ b/libervia/backend/tools/common/tls.py @@ -18,9 +18,9 @@ """TLS handling with twisted""" -from sat.core.log import getLogger -from sat.core import exceptions -from sat.tools import config as tools_config +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.tools import config as tools_config try: diff --git a/sat/tools/common/uri.py b/libervia/backend/tools/common/uri.py similarity index 100% rename from sat/tools/common/uri.py rename to libervia/backend/tools/common/uri.py diff --git a/sat/tools/common/utils.py b/libervia/backend/tools/common/utils.py similarity index 100% rename from sat/tools/common/utils.py rename to libervia/backend/tools/common/utils.py diff --git a/sat/tools/config.py b/libervia/backend/tools/config.py similarity index 97% rename from sat/tools/config.py rename to libervia/backend/tools/config.py index 0b87776e..a8ca49cb 100644 --- a/sat/tools/config.py +++ b/libervia/backend/tools/config.py @@ -26,10 +26,10 @@ import json from typing import Any from configparser import ConfigParser, DEFAULTSECT, NoOptionError, NoSectionError from xdg import BaseDirectory -from sat.core.log import getLogger -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core import exceptions +from libervia.backend.core.log import getLogger +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions log = getLogger(__name__) diff --git a/sat/tools/image.py b/libervia/backend/tools/image.py similarity index 98% rename from sat/tools/image.py rename to libervia/backend/tools/image.py index 55be6a08..f883a36f 100644 --- a/sat/tools/image.py +++ b/libervia/backend/tools/image.py @@ -23,9 +23,9 @@ import mimetypes from PIL import Image, ImageOps from pathlib import Path from twisted.internet import threads -from sat.core.i18n import _ -from sat.core import exceptions -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/tools/sat_defer.py b/libervia/backend/tools/sat_defer.py similarity index 98% rename from sat/tools/sat_defer.py rename to libervia/backend/tools/sat_defer.py index ddd7c5ff..f19966c1 100644 --- a/sat/tools/sat_defer.py +++ b/libervia/backend/tools/sat_defer.py @@ -19,17 +19,17 @@ """tools related to deferred""" -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions +from libervia.backend.core import exceptions from twisted.internet import defer from twisted.internet import error as internet_error from twisted.internet import reactor from twisted.words.protocols.jabber import error as jabber_error from twisted.python import failure -from sat.core.constants import Const as C -from sat.memory import memory +from libervia.backend.core.constants import Const as C +from libervia.backend.memory import memory KEY_DEFERREDS = "deferreds" KEY_NEXT = "next_defer" diff --git a/sat/tools/stream.py b/libervia/backend/tools/stream.py similarity index 97% rename from sat/tools/stream.py rename to libervia/backend/tools/stream.py index a205cf4b..09da57ed 100644 --- a/sat/tools/stream.py +++ b/libervia/backend/tools/stream.py @@ -24,14 +24,14 @@ from typing import Callable, Optional, Union import uuid import os from zope import interface -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.core_types import SatXMPPEntity -from sat.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.core_types import SatXMPPEntity +from libervia.backend.core.log import getLogger from twisted.protocols import basic from twisted.internet import interfaces -from sat.core.sat_main import SAT +from libervia.backend.core.sat_main import SAT log = getLogger(__name__) diff --git a/sat/tools/trigger.py b/libervia/backend/tools/trigger.py similarity index 98% rename from sat/tools/trigger.py rename to libervia/backend/tools/trigger.py index 5fd6dd4e..3ff92a8a 100644 --- a/sat/tools/trigger.py +++ b/libervia/backend/tools/trigger.py @@ -19,8 +19,8 @@ """Misc usefull classes""" -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/tools/utils.py b/libervia/backend/tools/utils.py similarity index 98% rename from sat/tools/utils.py rename to libervia/backend/tools/utils.py index e0a8279e..8f65e145 100644 --- a/sat/tools/utils.py +++ b/libervia/backend/tools/utils.py @@ -32,9 +32,9 @@ import functools import asyncio from twisted.python import procutils, failure from twisted.internet import defer -from sat.core.constants import Const as C -from sat.core.log import getLogger -from sat.tools import xmpp_datetime +from libervia.backend.core.constants import Const as C +from libervia.backend.core.log import getLogger +from libervia.backend.tools import xmpp_datetime log = getLogger(__name__) diff --git a/sat/tools/video.py b/libervia/backend/tools/video.py similarity index 93% rename from sat/tools/video.py rename to libervia/backend/tools/video.py index 1190a08d..7f644ce5 100644 --- a/sat/tools/video.py +++ b/libervia/backend/tools/video.py @@ -20,9 +20,9 @@ from typing import Union from pathlib import Path from twisted.python.procutils import which -from sat.core.i18n import _ -from sat.core import exceptions -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger from .common import async_process diff --git a/sat/tools/web.py b/libervia/backend/tools/web.py similarity index 97% rename from sat/tools/web.py rename to libervia/backend/tools/web.py index 504a6c35..168a2675 100644 --- a/sat/tools/web.py +++ b/libervia/backend/tools/web.py @@ -29,8 +29,8 @@ from twisted.web import iweb from twisted.web import client as http_client from zope.interface import implementer -from sat.core import exceptions -from sat.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/tools/xml_tools.py b/libervia/backend/tools/xml_tools.py similarity index 99% rename from sat/tools/xml_tools.py rename to libervia/backend/tools/xml_tools.py index 180d4967..e06561d0 100644 --- a/sat/tools/xml_tools.py +++ b/libervia/backend/tools/xml_tools.py @@ -30,10 +30,10 @@ from twisted.words.protocols.jabber import jid from twisted.words.xish import domish from wokkel import data_form -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat/tools/xmpp_datetime.py b/libervia/backend/tools/xmpp_datetime.py similarity index 99% rename from sat/tools/xmpp_datetime.py rename to libervia/backend/tools/xmpp_datetime.py index 90f2788f..7bb81964 100644 --- a/sat/tools/xmpp_datetime.py +++ b/libervia/backend/tools/xmpp_datetime.py @@ -20,7 +20,7 @@ from datetime import date, datetime, time, timezone import re from typing import Optional, Tuple -from sat.core import exceptions +from libervia.backend.core import exceptions __all__ = [ # pylint: disable=unused-variable diff --git a/sat_frontends/bridge/dbus_bridge.py b/sat_frontends/bridge/dbus_bridge.py index 776b4ff9..4252ed7a 100644 --- a/sat_frontends/bridge/dbus_bridge.py +++ b/sat_frontends/bridge/dbus_bridge.py @@ -19,10 +19,10 @@ import asyncio import dbus import ast -from sat.core.i18n import _ -from sat.tools import config -from sat.core.log import getLogger -from sat.core.exceptions import BridgeExceptionNoService, BridgeInitError +from libervia.backend.core.i18n import _ +from libervia.backend.tools import config +from libervia.backend.core.log import getLogger +from libervia.backend.core.exceptions import BridgeExceptionNoService, BridgeInitError from dbus.mainloop.glib import DBusGMainLoop from .bridge_frontend import BridgeException diff --git a/sat_frontends/bridge/pb.py b/sat_frontends/bridge/pb.py index 2a55f1e0..6640780e 100644 --- a/sat_frontends/bridge/pb.py +++ b/sat_frontends/bridge/pb.py @@ -23,8 +23,8 @@ from pathlib import Path from twisted.spread import pb from twisted.internet import reactor, defer from twisted.internet.error import ConnectionRefusedError, ConnectError -from sat.core import exceptions -from sat.tools import config +from libervia.backend.core import exceptions +from libervia.backend.tools import config from sat_frontends.bridge.bridge_frontend import BridgeException log = getLogger(__name__) diff --git a/sat_frontends/jp/arg_tools.py b/sat_frontends/jp/arg_tools.py index f9d7fd6d..59111265 100644 --- a/sat_frontends/jp/arg_tools.py +++ b/sat_frontends/jp/arg_tools.py @@ -17,8 +17,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core import exceptions +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions def escape(arg, smart=True): diff --git a/sat_frontends/jp/base.py b/sat_frontends/jp/base.py index b673eebe..2cb45ec0 100644 --- a/sat_frontends/jp/base.py +++ b/sat_frontends/jp/base.py @@ -17,7 +17,7 @@ # along with this program. If not, see . import asyncio -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ ### logging ### import logging as log @@ -37,14 +37,14 @@ from glob import iglob from typing import Optional, Set, Union from importlib import import_module from sat_frontends.tools.jid import JID -from sat.tools import config -from sat.tools.common import dynamic_import -from sat.tools.common import uri -from sat.tools.common import date_utils -from sat.tools.common import utils -from sat.tools.common import data_format -from sat.tools.common.ansi import ANSI as A -from sat.core import exceptions +from libervia.backend.tools import config +from libervia.backend.tools.common import dynamic_import +from libervia.backend.tools.common import uri +from libervia.backend.tools.common import date_utils +from libervia.backend.tools.common import utils +from libervia.backend.tools.common import data_format +from libervia.backend.tools.common.ansi import ANSI as A +from libervia.backend.core import exceptions import sat_frontends.jp from sat_frontends.jp.loops import QuitException, get_jp_loop from sat_frontends.jp.constants import Const as C diff --git a/sat_frontends/jp/cmd_account.py b/sat_frontends/jp/cmd_account.py index 15f10c99..bd71ca92 100644 --- a/sat_frontends/jp/cmd_account.py +++ b/sat_frontends/jp/cmd_account.py @@ -21,8 +21,8 @@ from sat_frontends.jp.constants import Const as C from sat_frontends.bridge.bridge_frontend import BridgeException -from sat.core.log import getLogger -from sat.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.i18n import _ from sat_frontends.jp import base from sat_frontends.tools import jid diff --git a/sat_frontends/jp/cmd_adhoc.py b/sat_frontends/jp/cmd_adhoc.py index b0a68d56..34f32485 100644 --- a/sat_frontends/jp/cmd_adhoc.py +++ b/sat_frontends/jp/cmd_adhoc.py @@ -18,7 +18,7 @@ # along with this program. If not, see . from . import base -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.jp.constants import Const as C from sat_frontends.jp import xmlui_manager diff --git a/sat_frontends/jp/cmd_application.py b/sat_frontends/jp/cmd_application.py index 806af7fd..935c90c9 100644 --- a/sat_frontends/jp/cmd_application.py +++ b/sat_frontends/jp/cmd_application.py @@ -17,8 +17,8 @@ # along with this program. If not, see . from . import base -from sat.core.i18n import _ -from sat.tools.common import data_format +from libervia.backend.core.i18n import _ +from libervia.backend.tools.common import data_format from sat_frontends.jp.constants import Const as C __commands__ = ["Application"] diff --git a/sat_frontends/jp/cmd_avatar.py b/sat_frontends/jp/cmd_avatar.py index d40d37e8..8e4ba2e7 100644 --- a/sat_frontends/jp/cmd_avatar.py +++ b/sat_frontends/jp/cmd_avatar.py @@ -22,10 +22,10 @@ import os import os.path import asyncio from . import base -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.jp.constants import Const as C -from sat.tools import config -from sat.tools.common import data_format +from libervia.backend.tools import config +from libervia.backend.tools.common import data_format __commands__ = ["Avatar"] diff --git a/sat_frontends/jp/cmd_blocking.py b/sat_frontends/jp/cmd_blocking.py index a6562603..f5691077 100644 --- a/sat_frontends/jp/cmd_blocking.py +++ b/sat_frontends/jp/cmd_blocking.py @@ -20,8 +20,8 @@ import json import os -from sat.core.i18n import _ -from sat.tools.common import data_format +from libervia.backend.core.i18n import _ +from libervia.backend.tools.common import data_format from sat_frontends.jp import common from sat_frontends.jp.constants import Const as C from . import base diff --git a/sat_frontends/jp/cmd_blog.py b/sat_frontends/jp/cmd_blog.py index 9afdb37b..9fb6094f 100644 --- a/sat_frontends/jp/cmd_blog.py +++ b/sat_frontends/jp/cmd_blog.py @@ -31,11 +31,11 @@ import sys import tempfile from urllib.parse import urlparse -from sat.core.i18n import _ -from sat.tools import config -from sat.tools.common import uri -from sat.tools.common import data_format -from sat.tools.common.ansi import ANSI as A +from libervia.backend.core.i18n import _ +from libervia.backend.tools import config +from libervia.backend.tools.common import uri +from libervia.backend.tools.common import data_format +from libervia.backend.tools.common.ansi import ANSI as A from sat_frontends.jp import common from sat_frontends.jp.constants import Const as C diff --git a/sat_frontends/jp/cmd_bookmarks.py b/sat_frontends/jp/cmd_bookmarks.py index e3cd37ab..77948bab 100644 --- a/sat_frontends/jp/cmd_bookmarks.py +++ b/sat_frontends/jp/cmd_bookmarks.py @@ -18,7 +18,7 @@ # along with this program. If not, see . from . import base -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.jp.constants import Const as C __commands__ = ["Bookmarks"] diff --git a/sat_frontends/jp/cmd_debug.py b/sat_frontends/jp/cmd_debug.py index a9aa00d7..879294c4 100644 --- a/sat_frontends/jp/cmd_debug.py +++ b/sat_frontends/jp/cmd_debug.py @@ -19,9 +19,9 @@ from . import base -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.jp.constants import Const as C -from sat.tools.common.ansi import ANSI as A +from libervia.backend.tools.common.ansi import ANSI as A import json __commands__ = ["Debug"] diff --git a/sat_frontends/jp/cmd_encryption.py b/sat_frontends/jp/cmd_encryption.py index 26bc8d11..28107d64 100644 --- a/sat_frontends/jp/cmd_encryption.py +++ b/sat_frontends/jp/cmd_encryption.py @@ -19,8 +19,8 @@ from sat_frontends.jp import base from sat_frontends.jp.constants import Const as C -from sat.core.i18n import _ -from sat.tools.common import data_format +from libervia.backend.core.i18n import _ +from libervia.backend.tools.common import data_format from sat_frontends.jp import xmlui_manager __commands__ = ["Encryption"] diff --git a/sat_frontends/jp/cmd_event.py b/sat_frontends/jp/cmd_event.py index a9dd0a81..23fafec8 100644 --- a/sat_frontends/jp/cmd_event.py +++ b/sat_frontends/jp/cmd_event.py @@ -23,13 +23,13 @@ import sys from sqlalchemy import desc -from sat.core.i18n import _ -from sat.core.i18n import _ -from sat.tools.common import data_format -from sat.tools.common import data_format -from sat.tools.common import date_utils -from sat.tools.common.ansi import ANSI as A -from sat.tools.common.ansi import ANSI as A +from libervia.backend.core.i18n import _ +from libervia.backend.core.i18n import _ +from libervia.backend.tools.common import data_format +from libervia.backend.tools.common import data_format +from libervia.backend.tools.common import date_utils +from libervia.backend.tools.common.ansi import ANSI as A +from libervia.backend.tools.common.ansi import ANSI as A from sat_frontends.jp import common from sat_frontends.jp.constants import Const as C from sat_frontends.jp.constants import Const as C diff --git a/sat_frontends/jp/cmd_file.py b/sat_frontends/jp/cmd_file.py index ec396e54..62918475 100644 --- a/sat_frontends/jp/cmd_file.py +++ b/sat_frontends/jp/cmd_file.py @@ -24,13 +24,13 @@ import sys import os import os.path import tarfile -from sat.core.i18n import _ -from sat.tools.common import data_format +from libervia.backend.core.i18n import _ +from libervia.backend.tools.common import data_format from sat_frontends.jp.constants import Const as C from sat_frontends.jp import common from sat_frontends.tools import jid -from sat.tools.common.ansi import ANSI as A -from sat.tools.common import utils +from libervia.backend.tools.common.ansi import ANSI as A +from libervia.backend.tools.common import utils from urllib.parse import urlparse from pathlib import Path import tempfile diff --git a/sat_frontends/jp/cmd_forums.py b/sat_frontends/jp/cmd_forums.py index bd37cadf..5006eed5 100644 --- a/sat_frontends/jp/cmd_forums.py +++ b/sat_frontends/jp/cmd_forums.py @@ -19,10 +19,10 @@ from . import base -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.jp.constants import Const as C from sat_frontends.jp import common -from sat.tools.common.ansi import ANSI as A +from libervia.backend.tools.common.ansi import ANSI as A import codecs import json diff --git a/sat_frontends/jp/cmd_identity.py b/sat_frontends/jp/cmd_identity.py index 9c61a1c8..1e115554 100644 --- a/sat_frontends/jp/cmd_identity.py +++ b/sat_frontends/jp/cmd_identity.py @@ -19,9 +19,9 @@ from . import base -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.jp.constants import Const as C -from sat.tools.common import data_format +from libervia.backend.tools.common import data_format __commands__ = ["Identity"] diff --git a/sat_frontends/jp/cmd_info.py b/sat_frontends/jp/cmd_info.py index 0b413156..086bb351 100644 --- a/sat_frontends/jp/cmd_info.py +++ b/sat_frontends/jp/cmd_info.py @@ -19,9 +19,9 @@ from pprint import pformat -from sat.core.i18n import _ -from sat.tools.common import data_format, date_utils -from sat.tools.common.ansi import ANSI as A +from libervia.backend.core.i18n import _ +from libervia.backend.tools.common import data_format, date_utils +from libervia.backend.tools.common.ansi import ANSI as A from sat_frontends.jp import common from sat_frontends.jp.constants import Const as C diff --git a/sat_frontends/jp/cmd_input.py b/sat_frontends/jp/cmd_input.py index 60dfc944..f0900c83 100644 --- a/sat_frontends/jp/cmd_input.py +++ b/sat_frontends/jp/cmd_input.py @@ -24,10 +24,10 @@ import sys import shlex import asyncio from . import base -from sat.core.i18n import _ -from sat.core import exceptions +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions from sat_frontends.jp.constants import Const as C -from sat.tools.common.ansi import ANSI as A +from libervia.backend.tools.common.ansi import ANSI as A __commands__ = ["Input"] OPT_STDIN = "stdin" diff --git a/sat_frontends/jp/cmd_invitation.py b/sat_frontends/jp/cmd_invitation.py index 257fd81a..e9f0a5d1 100644 --- a/sat_frontends/jp/cmd_invitation.py +++ b/sat_frontends/jp/cmd_invitation.py @@ -19,10 +19,10 @@ from . import base -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.jp.constants import Const as C -from sat.tools.common.ansi import ANSI as A -from sat.tools.common import data_format +from libervia.backend.tools.common.ansi import ANSI as A +from libervia.backend.tools.common import data_format __commands__ = ["Invitation"] diff --git a/sat_frontends/jp/cmd_list.py b/sat_frontends/jp/cmd_list.py index 84e68e08..e006768c 100644 --- a/sat_frontends/jp/cmd_list.py +++ b/sat_frontends/jp/cmd_list.py @@ -20,8 +20,8 @@ import json import os -from sat.core.i18n import _ -from sat.tools.common import data_format +from libervia.backend.core.i18n import _ +from libervia.backend.tools.common import data_format from sat_frontends.jp import common from sat_frontends.jp.constants import Const as C from . import base diff --git a/sat_frontends/jp/cmd_merge_request.py b/sat_frontends/jp/cmd_merge_request.py index bb16a9a2..65d77611 100644 --- a/sat_frontends/jp/cmd_merge_request.py +++ b/sat_frontends/jp/cmd_merge_request.py @@ -20,8 +20,8 @@ import os.path from . import base -from sat.core.i18n import _ -from sat.tools.common import data_format +from libervia.backend.core.i18n import _ +from libervia.backend.tools.common import data_format from sat_frontends.jp.constants import Const as C from sat_frontends.jp import xmlui_manager from sat_frontends.jp import common diff --git a/sat_frontends/jp/cmd_message.py b/sat_frontends/jp/cmd_message.py index 7257ecba..e2ed15a9 100644 --- a/sat_frontends/jp/cmd_message.py +++ b/sat_frontends/jp/cmd_message.py @@ -22,10 +22,10 @@ import sys from twisted.python import filepath -from sat.core.i18n import _ -from sat.tools.common import data_format -from sat.tools.common.ansi import ANSI as A -from sat.tools.utils import clean_ustr +from libervia.backend.core.i18n import _ +from libervia.backend.tools.common import data_format +from libervia.backend.tools.common.ansi import ANSI as A +from libervia.backend.tools.utils import clean_ustr from sat_frontends.jp import base from sat_frontends.jp.constants import Const as C from sat_frontends.tools import jid diff --git a/sat_frontends/jp/cmd_param.py b/sat_frontends/jp/cmd_param.py index 9407cfd2..8ec5cb8a 100644 --- a/sat_frontends/jp/cmd_param.py +++ b/sat_frontends/jp/cmd_param.py @@ -20,7 +20,7 @@ from . import base -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from .constants import Const as C __commands__ = ["Param"] diff --git a/sat_frontends/jp/cmd_ping.py b/sat_frontends/jp/cmd_ping.py index 55ebbcb5..c3283efe 100644 --- a/sat_frontends/jp/cmd_ping.py +++ b/sat_frontends/jp/cmd_ping.py @@ -18,7 +18,7 @@ # along with this program. If not, see . from . import base -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.jp.constants import Const as C __commands__ = ["Ping"] diff --git a/sat_frontends/jp/cmd_pipe.py b/sat_frontends/jp/cmd_pipe.py index 787d2520..bbdc6abb 100644 --- a/sat_frontends/jp/cmd_pipe.py +++ b/sat_frontends/jp/cmd_pipe.py @@ -23,8 +23,8 @@ from functools import partial import socket import sys -from sat.core.i18n import _ -from sat.tools.common import data_format +from libervia.backend.core.i18n import _ +from libervia.backend.tools.common import data_format from sat_frontends.jp import base from sat_frontends.jp import xmlui_manager from sat_frontends.jp.constants import Const as C diff --git a/sat_frontends/jp/cmd_profile.py b/sat_frontends/jp/cmd_profile.py index 49ef3815..98f7121a 100644 --- a/sat_frontends/jp/cmd_profile.py +++ b/sat_frontends/jp/cmd_profile.py @@ -21,8 +21,8 @@ and retrieve information about a profile.""" from sat_frontends.jp.constants import Const as C -from sat.core.log import getLogger -from sat.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core.i18n import _ from sat_frontends.jp import base log = getLogger(__name__) diff --git a/sat_frontends/jp/cmd_pubsub.py b/sat_frontends/jp/cmd_pubsub.py index d490bc73..0088d271 100644 --- a/sat_frontends/jp/cmd_pubsub.py +++ b/sat_frontends/jp/cmd_pubsub.py @@ -26,17 +26,17 @@ import subprocess import asyncio import json from . import base -from sat.core.i18n import _ -from sat.core import exceptions +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions from sat_frontends.jp.constants import Const as C from sat_frontends.jp import common from sat_frontends.jp import arg_tools from sat_frontends.jp import xml_tools from functools import partial -from sat.tools.common import data_format -from sat.tools.common import uri -from sat.tools.common.ansi import ANSI as A -from sat.tools.common import date_utils +from libervia.backend.tools.common import data_format +from libervia.backend.tools.common import uri +from libervia.backend.tools.common.ansi import ANSI as A +from libervia.backend.tools.common import date_utils from sat_frontends.tools import jid, strings from sat_frontends.bridge.bridge_frontend import BridgeException diff --git a/sat_frontends/jp/cmd_roster.py b/sat_frontends/jp/cmd_roster.py index 093f5ec7..4a0ca8ff 100644 --- a/sat_frontends/jp/cmd_roster.py +++ b/sat_frontends/jp/cmd_roster.py @@ -19,10 +19,10 @@ from . import base from collections import OrderedDict -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.jp.constants import Const as C from sat_frontends.tools import jid -from sat.tools.common.ansi import ANSI as A +from libervia.backend.tools.common.ansi import ANSI as A __commands__ = ["Roster"] diff --git a/sat_frontends/jp/cmd_shell.py b/sat_frontends/jp/cmd_shell.py index 8300e426..041f18e2 100644 --- a/sat_frontends/jp/cmd_shell.py +++ b/sat_frontends/jp/cmd_shell.py @@ -23,11 +23,11 @@ import sys import shlex import subprocess from . import base -from sat.core.i18n import _ -from sat.core import exceptions +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions from sat_frontends.jp.constants import Const as C from sat_frontends.jp import arg_tools -from sat.tools.common.ansi import ANSI as A +from libervia.backend.tools.common.ansi import ANSI as A __commands__ = ["Shell"] INTRO = _( diff --git a/sat_frontends/jp/cmd_uri.py b/sat_frontends/jp/cmd_uri.py index 5d6b6529..d5b57f34 100644 --- a/sat_frontends/jp/cmd_uri.py +++ b/sat_frontends/jp/cmd_uri.py @@ -19,9 +19,9 @@ from . import base -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.jp.constants import Const as C -from sat.tools.common import uri +from libervia.backend.tools.common import uri __commands__ = ["Uri"] diff --git a/sat_frontends/jp/common.py b/sat_frontends/jp/common.py index 08e3a47a..e4d0a5fe 100644 --- a/sat_frontends/jp/common.py +++ b/sat_frontends/jp/common.py @@ -27,12 +27,12 @@ import shlex import re from pathlib import Path from sat_frontends.jp.constants import Const as C -from sat.core.i18n import _ -from sat.core import exceptions -from sat.tools.common import regex -from sat.tools.common.ansi import ANSI as A -from sat.tools.common import uri as xmpp_uri -from sat.tools import config +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.tools.common import regex +from libervia.backend.tools.common.ansi import ANSI as A +from libervia.backend.tools.common import uri as xmpp_uri +from libervia.backend.tools import config from configparser import NoSectionError, NoOptionError from collections import namedtuple diff --git a/sat_frontends/jp/constants.py b/sat_frontends/jp/constants.py index 223d5706..792d3e39 100644 --- a/sat_frontends/jp/constants.py +++ b/sat_frontends/jp/constants.py @@ -18,7 +18,7 @@ # along with this program. If not, see . from sat_frontends.quick_frontend import constants -from sat.tools.common.ansi import ANSI as A +from libervia.backend.tools.common.ansi import ANSI as A class Const(constants.Const): diff --git a/sat_frontends/jp/loops.py b/sat_frontends/jp/loops.py index d2394ed4..3156e44b 100644 --- a/sat_frontends/jp/loops.py +++ b/sat_frontends/jp/loops.py @@ -19,7 +19,7 @@ import sys import asyncio import logging as log -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.jp.constants import Const as C log.basicConfig(level=log.WARNING, diff --git a/sat_frontends/jp/output_std.py b/sat_frontends/jp/output_std.py index 24ab8fdf..0c0f3746 100644 --- a/sat_frontends/jp/output_std.py +++ b/sat_frontends/jp/output_std.py @@ -21,8 +21,8 @@ from sat_frontends.jp.constants import Const as C from sat_frontends.tools import jid -from sat.tools.common.ansi import ANSI as A -from sat.tools.common import date_utils +from libervia.backend.tools.common.ansi import ANSI as A +from libervia.backend.tools.common import date_utils import json __outputs__ = ["Simple", "Json"] diff --git a/sat_frontends/jp/output_template.py b/sat_frontends/jp/output_template.py index a6fe493c..a32a52ae 100644 --- a/sat_frontends/jp/output_template.py +++ b/sat_frontends/jp/output_template.py @@ -20,9 +20,9 @@ from sat_frontends.jp.constants import Const as C -from sat.core.i18n import _ -from sat.core import log -from sat.tools.common import template +from libervia.backend.core.i18n import _ +from libervia.backend.core import log +from libervia.backend.tools.common import template from functools import partial import logging import webbrowser diff --git a/sat_frontends/jp/output_xml.py b/sat_frontends/jp/output_xml.py index 29131f94..4bde2087 100644 --- a/sat_frontends/jp/output_xml.py +++ b/sat_frontends/jp/output_xml.py @@ -19,9 +19,9 @@ from sat_frontends.jp.constants import Const as C -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from lxml import etree -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) import sys diff --git a/sat_frontends/jp/output_xmlui.py b/sat_frontends/jp/output_xmlui.py index 65168fdd..931a1635 100644 --- a/sat_frontends/jp/output_xmlui.py +++ b/sat_frontends/jp/output_xmlui.py @@ -21,7 +21,7 @@ from sat_frontends.jp.constants import Const as C from sat_frontends.jp import xmlui_manager -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat_frontends/jp/xml_tools.py b/sat_frontends/jp/xml_tools.py index 902c5408..5db9a043 100644 --- a/sat_frontends/jp/xml_tools.py +++ b/sat_frontends/jp/xml_tools.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.jp.constants import Const as C def etree_parse(cmd, raw_xml, reraise=False): diff --git a/sat_frontends/jp/xmlui_manager.py b/sat_frontends/jp/xmlui_manager.py index 3f25795d..4eb396ea 100644 --- a/sat_frontends/jp/xmlui_manager.py +++ b/sat_frontends/jp/xmlui_manager.py @@ -18,12 +18,12 @@ # along with this program. If not, see . from functools import partial -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger from sat_frontends.tools import xmlui as xmlui_base from sat_frontends.jp.constants import Const as C -from sat.tools.common.ansi import ANSI as A -from sat.core.i18n import _ -from sat.tools.common import data_format +from libervia.backend.tools.common.ansi import ANSI as A +from libervia.backend.core.i18n import _ +from libervia.backend.tools.common import data_format log = getLogger(__name__) diff --git a/sat_frontends/primitivus/base.py b/sat_frontends/primitivus/base.py index ede86da0..b517110e 100644 --- a/sat_frontends/primitivus/base.py +++ b/sat_frontends/primitivus/base.py @@ -17,13 +17,13 @@ # along with this program. If not, see . -from sat.core.i18n import _, D_ +from libervia.backend.core.i18n import _, D_ from sat_frontends.primitivus.constants import Const as C -from sat.core import log_config +from libervia.backend.core import log_config log_config.sat_configure(C.LOG_BACKEND_STANDARD, C) -from sat.core import log as logging +from libervia.backend.core import log as logging log = logging.getLogger(__name__) -from sat.tools import config as sat_config +from libervia.backend.tools import config as sat_config import urwid from urwid.util import is_wide_char from urwid_satext import sat_widgets @@ -39,7 +39,7 @@ from sat_frontends.primitivus.notify import Notify from sat_frontends.primitivus.keys import action_key_map as a_key from sat_frontends.primitivus import config from sat_frontends.tools.misc import InputHistory -from sat.tools.common import dynamic_import +from libervia.backend.tools.common import dynamic_import from sat_frontends.tools import jid import signal import sys diff --git a/sat_frontends/primitivus/chat.py b/sat_frontends/primitivus/chat.py index 59a1f1d3..2d1f42cf 100644 --- a/sat_frontends/primitivus/chat.py +++ b/sat_frontends/primitivus/chat.py @@ -22,8 +22,8 @@ from pathlib import Path import bisect import urwid from urwid_satext import sat_widgets -from sat.core.i18n import _ -from sat.core import log as logging +from libervia.backend.core.i18n import _ +from libervia.backend.core import log as logging from sat_frontends.quick_frontend import quick_widgets from sat_frontends.quick_frontend import quick_chat from sat_frontends.quick_frontend import quick_games diff --git a/sat_frontends/primitivus/contact_list.py b/sat_frontends/primitivus/contact_list.py index a087c948..f0fca6cb 100644 --- a/sat_frontends/primitivus/contact_list.py +++ b/sat_frontends/primitivus/contact_list.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ import urwid from urwid_satext import sat_widgets from sat_frontends.quick_frontend.quick_contact_list import QuickContactList @@ -26,7 +26,7 @@ from sat_frontends.primitivus.constants import Const as C from sat_frontends.primitivus.keys import action_key_map as a_key from sat_frontends.primitivus.widget import PrimitivusWidget from sat_frontends.tools import jid -from sat.core import log as logging +from libervia.backend.core import log as logging log = logging.getLogger(__name__) from sat_frontends.quick_frontend import quick_widgets diff --git a/sat_frontends/primitivus/game_tarot.py b/sat_frontends/primitivus/game_tarot.py index 73f332b3..ccf2a419 100644 --- a/sat_frontends/primitivus/game_tarot.py +++ b/sat_frontends/primitivus/game_tarot.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ import urwid from urwid_satext import sat_widgets from sat_frontends.tools.games import TarotCard diff --git a/sat_frontends/primitivus/profile_manager.py b/sat_frontends/primitivus/profile_manager.py index 2b243a6c..bc118e4b 100644 --- a/sat_frontends/primitivus/profile_manager.py +++ b/sat_frontends/primitivus/profile_manager.py @@ -17,8 +17,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core import log as logging +from libervia.backend.core.i18n import _ +from libervia.backend.core import log as logging log = logging.getLogger(__name__) from sat_frontends.quick_frontend.quick_profile_manager import QuickProfileManager diff --git a/sat_frontends/primitivus/progress.py b/sat_frontends/primitivus/progress.py index ebd088f4..ec5e5427 100644 --- a/sat_frontends/primitivus/progress.py +++ b/sat_frontends/primitivus/progress.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ import urwid from urwid_satext import sat_widgets from sat_frontends.quick_frontend import quick_widgets diff --git a/sat_frontends/primitivus/status.py b/sat_frontends/primitivus/status.py index ffef4088..108210ac 100644 --- a/sat_frontends/primitivus/status.py +++ b/sat_frontends/primitivus/status.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ import urwid from urwid_satext import sat_widgets from sat_frontends.quick_frontend.constants import Const as commonConst diff --git a/sat_frontends/primitivus/widget.py b/sat_frontends/primitivus/widget.py index ac058f3c..44fa7e44 100644 --- a/sat_frontends/primitivus/widget.py +++ b/sat_frontends/primitivus/widget.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core import log as logging +from libervia.backend.core import log as logging log = logging.getLogger(__name__) import urwid diff --git a/sat_frontends/primitivus/xmlui.py b/sat_frontends/primitivus/xmlui.py index 98fa98fb..5b18e949 100644 --- a/sat_frontends/primitivus/xmlui.py +++ b/sat_frontends/primitivus/xmlui.py @@ -17,13 +17,13 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ import urwid import copy -from sat.core import exceptions +from libervia.backend.core import exceptions from urwid_satext import sat_widgets from urwid_satext import files_management -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) from sat_frontends.primitivus.constants import Const as C diff --git a/sat_frontends/quick_frontend/constants.py b/sat_frontends/quick_frontend/constants.py index 36e130e9..5fa9b61d 100644 --- a/sat_frontends/quick_frontend/constants.py +++ b/sat_frontends/quick_frontend/constants.py @@ -17,8 +17,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core import constants -from sat.core.i18n import _ +from libervia.backend.core import constants +from libervia.backend.core.i18n import _ from collections import OrderedDict # only available from python 2.7 diff --git a/sat_frontends/quick_frontend/quick_app.py b/sat_frontends/quick_frontend/quick_app.py index a78ca34c..9a23e7ae 100644 --- a/sat_frontends/quick_frontend/quick_app.py +++ b/sat_frontends/quick_frontend/quick_app.py @@ -16,11 +16,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.log import getLogger -from sat.core.i18n import _ -from sat.core import exceptions -from sat.tools import trigger -from sat.tools.common import data_format +from libervia.backend.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core import exceptions +from libervia.backend.tools import trigger +from libervia.backend.tools.common import data_format from sat_frontends.tools import jid from sat_frontends.quick_frontend import quick_widgets diff --git a/sat_frontends/quick_frontend/quick_blog.py b/sat_frontends/quick_frontend/quick_blog.py index e5cdfce3..8da14aaa 100644 --- a/sat_frontends/quick_frontend/quick_blog.py +++ b/sat_frontends/quick_frontend/quick_blog.py @@ -18,7 +18,7 @@ # along with this program. If not, see . # from sat.core.i18n import _, D_ -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) @@ -26,7 +26,7 @@ log = getLogger(__name__) from sat_frontends.quick_frontend.constants import Const as C from sat_frontends.quick_frontend import quick_widgets from sat_frontends.tools import jid -from sat.tools.common import data_format +from libervia.backend.tools.common import data_format try: # FIXME: to be removed when an acceptable solution is here diff --git a/sat_frontends/quick_frontend/quick_chat.py b/sat_frontends/quick_frontend/quick_chat.py index 5840b5e1..00e9c731 100644 --- a/sat_frontends/quick_frontend/quick_chat.py +++ b/sat_frontends/quick_frontend/quick_chat.py @@ -16,10 +16,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.tools.common import data_format -from sat.core import exceptions +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.tools.common import data_format +from libervia.backend.core import exceptions from sat_frontends.quick_frontend import quick_widgets from sat_frontends.quick_frontend.constants import Const as C from collections import OrderedDict diff --git a/sat_frontends/quick_frontend/quick_contact_list.py b/sat_frontends/quick_frontend/quick_contact_list.py index 15403c29..205714bd 100644 --- a/sat_frontends/quick_frontend/quick_contact_list.py +++ b/sat_frontends/quick_frontend/quick_contact_list.py @@ -19,9 +19,9 @@ """Contact List handling multi profiles at once, should replace quick_contact_list module in the future""" -from sat.core.i18n import _ -from sat.core.log import getLogger -from sat.core import exceptions +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger +from libervia.backend.core import exceptions from sat_frontends.quick_frontend.quick_widgets import QuickWidget from sat_frontends.quick_frontend.constants import Const as C from sat_frontends.tools import jid diff --git a/sat_frontends/quick_frontend/quick_contact_management.py b/sat_frontends/quick_frontend/quick_contact_management.py index dbfa9259..ebe5f171 100644 --- a/sat_frontends/quick_frontend/quick_contact_management.py +++ b/sat_frontends/quick_frontend/quick_contact_management.py @@ -17,8 +17,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) from sat_frontends.tools.jid import JID diff --git a/sat_frontends/quick_frontend/quick_game_tarot.py b/sat_frontends/quick_frontend/quick_game_tarot.py index db6d1e17..5fe61f4a 100644 --- a/sat_frontends/quick_frontend/quick_game_tarot.py +++ b/sat_frontends/quick_frontend/quick_game_tarot.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) from sat_frontends.tools.jid import JID diff --git a/sat_frontends/quick_frontend/quick_games.py b/sat_frontends/quick_frontend/quick_games.py index 55bd480d..61f6ebad 100644 --- a/sat_frontends/quick_frontend/quick_games.py +++ b/sat_frontends/quick_frontend/quick_games.py @@ -17,11 +17,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from sat_frontends.tools import jid from sat_frontends.tools import games diff --git a/sat_frontends/quick_frontend/quick_menus.py b/sat_frontends/quick_frontend/quick_menus.py index 9da725e4..fb250f2e 100644 --- a/sat_frontends/quick_frontend/quick_menus.py +++ b/sat_frontends/quick_frontend/quick_menus.py @@ -26,8 +26,8 @@ except ( ): # Error raised is not the same depending on pyjsbuild options str = str -from sat.core.log import getLogger -from sat.core.i18n import _, language_switch +from libervia.backend.core.log import getLogger +from libervia.backend.core.i18n import _, language_switch log = getLogger(__name__) from sat_frontends.quick_frontend.constants import Const as C diff --git a/sat_frontends/quick_frontend/quick_profile_manager.py b/sat_frontends/quick_frontend/quick_profile_manager.py index 1cf0f32a..821bbf0c 100644 --- a/sat_frontends/quick_frontend/quick_profile_manager.py +++ b/sat_frontends/quick_frontend/quick_profile_manager.py @@ -17,8 +17,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core import log as logging +from libervia.backend.core.i18n import _ +from libervia.backend.core import log as logging log = logging.getLogger(__name__) from sat_frontends.primitivus.constants import Const as C diff --git a/sat_frontends/quick_frontend/quick_utils.py b/sat_frontends/quick_frontend/quick_utils.py index 27dd3098..102e4072 100644 --- a/sat_frontends/quick_frontend/quick_utils.py +++ b/sat_frontends/quick_frontend/quick_utils.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ +from libervia.backend.core.i18n import _ from os.path import exists, splitext from optparse import OptionParser diff --git a/sat_frontends/quick_frontend/quick_widgets.py b/sat_frontends/quick_frontend/quick_widgets.py index 6e437595..56cf7c11 100644 --- a/sat_frontends/quick_frontend/quick_widgets.py +++ b/sat_frontends/quick_frontend/quick_widgets.py @@ -17,10 +17,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) -from sat.core import exceptions +from libervia.backend.core import exceptions from sat_frontends.quick_frontend.constants import Const as C diff --git a/sat_frontends/tools/css_color.py b/sat_frontends/tools/css_color.py index fe98df89..a370a1cd 100644 --- a/sat_frontends/tools/css_color.py +++ b/sat_frontends/tools/css_color.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.log import getLogger +from libervia.backend.core.log import getLogger log = getLogger(__name__) diff --git a/sat_frontends/tools/xmlui.py b/sat_frontends/tools/xmlui.py index a21a7f3d..d4c4e1a7 100644 --- a/sat_frontends/tools/xmlui.py +++ b/sat_frontends/tools/xmlui.py @@ -17,12 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from sat.core.i18n import _ -from sat.core.log import getLogger +from libervia.backend.core.i18n import _ +from libervia.backend.core.log import getLogger log = getLogger(__name__) from sat_frontends.quick_frontend.constants import Const as C -from sat.core import exceptions +from libervia.backend.core import exceptions _class_map = {} diff --git a/setup.py b/setup.py index 0ffe1ab0..90f885e4 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ import os NAME = "libervia-backend" # NOTE: directory is still "sat" for compatibility reason, should be changed for 0.9 -DIR_NAME = "sat" +DIR_NAME = "libervia/backend" install_requires = [ 'babel < 3', @@ -102,9 +102,9 @@ setup( "architecture. It's multi frontend (desktop, web, console " "interface, CLI, etc) and multipurpose (instant messaging, " "microblogging, games, file sharing, etc).", - author="Association « Salut à Toi »", + author="Libervia dev team", author_email="contact@goffi.org", - url="https://salut-a-toi.org", + url="https://libervia.org", classifiers=[ "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.7", @@ -120,7 +120,7 @@ setup( ], packages=find_packages() + ["twisted.plugins"], data_files=[("share/locale/fr/LC_MESSAGES", - ["i18n/fr/LC_MESSAGES/sat.mo"]), + ["i18n/fr/LC_MESSAGES/libervia_backend.mo"]), (os.path.join("share/doc", NAME), ["CHANGELOG", "COPYING", "INSTALL", "README", "README4TRANSLATORS"]), (os.path.join("share", DBUS_DIR), [DBUS_FILE]), @@ -128,8 +128,8 @@ setup( entry_points={ "console_scripts": [ # backend + alias - "libervia-backend = sat.core.launcher:Launcher.run", - "sat = sat.core.launcher:Launcher.run", + "libervia-backend = libervia.backend.core.launcher:Launcher.run", + "sat = libervia.backend.core.launcher:Launcher.run", # CLI + aliases "libervia-cli = sat_frontends.jp.base:LiberviaCli.run", @@ -146,6 +146,6 @@ setup( use_scm_version=sat_dev_version if is_dev_version else False, install_requires=install_requires, extras_require=extras_require, - package_data={"sat": ["VERSION", "memory/migration/alembic.ini"]}, + package_data={"libervia.backend": ["VERSION", "memory/migration/alembic.ini"]}, python_requires=">=3.7", ) diff --git a/tests/e2e/libervia-cli/conftest.py b/tests/e2e/libervia-cli/conftest.py index 362559fd..e3fb988d 100644 --- a/tests/e2e/libervia-cli/conftest.py +++ b/tests/e2e/libervia-cli/conftest.py @@ -54,7 +54,7 @@ class LiberviaCliElt(LiberviaCliJson): def __init__(self): super().__init__() - from sat.tools.xml_tools import ElementParser + from libervia.backend.tools.xml_tools import ElementParser self.parser = ElementParser() def __call__(self, *args, **kwargs): diff --git a/tests/e2e/libervia-cli/test_libervia-cli.py b/tests/e2e/libervia-cli/test_libervia-cli.py index c8871cab..0762e198 100644 --- a/tests/e2e/libervia-cli/test_libervia-cli.py +++ b/tests/e2e/libervia-cli/test_libervia-cli.py @@ -25,10 +25,10 @@ import sh from sh import li import pytest -from sat.plugins.plugin_sec_oxps import NS_OXPS -from sat.plugins.plugin_sec_pte import NS_PTE -from sat.plugins.plugin_xep_0277 import NS_ATOM -from sat.tools.common import uri +from libervia.backend.plugins.plugin_sec_oxps import NS_OXPS +from libervia.backend.plugins.plugin_sec_pte import NS_PTE +from libervia.backend.plugins.plugin_xep_0277 import NS_ATOM +from libervia.backend.tools.common import uri if os.getenv("LIBERVIA_TEST_ENV_E2E") is None: diff --git a/tests/e2e/run_e2e.py b/tests/e2e/run_e2e.py index f5ed7a05..be8e0334 100755 --- a/tests/e2e/run_e2e.py +++ b/tests/e2e/run_e2e.py @@ -27,8 +27,8 @@ import sh import io import sat_templates import libervia -from sat.core import exceptions -from sat.tools.common import regex +from libervia.backend.core import exceptions +from libervia.backend.tools.common import regex import yaml try: from yaml import CLoader as Loader, CDumper as Dumper diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index f4e6cde0..3e54b7c4 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -21,9 +21,9 @@ from unittest.mock import MagicMock, AsyncMock from pytest import fixture from twisted.internet import defer from twisted.words.protocols.jabber import jid -from sat.core.sat_main import SAT -from sat.tools import async_trigger as trigger -from sat.core import xmpp +from libervia.backend.core.sat_main import SAT +from libervia.backend.tools import async_trigger as trigger +from libervia.backend.core import xmpp @fixture(scope="session") diff --git a/tests/unit/test_ap-gateway.py b/tests/unit/test_ap-gateway.py index fb34d34f..d4a516a3 100644 --- a/tests/unit/test_ap-gateway.py +++ b/tests/unit/test_ap-gateway.py @@ -34,20 +34,20 @@ from twisted.words.protocols.jabber.error import StanzaError from twisted.words.xish import domish from wokkel import pubsub, rsm -from sat.core import exceptions -from sat.core.constants import Const as C -from sat.memory.sqla_mapping import SubscriptionState -from sat.plugins import plugin_comp_ap_gateway -from sat.plugins.plugin_comp_ap_gateway import constants as ap_const -from sat.plugins.plugin_comp_ap_gateway import TYPE_ACTOR -from sat.plugins.plugin_comp_ap_gateway.http_server import HTTPServer -from sat.plugins.plugin_xep_0277 import NS_ATOM -from sat.plugins.plugin_xep_0422 import NS_FASTEN -from sat.plugins.plugin_xep_0424 import NS_MESSAGE_RETRACT -from sat.plugins.plugin_xep_0465 import NS_PPS -from sat.tools import xml_tools -from sat.tools.common import uri as xmpp_uri -from sat.tools.utils import xmpp_date +from libervia.backend.core import exceptions +from libervia.backend.core.constants import Const as C +from libervia.backend.memory.sqla_mapping import SubscriptionState +from libervia.backend.plugins import plugin_comp_ap_gateway +from libervia.backend.plugins.plugin_comp_ap_gateway import constants as ap_const +from libervia.backend.plugins.plugin_comp_ap_gateway import TYPE_ACTOR +from libervia.backend.plugins.plugin_comp_ap_gateway.http_server import HTTPServer +from libervia.backend.plugins.plugin_xep_0277 import NS_ATOM +from libervia.backend.plugins.plugin_xep_0422 import NS_FASTEN +from libervia.backend.plugins.plugin_xep_0424 import NS_MESSAGE_RETRACT +from libervia.backend.plugins.plugin_xep_0465 import NS_PPS +from libervia.backend.tools import xml_tools +from libervia.backend.tools.common import uri as xmpp_uri +from libervia.backend.tools.utils import xmpp_date TEST_BASE_URL = "https://example.org" diff --git a/tests/unit/test_plugin_xep_0082.py b/tests/unit/test_plugin_xep_0082.py index c9a75dcd..448c68c7 100644 --- a/tests/unit/test_plugin_xep_0082.py +++ b/tests/unit/test_plugin_xep_0082.py @@ -19,9 +19,9 @@ from datetime import date, datetime, time, timezone import pytest -from sat.core import exceptions +from libervia.backend.core import exceptions -from sat.plugins.plugin_xep_0082 import XEP_0082 +from libervia.backend.plugins.plugin_xep_0082 import XEP_0082 __all__ = [ # pylint: disable=unused-variable diff --git a/tests/unit/test_plugin_xep_0167.py b/tests/unit/test_plugin_xep_0167.py index 57bfc6c0..4c5932b1 100644 --- a/tests/unit/test_plugin_xep_0167.py +++ b/tests/unit/test_plugin_xep_0167.py @@ -23,11 +23,11 @@ from pytest import fixture from pytest import raises from twisted.words.protocols.jabber import jid -from sat.plugins.plugin_xep_0166 import XEP_0166 -from sat.plugins.plugin_xep_0167 import XEP_0167, mapping -from sat.plugins.plugin_xep_0167.constants import NS_JINGLE_RTP, NS_JINGLE_RTP_INFO -from sat.tools import xml_tools -from sat.tools.common import data_format +from libervia.backend.plugins.plugin_xep_0166 import XEP_0166 +from libervia.backend.plugins.plugin_xep_0167 import XEP_0167, mapping +from libervia.backend.plugins.plugin_xep_0167.constants import NS_JINGLE_RTP, NS_JINGLE_RTP_INFO +from libervia.backend.tools import xml_tools +from libervia.backend.tools.common import data_format @fixture(autouse=True) diff --git a/tests/unit/test_plugin_xep_0176.py b/tests/unit/test_plugin_xep_0176.py index ec7c3986..6ec16923 100644 --- a/tests/unit/test_plugin_xep_0176.py +++ b/tests/unit/test_plugin_xep_0176.py @@ -21,9 +21,9 @@ from unittest.mock import AsyncMock, MagicMock from pytest import fixture from pytest_twisted import ensureDeferred as ed -from sat.plugins.plugin_xep_0166 import XEP_0166 -from sat.plugins.plugin_xep_0176 import NS_JINGLE_ICE_UDP, XEP_0176 -from sat.tools import xml_tools +from libervia.backend.plugins.plugin_xep_0166 import XEP_0166 +from libervia.backend.plugins.plugin_xep_0176 import NS_JINGLE_ICE_UDP, XEP_0176 +from libervia.backend.tools import xml_tools @fixture(autouse=True) diff --git a/tests/unit/test_plugin_xep_0215.py b/tests/unit/test_plugin_xep_0215.py index 36bc1289..1d687bbb 100644 --- a/tests/unit/test_plugin_xep_0215.py +++ b/tests/unit/test_plugin_xep_0215.py @@ -19,8 +19,8 @@ from twisted.internet import defer from pytest_twisted import ensureDeferred as ed from unittest.mock import MagicMock -from sat.plugins.plugin_xep_0215 import XEP_0215 -from sat.tools import xml_tools +from libervia.backend.plugins.plugin_xep_0215 import XEP_0215 +from libervia.backend.tools import xml_tools from twisted.words.protocols.jabber import jid diff --git a/tests/unit/test_plugin_xep_0293.py b/tests/unit/test_plugin_xep_0293.py index e4183df7..1f784dc4 100644 --- a/tests/unit/test_plugin_xep_0293.py +++ b/tests/unit/test_plugin_xep_0293.py @@ -18,9 +18,9 @@ from twisted.words.xish import domish -from sat.plugins.plugin_xep_0167.constants import NS_JINGLE_RTP -from sat.plugins.plugin_xep_0293 import NS_JINGLE_RTP_RTCP_FB, RTCP_FB_KEY, XEP_0293 -from sat.tools import xml_tools +from libervia.backend.plugins.plugin_xep_0167.constants import NS_JINGLE_RTP +from libervia.backend.plugins.plugin_xep_0293 import NS_JINGLE_RTP_RTCP_FB, RTCP_FB_KEY, XEP_0293 +from libervia.backend.tools import xml_tools class TestXEP0293: diff --git a/tests/unit/test_plugin_xep_0294.py b/tests/unit/test_plugin_xep_0294.py index 987859e9..851f8e0e 100644 --- a/tests/unit/test_plugin_xep_0294.py +++ b/tests/unit/test_plugin_xep_0294.py @@ -19,8 +19,8 @@ from twisted.words.xish import domish -from sat.plugins.plugin_xep_0294 import NS_JINGLE_RTP_HDREXT, XEP_0294 -from sat.tools.xml_tools import parse +from libervia.backend.plugins.plugin_xep_0294 import NS_JINGLE_RTP_HDREXT, XEP_0294 +from libervia.backend.tools.xml_tools import parse class TestXEP0294: diff --git a/tests/unit/test_plugin_xep_0320.py b/tests/unit/test_plugin_xep_0320.py index 54026805..847d84a3 100644 --- a/tests/unit/test_plugin_xep_0320.py +++ b/tests/unit/test_plugin_xep_0320.py @@ -18,8 +18,8 @@ from twisted.words.xish import domish -from sat.plugins.plugin_xep_0320 import NS_JINGLE_DTLS, XEP_0320 -from sat.tools import xml_tools +from libervia.backend.plugins.plugin_xep_0320 import NS_JINGLE_DTLS, XEP_0320 +from libervia.backend.tools import xml_tools class TestXEP0320: diff --git a/tests/unit/test_plugin_xep_0338.py b/tests/unit/test_plugin_xep_0338.py index babf21b1..845bd131 100644 --- a/tests/unit/test_plugin_xep_0338.py +++ b/tests/unit/test_plugin_xep_0338.py @@ -19,8 +19,8 @@ from twisted.words.xish import domish -from sat.plugins.plugin_xep_0338 import NS_JINGLE_GROUPING, XEP_0338 -from sat.tools.xml_tools import parse +from libervia.backend.plugins.plugin_xep_0338 import NS_JINGLE_GROUPING, XEP_0338 +from libervia.backend.tools.xml_tools import parse class TestXEP0338: diff --git a/tests/unit/test_plugin_xep_0339.py b/tests/unit/test_plugin_xep_0339.py index 49b1ea47..3b7d9eae 100644 --- a/tests/unit/test_plugin_xep_0339.py +++ b/tests/unit/test_plugin_xep_0339.py @@ -19,8 +19,8 @@ from twisted.words.xish import domish -from sat.plugins.plugin_xep_0339 import NS_JINGLE_RTP_SSMA, XEP_0339 -from sat.tools.xml_tools import parse +from libervia.backend.plugins.plugin_xep_0339 import NS_JINGLE_RTP_SSMA, XEP_0339 +from libervia.backend.tools.xml_tools import parse class TestXEP0339: diff --git a/tests/unit/test_plugin_xep_0373.py b/tests/unit/test_plugin_xep_0373.py index 94b9c731..dc27d83a 100644 --- a/tests/unit/test_plugin_xep_0373.py +++ b/tests/unit/test_plugin_xep_0373.py @@ -1,12 +1,12 @@ from datetime import datetime, timedelta, timezone import pytest -from sat.core import exceptions +from libervia.backend.core import exceptions try: - from sat.plugins.plugin_xep_0373 import XEP_0373, NS_OX + from libervia.backend.plugins.plugin_xep_0373 import XEP_0373, NS_OX except exceptions.MissingModule as e: pytest.skip(f"Can't test XEP-0373: {e}", allow_module_level=True) -from sat.tools.xmpp_datetime import parse_datetime +from libervia.backend.tools.xmpp_datetime import parse_datetime from twisted.words.protocols.jabber import jid diff --git a/tests/unit/test_plugin_xep_0420.py b/tests/unit/test_plugin_xep_0420.py index db7ee3ee..e73cfb43 100644 --- a/tests/unit/test_plugin_xep_0420.py +++ b/tests/unit/test_plugin_xep_0420.py @@ -20,14 +20,14 @@ from datetime import datetime, timezone from typing import Callable, cast import pytest -from sat.core import exceptions +from libervia.backend.core import exceptions -from sat.plugins.plugin_xep_0334 import NS_HINTS -from sat.plugins.plugin_xep_0420 import ( +from libervia.backend.plugins.plugin_xep_0334 import NS_HINTS +from libervia.backend.plugins.plugin_xep_0420 import ( NS_SCE, XEP_0420, AffixVerificationFailed, ProfileRequirementsNotMet, SCEAffixPolicy, SCECustomAffix, SCEProfile ) -from sat.tools.xml_tools import ElementParser +from libervia.backend.tools.xml_tools import ElementParser from twisted.words.xish import domish diff --git a/tests/unit/test_pubsub-cache.py b/tests/unit/test_pubsub-cache.py index b0da4566..e6e00ed8 100644 --- a/tests/unit/test_pubsub-cache.py +++ b/tests/unit/test_pubsub-cache.py @@ -19,8 +19,8 @@ from twisted.internet import defer from pytest_twisted import ensureDeferred as ed from unittest.mock import MagicMock, patch -from sat.memory.sqla import PubsubNode, SyncState -from sat.core.constants import Const as C +from libervia.backend.memory.sqla import PubsubNode, SyncState +from libervia.backend.core.constants import Const as C class TestPubsubCache: diff --git a/twisted/plugins/sat_plugin.py b/twisted/plugins/sat_plugin.py index 1cd53a48..95c40cc6 100644 --- a/twisted/plugins/sat_plugin.py +++ b/twisted/plugins/sat_plugin.py @@ -23,8 +23,8 @@ from twisted.plugin import IPlugin from twisted.application.service import IServiceMaker # XXX: We need to configure logs before any log method is used, so here is the best place. -from sat.core.constants import Const as C -from sat.core.i18n import _ +from libervia.backend.core.constants import Const as C +from libervia.backend.core.i18n import _ from sat_tmp.wokkel import install as install_wokkel_patches @@ -35,7 +35,7 @@ install_wokkel_patches() def initialise(options): """Method to initialise global modules""" # XXX: We need to configure logs before any log method is used, so here is the best place. - from sat.core import log_config + from libervia.backend.core import log_config log_config.sat_configure(C.LOG_BACKEND_TWISTED, C, backend_data=options) @@ -69,7 +69,7 @@ class SatMaker: # XXX: Libervia must be imported after log configuration, # because it write stuff to logs initialise(options.parent) - from sat.core.sat_main import SAT + from libervia.backend.core.sat_main import SAT return SAT()